@trailstash/ultra 3.5.0 → 3.5.2

package/components/ultra-map.js

@@ -30,6 +30,7 @@ export class UltraMap extends HTMLElement {
   #init;
   #shadow;
 
+  #cachedBBox;
   #cachedType;
   #cachedQuery;
   #cachedSource;
@@ -124,7 +125,7 @@ export class UltraMap extends HTMLElement {
     this.#shadow.adoptedStyleSheets.push(css);
 
     if (this.loadSettingsFromQueryParams) {
-      return Promise.resolve(getQueryFromQueryParams() || config.query).then(
+      return Promise.resolve(getQueryFromQueryParams() || this.query).then(
         async (query) => {
           const querySettings = parseSettings(query);
           const settings = {
@@ -263,8 +264,12 @@ export class UltraMap extends HTMLElement {
     if (
       !this.#cachedSource ||
       this.type !== this.#cachedType ||
-      query !== this.#cachedQuery
+      query !== this.#cachedQuery ||
+      (queryProvider.invalidateCacheOnBBox &&
+        this.#cachedBBox !=
+          setQueryBounds("{{bbox}}", this.refs.mapLibre.bounds))
     ) {
+      this.#cachedBBox = setQueryBounds("{{bbox}}", this.refs.mapLibre.bounds);
       this.#cachedQuery = query;
       this.#cachedType = this.type;
       this.#cachedSource = await queryProvider.source(query, controller, {

package/lib/queryProviders/auto.js

@@ -3,6 +3,7 @@ export default class AutoProvider {
   #layers;
   #popupContextBuilder;
   #popupTemplate;
+  #invalidateCacheOnBBox;
   #providers;
 
   constructor(providers = {}) {
@@ -23,6 +24,7 @@ export default class AutoProvider {
         this.#layers = provider.layers;
         this.#popupContextBuilder = provider.popupContextBuilder;
         this.#popupTemplate = provider.popupTemplate;
+        this.#invalidateCacheOnBBox = provider.invalidateCacheOnBBox;
         return provider.source(query, controller, { server, bounds });
       }
     }
@@ -44,4 +46,16 @@ export default class AutoProvider {
   get popupTemplate() {
     return this.#popupTemplate;
   }
+
+  get popupTemplate() {
+    return this.#popupTemplate;
+  }
+
+  get invalidateCacheOnBBox() {
+    // This isn't ideal, because this is called _before_ `source`, but it will work because it's either:
+    // * undefined & the first run, so bc first run it always will execute anyway
+    // * different type, which might mean a different invalidateCacheOnBBox value, but we always run on new type anyway
+    // * type unchanged, & subsequent run, so actually valid value
+    return this.#invalidateCacheOnBBox;
+  }
 }

package/lib/queryProviders/ohsome.js

@@ -58,5 +58,6 @@ const overpass = {
   layers,
   popupTemplate,
   popupContextBuilder,
+  invalidateCacheOnBBox: true,
 };
 export default overpass;

package/lib/queryProviders/overpass.js

@@ -126,6 +126,7 @@ export const osmWebsite = {
     return !!query.match(osmUrlRe);
   },
   fitBounds: true,
+  invalidateCacheOnBBox: true,
 };
 
 export const osmWiki = {
@@ -165,4 +166,5 @@ out geom;`,
     const page = decodeURIComponent(url.pathname.slice(6));
     return page.split(":")[0] === "Tag" || page.split(":")[0] === "Key";
   },
+  invalidateCacheOnBBox: true,
 };

package/package.json

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