@trailstash/ultra 3.0.0-dev

package/lib/style.js

@@ -0,0 +1,222 @@
+import { validateStyleMin, v8 } from "@maplibre/maplibre-gl-style-spec";
+import FallbackGlyphProtocol from "./glyphFallback.js";
+
+const paintKeys = new Set(
+  Object.entries(v8)
+    .filter(([k]) => k.startsWith("paint_"))
+    .map(([, v]) => Object.keys(v))
+    .reduce((a, c) => [...a, ...c], []),
+);
+const layoutKeys = new Set(
+  Object.entries(v8)
+    .filter(([k]) => k.startsWith("layout_"))
+    .map(([, v]) => Object.keys(v))
+    .reduce((a, c) => [...a, ...c], []),
+);
+
+export function setBaseStyle(style, baseStyle, overwrite = false) {
+  if (!baseStyle) {
+    return style;
+  }
+  if (typeof style === "string") {
+    return overwrite ? baseStyle : style;
+  } else if (overwrite) {
+    return {
+      ...style,
+      extends: baseStyle,
+    };
+  } else {
+    return {
+      extends: baseStyle,
+      ...style,
+    };
+  }
+}
+
+export async function getStyle(style, source) {
+  if (typeof style === "string") {
+    // Style is just a string, fetch it, parse it, and add ultra source & layers if defined
+    const resp = await fetch(style);
+    const styleJSON = await resp.json();
+    return ensureSourceAndLayers(styleJSON, source);
+  } else if (style && !style.version) {
+    // extended style! Merge layers & sources
+    let parentStyle;
+    if (typeof style.extends === "string") {
+      const resp = await fetch(style.extends);
+      parentStyle = await resp.json();
+    } else {
+      parentStyle = style.extends;
+    }
+    const layers = [...parentStyle.layers];
+    for (const i in style.layers) {
+      const { beforeLayerId, ...layer } = style.layers[i];
+      // If the layer defines the ID, see if it belongs to an existing layer
+      const curLayerIdx = layers.findIndex(({ id }) => id === layer.id);
+      let layerIdx = -1;
+      let newLayer = movePaintAndLayoutKeys(ensureLayerProps({ ...layer }, i));
+      // If the layer exists, merge with defined layer, remove from layers, and default to
+      // reinserting it at the same index
+      if (curLayerIdx >= 0) {
+        newLayer = {
+          ...layers[curLayerIdx],
+          ...movePaintAndLayoutKeys({ ...layer }),
+        };
+        layerIdx = curLayerIdx;
+        layers.splice(curLayerIdx, 1);
+      }
+      // find insertion point if beforeLayerId is specified.
+      // If insertion point is not found, layer is appended instead.
+      // an intetional side-effect of this is that you can specify an non-existing layer to move an
+      // existing layer from a style to the top
+      if (beforeLayerId) {
+        layerIdx = layers.findIndex(({ id }) => id === beforeLayerId);
+      }
+      if (newLayer.source === "ultra" && !source) {
+        continue;
+      }
+      if (layerIdx >= 0) {
+        layers.splice(layerIdx, 0, newLayer);
+      } else {
+        layers.push(newLayer);
+      }
+    }
+    if (!parentStyle.sprite) {
+      parentStyle.sprite = [];
+    } else if (typeof parentStyle.sprite === "string") {
+      parentStyle.sprite = [{ id: "default", url: parentStyle.sprite }];
+    }
+    if (!style.sprite) {
+      style.sprite = [];
+    } else if (typeof style.sprite === "string") {
+      style.sprite = [{ id: "default", url: style.sprite }];
+    }
+    const extendedStyle = {
+      ...parentStyle,
+      ...style,
+      sources: { ...parentStyle.sources, ...(style.sources || {}) },
+      sprite: [...parentStyle.sprite, ...style.sprite],
+      layers,
+    };
+    return ensureSourceAndLayers(extendedStyle, source);
+  } else {
+    // "complete" style, process layers & add ultra source & layers if defined
+    return ensureSourceAndLayers(
+      {
+        ...style,
+        layers: style.layers
+          ?.map(ensureLayerProps)
+          .filter((l) => l.source !== "ultra" || source)
+          .map(movePaintAndLayoutKeys),
+      },
+      source,
+    );
+  }
+}
+
+function movePaintAndLayoutKeys(layer) {
+  for (const [key, value] of Object.entries(layer)) {
+    if (paintKeys.has(key)) {
+      if (!layer.paint) {
+        layer.paint = {};
+      }
+      layer.paint[key] = value;
+      delete layer[key];
+    }
+    if (layoutKeys.has(key)) {
+      if (!layer.layout) {
+        layer.layout = {};
+      }
+      layer.layout[key] = value;
+      delete layer[key];
+    }
+  }
+  return layer;
+}
+
+// ensureLayerProps generates a layer ID if one is not set and sets the source to `ultra` if
+// not set
+function ensureLayerProps(layer, i) {
+  if (!layer.id) {
+    layer.id = `ultra-${i}`;
+  }
+  if (!layer.source && layer.type !== "background") {
+    layer.source = "ultra";
+  }
+  return layer;
+}
+
+export function ensureSourceAndLayers(style, source) {
+  style.glyphs = FallbackGlyphProtocol.makeURL(style.glyphs);
+  if (!style.sources) {
+    style.sources = {};
+  }
+  if (!style.sprite) {
+    style.sprite = [];
+  } else if (typeof style.sprite === "string") {
+    style.sprite = [{ id: "default", url: style.sprite }];
+  }
+  const spritesheets = style.sprite.map(({ id }) => id);
+  if (!spritesheets.includes("maki")) {
+    style.sprite.push({
+      id: "maki",
+      url: window.location.origin + "/sprites/maki",
+    });
+  }
+  if (!spritesheets.includes("temaki")) {
+    style.sprite.push({
+      id: "temaki",
+      url: window.location.origin + "/sprites/temaki",
+    });
+  }
+  if (source && !style.sources.ultra) {
+    let foundAttribution = false;
+    for (const sourceName in style.sources) {
+      if (
+        style.sources[sourceName].attribution
+          ?.toLowerCase()
+          .includes("openstreetmap") ||
+        style.sources[sourceName].url?.startsWith("https://tile.ourmap.us")
+      ) {
+        foundAttribution = true;
+      }
+    }
+    style.sources.ultra = source.source;
+    if (foundAttribution) {
+      style.sources.ultra.attribution = "";
+    }
+  }
+  if (!style.layers) {
+    style.layers = [];
+  }
+  let hasUltraLayer = false;
+  for (const layer of style.layers) {
+    if (layer.source === "ultra") {
+      hasUltraLayer = true;
+      break;
+    }
+  }
+  if (source && source.layers && !hasUltraLayer) {
+    for (const layer of source.layers) {
+      style.layers.push(layer);
+    }
+  }
+  const errors = validateStyleMin(style, v8);
+  if (errors.length) {
+    throw new Error(
+      "Invalid style:\n\n" + errors.map(({ message }) => message).join("\n"),
+    );
+  }
+  return style;
+}
+
+export const handleStyleImageMissing = (ev) => {
+  if (ev.id.startsWith("https://") || ev.id.startsWith("data:")) {
+    ev.target.loadImage(ev.id, (error, image) => {
+      if (error) throw error;
+      if (!ev.target.hasImage(ev.id)) {
+        ev.target.addImage(ev.id, image);
+      }
+    });
+  }
+};

package/mkdocs.yml

@@ -0,0 +1,26 @@
+site_name: Overpass Ultra
+site_url: https://overpass-ultra.us/docs/
+repo_url: https://gitlab.com/trailstash/overpass-ultra/
+copyright: '<a href="https://creativecommons.org/publicdomain/zero/1.0/deed.en">CC0 1.0 Universal</a>'
+edit_uri: ''
+site_dir: static/docs
+theme:
+  name: material
+  custom_dir: docs/overrides
+  logo: assets/logo.svg
+  favicon: assets/logo.svg
+  features:
+    - content.code.copy
+  hide:
+    - footer
+extra:
+  social:
+    - icon: fontawesome/brands/mastodon
+      link: https://mapstodon.space/@trailstash
+    - icon: fontawesome/brands/gitlab
+      link: https://gitlab.com/trailstash
+    - icon: fontawesome/brands/instagram
+      link: https://instagram.com/trailstashmaps
+extra:
+  analytics:
+    provider: custom

package/package.json

@@ -0,0 +1,80 @@
+{
+  "name": "@trailstash/ultra",
+  "publishConfig": {
+    "access": "public"
+  },
+  "version": "3.0.0-dev",
+  "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": {
+    "build": "node ./bin/run.js build",
+    "build:icons": "bash ./build-icons.sh",
+    "build:examples-docs": "node ./build-examples-docs.js Examples",
+    "build:examples-images": "node ./build-examples-images.js",
+    "build:maplibre-examples-docs": "node ./build-examples-docs.js MapLibre-Examples",
+    "build:docs": "mkdocs build",
+    "start:docs": "mkdocs serve",
+    "build:pages": "mkdir -p public && cp -Lr static/* public/.",
+    "start": "node ./bin/run.js serve",
+    "format": "prettier --print-width=80 --write '**/*.js' '**/*.json' README.md static/index.html '**/*.css'",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/trailstash/overpass-ultra.git"
+  },
+  "keywords": [
+    "maps",
+    "cartography",
+    "osm",
+    "overpass",
+    "mapbox-gl",
+    "mapbox-gl-js"
+  ],
+  "author": "Daniel Schep",
+  "bugs": {
+    "url": "https://gitlab.com/trailstash/overpass-ultra/issues"
+  },
+  "homepage": "https://overpass-ultra.us/",
+  "devDependencies": {
+    "@types/node": "^18.19.44",
+    "@unvt/sprite-one": "^0.1.1",
+    "esbuild": "^0.19.2",
+    "prettier": "^3.1.1",
+    "puppeteer": "^22.13.1",
+    "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",
+    "@tmcw/togeojson": "^5.8.1",
+    "@trailstash/maplibre-component": "^1.0.0",
+    "@turf/bbox": "^7.0.0",
+    "deep-equal": "^2.2.3",
+    "liquidjs": "^10.10.0",
+    "lodash.pick": "^4.4.0",
+    "lz-string": "^1.5.0",
+    "maplibre-gl": "^4.5.1",
+    "marked": "^13.0.2",
+    "normalize.css": "^8.0.1",
+    "osmtogeojson": "^3.0.0-beta.5",
+    "pmtiles": "^3.0.5",
+    "yaml": "^2.3.4"
+  },
+  "peerDependencies": {
+    "@maplibre/maplibre-gl-style-spec": "20.x"
+  },
+  "bin": {
+    "ultra": "./bin/run.js"
+  },
+  "oclif": {
+    "bin": "ultra",
+    "commands": "./cli",
+    "dirname": "ultra",
+    "topicSeparator": " "
+  }
+}

package/static/embed.js

@@ -0,0 +1,18 @@
+const el = document.createElement("iframe");
+el.setAttribute("style", document.currentScript.getAttribute("style"));
+document.currentScript.style.display = "none";
+const params = new URLSearchParams();
+params.set("query", document.currentScript.text.trim());
+el.src = new URL(
+  `/#map&${params.toString()}`,
+  document.currentScript.src,
+).toString();
+
+if (document.currentScript.nextSibling) {
+  document.currentScript.parentElement.insertBefore(
+    el,
+    document.currentScript.nextSibling,
+  );
+} else {
+  document.currentScript.parentElement.appendChild(el);
+}

package/static/font/10240-10495.pbf

@@ -0,0 +1,3 @@
+
+�
+�Noto Sans Regular, Noto Naskh Arabic Regular, Noto Sans Armenian Regular, Noto Sans Balinese Regular, Noto Sans Bengali Regular, Noto Sans CJK TC Regular, Noto Sans Devanagari Regular, Noto Sans Ethiopic Regular, Noto Sans Georgian Regular, Noto Sans Gujarati Regular, Noto Sans Gurmukhi Regular, Noto Sans Hebrew Regular, Noto Sans Javanese Regular, Noto Sans Kannada Regular, Noto Sans Khmer Regular, Noto Sans Lao Regular, Noto Sans Mongolian Regular, Noto Sans Myanmar Regular, Noto Sans Oriya Regular, Noto Sans Sinhala Regular, Noto Sans Tamil Regular, Noto Sans Thai Regular, Noto Sans Tibetan Regular10240-10495

package/static/font/10752-11007.pbf

@@ -0,0 +1,3 @@
+
+�
+�Noto Sans Regular, Noto Naskh Arabic Regular, Noto Sans Armenian Regular, Noto Sans Balinese Regular, Noto Sans Bengali Regular, Noto Sans CJK TC Regular, Noto Sans Devanagari Regular, Noto Sans Ethiopic Regular, Noto Sans Georgian Regular, Noto Sans Gujarati Regular, Noto Sans Gurmukhi Regular, Noto Sans Hebrew Regular, Noto Sans Javanese Regular, Noto Sans Kannada Regular, Noto Sans Khmer Regular, Noto Sans Lao Regular, Noto Sans Mongolian Regular, Noto Sans Myanmar Regular, Noto Sans Oriya Regular, Noto Sans Sinhala Regular, Noto Sans Tamil Regular, Noto Sans Thai Regular, Noto Sans Tibetan Regular10752-11007