@trailstash/ultra 3.1.0 → 3.1.2

package/cli/build.js

@@ -36,7 +36,7 @@ export const buildOptions = (config, watch = false) => ({
   plugins: [
     copy({
       assets: {
-        from: [path.join(ultraRoot, "static/*")],
+        from: [path.join(ultraRoot, "static/**/*")],
         to: [path.join(process.cwd(), "./dist")],
       },
       watch,

package/components/ultra-ide.js

@@ -213,7 +213,10 @@ export class UltraIDE extends HTMLElement {
       };
       Object.assign(this.refs.mapLibre, {
         ...pick(settings, UltraMap.RUNTIME_SETTINGS),
-        mapStyle: setBaseStyle(settings.mapStyle, this.settings.mapStyle),
+        mapStyle: setBaseStyle(
+          settings.mapStyle,
+          this.settings.mapStyle || UltraMap.defaults.mapStyle,
+        ),
       });
 
       this.refs.downloadButton.data = null;
@@ -286,7 +289,7 @@ export class UltraIDE extends HTMLElement {
     const settings = parseSettings(this.query);
     this.refs.mapLibre.mapStyle = setBaseStyle(
       settings.mapStyle,
-      this.settings.mapStyle,
+      this.settings.mapStyle || UltraMap.defaults.mapStyle,
     );
     this.refs.mapLibre.run();
   }

package/lib/queryProviders/geojson.js

@@ -1,3 +1,5 @@
+import { fetchIfHTTPS } from "./util.js";
+
 const layers = (source) => [
   {
     id: `${source}-geojson-fill`,
@@ -117,18 +119,11 @@ const geoJsonTypes = [
   "MultiPolygon",
 ];
 async function detect(query) {
-  try {
-    if (query.startsWith("https://")) {
-      const resp = await fetch(query, { cors: true });
-      if (resp.ok) {
-        query = await resp.text();
-      }
-    }
-  } catch {}
+  query = await fetchIfHTTPS(query);
   try {
     const json = JSON.parse(query);
     if (geoJsonTypes.includes(json.type)) {
-      return query;
+      return true;
     }
   } catch {}
 }

package/lib/queryProviders/gpx.js

@@ -1,3 +1,4 @@
+import { fetchIfHTTPS } from "./util.js";
 import { gpx } from "@tmcw/togeojson";
 
 const layers = (source) => [
@@ -65,20 +66,13 @@ const layers = (source) => [
 ];
 
 const detect = async (query) => {
-  try {
-    if (query.startsWith("https://")) {
-      const resp = await fetch(query, { cors: true });
-      if (resp.ok) {
-        query = await resp.text();
-      }
-    }
-  } catch {}
+  query = await fetchIfHTTPS(query);
   const doc = new window.DOMParser().parseFromString(query, "text/xml");
   if (
     !doc.querySelector("parsererror") &&
     Array.from(doc.childNodes).some((x) => x.nodeName === "gpx")
   ) {
-    return query;
+    return true;
   }
 };
 

package/lib/queryProviders/kml.js

@@ -1,3 +1,4 @@
+import { fetchIfHTTPS } from "./util.js";
 import { kml } from "@tmcw/togeojson";
 
 const layers = (source) => [
@@ -77,18 +78,7 @@ const detect = async (query) => {
   if (query.startsWith("https://www.google.com/maps/d/")) {
     return true;
   }
-  if (query.startsWith("https://")) {
-    try {
-      const resp = await fetch(query, { cors: true });
-      if (resp.ok) {
-        query = await resp.text();
-      } else {
-        return false;
-      }
-    } catch {
-      return false;
-    }
-  }
+  query = await fetchIfHTTPS(query);
   const doc = new window.DOMParser().parseFromString(query, "text/xml");
   return (
     !doc.querySelector("parsererror") &&

package/lib/queryProviders/overpass.js

@@ -33,6 +33,13 @@ const overpassQLRegexes = [
   /out( geom| center| skel)?;/,
 ];
 function detect(query) {
+  const doc = new window.DOMParser().parseFromString(query, "text/xml");
+  if (
+    !doc.querySelector("parsererror") &&
+    Array.from(doc.childNodes).some((x) => x.nodeName === "osm-script")
+  ) {
+    return true;
+  }
   for (const re of overpassQLRegexes) {
     if (query.match(re)) {
       return query;

package/lib/queryProviders/tcx.js

@@ -1,3 +1,4 @@
+import { fetchIfHTTPS } from "./util.js";
 import { tcx } from "@tmcw/togeojson";
 
 const layers = (source) => [
@@ -65,14 +66,7 @@ const layers = (source) => [
 ];
 
 const detect = async (query) => {
-  try {
-    if (query.startsWith("https://")) {
-      const resp = await fetch(query, { cors: true });
-      if (resp.ok) {
-        query = await resp.text();
-      }
-    }
-  } catch {}
+  query = await fetchIfHTTPS(query);
   const doc = new window.DOMParser().parseFromString(query, "text/xml");
   if (
     !doc.querySelector("parsererror") &&

package/lib/queryProviders/util.js

@@ -0,0 +1,11 @@
+export const fetchIfHTTPS = async (query) => {
+  if (query.startsWith("https://")) {
+    try {
+      const resp = await fetch(query, { cors: true });
+      if (resp.ok) {
+        query = await resp.text();
+      }
+    } catch {}
+  }
+  return query;
+};

package/package.json

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