@trailstash/ultra 4.1.5 → 4.2.0

package/Examples/alt-bbox-format.ultra

@@ -6,4 +6,4 @@ options:
   center: [-122.6847, 45.5112]
   zoom: 15
 ---
-https://api.ohsome.org/v1/elements/geometry?bboxes={{west}},{{south}},{{east}},{{north}}&filter=amenity%3Dbicycle_repair_station
+https://api.ohsome.org/v1/elements/geometry?bboxes={{wsen}}&filter=amenity%3Dbicycle_repair_station

package/Examples/emoji.ultra

@@ -0,0 +1,29 @@
+---
+title: Emojis
+description: Use the bundled emoji sprites to make a world map with flags for each country
+style:
+  layers:
+    - id: geolines
+      visibility: none
+    - id: geolines-label
+      visibility: none
+    - id: countries-label
+      visibility: none
+    - type: symbol
+      icon-overlap: always
+      icon-image:
+        - coalesce
+        - - image
+          - - concat
+            - 'emoji:flag-'
+            - - downcase
+              - - coalesce
+                - [ get, ISO3166-1:alpha2 ]
+                - [ get, ISO3166-1 ]
+                - [ get, country_code_iso3166_1_alpha_2 ]
+        - - image
+          - emoji:question
+  extends: https://demotiles.maplibre.org/style.json
+---
+node[place=country];
+out center;

package/Examples/postpass.ultra

@@ -0,0 +1,10 @@
+---
+title: Postpass
+description: Query OpenStreetMap using [Postpass](https://github.com/woodpeck/postpass)
+options:
+  center: [-122.6847, 45.5112]
+  zoom: 15
+---
+SELECT osm_id, way, tags FROM planet_osm_point
+WHERE amenity = 'bicycle_repair_station'
+  AND way && ST_MakeEnvelope({{wsen}}, 4326)

package/Examples/qlever.ultra

@@ -1,8 +1,7 @@
 ---
 title: Query OSM using QLever
 description: Load OSM data from the QLever osm-planet dataset.
-type: sparql
-server: https://qlever.cs.uni-freiburg.de/api/osm-planet
+type: qlever
 options:
   zoom: -0.1
   center: [0, 30]

package/Examples/sophox.ultra

@@ -1,8 +1,7 @@
 ---
 title: Query OSM using Sophox
 description: Load OSM data from Sophox
-type: sparql
-server: https://sophox.org/sparql
+type: sophox
 options:
   zoom: -0.1
   center: [0, 30]

package/build-emoji-sprites.js

@@ -0,0 +1,32 @@
+import fs from "fs";
+import emoji from "emoji-datasource-google/emoji.json" with { type: "json" };
+
+for (const [size, name] of [
+  [32, "emoji"],
+  [64, "emoji@2x"],
+]) {
+  const spriteJSON = {};
+
+  for (const { sheet_x, sheet_y, short_names, image } of emoji) {
+    const x = sheet_x * (size + 2) + 1;
+    const y = sheet_y * (size + 2) + 1;
+    for (const shortName of short_names) {
+      spriteJSON[shortName] = {
+        height: size,
+        pixelRatio: size / 32,
+        width: size,
+        x,
+        y,
+      };
+    }
+  }
+
+  fs.writeFileSync(
+    `static/sprites/${name}.json`,
+    JSON.stringify(spriteJSON, null, 2),
+  );
+  fs.copyFileSync(
+    `node_modules/emoji-datasource-google/img/google/sheets/${size}.png`,
+    `static/sprites/${name}.png`,
+  );
+}

package/build-sprites.sh

@@ -10,19 +10,17 @@ mkdir -p static/sprites
 curl -L -o maki.zip https://github.com/mapbox/maki/archive/refs/heads/main.zip
 unzip -u maki.zip
 for icon in maki-main/icons/*.svg; do
-    npx -- svg2png $icon -o ${icon%.svg*}.png -w 30 -h 30
-    rm $icon
+    rsvg-convert -f svg -o $icon $icon -w 30 -h 30
 done
 npx -- sprite-one ./static/sprites/maki -i maki-main/icons/ --sdf
 npx -- sprite-one --ratio=2 ./static/sprites/maki@2x -i maki-main/icons/ --sdf
 cp maki-main/LICENSE* static/sprites/maki.license
 rm -rf maki.zip maki-main
-#
+
 curl -L -o temaki.zip https://github.com/rapideditor/temaki/archive/refs/heads/main.zip
 unzip -u temaki.zip
 for icon in temaki-main/icons/*.svg; do
-    npx -- svg2png $icon -o ${icon%.svg*}.png -w 30 -h 30
-    rm $icon
+    rsvg-convert -f svg -o $icon $icon -w 30 -h 30
 done
 npx -- sprite-one ./static/sprites/temaki -i temaki-main/icons/ --sdf
 npx -- sprite-one --ratio=2 ./static/sprites/temaki@2x -i temaki-main/icons/ --sdf

package/docs/further-reading.md

@@ -2,7 +2,7 @@ Here are some more resources on Ultra:
 
 ## OSM Wiki
 
-[Overpass Ultra on the OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Overpass_Ultra)
+[Ultra on the OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Ultra)
 
 ## Diary Entries
 
@@ -18,3 +18,7 @@ Here are some more resources on Ultra:
 
 - [Ultraschnell: Overpass Ultra](https://geoobserver.de/2024/01/25/ultraschnell-overpass-ultra/) 🇩🇪
 - [Overpass Ultra & MapLibre: Heatmaps](https://geoobserver.de/2024/02/23/overpass-ultra-maplibre-heatmaps/) 🇩🇪
+
+## Third party tutorials
+- [Ultra (Overpass Ultra) Tutorial)](https://felipevaldez.com/ultra_tutorial/ultra_tutorial.html)
+  ([disponible en español 🇪🇸](https://fmvaldezg.codeberg.page/ultra_tutorial_sp/ultra_tutorial.html))

package/docs/query-shortcuts.md

@@ -12,12 +12,35 @@ 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:
+If you need to specify your bounding box in a different format, for example for an HTTP GeoJSON API
+or [Postpass](https://github.com/wookdpeck/postpass), you can specify just the specific lat/lon
+vaulues or a comma-delimited set of values.
+
+#### Short form
+
+The short form is wrapped it double curly braces and consists of a string of one or more of the
+letters `n`/`s`/`e`/`w` which corespond to the north/south-most latitudes and east/west-most
+longitudes.
+
+This means you can use simple 1-character shortcuts like:
+
+- `{{s}}`
+- `{{n}}`
+- `{{e}}`
+- `{{w}}`
+
+Or a longer string like `{{wsen}}` which is equivalent to `{{w}}{{s}}{{e}}{{n}}`.
+
+[Example](./Examples/alt-bbox-format.md)
+
+#### Long form
+
+The original long form of he individual min and max of both latitude and longitude are also
+available:
 
 - `{{south}}`
 - `{{north}}`
 - `{{east}}`
 - `{{west}}`
 
-[Example](./Examples/alt-bbox-format.md)
+

package/docs/resources.md

@@ -86,6 +86,10 @@ https://mappingsupport.com/p/surf_gis/list-federal-state-county-city-GIS-servers
 
 ## Base Style resources
 
+### Protomaps API
+
+The [Protomaps API](https://protomaps.com/api) is free for non-commercial use.
+
 ### TrailStash Style Server
 
 Most of the styles made available in the **Style Picker** menu on
@@ -95,8 +99,7 @@ Most of the styles made available in the **Style Picker** menu on
 #### OpenMapTiles Styles
 
 Most of the [OpenMapTiles Styles](https://openmaptiles.org/styles/) are available, with fonts and
-sprites hosted along-side the style, and tiles hosted by the [OSM US Tile
-Server](#openstreetmap-us-tileserver).
+sprites hosted along-side the style, and tiles hosted by [OpenFreeMap](#openfreemap).
 
 #### Protomaps
 

package/docs/showcase.md

@@ -0,0 +1,34 @@
+Here are some maps made with Ultra
+
+## DecomissionedAircraftMap
+
+![](../assets/showcase/DecomissionedAircraftMap.png)
+
+[View Map](https://overpass-ultra.us/#map&query=url:https://raw.githubusercontent.com/watmildon/DecomissionedAircraftMap/refs/heads/main/AircraftMap.ultra)
+|
+[Github Repo](https://github.com/watmildon/DecomissionedAircraftMap)
+
+## HighSchoolMascotMap
+
+
+![](../assets/showcase/HighSchoolMascotMap.png)
+
+[View Map](https://overpass-ultra.us/#map&query=url:https://raw.githubusercontent.com/watmildon/HighSchoolMascotMap/refs/heads/main/HSMascotMap.ultra)
+|
+[Github Repo](https://github.com/watmildon/HighSchoolMascotMap)
+
+## MapRVA Jan 2025 Water Crisis Maps
+
+![](../assets/showcase/water-crisis.png)
+
+[View Maps](https://maprva.org/projects/water-crisis/)
+|
+[Github Repo](https://github.com/maprva/2025-water-crisis)
+
+## Team Baden Parking Map
+
+![](../assets/showcase/teambaden.png)
+
+[View Map](https://overpass-ultra.us/#query=gist:aea22c9b953409e29558952fac49b945&run&map)
+|
+[Article](https://teambaden.ch/aktuell/viel-laerm-um-nichts-das-team-hat-die-parkplatz-zahlen/)

package/docs/yaml.md

@@ -152,6 +152,16 @@ Examples:
  * [Wikidata Query Service](./Examples/wikidata-sparql.md)
  * [Sophox](./Examples/sophox.md)
 
+### `qlever`
+
+Make a [SPARQL](https://www.w3.org/TR/sparql11-query/) query against QLever to load data. 
+
+Use [server](#server) to specify a backend slug. Default: `osm-planet`.
+
+### `sophox`
+
+Make a [SPARQL](https://www.w3.org/TR/sparql11-query/) query against Sophox to load data. 
+
 ### `ohsome`
 
 An [ohsome API](https://api.ohsome.org/) [filter](https://docs.ohsome.org/ohsome-api/v1/filter.html).
@@ -239,6 +249,11 @@ Detected if
 
 - A JSON document or URL to a JSON document containing a `tilejson` key and a `format` key equal to `pbf`.
 
+### `postpass`
+
+An SQL query to be executed on a [Postpass](https://github.com/woodpeck/postpass) server. Server
+results are modified to have the same structure as [overpass](#overpass)
+
 ## `options`
 
 When an Ultra query is run in "interactive map" mode, you can specify the

package/lib/bounds.js

@@ -1,5 +1,16 @@
+const dirs = {
+  n: "{{north}}",
+  s: "{{south}}",
+  e: "{{east}}",
+  w: "{{west}}",
+};
 export function setQueryBounds(query, bounds) {
   return query
+    .replace(/{{[wsen]+}}/g, (match) =>
+      Array.from(match.slice(2, -2))
+        .map((dir) => dirs[dir])
+        .join(","),
+    )
     .replace(/{{bbox}}/g, `{{south}},{{west}},{{north}},{{east}}`)
     .replace(/{{south}}/g, bounds.getSouth())
     .replace(/{{west}}/g, bounds.getWest())

package/lib/queryProviders/index.js

@@ -1,7 +1,8 @@
 import AutoProvider from "./auto.js";
 import overpass, { osmWebsite, osmWiki, taginfo } from "./overpass.js";
 import ohsome from "./ohsome.js";
-import sparql from "./sparql.js";
+import postpass from "./postpass.js";
+import { sparql, sophox, qlever } from "./sparql.js";
 import geojson from "./geojson.js";
 import raster from "./raster.js";
 import vector from "./vector.js";
@@ -14,8 +15,11 @@ import esri from "./esri.js";
 
 export const all = {
   overpass,
+  postpass,
   ohsome,
   sparql,
+  qlever,
+  sophox,
   geojson,
   kml,
   gpx,

package/lib/queryProviders/osm.js

@@ -19,11 +19,14 @@ export const flattenProperties = (geoJSON) => {
 };
 
 export const popupTemplate = `
+  {%- if type and id %}
   <h2>
     {{ type }}
     <a href="https://openstreetmap.org/{{ type }}/{{ id }}" target="_blank">{{ id }}</a>
     <a href="https://openstreetmap.org/edit?{{ type }}={{ id }}" target="_blank">✏️</a>
   </h2>
+  {%- endif %}
+  {%- if tags.size > 0 %}
   <h3>Tags</h3>
   {%- for tag in tags %}
     {%- if tag[0] contains "website" %}
@@ -38,6 +41,7 @@ export const popupTemplate = `
     {%- endif %}
     <br>
   {%- endfor %}
+  {%- endif %}
   {%- if meta %}
     <h3>Meta</h3>
     {%- for tag in meta %}

package/lib/queryProviders/postpass.js

@@ -0,0 +1,76 @@
+import osmtogeojson from "osmtogeojson";
+import { setQueryBounds } from "../bounds.js";
+
+import { layers, popupTemplate, popupContextBuilder } from "./osm.js";
+
+const nonTags = {
+  osm_id: true,
+  tags: true,
+  way_area: true,
+  z_order: true,
+};
+
+const flattenPropertiesAndInferIdAndType = (geoJSON) => {
+  // prety major assumption basked into this as Postpass executes arbitrary SQL so the returned
+  // data could be anything. This assumes that the query returns un-renamed columns.
+  geoJSON.features = geoJSON.features.map((x) => {
+    const properties = {};
+    if (x.properties.osm_id) {
+      properties["@type"] = x.geometry.type === "Point" ? "node" : "way";
+      properties["@id"] = x.properties.osm_id;
+      if (properties["@id"] < 0) {
+        properties["@id"] = -properties["@id"];
+        properties["@type"] = "relation";
+      }
+    }
+    if (x.properties.tags) {
+      for (const [k, v] of Object.entries(x.properties.tags)) {
+        properties[k] = v;
+      }
+    }
+    for (const [key, value] of Object.entries(x.properties)) {
+      if (!nonTags[key]) {
+        properties.tags[key] = value;
+      }
+    }
+    return {
+      ...x,
+      properties,
+    };
+  });
+  return geoJSON;
+};
+
+const postpass = {
+  source: async function (query, controller, { server, bounds }) {
+    if (!server) {
+      server = "http://postpass.geofabrik.de/api/0.1/interpreter";
+    }
+    const resp = await fetch(server, {
+      method: "POST",
+      body: new URLSearchParams([["data", query]]),
+      signal: controller.signal,
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
+      },
+    });
+    if (!resp.ok) {
+      throw new Error(
+        `Postpass API returned ${resp.status}:\n${await resp.text()}`,
+      );
+    }
+    const data = await resp.json();
+    return {
+      type: "geojson",
+      data: flattenPropertiesAndInferIdAndType(data),
+      attribution:
+        '\u003Ca href="https://www.openstreetmap.org/copyright" target="_blank"\u003E© OpenStreetMap contributors\u003C/a\u003E',
+      generateId: true,
+    };
+  },
+  layers,
+  popupTemplate,
+  popupContextBuilder,
+};
+export default postpass;

package/lib/queryProviders/sparql.js

@@ -14,9 +14,12 @@ export const popupTemplate = `
   {%- endfor %}
 `;
 
+const SOPHOX = "https://sophox.org/sparql";
+const QLEVER_ROOT = "https://qlever.cs.uni-freiburg.de/api/";
+
 const OSM_SERVERS = new Set([
-  "https://qlever.cs.uni-freiburg.de/api/osm-planet",
-  "https://sophox.org/sparql",
+  new URL("osm-planet", QLEVER_ROOT).toString(),
+  SOPHOX,
 ]);
 
 const source = async function (query, controller, { server, bounds }) {
@@ -49,9 +52,24 @@ const source = async function (query, controller, { server, bounds }) {
   };
 };
 
-const sparql = {
+export const sparql = {
   source,
   layers,
   popupTemplate,
 };
 export default sparql;
+
+export const sophox = {
+  ...sparql,
+  source: (query, controller, { server, bounds }) =>
+    source(query, controller, { server: server || SOPHOX, bounds }),
+};
+
+export const qlever = {
+  ...sparql,
+  source: (query, controller, { server, bounds }) =>
+    source(query, controller, {
+      server: new URL(server || "osm-planet", QLEVER_ROOT).toString(),
+      bounds,
+    }),
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.1.5",
+  "version": "4.2.0",
   "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": {
@@ -43,7 +43,7 @@
   "homepage": "https://overpass-ultra.us/",
   "devDependencies": {
     "@types/node": "^22.6.1",
-    "@unvt/sprite-one": "^0.1.1",
+    "@unvt/sprite-one": "github:dschep/sprite-one",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",