@trailstash/ultra 4.2.3 → 4.2.5

package/Examples/postpass.ultra

@@ -6,6 +6,7 @@ options:
   zoom: 15
 type: postpass
 ---
-SELECT osm_id, way, tags FROM planet_osm_point
-WHERE amenity = 'bicycle_repair_station'
-  AND way && ST_MakeEnvelope({{wsen}}, 4326)
+SELECT osm_id, osm_type, tags, geom
+FROM postpass_point
+WHERE tags->>'amenity'='fast_food'
+  AND geom && ST_MakeEnvelope({{wsen}},4326)

package/docs/yaml.md

@@ -254,6 +254,13 @@ Detected if
 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)
 
+!!! warning
+
+    Postpass is in very early stages of development, so Ultra may lag behind as new versions of the
+    API are released. This provider defaults to the version 0.2 of the [GeoFabrik Postpass
+    API](https://github.com/woodpeck/postpass-ops) &
+    [Schema](https://github.com/woodpeck/postpass-ops/blob/main/SCHEMA.md)
+
 ## `options`
 
 When an Ultra query is run in "interactive map" mode, you can specify the

package/lib/queryProviders/postpass.js

@@ -3,38 +3,25 @@ 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) => {
+  geoJSON.features = geoJSON.features.map((f) => {
     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 (f.properties.osm_id) {
+      properties["@id"] = f.properties.osm_id;
+      properties["@type"] = f.properties.osm_type;
     }
-    if (x.properties.tags) {
-      for (const [k, v] of Object.entries(x.properties.tags)) {
+    if (f.properties.tags) {
+      for (const [k, v] of Object.entries(f.properties.tags)) {
         properties[k] = v;
       }
     }
-    for (const [key, value] of Object.entries(x.properties)) {
-      if (!nonTags[key]) {
-        properties.tags[key] = value;
-      }
+    for (const [k, v] of Object.entries(f.properties)) {
+      properties[k] = v;
     }
     return {
-      ...x,
+      ...f,
       properties,
     };
   });
@@ -44,7 +31,7 @@ const flattenPropertiesAndInferIdAndType = (geoJSON) => {
 const postpass = {
   source: async function (query, controller, { server, bounds }) {
     if (!server) {
-      server = "https://postpass.geofabrik.de/api/0.1/interpreter";
+      server = "https://postpass.geofabrik.de/api/0.2/interpreter";
     }
     const resp = await fetch(server, {
       method: "POST",

package/mkdocs.yml

@@ -24,3 +24,7 @@ extra:
 extra:
   analytics:
     provider: custom
+markdown_extensions:
+  - admonition
+  - pymdownx.details
+  - pymdownx.superfences

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.2.3",
+  "version": "4.2.5",
   "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": {