@trailstash/ultra 3.8.4 → 3.8.6

package/.gitlab-ci.yml

@@ -1,3 +1,8 @@
+test:
+  image: node:20
+  script:
+    - npm ci
+    - npm test
 pages:
   image: node:20
   script:

package/Examples/sophox.ultra

@@ -0,0 +1,13 @@
+---
+title: Query OSM using Sophox
+description: Load OSM data from Sophox
+type: sparql
+server: https://sophox.org/sparql
+options:
+  zoom: -0.1
+  center: [0, 30]
+---
+SELECT * WHERE {
+  ?newspaper osmt:office "newspaper";
+             osmm:loc ?coordinates.
+}

package/docs/yaml.md

@@ -131,14 +131,15 @@ Detected if:
 
 ### `sparql`
 
-Make a [GeoSPARQL](https://www.ogc.org/publications/standard/geosparql/) query to load data. 
+Make a [SPARQL](https://www.w3.org/TR/sparql11-query/) query to load data. 
 
-**Note:** requrires you to specify a [server](#server).
+**Note:** requires you to specify a [server](#server).
 
 Examples:
 
  * [Qlever](./Examples/qlever.md)
  * [Wikidata Query Service](./Examples/wikidata-sparql.md)
+ * [Sophox](./Examples/sophox.md)
 
 ### `ohsome`
 

package/lib/queryProviders/overpass.js

@@ -14,14 +14,15 @@ const overpassQLRegexes = [
   /\({{bbox}}\)/,
   /\[out:json\]/,
   /\[out:xml\]/,
-  /node\[[^]\]/,
-  /way\[[^]\]/,
-  /relation\[[^]\]/,
-  /nwr\[[^]\]/,
-  /nw\[[^]\]/,
-  /nr\[[^]\]/,
-  /wr\[[^]\]/,
-  /area\[[^]\]/,
+  /node\[[^\]]+]/,
+  /way\[[^\]]+]/,
+  /relation\[[^\]]+]/,
+  /nwr\[[^\]]+]/,
+  /nw\[[^\]]+]/,
+  /nr\[[^\]]+]/,
+  /wr\[[^\]]+]/,
+  /area\[[^\]]+]/,
+
   /node\([^)]\)/,
   /way\([^)]\)/,
   /relation\([^)]\)/,
@@ -30,7 +31,8 @@ const overpassQLRegexes = [
   /nr\([^)]\)/,
   /wr\([^)]\)/,
   /area\([^)]\)/,
-  /out( geom| center| skel)?;/,
+
+  /out( meta| geom| center| skel)*;/,
 ];
 function detect(query) {
   const doc = new window.DOMParser().parseFromString(query, "text/xml");
@@ -42,9 +44,10 @@ function detect(query) {
   }
   for (const re of overpassQLRegexes) {
     if (query.match(re)) {
-      return query;
+      return true;
     }
   }
+  return false;
 }
 
 const overpass = {

package/lib/queryProviders/overpass.test.js

@@ -0,0 +1,32 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import overpass from "./overpass.js";
+
+describe("overpass", () => {
+  it("should detect Overpass XML", () => {
+    expect(overpass.detect("<osm-script></osm-script>")).toEqual(true);
+  });
+  it("should detect OverpassQL", () => {
+    expect(overpass.detect("node(8072127669);out;")).toEqual(true);
+    expect(
+      overpass.detect("node[amenity=bicycle_repair_station];out meta;"),
+    ).toEqual(true);
+    expect(
+      overpass.detect(
+        "[bbox:-85.05112899999985,-143.4237868840288,85.05112900000006,143.19307950688642];way[highway];out geom;",
+      ),
+    ).toEqual(true);
+    expect(
+      overpass.detect(`[bbox:-85.05112899999985,-143.4237868840288,85.05112900000006,143.19307950688642];
+(
+way[highway=path];
+way[highway=footway];
+way[highway=cycleway];
+way[highway=steps];
+);
+out meta geom;`),
+    ).toEqual(true);
+  });
+});

package/lib/queryProviders/sparql.js

@@ -25,15 +25,15 @@ const source = async function (query, controller, { server, bounds }) {
   }
   const resp = await fetch(server, {
     method: "POST",
-    body: query,
+    body: new URLSearchParams([["query", query]]),
     signal: controller.signal,
     headers: {
-      "Content-Type": "application/sparql-query",
+      "Content-Type": "application/x-www-form-urlencoded",
       Accept: "application/sparql-results+json",
     },
   });
   if (!resp.ok) {
-    throw new Error(`SparQL API returned ${resp.status}: ${await resp.text()}`);
+    throw new Error(`SPARQL API returned ${resp.status}: ${await resp.text()}`);
   }
   const data = sparql2geojson(await resp.json());
   let attribution = "";

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.8.4",
+  "version": "3.8.6",
   "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": {
@@ -17,7 +17,7 @@
     "build:pages": "mkdir -p public && cp -Lr dist/* public/.",
     "start": "node ./bin/run.js serve",
     "format": "prettier --print-width=80 --write '**/*.js' '**/*.json' README.md '**/*.css'",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "type": "module",
   "repository": {
@@ -44,6 +44,9 @@
   "devDependencies": {
     "@types/node": "^22.6.1",
     "@unvt/sprite-one": "^0.1.1",
+    "esbuild-jest": "^0.5.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.3.3",
     "puppeteer": "^23.4.0",
     "svg2png": "^4.1.1",
@@ -83,5 +86,10 @@
     "commands": "./cli",
     "dirname": "ultra",
     "topicSeparator": " "
+  },
+  "jest": {
+    "transform": {
+      "^.+\\.js$": "esbuild-jest"
+    }
   }
 }