@maptrip/map-tiles 1.3.0 → 1.3.2

package/dist/util/MapReleaseFetcher.d.ts

@@ -1,12 +1,10 @@
 export declare class MapReleaseFetcher {
-    private _baseUrl;
     private _token;
     private _tomtom;
     private _osm;
     private _here;
     constructor(token: string);
-    updateUrl(provider: string): void;
-    getRelease(provider: string): Promise<string | null>;
-    fetchAndExtractRelease(provider: string): Promise<string | null>;
+    getRelease(provider: string): Promise<string | null | undefined>;
+    fetchAndExtractRelease(url: string): Promise<string | null>;
     private extractTargetString;
 }

package/lib/api-extensions/leaflet/MapTripLeafletGridLayer.ts

@@ -101,9 +101,8 @@ class MapTripLeafletGridLayer extends L.GridLayer {
       // remove the attribution with release date from map for instances where different layers have different preferences for setting release date
       const map = this._map;
       this._map.addEventListener("baselayerchange", () => {
-        map.attributionControl.removeAttribution(this.attribution)
-      })
-
+        map.attributionControl.removeAttribution(this.attribution);
+      });
     } catch (error) {
       console.error("Error fetching release version: ", error);
     }

package/lib/core/constants.ts

@@ -1,10 +1,11 @@
 export const URL_TEMPLATE =
   "https://v${index}.maptrip.de/?tilex=${x}&tiley=${y}&acao=true&context=tomtom${z}&project=${project}&projection=wgs84";
 
+
 export const PROVIDER_PROJECTS: { [key: string]: string } = {
   tomtom: "TomTom_latest",
-  here: "HERE_PLANET_2023_03",
-  openstreetmap: "OSM_PLANET_2023_03",
+  here: "HERE_latest",
+  openstreetmap: "OSM_latest",
 };
 
 export const PROVIDER_TRAFFIC: { [key: string]: string | null } = {

package/lib/util/MapReleaseFetcher.ts

@@ -1,5 +1,4 @@
 export class MapReleaseFetcher {
-  private _baseUrl: string;
   private _token: string;
 
   private _tomtom: Promise<string | null> | null = null;
@@ -7,43 +6,35 @@ export class MapReleaseFetcher {
   private _here: Promise<string | null> | null = null;
 
   constructor(token: string) {
-    this._baseUrl =
-      "https://v1.maptrip.de/?CMD=GETFILE&PROJECT=${project}&RELATIVEPATH=/data/mapset/data/routing_geocoder/admin.bin&acao=true";
     this._token = token;
   }
 
-  updateUrl(provider: string) {
-    if (provider === "tomtom") {
-      this._baseUrl = this._baseUrl.replace("${project}", "TomTom_latest");
-    } else if (provider === "openstreetmap") {
-      this._baseUrl = this._baseUrl.replace("${project}", "OSM_latest");
-    } else {
-      this._baseUrl = this._baseUrl.replace("${project}", "HERE_latest");
-    }
-  }
-
   async getRelease(provider: string) {
-    const providerLowercase = provider.toLowerCase();
-    if (providerLowercase === "tomtom") {
+    if (provider === "tomtom") {
       if (!this._tomtom) {
-        this._tomtom = this.fetchAndExtractRelease(providerLowercase);
+        const url =
+          "https://v1.maptrip.de/?CMD=GETFILE&PROJECT=TomTom_latest&RELATIVEPATH=/data/mapset/data/routing_geocoder/admin.bin&acao=true";
+        this._tomtom = this.fetchAndExtractRelease(url);
       }
-      return this._tomtom; 
-    } else if (providerLowercase === "here") {
+      return this._tomtom;
+    } else if (provider === "here") {
       if (!this._here) {
-        this._here = this.fetchAndExtractRelease(providerLowercase);
+        const url =
+          "https://v1.maptrip.de/?CMD=GETFILE&PROJECT=HERE_latest&RELATIVEPATH=/data/mapset/data/routing_geocoder/admin.bin&acao=true";
+        this._here = this.fetchAndExtractRelease(url);
       }
       return this._here;
-    } else {
+    } else if (provider === "openstreetmap") {
       if (!this._osm) {
-        this._osm = this.fetchAndExtractRelease(providerLowercase);
+        const url =
+          "https://v1.maptrip.de/?CMD=GETFILE&PROJECT=OSM_latest&RELATIVEPATH=/data/mapset/data/routing_geocoder/admin.bin&acao=true";
+        this._osm = this.fetchAndExtractRelease(url);
       }
       return this._osm;
     }
   }
 
-  async fetchAndExtractRelease(provider: string): Promise<string | null> {
-    const providerVar = this.updateUrl(provider);
+  async fetchAndExtractRelease(url: string): Promise<string | null> {
     return new Promise((resolve, reject) => {
       var xhr = new XMLHttpRequest();
       xhr.onreadystatechange = () => {
@@ -52,22 +43,15 @@ export class MapReleaseFetcher {
         if (xhr.status === 200) {
           const text = new TextDecoder("latin1").decode(xhr.response);
           const textString = this.extractTargetString(text);
-          const release = ` ${textString}`;
-
-          if (provider === "tomtom") {
-            this._tomtom = Promise.resolve(release);
-          } else if (provider === "here") {
-            this._here = Promise.resolve(release);
-          } else if (provider === "openstreetmap") {
-            this._osm = Promise.resolve(release);
-          }
+          const formattedString = textString!.split("Q").join(" Q");
+          const release = ` ${formattedString}`;
 
           resolve(release);
         } else {
           reject(`Error fetching: ${xhr.status}`);
         }
       };
-      xhr.open("GET", this._baseUrl, true);
+      xhr.open("GET", url, true);
       xhr.setRequestHeader("Authorization", `Bearer ${this._token}`);
       xhr.setRequestHeader("Accept", "*/*");
       xhr.setRequestHeader("Content-Type", "application/octet-stream");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maptrip/map-tiles",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "API to use MapTrip map tiles in other map APIs",
   "keywords": [
     "map",
@@ -21,7 +21,7 @@
     "dev": "vite src",
     "prepublish": "tsc",
     "build": "tsc && vite build",
-    "publish": "tsc && vite build && npm login --scope=@maptrip && npm publish"
+    "publish": "npm update && tsc && vite build && npm login --scope=@maptrip && npm publish"
   },
   "devDependencies": {
     "@googlemaps/js-api-loader": "^1.16.2",
@@ -30,21 +30,19 @@
     "eslint": "^8.52.0",
     "ol": "~8.2.x",
     "typescript": "^5.4.5",
-    "vite": "^4.5.0"
+    "vite": "^6.2.2"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.14",
-
     "@types/webfontloader": "^1.6.38",
-
     "rtree": "^1.4.2",
-    "vite-plugin-dts": "^3.9.0",
+    "vite-plugin-dts": "^4.5.3",
     "webfontloader": "^1.6.28"
   },
   "peerDependencies": {
-    "leaflet": "^1.9.x",
-    "@types/leaflet": "^1.9.12",
     "@googlemaps/js-api-loader": "^1.16.2",
+    "@types/leaflet": "^1.9.12",
+    "leaflet": "^1.9.x",
     "ol": "~8.2.x"
   },
   "directories": {