npm - @trailstash/ultra - Versions diffs - 3.1.2 → 3.2.0 - Mend

@trailstash/ultra 3.1.2 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/.kids.ultra.swn ADDED Viewed

Binary file

package/.kids.ultra.swo ADDED Viewed

Binary file

package/README.md CHANGED Viewed

@@ -6,7 +6,7 @@ JS](https://maplibre.org).
 ## Deployments
 - Production version - [overpass-ultra.us](https://overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/overpass-ultra/-/blob/main/config.js))</small>
-- Development Version - [ultra.trailsta.sh](https://ultra.trailsta.sh) <small>([config](./config.js))</small>
+- Development Version - [ultra.trailsta.sh](https://ultra.trailsta.sh) <small>([config](https://gitlab.com/trailstash/ultra/-/blob/main/config.js))</small>
 - OHM version - [ohm.overpass-ultra.us](https://ohm.overpass-ultra.us) <small>([config](https://gitlab.com/trailstash/ohm-ultra/-/blob/main/config.js))</small>
 ## Documentation

package/cli/.build.js.swo ADDED Viewed

Binary file

package/cli/build.js CHANGED Viewed

@@ -2,9 +2,10 @@ import fs from "fs";
 import path from "path";
 import process from "process";
 import { build } from "esbuild";
-import { Command, Flags } from "@oclif/core";
+import { Args, Command, Flags } from "@oclif/core";
 import { copy } from "esbuild-plugin-copy";
 import { Liquid } from "liquidjs";
+import { parseSettings } from "../lib/settings.js";
 const engine = new Liquid();
 export const getHTMLContext = async (configFile) => {
@@ -15,6 +16,19 @@ export const getHTMLContext = async (configFile) => {
   return { title, description, url, mastodon };
 };
+export const buildConfigFromQuery = async (config, query) => {
+  const querySettings = parseSettings(fs.readFileSync(query));
+  const { defaultMode, modes } = await import(config);
+  const settings = {
+    ...modes.map.settings,
+    ...querySettings,
+    loadSettingsFromQueryParams: false,
+  };
+  const newConfig = `export const defaultMode = "map";
+export const modes = {map: {settings: ${JSON.stringify(settings, null, 2)}}};`;
+  return `data:text/javascript;base64,${btoa(newConfig)}`;
+};
 export const ultraRoot = path.dirname(
   path.dirname(new URL(import.meta.url).pathname),
 );
@@ -52,14 +66,24 @@ export default class Build extends Command {
       default: path.join(process.cwd(), "/config.js"),
     }),
   };
+  static args = {
+    query: Args.file({
+      description: "A query to build an interactive map for",
+    }),
+  };
   static description = `Build a release of Ultra`;
   async run() {
-    const {
+    let {
       flags: { config },
+      args: { query },
     } = await this.parse(Build);
+    if (query) {
+      config = await buildConfigFromQuery(config, query);
+    }
     const html = engine.parseAndRenderSync(
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),

package/cli/serve.js CHANGED Viewed

@@ -1,8 +1,13 @@
 import fs from "fs";
 import path from "path";
 import { context } from "esbuild";
-import { Command, Flags } from "@oclif/core";
-import Build, { buildOptions, getHTMLContext, ultraRoot } from "./build.js";
+import { Args, Command, Flags } from "@oclif/core";
+import Build, {
+  buildConfigFromQuery,
+  buildOptions,
+  getHTMLContext,
+  ultraRoot,
+} from "./build.js";
 import { Liquid } from "liquidjs";
 const engine = new Liquid();
@@ -22,15 +27,24 @@ export default class Serve extends Command {
       parse: parseInt,
     }),
   };
+  static args = {
+    query: Args.file({
+      description: "A query to build an interactive map for",
+    }),
+  };
   static description = `Run an Ultra development server`;
   async run() {
-    const {
+    let {
       args: { query },
       flags: { config, host, port },
     } = await this.parse(Serve);
+    if (query) {
+      config = await buildConfigFromQuery(config, query);
+    }
     const html = engine.parseAndRenderSync(
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),

package/docs/assets/logo.svg ADDED Viewed

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   width="22"
+   viewBox="0 0 704 704"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="logo.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="23.748482"
+     inkscape:cx="0.28180161"
+     inkscape:cy="7.5070578"
+     inkscape:window-width="2000"
+     inkscape:window-height="1253"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:document-rotation="0" />
+  <!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
+  <path
+     d="M 0,352.00011 C 0,157.59567 157.59578,1.1113408e-4 352,1.1113408e-4 546.40422,1.1113408e-4 704,157.59567 704,352.00011 c 0,194.40445 -157.59578,352 -352,352 -194.40422,0 -352,-157.59555 -352,-352 z"
+     id="path2"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1.375"
+     sodipodi:nodetypes="sssss" />
+  <path
+     style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.968366;stroke-opacity:1"
+     d="m 562.1348,394.20034 c -24.36253,-6.09555 -38.87589,-31.23955 -31.57391,-54.70088 9.69205,-31.1406 48.93706,-41.17209 71.5572,-18.29088 9.2616,9.3685 12.98726,18.20169 12.98726,30.79153 0,12.58984 -3.72548,21.42303 -12.98726,30.79153 -10.4064,10.5265 -25.87191,14.93938 -39.98329,11.4087 z"
+     id="path2039" />
+  <path
+     style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.968366;stroke-opacity:1"
+     d="m 340.66013,570.73635 c -21.70562,-2.79677 -44.61211,-16.08209 -57.89509,-33.57808 -6.30391,-8.30334 -12.93817,-21.77501 -15.59751,-31.67254 -2.75361,-10.24844 -3.04204,-30.65931 -0.57272,-40.52935 3.95574,-15.81141 11.04495,-28.9471 21.84961,-40.48556 15.42529,-16.47286 35.63618,-26.11684 57.85929,-27.60858 l 8.82916,-0.59267 44.4121,-100.73482 c 24.42665,-55.40414 45.59793,-102.60464 47.04724,-104.89 3.22036,-5.07763 8.88677,-9.30546 16.14514,-12.04574 11.16289,-4.21442 26.27231,-0.396 34.21123,8.64611 6.66015,7.58552 9.92266,19.75235 7.68227,28.64966 -0.61248,2.43264 -21.16026,49.98921 -45.66166,105.68124 l -44.54792,101.25828 3.94794,4.48511 c 29.65793,33.69321 27.52934,86.07857 -4.81183,118.41974 -14.01168,14.01167 -31.60929,22.57355 -51.5307,25.07147 -9.04172,1.13388 -12.07327,1.12332 -21.36656,-0.0748 z"
+     id="path2189" />
+  <path
+     style="fill:#ffffff;stroke-width:0.0249354;stroke-linejoin:round;stroke-dashoffset:3.8;fill-opacity:1"
+     d="M 3.8030177,12.323546 C 3.3782561,12.22055 2.9749708,11.854662 2.8417976,11.451463 2.669399,10.929505 2.7856098,10.430606 3.1694843,10.044689 c 0.5418431,-0.5447266 1.3695005,-0.5440222 1.9147492,0.0016 0.2687844,0.268983 0.3958216,0.575086 0.3958216,0.953754 0,0.241343 -0.043233,0.415026 -0.1586014,0.637158 -0.1703677,0.32803 -0.521472,0.602511 -0.8782964,0.686624 -0.1724295,0.04065 -0.4718397,0.0405 -0.6401396,-3.08e-4 z"
+     id="path10"
+     transform="scale(32)" />
+  <path
+     style="fill:#ffffff;stroke-width:0.0249354;stroke-linejoin:round;stroke-dashoffset:3.8;fill-opacity:1"
+     d="M 5.9532325,7.5284272 C 5.5819707,7.4573167 5.2565902,7.2410423 5.0479378,6.9266941 4.9364416,6.7587179 4.8436181,6.4807429 4.8280826,6.2683021 4.7822526,5.6415959 5.2392938,5.0222238 5.8643213,4.8640142 6.0326362,4.8214096 6.3364212,4.8214763 6.504317,4.8641547 6.8739312,4.9581091 7.2382341,5.246434 7.4006,5.5735113 7.8343052,6.4471873 7.2474771,7.4729318 6.2723522,7.5456292 6.1726455,7.5530625 6.0462921,7.5462521 5.9532325,7.5284272 Z"
+     id="path12"
+     transform="scale(32)" />
+  <path
+     style="fill:#ffffff;stroke-width:0.0249354;stroke-linejoin:round;stroke-dashoffset:3.8;fill-opacity:1"
+     d="M 10.719604,5.4583568 C 9.9759581,5.2893251 9.5026576,4.5470852 9.6738812,3.8184319 9.7908054,3.3208531 10.217638,2.8991213 10.709857,2.7948375 c 0.416647,-0.088273 0.871064,0.029737 1.190494,0.3091668 0.134292,0.117475 0.313993,0.3773193 0.376521,0.5444406 0.18623,0.4977426 0.06458,1.0468044 -0.317331,1.4322699 -0.156873,0.1583324 -0.358748,0.2833937 -0.559266,0.3464643 -0.188139,0.059177 -0.495543,0.073257 -0.680671,0.031178 z"
+     id="path14"
+     transform="scale(32)" />
+</svg>

package/kids.ultra ADDED Viewed

@@ -0,0 +1,1044 @@
+---
+title: TrailStash Kids
+style:
+  extends: https://open.trailsta.sh/style.json
+  glyphs: https://styles.trailsta.sh/fonts/{fontstack}/{range}.pbf
+  sprite:
+    - id: nps
+      url: https://styles.trailsta.sh/sprites/nps-shielded
+  layers:
+    - {id: poi_dot, visibility: none}
+    - {id: poi, visibility: none}
+    - &poi
+      filter: [">=", [get, order], 15]
+      type: symbol
+      maxzoom: 24
+      minzoom: 14
+      symbol-sort-key: [get, order]
+      text-justify:
+        - case
+        - - any
+          - [ ==, [ get, anchor ], right ]
+          - [ ==, [ get, anchor ], left ]
+        - [get, anchor]
+        - - any
+          - [ ==, [ get, anchor ], top ]
+          - [ ==, [ get, anchor ], bottom ]
+        - center
+        - [ ==, [ length, [ get, sprites ] ], 1 ]
+        - center
+        - left
+      text-anchor:
+        - case
+        - [has, anchor]
+        - [get, anchor]
+        - [ ==, [ length, [ get, sprites ] ], 1 ]
+        - top
+        - left
+      text-offset:
+        - case
+        - [ ==, [ length, [ get, sprites ] ], 1 ]
+        - [ literal, [ 0, -.75 ] ]
+        - [ ==, [ get, anchor ], right ]
+        - [ literal, [ .75, 0 ] ]
+        - [ literal, [ -.75, 0 ] ]
+      text-color: white
+      text-halo-color: black
+      text-halo-width: 1
+      text-font: [ Noto Sans Bold ]
+      text-field:
+        - case
+        - [ '>', [ length, [ get, sprites ] ], 1 ]
+        - - format
+          - [ get, name ]
+          - {}
+          - [ literal, "\n" ]
+          - [ image, [ at, 0, [ get, sprites ] ] ]
+          - {}
+          - [ literal, " " ]
+          - {}
+          - [ image, [ at, 1, [ get, sprites ] ] ]
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 2 ]
+            - [ image, [ at, 2, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 3 ]
+            - [ image, [ at, 3, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 4 ]
+            - [ image, [ at, 4, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 5 ]
+            - [ image, [ at, 5, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 6 ]
+            - [ image, [ at, 6, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 7 ]
+            - [ image, [ at, 7, [ get, sprites ] ] ]
+            - ""
+          - {}
+          - [ literal, " " ]
+          - {}
+          - - case
+            - [ '>', [ length, [ get, sprites ] ], 8 ]
+            - [ image, [ at, 8, [ get, sprites ] ] ]
+            - ""
+          - {}
+        - - all
+          - [ ==, [ length, [ get, sprites ] ], 1 ]
+          - [ has, name ]
+        - - format
+          - [ image, [ at, 0, [ get, sprites ] ] ]
+          - {}
+          - "\n"
+          - {}
+          - [ get, name ]
+          - {}
+        - [ ==, [ length, [ get, sprites ] ], 1 ]
+        - - format
+          - [ image, [ at, 0, [ get, sprites ] ] ]
+          - {}
+        - [ get, name ]
+    - <<: *poi
+      maxzoom: 14
+      minzoom: 10
+      filter: ["<", [get, order], 20]
+---
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "T. Tyler Potterfield Memorial Bridge",
+        "sprites": [
+          "nps:bridge-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.44506279150815,
+          37.53235558757456
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Bryan Park",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:strollers-white-14",
+          "nps:bicycle-trail-white-14",
+          "nps:playground-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47615917296733,
+          37.59181931916156
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Deep Run Park",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:strollers-white-14",
+          "nps:bicycle-trail-white-14",
+          "nps:playground-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.59169355139638,
+          37.626191499030554
+        ],
+        "type": "Point"
+      },
+      "id": 2
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Deep Run Pump Track",
+        "sprites": [
+          "nps:bicycle-trail-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.59230305674437,
+          37.62717540687524
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Belle Isle",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:trailhead-white-14",
+          "nps:strollers-white-14",
+          "nps:bicycle-trail-white-14",
+          "nps:climbing-white-14"
+        ],
+        "order": 10,
+        "anchor": "right"
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45191935359166,
+          37.528638630614765
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Maymont",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:strollers-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47771160807967,
+          37.535612934418225
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Dogwood Dell",
+        "sprites": [
+          "nps:trailhead-white-14",
+          "nps:bicycle-trail-white-14",
+          "nps:playground-white-14"
+        ],
+        "order": 10,
+        "anchor": "right"
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48466698258284,
+          37.53820259060434
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Grayland Tot Lot",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 18
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48090347772688,
+          37.55075432612857
+        ],
+        "type": "Point"
+      },
+      "id": 7
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Hollywood Cemetery",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:strollers-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45478428524225,
+          37.53728439484483
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48585869421697,
+          37.537215365153585
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Carillon Tot Lot",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48497934364882,
+          37.5403340099183
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Dell Meadow",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 20
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48297062197632,
+          37.53857531134673
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Belle Isle Skills Park",
+        "sprites": [
+          "nps:bicycle-trail-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45096161105506,
+          37.52895591808621
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47602151745527,
+          37.520948344751815
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Forest Hill Park",
+        "sprites": [
+          "nps:walking-white-14",
+          "nps:trailhead-white-14",
+          "nps:strollers-white-14",
+          "nps:bicycle-trail-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47271307703281,
+          37.51998845148631
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4703325921651,
+          37.523437426165074
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47419231567358,
+          37.534893246138665
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47957964567996,
+          37.53840946159383
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48111236897748,
+          37.53949552487151
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.482971203615,
+          37.53516410683052
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48579206670578,
+          37.537232875191535
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45036538800733,
+          37.531390095985685
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47062405012079,
+          37.52359946524385
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45492061000064,
+          37.529525005855035
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:picnic-shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4570741235513,
+          37.52756109393489
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:picnic-shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47208335161108,
+          37.51800876106401
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47266471128455,
+          37.518790162979286
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:picnic-shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.48190851147247,
+          37.537912572204306
+        ],
+        "type": "Point"
+      },
+      "id": 27
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:picnic-shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47539948830153,
+          37.52072140073301
+        ],
+        "type": "Point"
+      },
+      "id": 28
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.44776218686246,
+          37.53472857768483
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4573528400114,
+          37.52409481945769
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47404228868851,
+          37.524082194233316
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4767346913299,
+          37.52511955799936
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Dry Rocks",
+        "sprites": [
+          "nps:climbing-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45638487042123,
+          37.52603849407491
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.44624888600774,
+          37.52960772192816
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:bike-rack-white-14"
+        ],
+        "order": 50
+      },
+      "geometry": {
+        "coordinates": [
+          -77.44465285804027,
+          37.53448234156134
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.46971721052016,
+          37.591844051624236
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4719470453588,
+          37.59599988542615
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:picnic-shelter-white-14"
+        ],
+        "order": 40
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47252468168541,
+          37.59630378424865
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.59147383869494,
+          37.62759134301483
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.58873538561534,
+          37.62648328469818
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.58677553776404,
+          37.62567841066857
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.58894901943765,
+          37.623824279445984
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.58755629538237,
+          37.62326202301716
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.59113373020111,
+          37.62695615106436
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 30
+      },
+      "geometry": {
+        "coordinates": [
+          -77.47247255415712,
+          37.59539014450705
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Lewis G. Larus Park",
+        "sprites": [
+          "nps:trailhead-white-14",
+          "nps:climbing-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.56503974424972,
+          37.54468292733333
+        ],
+        "type": "Point"
+      },
+      "id": 46
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Powhite Park",
+        "sprites": [
+          "nps:trailhead-white-14"
+        ],
+        "order": 10
+      },
+      "geometry": {
+        "coordinates": [
+          -77.5239034584741,
+          37.52352044625812
+        ],
+        "type": "Point"
+      },
+      "id": 47
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.52774598453678,
+          37.518090451874414
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.56780820156143,
+          37.543626275715354
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "sprites": [
+          "nps:parking-white-14"
+        ],
+        "order": 60
+      },
+      "geometry": {
+        "coordinates": [
+          -77.56042949379925,
+          37.5396827163662
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Geometry Park",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 17
+      },
+      "geometry": {
+        "coordinates": [
+          -77.46189334142085,
+          37.549675864272245
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Lombardy Park",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 19
+      },
+      "geometry": {
+        "coordinates": [
+          -77.45863578550944,
+          37.55088339548517
+        ],
+        "type": "Point"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "name": "Federal Park",
+        "sprites": [
+          "nps:playground-white-14"
+        ],
+        "order": 18
+      },
+      "geometry": {
+        "coordinates": [
+          -77.4673590709783,
+          37.55036487255619
+        ],
+        "type": "Point"
+      }
+    }
+  ]
+}

package/lib/queryProviders/osm.js CHANGED Viewed

@@ -53,7 +53,7 @@ export const popupTemplate = `
   {%- endif %}
   {%- if coordinates %}
     <h3>Coordinates</h3>
-    <a href="geo://{{coordinates[1]}},{{coordinates[0]}}">{{coordinates[1] | round: 6 }} / {{coordinates[0] | round: 6 }}</a> <small>(lat/lon)</small>
+    <a href="geo:{{coordinates[1]}},{{coordinates[0]}}">{{coordinates[1] | round: 6 }} / {{coordinates[0] | round: 6 }}</a> <small>(lat/lon)</small>
   {%- endif %}
 `;
 export const popupContextBuilder = ({ properties, geometry }) => {

package/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.1.2",
+  "version": "3.2.0",
   "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": {
@@ -22,19 +22,23 @@
   "type": "module",
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/trailstash/overpass-ultra.git"
+    "url": "git+https://gitlab.com/trailstash/ultra.git"
   },
   "keywords": [
     "maps",
     "cartography",
     "osm",
     "overpass",
+    "geojson",
+    "gpx",
+    "kml",
+    "tcx",
     "mapbox-gl",
     "mapbox-gl-js"
   ],
   "author": "Daniel Schep",
   "bugs": {
-    "url": "https://gitlab.com/trailstash/overpass-ultra/issues"
+    "url": "https://gitlab.com/trailstash/ultra/issues"
   },
   "homepage": "https://overpass-ultra.us/",
   "devDependencies": {