@trailstash/ultra 3.3.4 → 3.4.1

package/.gitlab-ci.yml

@@ -1,8 +1,10 @@
 pages:
-  image: node:18
+  image: node:20
   script:
-    - apt update && apt install -y mkdocs-material
+    - apt update && apt install -y mkdocs-material jq moreutils
     - npm ci
+    # Update version
+    - jq ".version = \"$(git describe --tags --dirty | sed -e 's/^v//')\"" package.json | sponge package.json
     - npm run build
     - npm run build:examples-docs
     - npm run build:maplibre-examples-docs
@@ -13,3 +15,11 @@ pages:
     - public
   only:
   - main
+  - tags
+npm:
+  image: node:20
+  script:
+    - npm version from-git --no-git-tag-version
+    - npm publish
+  only:
+  - tags

package/Examples/index.md

@@ -1,7 +1,6 @@
 # Overview
 
-These examples highlight capabilities and differences unique to Overpass Ultra such as it's styling
-capabilities, non-OSM data capabilities, etc.
+These examples highlight Ultra's capabilities.
 
 For examples of how to author OverpassQL queries, please reference the abundance of documentation
 on the [OSM Wiki](https://wiki.openstreetmap.org) and elsewhere.

package/README.md

@@ -1,45 +1,28 @@
-# Introduction
+# Ultra
 
-Ultra is a web-application made to simplify making maps with [MapLibre GL
+Ultra (née Overpass Ultra) is a web-application made to simplify making maps with [MapLibre GL
 JS](https://maplibre.org).
 
-## Deployments
-
-- Production version - [overpass-ultra.us](https://overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/overpass-ultra/-/blob/main/config.js))</small>
-- Development Version - [ultra.trailsta.sh](https://ultra.trailsta.sh) <small>([config](https://gitlab.com/trailstash/ultra/-/blob/main/config.js))</small>
+- Stable version - [overpass-ultra.us](https://overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/overpass-ultra/-/blob/main/config.js))</small>
+- Latest version - [ultra.trailsta.sh](https://ultra.trailsta.sh) <small>([config](https://gitlab.com/trailstash/ultra/-/blob/main/config.js))</small>
 - OHM version - [ohm.overpass-ultra.us](https://ohm.overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/ohm-ultra/-/blob/main/config.js))</small>
 
 ## Documentation
 
-The documentation for Ultra is available at <a target="_blank" href="/docs/">/docs</a>.
-
-## Configuration
-
-Various aspects of Ultra, such as styling, can be
-configured via [YAML front-matter](/docs/yaml).
+The documentation for Ultra is available at <a target="_blank" href="https://overpass-ultra.us/docs/">overpass-ultra.us/docs</a>.
 
-## Overpass Queries
+### Configuration
 
-Overpass API allows to query for OSM data by your own search criteria. For this purpose, it has a
-specifically crafted query language: [Overpass
-QL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
+Various aspects of Ultra, such as styling, can be configured via [YAML
+front-matter](https://overpass-ultra.us/docs/yaml).
 
-In addition to regular Overpass API queries one can use `{{bbox}}` to specify the bounding box
-coordinates of the current map view.
-
-## Styling
+### Styling
 
 Ultra supports styling using an
 [extended](/docs/style#ultra-maplibre-styles) version of the the [MapLibre
 Style Spec](https://maplibre.org/maplibre-style-spec/).
 
-See the [Styling](/docs/style) section for more information.
-
-## About
-
-Ultra is built by Daniel Schep.
-
-You can contact me on [Mastodon](https://mapstodon.space/@trailstash).
+See the [Styling](https://overpass-ultra.us/docs/style) section for more information.
 
 ## Feedback, Bug Reports, Feature Requests
 
@@ -49,7 +32,14 @@ experimental.
 If you would like to report a bug or provide other feedback, please do so in the project's
 [Issue Tracker](https://gitlab.com/trailstash/ultra/-/issues).
 
-## Source Code</h4>
+## Development
+
+```
+npm install
+npm start # for a Development server listening at http://localhost:8000
+npm run build # for a build in ./dist
+```
+
+## License
 
-The [source code](https://gitlab.com/trailstash/ultra) of this application is released under the
-[MIT license](https://gitlab.com/trailstash/ultra/-/blob/master/LICENSE).
+**Ultra** is licensed under the [MIT license](https://gitlab.com/trailstash/ultra/-/blob/master/LICENSE).

package/components/download-button.js

@@ -44,7 +44,7 @@ export class DownloadButton extends HTMLElement {
       const blob = new Blob([json], { type: "octet/stream" });
       const url = window.URL.createObjectURL(blob);
 
-      const link = h("a", { download: "overpass.geojson", href: url });
+      const link = h("a", { download: "ultra.geojson", href: url });
 
       // this is necessary as link.click() does not work on the latest firefox
       link.dispatchEvent(

package/components/help-modal.js

@@ -6,18 +6,85 @@ import { toQueryParams } from "../lib/queryParams.js";
 import { version } from "../package.json";
 import { version as maplibreVersion } from "maplibre-gl/package.json";
 import { version as osmtogeojsonVersion } from "osmtogeojson/package.json";
-import readme from "../README.md";
+
+const help = `# Introduction
+
+Ultra (née Overpass Ultra) is a web-application made to simplify making maps with [MapLibre GL
+JS](https://maplibre.org).
+
+It can easily visualize the following file/query types:
+
+ * [GeoJSON](https://geojson.org/)
+ * [KML](https://developers.google.com/kml/documentation/kml_tut)
+ * [GPX](https://www.topografix.com/gpx.asp)
+ * [TCX](https://en.wikipedia.org/wiki/Training_Center_XML)
+ * [OverpassQL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
+ * [Overpass XML](https://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide)
+ * [OSM XML](https://wiki.openstreetmap.org/wiki/OSM_XML)
+ * [OSM JSON](https://wiki.openstreetmap.org/wiki/OSM_JSON)
+
+## Documentation
+
+Full documentation for Ultra is available at ${window.location.origin}/docs
+
+## Configuration
+
+Various aspects of Ultra, such as styling, can be
+configured via [YAML front-matter](/docs/yaml).
+
+## Query Bounds
+
+The following shortcuts are available to parameterize your queries:
+
+| shortcut | description |
+| -------- | ----------- |
+| \`{{bbox}}\` | The map's bounds in the format expected by [https://overpass-api.de](Overpass) |
+| \`{{south}}\` | The Southern Latitude of the map's bounds |
+| \`{{north}}\` | The Northern Latitude of the map's bounds |
+| \`{{east}}\` | The Eastern Longitude of the map's bounds |
+| \`{{west}}\` | The Western Longitude of the map's bounds |
+
+## Styling
+
+Ultra supports styling using an extended version of the the
+[MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/).
+
+See the [Styling](/docs/style) section for more information.
+
+## About
+
+Ultra is built by Daniel Schep.
+
+You can contact me on [Mastodon](https://mapstodon.space/@trailstash).
+
+## Feedback, Bug Reports, Feature Requests
+
+While Ultra has been in development for a while, it should still be considered
+experimental.
+
+If you would like to report a bug or provide other feedback, please do so in the project's
+[Issue Tracker](https://gitlab.com/trailstash/ultra/-/issues).
+
+## Source Code</h4>
+
+The [source code](https://gitlab.com/trailstash/ultra) of this application is released under the
+[MIT license](https://gitlab.com/trailstash/ultra/-/blob/main/LICENSE).
+`;
 
 export class HelpModal extends HTMLElement {
+  static defaults = {
+    help,
+  };
   constructor() {
     super();
-    this.help = readme;
+    this.help = HelpModal.defaults.help;
+    this.styles = [];
   }
 
   connectedCallback() {
     const shadow = this.attachShadow({ mode: "open" });
 
-    const readmeHTML = marked
+    const helpHTML = marked
       .parse(this.help)
       .replace(/<\/h3>/g, "</h5>")
       .replace(/<h3>/g, "<h5>")
@@ -26,11 +93,21 @@ export class HelpModal extends HTMLElement {
       .replace(/<\/h1>/g, "</h3>")
       .replace(/<h1>/g, "<h3>");
 
+    let stylesHTML = "";
+    if (this.styles.length > 0) {
+      stylesHTML = `<div><h4>Style & Tile Providers</h4><ul>`;
+      for (const style of this.styles) {
+        stylesHTML += `<li>${style[2]}</li>`;
+      }
+      stylesHTML += `</ul></div>`;
+    }
+
     const div = h(
       "div",
       { style: "padding: 0 8px 8px;max-width:800px;", slot: "modal-content" },
       `
-          ${readmeHTML}
+          ${helpHTML}
+          ${stylesHTML}
           <div>
             <h4>Software &amp; Libraries</h4>
             <ul>

package/components/map-popup.js

@@ -1,3 +1,4 @@
+import DOMPurify from "dompurify";
 import { Liquid } from "liquidjs";
 import { h, t } from "../lib/dom.js";
 import { normalizeCSS } from "../lib/normalize.js";
@@ -50,7 +51,7 @@ export class MapPopup extends HTMLElement {
         this.template,
         this.contextBuilder(f),
       );
-      div.appendChild(h("div", {}, html));
+      div.appendChild(h("div", {}, DOMPurify.sanitize(html)));
     }
     shadow.appendChild(div);
   }

package/components/style-picker.js

@@ -4,10 +4,25 @@ import { normalizeCSS } from "../lib/normalize.js";
 
 const style = `margin: 10px 0; display: block; width: 100%; text-align: left;`;
 
+const styles = [
+  [
+    "Natural Earth Vector",
+    "https://trailstash.github.io/naturalearthtiles/maps/natural_earth.vector.json",
+    `<a href="https://github.com/trailstash/naturalearthtiles">TrailStash</a>`,
+  ],
+  [
+    "MapLibre Demo Tiles",
+    "https://demotiles.maplibre.org/style.json",
+    `<a href="https://github.com/maplibre/demotiles">MapLibre</a>`,
+  ],
+];
+
 export class StylePicker extends HTMLElement {
+  static defaults = { styles };
+
   constructor() {
     super();
-    this.styles = [];
+    this.styles = StylePicker.defaults.styles;
   }
 
   connectedCallback() {

package/components/ultra-ide.js

@@ -16,6 +16,8 @@ import {
   queryFromStorage,
 } from "../lib/localStorage.js";
 import { UltraMap } from "./ultra-map.js";
+import { HelpModal } from "./help-modal.js";
+import { StylePicker } from "./style-picker.js";
 
 const style = new CSSStyleSheet();
 style.replaceSync(`
@@ -85,7 +87,7 @@ export class UltraIDE extends HTMLElement {
   autoRun = false;
   query = "";
   settings = {};
-  styles = [];
+  styles;
   help;
 
   static MAP_INIT_SETTINGS = [
@@ -127,8 +129,13 @@ export class UltraIDE extends HTMLElement {
           h("run-button"),
           h("download-button"),
           h("share-button"),
-          h("style-picker", { styles: this.styles }),
-          h("help-modal", this.help ? { help: this.help } : {}),
+          h("style-picker", {
+            styles: this.styles || StylePicker.defaults.styles,
+          }),
+          h("help-modal", {
+            help: this.help || HelpModal.defaults.help,
+            styles: this.styles || StylePicker.defaults.styles,
+          }),
         ),
       ),
     );

package/components/ultra-map.js

@@ -41,7 +41,8 @@ export class UltraMap extends HTMLElement {
     type: "auto",
     query: "",
     server: null,
-    mapStyle: "https://demotiles.maplibre.org/style.json",
+    mapStyle:
+      "https://trailstash.github.io/naturalearthtiles/maps/natural_earth.vector.json",
     popupTemplate: null,
     querySources: ["ultra"],
     options: {},
@@ -169,7 +170,7 @@ export class UltraMap extends HTMLElement {
       document.title = this.title;
     }
     if (this.icon) {
-      document.querySelector('[rel=icon]').href = this.icon;
+      document.querySelector("[rel=icon]").href = this.icon;
     }
     if (this.description) {
       // TODO?

package/docs/index.md

@@ -1,39 +1,44 @@
 # Introduction
 
-Ultra is a web-application made to simplify making maps with [MapLibre GL
+Ultra (née Overpass Ultra) is a web-application made to simplify making maps with [MapLibre GL
 JS](https://maplibre.org).
 
-## Deployments
+![](./assets/screenshot.png)
 
-- Production version - [overpass-ultra.us](https://overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/overpass-ultra/-/blob/main/config.js))</small>
-- Development Version - [ultra.trailsta.sh](https://ultra.trailsta.sh) <small>([config](https://gitlab.com/trailstash/ultra/-/blob/main/config.js))</small>
-- OHM version - [ohm.overpass-ultra.us](https://ohm.overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/ohm-ultra/-/blob/main/config.js))</small>
+It can easily visualize the following file/query types:
 
-## Documentation
-
-The documentation for Ultra is available at <a target="_blank" href="/docs/">/docs</a>.
+ * [GeoJSON](https://geojson.org/)
+ * [KML](https://developers.google.com/kml/documentation/kml_tut)
+ * [GPX](https://www.topografix.com/gpx.asp)
+ * [TCX](https://en.wikipedia.org/wiki/Training_Center_XML)
+ * [OverpassQL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
+ * [Overpass XML](https://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide)
+ * [OSM XML](https://wiki.openstreetmap.org/wiki/OSM_XML)
+ * [OSM JSON](https://wiki.openstreetmap.org/wiki/OSM_JSON)
 
 ## Configuration
 
 Various aspects of Ultra, such as styling, can be
-configured via [YAML front-matter](/docs/yaml).
+configured via [YAML front-matter](./yaml.md).
 
-## Overpass Queries
+## Query Bounds
 
-Overpass API allows to query for OSM data by your own search criteria. For this purpose, it has a
-specifically crafted query language: [Overpass
-QL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
+The following shortcuts are available to parameterize your queries:
 
-In addition to regular Overpass API queries one can use `{{bbox}}` to specify the bounding box
-coordinates of the current map view.
+| shortcut | description |
+| -------- | ----------- |
+| `{{bbox}}` | The map's bounds in the format expected by [Overpass](https://overpass-api.de) |
+| `{{south}}` | The Southern Latitude of the map's bounds |
+| `{{north}}` | The Northern Latitude of the map's bounds |
+| `{{east}}` | The Eastern Longitude of the map's bounds |
+| `{{west}}` | The Western Longitude of the map's bounds |
 
 ## Styling
 
-Ultra supports styling using an
-[extended](/docs/style#ultra-maplibre-styles) version of the the [MapLibre
-Style Spec](https://maplibre.org/maplibre-style-spec/).
+Ultra supports styling using an extended version of the the
+[MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/).
 
-See the [Styling](/docs/style) section for more information.
+See the [Styling](./style.md) section for more information.
 
 ## About
 

package/docs/query-shortcuts.md

@@ -1,8 +1,9 @@
-In order to allow for querying Overpass with the extents of the MapLibre viewport, Overpass Ultra
+In order to allow for querying Overpass with the extents of the MapLibre viewport, Ultra
 replaces any occurences of `{{bbox}}` in the query with the bounding box in the format expected by
 the Overpass API.
 
 For example:
+
 ```
 [bbox:{{bbox}}];
 nwr[shop];
@@ -10,12 +11,13 @@ out center;
 ```
 
 ### Other formats
+
 If you need to specify the coordinates in a different order, you can use the following shortcuts
 for the min and max of both lattitude and longitude:
 
-* `{{south}}`
-* `{{north}}`
-* `{{east}}`
-* `{{west}}`
+- `{{south}}`
+- `{{north}}`
+- `{{east}}`
+- `{{west}}`
 
 [Example](./Examples/alt-bbox-format.md)

package/docs/style.md

@@ -1,20 +1,20 @@
 # Styling
 
-The MapLibre styling can be attached to a query written in the Overpass-QL query language via the
-`style:` key of the [YAML front-matter](./yaml.md).
+The MapLibre styling can be attached to a query via the `style:` key of the [YAML
+front-matter](./yaml.md).
 
 ```
 ---
 style: ... your MapLibre style here ...
 ---
-... your overpass query here ...
+... your query here ...
 ```
 
 The value of the style: key can contain:
 
- * a URL to a MapLibre style
- * a full MapLibre style object
- * a Ultra MapLibre style
+- a URL to a MapLibre style
+- a full MapLibre style object
+- a Ultra MapLibre style
 
 ## Ultra MapLibre styles
 
@@ -58,12 +58,14 @@ nwr[shop]({{bbox}}); out center;
 ```
 
 ### Layer `source` & `id`
+
 In the above examples, the layer definitions are lacking both source and layers keys.
 
 Layers don't need to specify an ID, and if the source is not specified, it will be set to to the
 source containting the query results.
 
 ### Automatic `paint` and `layer` keys
+
 In order to reduce the mental overhead of remember what keys are
 [`paint`](https://maplibre.org/maplibre-style-spec/layers/#paint) options and which are
 [`layout`](https://maplibre.org/maplibre-style-spec/layers/#layout) options, Ultra will
@@ -82,11 +84,13 @@ nwr[shop]({{bbox}}); out center;
 ```
 
 ### Sandwiching layers
-In order to place your layers below existing style layers, you can use the `beforeLayerId:` key. 
+
+In order to place your layers below existing style layers, you can use the `beforeLayerId:` key.
 
 [Example](./Examples/bike-infra.md)
 
 ## PNG sprites via HTTPS
+
 In order to facilitate adding icons to the map that don't exist in the basemap's
 [sprites](),
 if `icon-image` is set to an HTTPS URL to a PNG image, Ultra will automatically download
@@ -95,6 +99,7 @@ it and add it to the Map's images.
 [Example](./MapLibre-Examples/add-image.md)
 
 ## Bundled Sprites
+
 In order to simplify the creation of POI maps, Ultra bundles the
 [Maki](https://github.com/mapbox/maki) and [Temaki](https://github.com/rapideditor/temaki) sprites
 and adds them to your style as [SDFs](https://docs.mapbox.com/help/troubleshooting/using-recolorable-images-in-mapbox-maps/)
@@ -115,6 +120,7 @@ style:
 ```
 
 ## Fallback fontstack
+
 Since not all MapLibre styles have the same
 [glyphs](https://maplibre.org/maplibre-style-spec/glyphs/), Ultra will default to using
 Noto Sans Regular if the speficied(or default) fontstack is not available.

package/docs/url-parameters.md

@@ -6,7 +6,7 @@ You use the following query string parameters as a hash to instruct Ultra to set
 
 This sets the query to the given string.
 
-Example: [http://overpass-ultra.us/#query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B](http://overpass-ultra.us/#query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B)
+Example: [http://overpass-ultra.us/#query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B](<http://overpass-ultra.us/#query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B>)
 
 ### Loading Gists
 
@@ -36,10 +36,10 @@ Example: [http://overpass-ultra.us/#m=14.64/-33.8842/151.2077](http://overpass-u
 
 Runs the query immediately after startup.
 
-Example: [http://overpass-ultra.us/#run&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077](http://overpass-ultra.us/#run&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077)
+Example: [http://overpass-ultra.us/#run&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077](<http://overpass-ultra.us/#run&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077>)
 
 ## `map`
 
 Runs the query as a customizable interactive map.
 
-Example: [http://overpass-ultra.us/#map&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077 ](http://overpass-ultra.us/#map&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077 )
+Example: [http://overpass-ultra.us/#map&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077 ](<http://overpass-ultra.us/#map&query=node%5B%22amenity%22%3D%22drinking_water%22%5D(%7B%7Bbbox%7D%7D)%3B%0Aout%3B&m=14.64/-33.8842/151.2077>)

package/docs/yaml.md

@@ -7,7 +7,8 @@ The real power of Ultra lies in it's easy configuration of MapLibre with the a q
 
 Customize the MapLibre style. See [Styling](./style.md) for more information.
 
-Example: 
+Example:
+
 ```
 ---
 style: https://example.com/style.json
@@ -18,7 +19,8 @@ style: https://example.com/style.json
 
 Use a different Overpass API server.
 
-Example: 
+Example:
+
 ```
 ---
 server:  https://overpass.private.coffee/api/
@@ -45,92 +47,114 @@ Specify the type of source in the query.
 **Default:** `auto`
 
 ### `auto`
+
 Automatically detects and chooses the right query provider out of the following:
-* `overpass`
-* `osmWebsite`
-* `osmWiki`
-* `geojson`
-* `osmxml`
-* `osmjson`
-* `kml`
-* `gpx`
-* `tcx`
+
+- `overpass`
+- `osmWebsite`
+- `osmWiki`
+- `geojson`
+- `osmxml`
+- `osmjson`
+- `kml`
+- `gpx`
+- `tcx`
 
 See each provider for how it is auto-detected
 
 ### `overpass`
+
 An [Overpass QL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL) query. Results
 converted into a [GeoJSON source](https://maplibre.org/maplibre-style-spec/sources/#geojson) with
 [`osmtogeojson`](https://github.com/tyrasd/osmtogeojson).
 
 Detected if:
- * Parses as XML and the top level tag is `osm-script`
- * Matches one of the regexes defined [here](https://gitlab.com/trailstash/ultra/-/blob/main/lib/queryProviders/overpass.js#L11-34)
+
+- Parses as XML and the top level tag is `osm-script`
+- Matches one of the regexes defined [here](https://gitlab.com/trailstash/ultra/-/blob/main/lib/queryProviders/overpass.js#L11-34)
 
 ### `osmWebsite`
+
 Parses a URL to an node/way/relation on `osm.org` and fetches that element using an Overpass query
 using `out geom;`
 
 Detected if:
- * A URL on osm.org starting with node/way/relation
+
+- A URL on osm.org starting with node/way/relation
 
 ### `osmWiki`
+
 Perform an Overpass query using `nwr` and `out geom;` for an OSM wiki URL starting with `Tag:` or
 `Key:`
 
 Detected if:
- * A URL to the OSM wiki starting with `Tag:` or `Key:`
+
+- A URL to the OSM wiki starting with `Tag:` or `Key:`
 
 ### `osmxml`
+
 An [OSM XML](https://wiki.openstreetmap.org/wiki/OSM_XML) document or a URL to one. Converted into
 a [GeoJSON source](https://maplibre.org/maplibre-style-spec/sources/#geojson) with
 [`osmtogeojson`](https://github.com/tyrasd/osmtogeojson).
 
 Detected if:
- * Parses as XML and the top level tag is `osm`
- * Parses as a URL and the path matches that of an `node/:id`, `way/:id/full`, or
-   `relation/:id/full` OSM API route
+
+- Parses as XML and the top level tag is `osm`
+- Parses as a URL and the path matches that of an `node/:id`, `way/:id/full`, or
+  `relation/:id/full` OSM API route
 
 ### `osmjson`
+
 An [OSM JSON](https://wiki.openstreetmap.org/wiki/OSM_JSON) document or a URL to one. Converted
 into a [GeoJSON source](https://maplibre.org/maplibre-style-spec/sources/#geojson) with
 [`osmtogeojson`](https://github.com/tyrasd/osmtogeojson).
 
 Detected if:
- * Parses as JSON and contains a `version` key containing the value `0.6` at the top level.
- * Parses as a URL and the path matches that of an `node/:id`, `way/:id/full`, or
-   `relation/:id/full` OSM API route
+
+- Parses as JSON and contains a `version` key containing the value `0.6` at the top level.
+- Parses as a URL and the path matches that of an `node/:id`, `way/:id/full`, or
+  `relation/:id/full` OSM API route
 
 ### `geojson`
+
 A JSON-encoded GeoJSON object or a URL to a GeoJSON file.
 
 Detected if:
- * Parses as JSON and contains a `type` with a valid GeoJSON type.
+
+- Parses as JSON and contains a `type` with a valid GeoJSON type.
 
 ### `kml`
+
 A KML file or URL to a KML file.
 
 Detected if
- * Parses as XML and contains a top level `kml` tag
+
+- Parses as XML and contains a top level `kml` tag
 
 ### `gpx`
+
 A GPX file or URL to a GPX file.
 
 Detected if
- * Parses as XML and contains a top level `gpx` tag
+
+- Parses as XML and contains a top level `gpx` tag
 
 ### `tcx`
+
 A TCX file or URL to a TCX file.
 
 Detected if
- * Parses as XML and contains a top level `tcx` tag
+
+- Parses as XML and contains a top level `tcx` tag
 
 ### `raster`
+
 A line delimited list of [tile URLs](https://maplibre.org/maplibre-style-spec/sources/#tiles_1) for
 a [raster source](https://maplibre.org/maplibre-style-spec/sources/#raster) or a [TileJSON
 url](https://maplibre.org/maplibre-style-spec/sources/#url_1)
 
 ### `vector`
+
 A line delimited list of [tile URLs](https://maplibre.org/maplibre-style-spec/sources/#tiles_2) for
 a [vector source](https://maplibre.org/maplibre-style-spec/sources/#vector) or a [TileJSON
 url](https://maplibre.org/maplibre-style-spec/sources/#url_2)
@@ -152,13 +176,15 @@ options:
 ```
 
 ## `controls`
+
 When an Ultra query is run in "interactive map" mode, you can specify controls to be added to the map with the `controls` key
-in the YAML-front matter. The key should contain a list of objects. Each object must specify a `type` key containing the 
+in the YAML-front matter. The key should contain a list of objects. Each object must specify a `type` key containing the
 name of a control present in MapLibre. It can optionally contain an `options` key who's contents are passed to the
 control's constructor and a `position` key that is passed to
 [`map.addControl`](https://maplibre.org/maplibre-gl-js/docs/API/classes/Map/#addcontrol).
 
 For example, to add a NavigationControl to your map:
+
 ```
 ---
 controls:

package/lib/queryProviders/overpass.js

@@ -117,7 +117,6 @@ export const osmWebsite = {
       const [type, id] = urlMatch.slice(1);
       return overpass.source(`${type}(${id});out geom;`, controller, {
         server,
-        bounds,
       });
     } else {
       throw new Error(`Don't know how to load ${query}`);
@@ -156,7 +155,7 @@ out geom;`,
       throw new Error(`Don't know how to load ${query}`);
     }
 
-    return overpass.source(query, controller, { server, bounds });
+    return overpass.source(overpassQuery, controller, { server });
   },
   detect: function (query, bounds) {
     if (!query.startsWith("https://wiki.openstreetmap.org/wiki/")) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.3.4",
+  "version": "3.4.1",
   "description": "A web based tool for making MapLibre GL maps with data from sources such as Overpass, GeoJSON, GPX, KML, TCX, etc",
   "main": "index.js",
   "scripts": {
@@ -58,6 +58,9 @@
     "@trailstash/maplibre-component": "^1.0.1",
     "@turf/bbox": "^7.1.0",
     "deep-equal": "^2.2.3",
+    "dompurify": "^3.1.7",
+    "esbuild": "^0.24.0",
+    "esbuild-plugin-copy": "^2.1.1",
     "liquidjs": "^10.17.0",
     "lodash.pick": "^4.4.0",
     "lz-string": "^1.5.0",
@@ -66,9 +69,7 @@
     "normalize.css": "^8.0.1",
     "osmtogeojson": "^3.0.0-beta.5",
     "pmtiles": "^3.2.0",
-    "yaml": "^2.5.1",
-    "esbuild": "^0.24.0",
-    "esbuild-plugin-copy": "^2.1.1"
+    "yaml": "^2.5.1"
   },
   "peerDependencies": {
     "@maplibre/maplibre-gl-style-spec": "20.x"