@trailstash/ultra 4.0.0 → 4.1.1

package/MapLibre-Examples/fallback-image.ultra

@@ -0,0 +1,62 @@
+---
+title: Use a fallback image
+description: Use a coalesce expression to display another image when a requested image is not available.
+options:
+  center: [-77, 38.75]
+  zoom: 5
+style:
+  layers:
+    - type: symbol
+      icon-image:
+        - coalesce
+        - [image, [concat, "maki:", [get, icon]]]
+        - [image, maki:marker]
+  extends: https://styles.trailsta.sh/osm-liberty.json
+---
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.03238901390978,
+          38.913188059745586
+        ]
+      },
+      "properties": {
+        "title": "Washington DC",
+        "icon": "monument"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -79.9959,
+          40.4406
+        ]
+      },
+      "properties": {
+        "title": "Pittsburgh",
+        "icon": "bridges"
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -76.2859,
+          36.8508
+        ]
+      },
+      "properties": {
+        "title": "Norfolk",
+        "icon": "harbor"
+      }
+    }
+  ]
+}

package/MapLibre-Examples/popup-on-click.ultra

@@ -0,0 +1,151 @@
+---
+title: Display a popup on click
+description: When a user clicks a symbol, show a popup containing more information.
+popupTemplate: '{{ properties.description }}'
+options:
+  center: [-77.04, 38.907]
+  zoom: 11.15
+style:
+  layers:
+    - type: symbol
+      icon-image:
+        - concat
+        - 'maki:'
+        - [ get, icon ]
+      icon-size: 0.75
+      icon-halo-width: 2
+      icon-halo-color: white
+      icon-color: '#5d60be'
+  extends: https://styles.trailsta.sh/osm-liberty.json
+---
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Make it Mount Pleasant</strong><p><a href=\"http://www.mtpleasantdc.com/makeitmtpleasant\" target=\"_blank\" title=\"Opens in a new window\">Make it Mount Pleasant</a> is a handmade and vintage market and afternoon of live entertainment and kids activities. 12:00-6:00 p.m.</p>",
+        "icon": "theatre"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.038659,
+          38.931567
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Mad Men Season Five Finale Watch Party</strong><p>Head to Lounge 201 (201 Massachusetts Avenue NE) Sunday for a <a href=\"http://madmens5finale.eventbrite.com/\" target=\"_blank\" title=\"Opens in a new window\">Mad Men Season Five Finale Watch Party</a>, complete with 60s costume contest, Mad Men trivia, and retro food and drink. 8:00-11:00 p.m. $10 general admission, $20 admission and two hour open bar.</p>",
+        "icon": "theatre"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.003168,
+          38.894651
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Big Backyard Beach Bash and Wine Fest</strong><p>EatBar (2761 Washington Boulevard Arlington VA) is throwing a <a href=\"http://tallulaeatbar.ticketleap.com/2012beachblanket/\" target=\"_blank\" title=\"Opens in a new window\">Big Backyard Beach Bash and Wine Fest</a> on Saturday, serving up conch fritters, fish tacos and crab sliders, and Red Apron hot dogs. 12:00-3:00 p.m. $25.grill hot dogs.</p>",
+        "icon": "bar"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.090372,
+          38.881189
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Ballston Arts & Crafts Market</strong><p>The <a href=\"https://ballstonarts-craftsmarket.blogspot.com/\" target=\"_blank\" title=\"Opens in a new window\">Ballston Arts & Crafts Market</a> sets up shop next to the Ballston metro this Saturday for the first of five dates this summer. Nearly 35 artists and crafters will be on hand selling their wares. 10:00-4:00 p.m.</p>",
+        "icon": "art-gallery"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.111561,
+          38.882342
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Seersucker Bike Ride and Social</strong><p>Feeling dandy? Get fancy, grab your bike, and take part in this year's <a href=\"http://dandiesandquaintrelles.com/2012/04/the-seersucker-social-is-set-for-june-9th-save-the-date-and-start-planning-your-look/\" target=\"_blank\" title=\"Opens in a new window\">Seersucker Social</a> bike ride from Dandies and Quaintrelles. After the ride enjoy a lawn party at Hillwood with jazz, cocktails, paper hat-making, and more. 11:00-7:00 p.m.</p>",
+        "icon": "bicycle"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.052477,
+          38.943951
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Capital Pride Parade</strong><p>The annual <a href=\"https://www.capitalpride.org/parade\" target=\"_blank\" title=\"Opens in a new window\">Capital Pride Parade</a> makes its way through Dupont this Saturday. 4:30 p.m. Free.</p>",
+        "icon": "rocket"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.043444,
+          38.909664
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Muhsinah</strong><p>Jazz-influenced hip hop artist <a href=\"https://www.muhsinah.com\" target=\"_blank\" title=\"Opens in a new window\">Muhsinah</a> plays the <a href=\"https://www.blackcatdc.com\">Black Cat</a> (1811 14th Street NW) tonight with <a href=\"https://www.exitclov.com\" target=\"_blank\" title=\"Opens in a new window\">Exit Clov</a> and <a href=\"https://godsilla.bandcamp.com\" target=\"_blank\" title=\"Opens in a new window\">Gods’illa</a>. 9:00 p.m. $12.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.031706,
+          38.914581
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>A Little Night Music</strong><p>The Arlington Players' production of Stephen Sondheim's  <a href=\"http://www.thearlingtonplayers.org/drupal-6.20/node/4661/show\" target=\"_blank\" title=\"Opens in a new window\"><em>A Little Night Music</em></a> comes to the Kogod Cradle at The Mead Center for American Theater (1101 6th Street SW) this weekend and next. 8:00 p.m.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.020945,
+          38.878241
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Truckeroo</strong><p><a href=\"http://www.truckeroodc.com/www/\" target=\"_blank\">Truckeroo</a> brings dozens of food trucks, live music, and games to half and M Street SE (across from Navy Yard Metro Station) today from 11:00 a.m. to 11:00 p.m.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.007481,
+          38.876516
+        ]
+      }
+    }
+  ]
+}

package/MapLibre-Examples/popup-on-hover.ultra

@@ -0,0 +1,148 @@
+---
+title: Display a popup on hover
+description: When a user hovers over a custom marker, show a popup containing more information.
+popupTemplate: '{{ properties.description }}'
+options:
+  center: [-77.04, 38.907]
+  zoom: 11.15
+popupOnHover: true
+style:
+  layers:
+    - type: symbol
+      icon-image: maki:marker
+      icon-halo-width: 2
+      icon-halo-color: white
+      icon-color: '#95befa'
+  extends: https://styles.trailsta.sh/osm-liberty.json
+---
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Make it Mount Pleasant</strong><p><a href=\"http://www.mtpleasantdc.com/makeitmtpleasant\" target=\"_blank\" title=\"Opens in a new window\">Make it Mount Pleasant</a> is a handmade and vintage market and afternoon of live entertainment and kids activities. 12:00-6:00 p.m.</p>",
+        "icon": "theatre"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.038659,
+          38.931567
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Mad Men Season Five Finale Watch Party</strong><p>Head to Lounge 201 (201 Massachusetts Avenue NE) Sunday for a <a href=\"http://madmens5finale.eventbrite.com/\" target=\"_blank\" title=\"Opens in a new window\">Mad Men Season Five Finale Watch Party</a>, complete with 60s costume contest, Mad Men trivia, and retro food and drink. 8:00-11:00 p.m. $10 general admission, $20 admission and two hour open bar.</p>",
+        "icon": "theatre"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.003168,
+          38.894651
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Big Backyard Beach Bash and Wine Fest</strong><p>EatBar (2761 Washington Boulevard Arlington VA) is throwing a <a href=\"http://tallulaeatbar.ticketleap.com/2012beachblanket/\" target=\"_blank\" title=\"Opens in a new window\">Big Backyard Beach Bash and Wine Fest</a> on Saturday, serving up conch fritters, fish tacos and crab sliders, and Red Apron hot dogs. 12:00-3:00 p.m. $25.grill hot dogs.</p>",
+        "icon": "bar"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.090372,
+          38.881189
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Ballston Arts & Crafts Market</strong><p>The <a href=\"https://ballstonarts-craftsmarket.blogspot.com/\" target=\"_blank\" title=\"Opens in a new window\">Ballston Arts & Crafts Market</a> sets up shop next to the Ballston metro this Saturday for the first of five dates this summer. Nearly 35 artists and crafters will be on hand selling their wares. 10:00-4:00 p.m.</p>",
+        "icon": "art-gallery"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.111561,
+          38.882342
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Seersucker Bike Ride and Social</strong><p>Feeling dandy? Get fancy, grab your bike, and take part in this year's <a href=\"http://dandiesandquaintrelles.com/2012/04/the-seersucker-social-is-set-for-june-9th-save-the-date-and-start-planning-your-look/\" target=\"_blank\" title=\"Opens in a new window\">Seersucker Social</a> bike ride from Dandies and Quaintrelles. After the ride enjoy a lawn party at Hillwood with jazz, cocktails, paper hat-making, and more. 11:00-7:00 p.m.</p>",
+        "icon": "bicycle"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.052477,
+          38.943951
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Capital Pride Parade</strong><p>The annual <a href=\"https://www.capitalpride.org/parade\" target=\"_blank\" title=\"Opens in a new window\">Capital Pride Parade</a> makes its way through Dupont this Saturday. 4:30 p.m. Free.</p>",
+        "icon": "rocket"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.043444,
+          38.909664
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Muhsinah</strong><p>Jazz-influenced hip hop artist <a href=\"https://www.muhsinah.com\" target=\"_blank\" title=\"Opens in a new window\">Muhsinah</a> plays the <a href=\"https://www.blackcatdc.com\">Black Cat</a> (1811 14th Street NW) tonight with <a href=\"https://www.exitclov.com\" target=\"_blank\" title=\"Opens in a new window\">Exit Clov</a> and <a href=\"https://godsilla.bandcamp.com\" target=\"_blank\" title=\"Opens in a new window\">Gods’illa</a>. 9:00 p.m. $12.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.031706,
+          38.914581
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>A Little Night Music</strong><p>The Arlington Players' production of Stephen Sondheim's  <a href=\"http://www.thearlingtonplayers.org/drupal-6.20/node/4661/show\" target=\"_blank\" title=\"Opens in a new window\"><em>A Little Night Music</em></a> comes to the Kogod Cradle at The Mead Center for American Theater (1101 6th Street SW) this weekend and next. 8:00 p.m.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.020945,
+          38.878241
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {
+        "description": "<strong>Truckeroo</strong><p><a href=\"http://www.truckeroodc.com/www/\" target=\"_blank\">Truckeroo</a> brings dozens of food trucks, live music, and games to half and M Street SE (across from Navy Yard Metro Station) today from 11:00 a.m. to 11:00 p.m.</p>",
+        "icon": "music"
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -77.007481,
+          38.876516
+        ]
+      }
+    }
+  ]
+}

package/cli/build.js

@@ -46,6 +46,7 @@ export const buildOptions = (config, watch = false) => ({
   },
   alias: {
     "ultra-config": config,
+    "node:events": "node-events", // esri-dump support
   },
   plugins: [
     copy({

package/components/help-modal.js

@@ -6,6 +6,7 @@ import { toQueryParams } from "../lib/queryParams.js";
 import { version } from "../package.json";
 import { version as maplibreVersion } from "maplibre-gl/package.json";
 import { version as osmtogeojsonVersion } from "osmtogeojson/package.json";
+import { version as esridumpVersion } from "esri-dump/package.json";
 
 const help = `# Introduction
 
@@ -129,7 +130,7 @@ export class HelpModal extends HTMLElement {
                 this.queryProviders.osmjson ||
                 this.queryProviders.osmxml
                   ? `<li>
-                OSM to GeoJSON conversion powered by
+                Overpass &amp; OSM support powered by
                 <a target="_blank" href="https://github.com/tyrasd/osmtogeojson"
                   >osmtogeojson</a
                 > <code>${osmtogeojsonVersion}</code>
@@ -142,13 +143,24 @@ export class HelpModal extends HTMLElement {
                 this.queryProviders.tcx ||
                 this.queryProviders.kml
                   ? `<li>
-                KML/GPX/TCX to GeoJSON conversion powered by
+                KML/GPX/TCX support powered by
                 <a target="_blank" href="https://github.com/placemark/togeojson"
                   >@tmcw/togeojson</a
                 >
               </li>`
                   : ""
               }
+
+              ${
+                this.queryProviders.esri
+                  ? `<li>
+                Esri support powered by
+                <a target="_blank" href="https://github.com/openaddresses/esri-dump"
+                  >esri-dump</a
+                > <code>${esridumpVersion}</code>
+              </li>`
+                  : ""
+              }
             </ul>
           </div>
       `,

package/docs/resources.md

@@ -78,6 +78,12 @@ appropriate headers yourself.
 The [Overture foundation](https://overturemaps.org/) makes map data derived from various sources
 available. It needs to be processed and hosted before use with Ultra.
 
+### Esri
+
+mappingsupport.com maintains an excellent list of ArcGIS REST servers:
+
+https://mappingsupport.com/p/surf_gis/list-federal-state-county-city-GIS-servers.pdf
+
 ## Base Style resources
 
 ### TrailStash Style Server

package/docs/yaml.md

@@ -27,7 +27,7 @@ server:  https://overpass.private.coffee/api/
 ---
 ```
 
-<small>Only applies to Overpass queries.</small>
+<small>Only applies to Overpass, SPARQL, & Esri.</small>
 
 ## `popupTemplate`
 
@@ -40,6 +40,16 @@ popupTemplate: "{{type}} {{id}} - {{tags.name}}"
 ---
 ```
 
+## `popupOnHover`
+
+Show the features inspection popup on hover rather than on click.
+
+```
+---
+popupOnHover: true
+---
+```
+
 ## `type`
 
 Specify the type of source in the query.
@@ -55,6 +65,7 @@ Automatically detects and chooses the right query provider out of the following:
 - `kml`
 - `gpx`
 - `tcx`
+- `esri`
 - `vector`
 - `raster`
 - `raw`
@@ -182,6 +193,23 @@ Detected if
 
 - Parses as XML and contains a top level `tcx` tag
 
+### `esri`
+
+Load vector features from an Esri FeatureServer or MapServer.
+
+Detected if
+
+- A URL ending in `/FeatureServer/NUMBER` or `/MapServer/NUMBER`
+
+*Simple usage*
+
+To load all features in a layer, specify the layer URL on the EsriServer as the query text
+
+*Advanced usage*
+
+To specify query parameters, specify them as the query text using YAML encoding. Specify the layer
+URL using [`server`](#server).
+
 ### `raw`
 
 A full [MapLibre Source](https://maplibre.org/maplibre-style-spec/sources/) as JSON or YAML.

package/index.js

@@ -22,6 +22,9 @@ import { FontAwesomeIcon } from "./components/fontawesome-icon.js";
 import { ButtonModal } from "./components/button-modal.js";
 import { MapPopup } from "./components/map-popup.js";
 
+// esri dump expects to be running in a node env, so add global process.env
+window.process = { env: {} };
+
 // Allow pages in new windows securely
 DOMPurify.addHook("afterSanitizeAttributes", function (node) {
   // set all elements owning target to target=_blank

package/lib/queryMap.js

@@ -45,7 +45,11 @@ export const handleMouseClick = (
   for (const f of features) {
     distinctFeatures[f.id] = f;
   }
-  if (equal(currentFeatures, distinctFeatures) && currentPopup && e.type !== "click") {
+  if (
+    equal(currentFeatures, distinctFeatures) &&
+    currentPopup &&
+    e.type !== "click"
+  ) {
     currentPopup.setLngLat(e.lngLat);
     return;
   }

package/lib/queryProviders/esri.js

@@ -0,0 +1,89 @@
+import EsriDump from "esri-dump";
+
+const layers = (source) => [
+  {
+    id: `${source}-geojson-fill`,
+    type: "fill",
+    source,
+    filter: ["==", ["geometry-type"], "Polygon"],
+    paint: {
+      "fill-color": "#555",
+      "fill-opacity": 0.3,
+    },
+  },
+  {
+    id: `${source}-geojson-fill-outline`,
+    type: "line",
+    source,
+    filter: ["==", ["geometry-type"], "Polygon"],
+    layout: { "line-cap": "round" },
+    paint: {
+      "line-color": "#555",
+      "line-width": 2,
+      "line-opacity": 1,
+    },
+  },
+  {
+    id: `${source}-geojson-line-2`,
+    type: "line",
+    source,
+    filter: ["==", ["geometry-type"], "LineString"],
+    layout: { "line-cap": "round" },
+    paint: {
+      "line-color": "#555",
+      "line-width": 2,
+      "line-opacity": 1,
+    },
+  },
+  {
+    id: `${source}-geojson-point`,
+    type: "circle",
+    source,
+    filter: ["==", ["geometry-type"], "Point"],
+    paint: {
+      "circle-stroke-width": 2,
+      "circle-stroke-color": "#555",
+      "circle-color": "rgba(85, 85, 85, 0.3)",
+    },
+  },
+];
+
+async function detect(query) {
+  const url = new URL(query);
+  return !!url.pathname.match(/\/(Map|Feature)Server\/\d+$/);
+}
+
+export default {
+  source: function geojson(query, controller) {
+    return new Promise((resolve, reject) => {
+      const esri = new EsriDump(query);
+
+      const data = {
+        type: "FeatureCollection",
+        features: [],
+      };
+
+      esri.fetch();
+
+      esri.on("type", (type) => {
+        //Emitted before any data events
+        //emits one of
+        // - `MapServer'
+        // - `FeatureServer'
+      });
+
+      esri.on("feature", (feature) => {
+        data.features.push(feature);
+      });
+
+      esri.on("done", () => {
+        resolve({ type: "geojson", data, generateId: true });
+      });
+
+      esri.on("error", reject);
+    });
+  },
+  fitBounds: true,
+  layers,
+  detect,
+};

package/lib/queryProviders/index.js

@@ -10,6 +10,7 @@ import kml from "./kml.js";
 import gpx from "./gpx.js";
 import tcx from "./tcx.js";
 import raw from "./raw.js";
+import esri from "./esri.js";
 
 export const all = {
   overpass,
@@ -21,6 +22,7 @@ export const all = {
   tcx,
   osmxml,
   osmjson,
+  esri,
   raster,
   vector,
   raw,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.0.0",
+  "version": "4.1.1",
   "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": {
@@ -64,12 +64,14 @@
     "dompurify": "^3.1.7",
     "esbuild": "^0.24.0",
     "esbuild-plugin-copy": "^2.1.1",
+    "esri-dump": "^5.4.0",
     "fast-deep-equal": "^3.1.3",
     "liquidjs": "^10.17.0",
     "lodash.pick": "^4.4.0",
     "lz-string": "^1.5.0",
     "maplibre-gl": "^5.0.1",
     "marked": "^14.1.2",
+    "node-events": "^0.0.2",
     "normalize.css": "^8.0.1",
     "osmtogeojson": "^3.0.0-beta.5",
     "pmtiles": "^3.2.0",