@trailstash/ultra 3.8.3 → 3.8.5

package/.gitlab-ci.yml

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

package/components/code-editor.js

@@ -40,7 +40,7 @@ export class CodeEditor extends HTMLElement {
     shadow.adoptedStyleSheets.push(style);
     const textarea = h(
       "textarea",
-      { autofocus: this.autofocus, spellcheck: false },
+      { autofocus: this.autofocus, spellcheck: false, autocapitalize: "off" },
       this.source,
     );
     this.refs = { textarea };

package/components/ultra-ide.js

@@ -167,7 +167,7 @@ export class UltraIDE extends HTMLElement {
     this.refs = {
       navBar: shadow.querySelector("nav-bar"),
       codeEditor: shadow.querySelector("code-editor"),
-      mapLibre: shadow.querySelector("ultra-map"),
+      ultraMap: shadow.querySelector("ultra-map"),
       runButton: shadow.querySelector("run-button"),
       downloadButton: shadow.querySelector("download-button"),
       shareButton: shadow.querySelector("share-button"),
@@ -190,8 +190,8 @@ export class UltraIDE extends HTMLElement {
       "exit-fullscreen",
       this.onExitFullscreen,
     );
-    this.refs.mapLibre.map.on("moveend", this.onMoveEnd);
-    this.refs.mapLibre.map.once("idle", this.onMoveEnd);
+    this.refs.ultraMap.map.on("moveend", this.onMoveEnd);
+    this.refs.ultraMap.map.once("idle", this.onMoveEnd);
 
     // initialize share values
     this.refs.shareButton.query = this.query;
@@ -219,7 +219,7 @@ export class UltraIDE extends HTMLElement {
         ...this.settings,
         ...parseSettings(this.query),
       };
-      Object.assign(this.refs.mapLibre, {
+      Object.assign(this.refs.ultraMap, {
         ...pick(settings, UltraMap.RUNTIME_SETTINGS),
         mapStyle: setBaseStyle(
           settings.mapStyle,
@@ -229,7 +229,7 @@ export class UltraIDE extends HTMLElement {
 
       this.refs.downloadButton.data = null;
       this.controller = new AbortController();
-      this.refs.downloadButton.data = await this.refs.mapLibre.run(
+      this.refs.downloadButton.data = await this.refs.ultraMap.run(
         this.controller,
       );
       delete this.controller;
@@ -237,7 +237,7 @@ export class UltraIDE extends HTMLElement {
       this.refs.runButton.loading = false;
     } catch (err) {
       this.resetMap();
-      this.refs.mapLibre.run();
+      this.refs.ultraMap.run();
       this.refs.runButton.loading = false;
       if (err.name != "AbortError") {
         alert(err);
@@ -251,12 +251,12 @@ export class UltraIDE extends HTMLElement {
       delete this.controller;
     }
     this.resetMap();
-    this.refs.mapLibre.run();
+    this.refs.ultraMap.run();
     this.refs.runButton.loading = false;
   }
   resetMap() {
     Object.assign(
-      this.refs.mapLibre,
+      this.refs.ultraMap,
       pick(
         {
           ...UltraMap.defaults,
@@ -274,8 +274,8 @@ export class UltraIDE extends HTMLElement {
         settings.options?.zoom === undefined) &&
       settings.options?.bounds === undefined
     ) {
-      params.center = this.refs.mapLibre.center.toArray();
-      params.zoom = this.refs.mapLibre.zoom;
+      params.center = this.refs.ultraMap.center.toArray();
+      params.zoom = this.refs.ultraMap.zoom;
     }
     window.location = toQueryParams(params);
   }
@@ -285,8 +285,8 @@ export class UltraIDE extends HTMLElement {
     localStorage.setItem("query", this.query);
   }
   onMoveEnd() {
-    const zoom = this.refs.mapLibre.zoom;
-    const center = this.refs.mapLibre.center.toArray();
+    const zoom = this.refs.ultraMap.zoom;
+    const center = this.refs.ultraMap.center.toArray();
     this.refs.shareButton.zoom = zoom;
     this.refs.shareButton.center = center;
   }
@@ -295,11 +295,11 @@ export class UltraIDE extends HTMLElement {
       style: e.detail.value,
     });
     const settings = parseSettings(this.query);
-    this.refs.mapLibre.mapStyle = setBaseStyle(
+    this.refs.ultraMap.mapStyle = setBaseStyle(
       settings.mapStyle,
       this.settings.mapStyle || UltraMap.defaults.mapStyle,
     );
-    this.refs.mapLibre.run();
+    this.refs.ultraMap.run();
   }
 
   onEnterFullscreen() {

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/package.json

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

package/components/share-button.js

@@ -1,35 +0,0 @@
-import { h } from "../lib/dom.js";
-import buttonStyle from "./button.css";
-import { style as buttonCSS } from "./button.js";
-import { normalizeCSS } from "../lib/normalize.js";
-
-export const css = new CSSStyleSheet();
-css.replaceSync(`
-  button:after {
-    content: " Share";
-  }
-  @media (max-width: 900px) {
-    button:after {
-      content: "";
-    }
-  }
-`);
-
-export class ShareButton extends HTMLElement {
-  constructor() {
-    super();
-  }
-
-  connectedCallback() {
-    const shadow = this.attachShadow({ mode: "open" });
-
-    shadow.adoptedStyleSheets.push(normalizeCSS);
-    shadow.adoptedStyleSheets.push(buttonCSS);
-    shadow.adoptedStyleSheets.push(css);
-
-    const button = h("button", {}, h("fa-icon", { icon: "link" }));
-    this.refs = { button };
-
-    shadow.appendChild(button);
-  }
-}