@maptrip/map-tiles 1.2.0 → 1.3.0

package/lib/main.ts

@@ -1,9 +1,10 @@
-import type * as types from "./types/interfaces.js";
 import { VectorTileFactory } from "./core/VectorTileFactory.js";
 import { RENDERING_CONFIG_DEFAULT } from "./core/rendering_config_default.js";
 import { RENDERING_CONFIG_GRAYSCALE } from "./core/rendering_config_grayscale.js";
 import { RENDERING_CONFIG_TRAFFIC } from "./core/rendering_config_traffic.js";
 
+import { MapReleaseFetcher } from "./util/MapReleaseFetcher.js";
+
 import { MapTripGoogleMapType } from "./api-extensions/google/MapTripGoogleMapType.js";
 import { MapTripLeafletGridLayer } from "./api-extensions/leaflet/MapTripLeafletGridLayer.js";
 import { MapTripOpenLayersSource } from "./api-extensions/openlayers/MapTripOpenLayersSource.js";
@@ -13,8 +14,8 @@ export {
   RENDERING_CONFIG_DEFAULT,
   RENDERING_CONFIG_GRAYSCALE,
   RENDERING_CONFIG_TRAFFIC,
+  MapReleaseFetcher,
   MapTripLeafletGridLayer,
   MapTripGoogleMapType,
   MapTripOpenLayersSource,
-  types,
 };

package/lib/types/interfaces.ts

@@ -12,6 +12,7 @@ export interface MapTilesProperties {
   maxZoom?: number;
   name?: string;
   NAME?: string;
+  releaseDate?: boolean | false;
 }
 
 export interface Renderer {
@@ -36,14 +37,7 @@ export interface Renderer {
     dy: number;
   };
   filters?: Filter[];
-  [key: string]: any;
-}
-
-export interface Filter {
-  interface: string;
-  key: string;
-  value?: any;
-  type: string;
+  // [key: string]: any;
 }
 
 export interface RENDERING_CONFIG {
@@ -56,6 +50,13 @@ export interface RENDERING_CONFIG {
   renderers: { [key: string]: Renderer[] };
 }
 
+export interface Filter {
+  interface: string;
+  key: string;
+  value?: any;
+  type: string;
+}
+
 export interface PolylineTextStyle {
   size: number;
   color: string;
@@ -81,8 +82,8 @@ export interface PolygonStyle {
   opacity?: number | undefined;
   outlineColor?: string | undefined;
   outlineWidth?: number | undefined;
-  url: string;
-  font: string;
+  url?: string | undefined;
+  font?: string | undefined;
   fontStyle?: string | undefined;
   fontWeight?: string | undefined;
   size?: number | undefined;

package/lib/util/MapReleaseFetcher.ts

@@ -0,0 +1,82 @@
+export class MapReleaseFetcher {
+  private _baseUrl: string;
+  private _token: string;
+
+  private _tomtom: Promise<string | null> | null = null;
+  private _osm: Promise<string | null> | null = null;
+  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 (!this._tomtom) {
+        this._tomtom = this.fetchAndExtractRelease(providerLowercase);
+      }
+      return this._tomtom; 
+    } else if (providerLowercase === "here") {
+      if (!this._here) {
+        this._here = this.fetchAndExtractRelease(providerLowercase);
+      }
+      return this._here;
+    } else {
+      if (!this._osm) {
+        this._osm = this.fetchAndExtractRelease(providerLowercase);
+      }
+      return this._osm;
+    }
+  }
+
+  async fetchAndExtractRelease(provider: string): Promise<string | null> {
+    const providerVar = this.updateUrl(provider);
+    return new Promise((resolve, reject) => {
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState !== XMLHttpRequest.DONE) return;
+
+        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);
+          }
+
+          resolve(release);
+        } else {
+          reject(`Error fetching: ${xhr.status}`);
+        }
+      };
+      xhr.open("GET", this._baseUrl, true);
+      xhr.setRequestHeader("Authorization", `Bearer ${this._token}`);
+      xhr.setRequestHeader("Accept", "*/*");
+      xhr.setRequestHeader("Content-Type", "application/octet-stream");
+      xhr.responseType = "arraybuffer";
+      xhr.send(null);
+    });
+  }
+  private extractTargetString(text: string): string | null {
+    const match = text.match(/2\d{3}Q[1-4]/);
+    return match ? match[0] : null;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maptrip/map-tiles",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "API to use MapTrip map tiles in other map APIs",
   "keywords": [
     "map",
@@ -18,32 +18,33 @@
   "main": "dist/map-tiles.js",
   "types": "dist/map-tiles.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "vite src",
     "prepublish": "tsc",
-    "build": "tsc && vite build"
+    "build": "tsc && vite build",
+    "publish": "tsc && vite build && npm login --scope=@maptrip && npm publish"
   },
   "devDependencies": {
     "@googlemaps/js-api-loader": "^1.16.2",
     "@types/google.maps": "^3.55.4",
-    "@types/leaflet": "^1.9.8",
     "@types/rtree": "^1.4.30",
     "eslint": "^8.52.0",
-    "leaflet": "~1.9.x",
     "ol": "~8.2.x",
     "typescript": "^5.4.5",
     "vite": "^4.5.0"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.14",
+
     "@types/webfontloader": "^1.6.38",
+
     "rtree": "^1.4.2",
     "vite-plugin-dts": "^3.9.0",
     "webfontloader": "^1.6.28"
   },
   "peerDependencies": {
+    "leaflet": "^1.9.x",
+    "@types/leaflet": "^1.9.12",
     "@googlemaps/js-api-loader": "^1.16.2",
-    "leaflet": "~1.9.x",
     "ol": "~8.2.x"
   },
   "directories": {