Merge branch 'main' into v3.0.0

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json

Author: sebstryczek

CHANGELOG.md

@@ -8,11 +8,19 @@
 ### Bug Fixes
 - Navigation now relies on `Map` methods instead of `Transform` methods for bearing due to globe projection being available
 
+## 2.5.1
+### Bug Fixes
+- Better control of the status of `monitoredStyleUrls` in Map instance when error is caught (https://github.com/maptiler/maptiler-sdk-js/pull/141)
+- Added extra integrity checks on style object when updating language (https://github.com/maptiler/maptiler-sdk-js/pull/142)
+- The Geolocate control no longer throwing error when window is lost (issue on Firefox only) (https://github.com/maptiler/maptiler-sdk-js/pull/140)
+
+## 2.5.0
+### others
+- Update MapTiler Client library to v2.5.0
 
 ## 2.4.2
 ### Bug Fixes
 - The language switching is now more robust and preserves the original formatting from the style (`Map.setPrimaryLangage()`) (https://github.com/maptiler/maptiler-sdk-js/pull/134)
-
 ### Others
 - Now able to GitHub action a beta on NPM from the GH release creation process
 - Updated GH action to v4

readme.md

@@ -1103,7 +1103,40 @@ Turning off *zoom compensation* allows for more accurate adjustments to the visu
 
 All the other options are documented on [our reference page](https://docs.maptiler.com/sdk-js/api/helpers/#heatmap) and more examples are available [here](https://docs.maptiler.com/sdk-js/examples/?q=heatmap+helper).
 
-# Other helper
+# Other helpers
+## Convert GPX and KML to GeoJSON
+In the [Polyline helper section](#polyline-layer-helper) above, we have seen that one can feed the helper directly with a path to a GPX or KML file, that is then converted under the hood client-side into a GeoJSON `FeatureCollection` object. This conversion feature is also exposed and can be used as such:
+
+```ts
+import { gpx } from "@maptiler/sdk";
+
+// ... assuming inside an async function
+
+// Fetching the GPX file as a string:
+const gpxFilePath = "some_gps_trace.gpx";
+const gpxResponse = await fetch(gpxFilePath);
+const gpxStr = await res.text();
+
+// Converting the GPX payload into a GeoJSON FeatureCollection:
+const features = maptilersdk.gpx(gpxStr);
+```
+
+And for KML files:
+```ts
+import { kml } from "@maptiler/sdk";
+
+// ... assuming inside an async function
+
+// Fetching the KML file as a string:
+const kmlFilePath = "some_gps_trace.kml";
+const kmlResponse = await fetch(kmlFilePath);
+const kmlStr = await res.text();
+
+// Converting the KML payload into a GeoJSON FeatureCollection:
+const features = maptilersdk.gpx(kmlStr);
+```
+
+
 ## Take Screenshots, programmatically
 There are two different ways to create screenshot, corresponding to two very different usecases. Note that screenshots will not contain *DOM elements* such as `Marker` and `Popup`, since those are not part of the rendering context.
 

src/Map.ts

@@ -307,7 +307,7 @@ export class Map extends maplibregl.Map {
         // If the URL is present in the list of monitored style URL,
         // that means this AJAXError was about a style, and we want to fallback to
         // the default style
-        if (this.monitoredStyleUrls.has(clearnUrlStr)) {
+        if (this.monitoredStyleUrls && this.monitoredStyleUrls.has(clearnUrlStr)) {
           this.monitoredStyleUrls.delete(clearnUrlStr);
           applyFallbackStyle();
         }
@@ -975,7 +975,7 @@ export class Map extends maplibregl.Map {
   }
 
   private getStyleLanguage(): LanguageInfo | null {
-    if (!this.style.stylesheet.metadata) return null;
+    if (!this.style || !this.style.stylesheet || !this.style.stylesheet.metadata) return null;
     if (typeof this.style.stylesheet.metadata !== "object") return null;
 
     if (

src/MaptilerGeolocateControl.ts

@@ -166,4 +166,37 @@ export class MaptilerGeolocateControl extends GeolocateControl {
       this._updateCircleRadius();
     }
   };
+
+  // We are overwriting the method _setErrorState from Maplibre's GeolocateControl because the
+  // case BACKGROUND_ERROR is not dealt with in the original function and yields an error.
+  // Related issue: https://github.com/maplibre/maplibre-gl-js/issues/2294
+  _setErrorState() {
+    switch (this._watchState) {
+      case "WAITING_ACTIVE":
+        this._watchState = "ACTIVE_ERROR";
+        this._geolocateButton.classList.remove("maplibregl-ctrl-geolocate-active");
+        this._geolocateButton.classList.add("maplibregl-ctrl-geolocate-active-error");
+        break;
+      case "ACTIVE_LOCK":
+        this._watchState = "ACTIVE_ERROR";
+        this._geolocateButton.classList.remove("maplibregl-ctrl-geolocate-active");
+        this._geolocateButton.classList.add("maplibregl-ctrl-geolocate-active-error");
+        this._geolocateButton.classList.add("maplibregl-ctrl-geolocate-waiting");
+        // turn marker grey
+        break;
+      case "BACKGROUND":
+        this._watchState = "BACKGROUND_ERROR";
+        this._geolocateButton.classList.remove("maplibregl-ctrl-geolocate-background");
+        this._geolocateButton.classList.add("maplibregl-ctrl-geolocate-background-error");
+        this._geolocateButton.classList.add("maplibregl-ctrl-geolocate-waiting");
+        // turn marker grey
+        break;
+      case "ACTIVE_ERROR":
+        break;
+      case "BACKGROUND_ERROR":
+        break;
+      default:
+        throw new Error(`Unexpected watchState ${this._watchState}`);
+    }
+  }
 }