-
-
Notifications
You must be signed in to change notification settings - Fork 729
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Style Switcher for Examples #4813
base: main
Are you sure you want to change the base?
Conversation
|
||
try { | ||
config = JSON.parse(configBody); | ||
const htmlContent = rawHtml.replace(configPattern, '').trim(); |
Check failure
Code scanning / CodeQL
Incomplete multi-character sanitization High
<!--
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4813 +/- ##
==========================================
- Coverage 87.87% 87.76% -0.11%
==========================================
Files 265 265
Lines 37577 37590 +13
Branches 2349 2359 +10
==========================================
- Hits 33020 32991 -29
- Misses 3518 3561 +43
+ Partials 1039 1038 -1 ☔ View full report in Codecov by Sentry. |
Thanks for opening this pull request and showcasing how different tile providers could be handled on a technical level, @ianthetechie. The MapLibre Governing Board is in the middle of drafting a policy for the examples and I suggest to wait for the new policy before changing the current state of the docs website. Thanks for your patience! |
Besides what @wipfli mentioned, here are my 2 cents:
Hope that makes sense. I don't have hard feelings either way. But the examples and docs were extremely complicated when I rewrote them, and I would like to avoid getting back to a complicated docs build scripting as much as possible... |
@ianthetechie thanks for the PR. It'd like to see the scope of this work be reduced to the style switcher functionality itself, focusing on the feedback @HarelM mention, and leaving out any changes to which styles are used in the examples. Introducing the capability of listing multiple styles is by itself not controversial, and it brings a degree of freedom to the policy negotiations that @wipfli mentioned (which styles to list; which to have default). I don't know if it's the case already, but it's necessary we can set a default / order, and not only have it alphabetic. |
I thought the same thing initially. I liked the look and feel of
Yeah, I think I understand what you're getting at here. My approach so far preserves that, I think? As in, you can just open up any HTML file (with a The style switcher is added on separately for now because this isn't important to the example. If we added the style switcher directly in the example code, we would have to process that out, which gets a lot trickier. Adding the "metadata" about which styles are supported via a comment preserves the "just works locally" nature of the examples, and makes them easy to copy+paste. I'm not sure if you were also (in?)directly addressing the fact that the style switcher manipulates the example HTML as well, but I think this is a useful feature because it means users can copy any example and reproduce it (sans API key perhaps) locally, and the result will look just like the example. Let me know if I've missed/misunderstood something in this discussion @HarelM :)
Understood and agreed 😅 |
Thanks for the comments @birkskyum!
Fair enough! Apologies if this was perceived as a recommendation on specific styles to include. The easiest way to implement a style picker selectively was to look for a known (default) URL. I think it's important to point out that some examples today are highly specific to one tile provider (ex: some that make modifications that are specific to MapTiler), or that make assumptions about the schema. I'm perfectly fine with both, so my suggestion was to set a default style because it's easy to just look for that and assume that styles using a different default are not going to use the switcher.
The current implementation is that the default is sorta hard-coded, and the rest appear in the specified order. I chose alphabetical ordering because it was neutral. I think the two big outstanding questions on how to best implement this are as follows:
|
Let's wait for the board decision on this before we progress any further. |
This isn't blocked by the board negotiation, because we're only been proposed to control the default style, not wether or not there can be multiple options. So it should be possible to add this uncontroversially, if the default aren't changed. A note on the latter, to accommodate the need for providers to link to example using their styles, there are some options that can be considered adding on top, if it doesn't inflate complexity too much. One option is to introduce a query param like /heatmap-example/?provider=stadiamaps and another is a localstorage to remember the selection when moving around, like the mapbox/maplibre switch here - but that work comes after introducing the core functionality. |
As stated above, I would like to reduce the complexity of the examples as much as possible. |
I'm opening this PR as a draft first as it is still incomplete, but want to get feedback on the overall approach before proceeding.
Summary
This PR introduces a wider set of basemaps that will cover most examples.
The MapLibre demo tiles work for some examples, but are not great at showcasing MapLibre's full capabilities. As such, MapLibre GL JS examples currently use tiles from several providers (the vast majority being MapTiler, which whitelists the example traffic). Since MapLibre is a vendor-neutral project and most examples are not specific to any particular provider, it makes sense to be able to switch examples between several options. This will result in greater awareness for MapLibre and better examples, since tile providers are incentivized to improve and update the examples, and link directly to them from their own sites.
Where possible (some examples may justifiably be limited to specific providers), I propose that the Americana stylesheet should be the default where we need a more "full" basemap. Other providers will be listed in alphabetical order (full disclosure: I'm affiliated with Stadia Maps, and the proposed sorting puts us at the bottom of the current list).
My reading of the Americana Tile Usage Policy is that MapLibre usage falls under the acceptable usage policy. Though I think we probably need to reach out as the maplibre.org domain, while (I think) hosted on GitHub pages, seems to use CloudFlare in front.
Technical discussion
Deciding when to display a style switcher
Examples that meet some criteria (at doc generation time) will have a style switcher. Currently, the criteria is "does the example use the OSM Americana style URL, since I'm proposing that as the default. I have updated a handful of examples to illustrate this. The rest of the examples will be addressed one-by-one after we agree on the approach.
An alternative would be to include some metadata at the top of the example (more on that later). I have opened this draft without that, as I think it unnecessarily complicates the majority of examples.
Examples that do not pass the "should we have a switcher" check are displayed as they were before. This allows for examples that are provider-specific or only make sense with a single style.
Style switcher implementation
The style switcher is currently a select box added via a map control. We could devise something that looks a bit nicer perhaps, but I opted for this as it's simple and looks reasonably good. The control is injected into the documentation (iframe component) if the generator determines that the example should have a style switcher. This JavaScript is obviously not included in the copyable sample code; it's localized to the iframe.
Changing the selection map style will update the URL with a query string parameter with a style slug. This parameter will be consulted on page load so that copying a URL will let the recipient see the same style.
Changing the map style will also update the example code! The way this currently works is admittedly a bit hackish, since we have to work with a loaded DOM. I believe the method is sufficiently robust, but am open to alternatives. The only MkDocs-native methods I could think of (generating a bunch of tabs with code fences that are 99% duplicate code) would multiply the size of the examples, and would be difficult if not impossible to sync with the map view.
Customizing the set of displayed styles
The set of available map styles can be overridden per example.
The examples are currently plain HTML files, so in the interest of keeping it that way and localizing overrides, I've opted for parsing a leading HTML comment as a JSON configuration (sort of like YAML frontmatter, but we can't have nice things like that in HTML). The generator removes the parsed comment from the example.
This is admittedly hackish, but I believe it's robust enough. We already use similar approaches when parsing JS plugins in the doc from the awesom-maplibre repo. The other idea I've considered so far is putting the overrides directly in
generate-docs.ts
. This is worse in my opinion, since you would need to look at the generator script to understand how an example behaves. That felt wrong.Known issues
Screenshots
Before
After
Launch Checklist
CHANGELOG.md
under the## main
section.