@trailstash/ultra 3.1.0-beta2 → 3.1.0-beta4

package/README.md

@@ -3,28 +3,37 @@
 Ultra is a web-application made to simplify making maps with [MapLibre GL
 JS](https://maplibre.org).
 
-[Overpass Ultra](https://overpass-ultra.us) is the main deployment of Ultra.
+## Deployments
 
-The customization of the map complies with an [extended](https://overpass-ultra.us/docs/style#ultra-maplibre-styles) version
-of the the [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/).
+- 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>
+- 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
 
-The documentation for Overpass Ultra is available at <a target="_blank" href="https://overpass-ultra.us/docs/">overpass-ultra.us/docs</a>.
-The only difference between the base Ultra configuration and Overpass Ultra is that Overpass Ultra
-defaults to `type: overpass`.
+The documentation for Ultra is available at <a target="_blank" href="/docs/">/docs</a>.
 
 ## Configuration
 
 Various aspects of Ultra, such as styling, can be
-configured via [YAML front-matter](https://overpass-ultra.us/docs/yaml).
+configured via [YAML front-matter](/docs/yaml).
+
+## Overpass Queries
+
+Overpass API allows to query for OSM data by your own search criteria. For this purpose, it has a
+specifically crafted query language: [Overpass
+QL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
+
+In addition to regular Overpass API queries one can use `{{bbox}}` to specify the bounding box
+coordinates of the current map view.
 
 ## Styling
 
-Ultra supports styling using the [MapLibre Style
-Specification](https://maplibre.org/maplibre-style-spec/).
+Ultra supports styling using an
+[extended](/docs/style#ultra-maplibre-styles) version of the the [MapLibre
+Style Spec](https://maplibre.org/maplibre-style-spec/).
 
-See the [Styling](https://overpass-ultra.us/docs/style) section for more information.
+See the [Styling](/docs/style) section for more information.
 
 ## About
 

package/cli/build.js

@@ -64,7 +64,7 @@ export default class Build extends Command {
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),
     );
-    fs.mkdirSync("dist", { recursive: true});
+    fs.mkdirSync("dist", { recursive: true });
     fs.writeFileSync("dist/index.html", html);
 
     await build(buildOptions(config));

package/cli/serve.js

@@ -35,7 +35,7 @@ export default class Serve extends Command {
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),
     );
-    fs.mkdirSync("dist", { recursive: true});
+    fs.mkdirSync("dist", { recursive: true });
     fs.writeFileSync("dist/index.html", html);
 
     const ctx = await context(buildOptions(config, true));

package/components/help-modal.js

@@ -68,7 +68,6 @@ export class HelpModal extends HTMLElement {
             <h4>Software &amp; Libraries</h4>
             <ul>
               <li>
-                IDE powered by
                 <a target="_blank" href="https://gitlab.com/trailstash/ultra"
                   >@trailstash/ultra</a
                 > <code>${version}</code>

package/components/ultra-ide.js

@@ -91,6 +91,7 @@ export class UltraIDE extends HTMLElement {
   help;
 
   static MAP_INIT_SETTINGS = [
+    "loadSettingsFromQueryParams",
     "options",
     "controls",
     "mapStyle",
@@ -137,7 +138,11 @@ export class UltraIDE extends HTMLElement {
     // Get initial query and center&zoom
     this.query = getQueryFromQueryParams() || queryFromStorage() || this.query;
     this.autoRun = getAutoRunFromQueryParams();
-    this.settings = { persistState: true, ...this.settings };
+    this.settings = {
+      persistState: true,
+      ...this.settings,
+      loadSettingsFromQueryParams: false,
+    };
 
     shadow.appendChild(
       h(

package/components/ultra-map.js

@@ -37,7 +37,7 @@ export class UltraMap extends HTMLElement {
   #autoProvider;
 
   static defaults = {
-    loadSettingsFromQueryParams: false,
+    loadSettingsFromQueryParams: true,
     type: "auto",
     query: "",
     server: null,

package/mkdocs.yml

@@ -1,9 +1,9 @@
-site_name: Overpass Ultra
-site_url: https://overpass-ultra.us/docs/
-repo_url: https://gitlab.com/trailstash/overpass-ultra/
+site_name: Ultra
+site_url: https://ultra.trailsta.sh/docs/
+repo_url: https://gitlab.com/trailstash/ultra/
 copyright: '<a href="https://creativecommons.org/publicdomain/zero/1.0/deed.en">CC0 1.0 Universal</a>'
 edit_uri: ''
-site_dir: static/docs
+site_dir: dist/docs
 theme:
   name: material
   custom_dir: docs/overrides

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.1.0-beta2",
+  "version": "3.1.0-beta4",
   "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": {
@@ -40,8 +40,6 @@
   "devDependencies": {
     "@types/node": "^22.6.1",
     "@unvt/sprite-one": "^0.1.1",
-    "esbuild": "^0.24.0",
-    "esbuild-plugin-copy": "^2.1.1",
     "prettier": "^3.3.3",
     "puppeteer": "^23.4.0",
     "svg2png": "^4.1.1",
@@ -64,7 +62,9 @@
     "normalize.css": "^8.0.1",
     "osmtogeojson": "^3.0.0-beta.5",
     "pmtiles": "^3.2.0",
-    "yaml": "^2.5.1"
+    "yaml": "^2.5.1",
+    "esbuild": "^0.24.0",
+    "esbuild-plugin-copy": "^2.1.1"
   },
   "peerDependencies": {
     "@maplibre/maplibre-gl-style-spec": "20.x"

package/docs/index.md

@@ -1,53 +0,0 @@
-# Introduction
-
-<img alt="powered by Overpass API" style="float: right" src="https://wiki.openstreetmap.org/w/images/b/b3/Powered_by_Overpass_API.png">
-
-[Ultra](https://overpass-ultra.us) is a web-application made to simplify making maps with [MapLibre GL
-JS](https://maplibre.org) and [OpenStreetMap](https://openstreetmap.org) data.
-
-The customization of the map complies with an [extended](https://overpass-ultra.us/docs/style#ultra-maplibre-styles) version
-of the the [MapLibre Style Spec](https://maplibre.org/maplibre-style-spec/).
-
-## Documentation
-
-The documentation for Ultra is available at <a target="_blank" href="https://overpass-ultra.us/docs/">overpass-ultra.us/docs</a>
-
-## Overpass Queries
-
-Overpass API allows to query for OSM data by your own search criteria. For this purpose, it has a
-specifically crafted query language: [Overpass
-QL](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL)
-
-In addition to regular Overpass API queries one can use `{{bbox}}` to specify the bounding box
-coordinates of the current map view.
-
-## Configuration
-
-Various aspects of Ultra, such as styling and the Overpass API server to use, can be
-configured via [YAML front-matter](https://overpass-ultra.us/docs/yaml).
-
-## Styling
-
-Ultra supports styling using the [MapLibre Style
-Specification](https://maplibre.org/maplibre-style-spec/).
-
-See the [Styling](https://overpass-ultra.us/docs/style) section for more information.
-
-## About
-
-Ultra is built by Daniel Schep.
-
-You can contact me on [Mastodon](https://mapstodon.space/@trailstash).
-
-## Feedback, Bug Reports, Feature Requests
-
-While Ultra has been in development for a while, it should still be considered
-experimental.
-
-If you would like to report a bug or provide other feedback, please do so in the project's
-[Issue Tracker](https://gitlab.com/trailstash/overpass-ultra/-/issues).
-
-## Source Code</h4>
-
-The [source code](https://gitlab.com/trailstash/overpass-ultra) of this application is released under the
-[MIT license](https://gitlab.com/trailstash/overpass-ultra/-/blob/master/LICENSE).