@trailstash/ultra 4.2.2 → 4.2.4

package/lib/queryProviders/postpass.js

@@ -6,35 +6,37 @@ import { layers, popupTemplate, popupContextBuilder } from "./osm.js";
 const nonTags = {
   osm_id: true,
   tags: true,
-  way_area: true,
-  z_order: true,
+  // yes... these are not tags... but they are useful! so we're keeping them.
+  // 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 (f.properties.osm_id) {
+      properties["@id"] = f.properties.osm_id;
       if (properties["@id"] < 0) {
         properties["@id"] = -properties["@id"];
         properties["@type"] = "relation";
+      } else {
+        properties["@type"] = f.geometry.type === "Point" ? "node" : "way";
       }
     }
-    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)) {
+      if (!nonTags[k]) {
+        properties[k] = v;
       }
     }
     return {
-      ...x,
+      ...f,
       properties,
     };
   });
@@ -44,7 +46,7 @@ const flattenPropertiesAndInferIdAndType = (geoJSON) => {
 const postpass = {
   source: async function (query, controller, { server, bounds }) {
     if (!server) {
-      server = "http://postpass.geofabrik.de/api/0.1/interpreter";
+      server = "https://postpass.geofabrik.de/api/0.1/interpreter";
     }
     const resp = await fetch(server, {
       method: "POST",

package/package.json

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