@trailstash/ultra 3.0.0-dev1 → 3.0.0-dev2

package/.gitlab-ci.yml

@@ -3,7 +3,7 @@ pages:
   script:
     - apt update && apt install -y mkdocs-material
     - npm ci
-    - npm run build -- -c ./configs/lab/index.js
+    - npm run build
     - npm run build:examples-docs
     - npm run build:maplibre-examples-docs
     - npm run build:docs

package/components/code-editor.js

@@ -45,6 +45,21 @@ export class CodeEditor extends HTMLElement {
     );
     this.refs = { textarea };
     shadow.appendChild(textarea);
+    textarea.addEventListener("dragenter", (e) => {
+      e.preventDefault();
+    });
+    textarea.addEventListener("dragover", (e) => {
+      e.preventDefault();
+    });
+    textarea.addEventListener("drop", async (e) => {
+      e.preventDefault();
+      const item = e.dataTransfer.items[0];
+      if (item.kind === "file"){
+        this.source = await item.getAsFile().text();
+      } else {
+        this.source = e.dataTransfer.getData('text/plain');
+      }
+    });
     textarea.addEventListener("keydown", (e) => {
       const start = e.target.selectionStart;
       const end = e.target.selectionEnd;

package/components/help-modal.js

@@ -5,6 +5,7 @@ import { normalizeCSS } from "../lib/normalize.js";
 import { toQueryParams } from "../lib/queryParams.js";
 import { version as maplibreVersion } from "maplibre-gl/package.json";
 import { version as osmtogeojsonVersion } from "osmtogeojson/package.json";
+import packageLock from "../package-lock.json"
 import readme from "../README.md";
 
 export class HelpModal extends HTMLElement {
@@ -82,7 +83,7 @@ export class HelpModal extends HTMLElement {
                 KML/GPX/TCX to GeoJSON conversion powered by
                 <a target="_blank" href="https://github.com/placemark/togeojson"
                   >@tmcw/togeojson</a
-                >
+                > <code>${packageLock.packages['node_modules/@tmcw/togeojson'].version}</code>
               </li>
             </ul>
           </div>

package/components/ultra-loader.js

@@ -1,8 +1,5 @@
 import { h } from "../lib/dom.js";
-import {
-  getConfigFromQueryParams,
-  getModeFromQueryParams,
-} from "../lib/queryParams.js";
+import { getModeFromQueryParams } from "../lib/queryParams.js";
 import { UltraMap } from "./ultra-map.js";
 import { UltraIDE } from "./ultra-ide.js";
 import pick from "lodash.pick";
@@ -28,13 +25,7 @@ export class UltraLoader extends HTMLElement {
     shadow.adoptedStyleSheets.push(style);
 
     let mode = getModeFromQueryParams() || defaultMode;
-    let config = modes[mode];
-
-    const remoteConfig = await getConfigFromQueryParams();
-    if (remoteConfig) {
-      mode = getModeFromQueryParams() || remoteConfig.defaultMode;
-      config = remoteConfig.modes[mode];
-    }
+    const config = modes[mode];
 
     if (config.title) {
       document.title = config.title;

package/configs/overpass-ultra.js

@@ -79,19 +79,18 @@ let styles = [
   ["OpenTrailStash", "https://open.trailsta.sh/style.json", "OpenTrailStash"],
 ];
 
-if (window.location.host === "overpass-ultra.us") {
-  // full config!
-} else if (window.location.host === "localhost:8000") {
-  // full config!
-} else if (
-  window.location.host.startsWith("localhost:") ||
-  window.location.host.startsWith("127.0.0.1:")
-) {
-  // All standard overpass-ultra.us styles work on localhost:* & 127.0.0.1:*  except for protomaps
-  // bc you can't wildcard on port :(
-  styles = styles.filter((x) => !x[1].includes("protomaps"));
-} else if (window.location.host === "ohm.overpass-ultra.us") {
+if (window.location.host === "ohm.overpass-ultra.us") {
+  // TODO: customize help
   styles = [];
+  query = `/*
+This is an example Overpass query.
+Try it out by pressing the Run button above!
+*/
+nwr["amenity"="theatre"]["start_date"](if:
+  t["start_date"] < "1976" &&
+  (!is_tag("end_date") || t["end_date"] >= "1975"));
+
+out geom;`;
   server = "https://overpass-api.openhistoricalmap.org/api/";
   mapStyle = "https://www.openhistoricalmap.org/map-styles/main/main.json";
   popupTemplate = `
@@ -132,9 +131,6 @@ if (window.location.host === "overpass-ultra.us") {
     <a href="geo://{{coordinates[1]}},{{coordinates[0]}}">{{coordinates[1] | round: 6 }} / {{coordinates[0] | round: 6 }}</a> <small>(lat/lon)</small>
   {%- endif %}
 `;
-} else {
-  styles = [];
-  mapStyle = "https://styles.trailsta.sh/osm-carto.json";
 }
 
 const settings = {

package/lib/queryParams.js

@@ -13,18 +13,6 @@ export const getModeFromQueryParams = () => {
   return mode;
 };
 
-export const getConfigFromQueryParams = async () => {
-  const params = new URLSearchParams(window.location.hash.slice(1));
-  if (params.has("config")) {
-    const config = params.get("config");
-    if (config.endsWith(".js")) {
-      return import(new URL(config, window.location));
-    } else {
-      return (await fetch(new URL(config, window.location))).json();
-    }
-  }
-};
-
 const fetchGist = async (query) => {
   let [gistID, filename] = query.slice("gist:".length).split("/", 2);
   let resp = await fetch(`https://api.github.com/gists/${gistID}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.0.0-dev1",
+  "version": "3.0.0-dev2",
   "description": "A web based tool for making MapLibre GL maps with data from souces such as Overpass, GeoJSON, GPX, KML, TCX, etc",
   "main": "index.js",
   "scripts": {
@@ -38,32 +38,32 @@
   },
   "homepage": "https://overpass-ultra.us/",
   "devDependencies": {
-    "@types/node": "^18.19.44",
+    "@types/node": "^22.5.4",
     "@unvt/sprite-one": "^0.1.1",
-    "esbuild": "^0.19.2",
-    "prettier": "^3.1.1",
-    "puppeteer": "^22.13.1",
+    "esbuild": "^0.23.1",
+    "prettier": "^3.3.3",
+    "puppeteer": "^23.3.0",
     "svg2png": "^4.1.1",
     "ts-node": "^10.9.2"
   },
   "license": "ISC",
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
-    "@oclif/core": "^4.0.17",
+    "@fortawesome/fontawesome-svg-core": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "@oclif/core": "^4.0.20",
     "@tmcw/togeojson": "^5.8.1",
-    "@trailstash/maplibre-component": "^1.0.0",
-    "@turf/bbox": "^7.0.0",
+    "@trailstash/maplibre-component": "^1.0.1",
+    "@turf/bbox": "^7.1.0",
     "deep-equal": "^2.2.3",
-    "liquidjs": "^10.10.0",
+    "liquidjs": "^10.16.7",
     "lodash.pick": "^4.4.0",
     "lz-string": "^1.5.0",
-    "maplibre-gl": "^4.5.1",
-    "marked": "^13.0.2",
+    "maplibre-gl": "^4.6.0",
+    "marked": "^14.1.1",
     "normalize.css": "^8.0.1",
     "osmtogeojson": "^3.0.0-beta.5",
-    "pmtiles": "^3.0.5",
-    "yaml": "^2.3.4"
+    "pmtiles": "^3.0.7",
+    "yaml": "^2.5.1"
   },
   "peerDependencies": {
     "@maplibre/maplibre-gl-style-spec": "20.x"