@maptiler/sdk 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maptiler/sdk",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "The Javascript & TypeScript map SDK tailored for MapTiler Cloud",
   "module": "dist/maptiler-sdk.mjs",
   "types": "dist/maptiler-sdk.d.ts",

package/readme.md

@@ -165,10 +165,13 @@ Here is the full list:
   - `MapStyle.STREETS.DARK` (variant)
   - `MapStyle.STREETS.LIGHT` (variant)
   - `MapStyle.STREETS.PASTEL` (variant)
-- `MapStyle.OUTDOOR` reference style for adventure
-- `MapStyle.WINTER` reference style for winter adventure
 - `MapStyle.SATELLITE` reference style satellite and airborne imagery (no variants)
 - `MapStyle.HYBRID` reference style satellite and airborne imagery with labels (no variants)
+- `MapStyle.OUTDOOR` reference style for adventure
+- `MapStyle.WINTER` reference style for winter adventure
+- `MapStyle.DATAVIZ`, the perfect style for data visualization, with very little noise
+  - `MapStyle.DATAVIZ.DARK` (variant)
+  - `MapStyle.DATAVIZ.LIGHT` (variant)
 - `MapStyle.BASIC` reference style for minimalist design and general purpose
   - `MapStyle.BASIC.DARK` (variant)
   - `MapStyle.BASIC.LIGHT` (variant)
@@ -189,9 +192,7 @@ Here is the full list:
   - `MapStyle.TONER.LITE` (variant)
   - `MapStyle.TONER.LINES` (variant)
 - `MapStyle.OPENSTREETMAP` (reference style, this one does not have any variants)
-- `MapStyle.DATAVIZ`, the perfect style for data visualization, with very little noise
-  - `MapStyle.DATAVIZ.DARK` (variant)
-  - `MapStyle.DATAVIZ.LIGHT` (variant)
+
 
 All reference styles (instances of `ReferenceMapStyle`) and style variants (instances of `MapStyleVariant`) have methods to know the alternative styles and variant that belong to the same reference style (`.getVariants()`). This is handy to provide a default/dark/light alternative color scheme, yet preserving the same level of details as in the reference style. Read more about about [ReferenceMapStyle](docsmd/classes/ReferenceMapStyle.md) and [MapStyleVariant](docsmd/classes/MapStyleVariant.md).
 </details>  

package/src/Map.ts

@@ -140,6 +140,8 @@ export class Map extends maplibregl.Map {
   private isStyleInitialized = false;
   private isTerrainEnabled = false;
   private terrainExaggeration = 1;
+  private primaryLanguage: LanguageString | null = null;
+  private secondaryLanguage: LanguageString | null = null;
 
   constructor(options: MapOptions) {
     // if (options.language) {
@@ -197,6 +199,9 @@ export class Map extends maplibregl.Map {
       },
     });
 
+    this.primaryLanguage = options.language ?? config.primaryLanguage;
+    this.secondaryLanguage = config.secondaryLanguage;
+
     // Map centering and geolocation
     this.once("styledata", async () => {
       // Not using geolocation centering if...
@@ -271,40 +276,10 @@ export class Map extends maplibregl.Map {
       }
     });
 
-    // Check if language has been modified and. If so, it will be updated during the next lifecycle step
-    this.on("styledataloading", () => {
-      this.languageShouldUpdate =
-        !!config.primaryLanguage || !!config.secondaryLanguage;
-    });
-
-    // To flag if the language was already initialized at build time
-    // so that the language optionnaly passed in constructor is
-    // considered only once and at instanciation time.
-    let initLanguageFromConstructor = true;
-
     // If the config includes language changing, we must update the map language
     this.on("styledata", () => {
-      // If the language is set as a constructor options,
-      // This prevails on the language from the config.
-      if (options.language && initLanguageFromConstructor) {
-        this.setPrimaryLanguage(options.language);
-      } else if (
-        config.primaryLanguage &&
-        (this.languageShouldUpdate || !this.isStyleInitialized)
-      ) {
-        this.setPrimaryLanguage(config.primaryLanguage);
-      }
-
-      if (
-        config.secondaryLanguage &&
-        (this.languageShouldUpdate || !this.isStyleInitialized)
-      ) {
-        this.setSecondaryLanguage(config.secondaryLanguage);
-      }
-
-      this.languageShouldUpdate = false;
-      this.isStyleInitialized = true;
-      initLanguageFromConstructor = false;
+      this.setPrimaryLanguage(this.primaryLanguage);
+      this.setSecondaryLanguage(this.secondaryLanguage);
     });
 
     // this even is in charge of reaplying the terrain elevation after the
@@ -495,6 +470,8 @@ export class Map extends maplibregl.Map {
       return;
     }
 
+    this.primaryLanguage = language;
+
     this.onStyleReady(() => {
       if (language === Language.AUTO) {
         return this.setPrimaryLanguage(getBrowserLanguage());
@@ -649,7 +626,7 @@ export class Map extends maplibregl.Map {
   }
 
   /**
-   * Define the secondary language of the map.
+   * Define the secondary language of the map. Note that this is not supported by all the map styles
    * Note that most styles do not allow a secondary language and this function only works if the style allows (no force adding)
    * @param language
    */
@@ -658,6 +635,8 @@ export class Map extends maplibregl.Map {
       return;
     }
 
+    this.secondaryLanguage = language;
+
     this.onStyleReady(() => {
       if (language === Language.AUTO) {
         return this.setSecondaryLanguage(getBrowserLanguage());
@@ -780,6 +759,22 @@ export class Map extends maplibregl.Map {
     });
   }
 
+  /**
+   * Get the primary language
+   * @returns
+   */
+  getPrimaryLanguage(): LanguageString {
+    return this.primaryLanguage;
+  }
+
+  /**
+   * Get the secondary language
+   * @returns
+   */
+  getSecondaryLanguage(): LanguageString {
+    return this.secondaryLanguage;
+  }
+
   /**
    * Get the exaggeration factor applied to the terrain
    * @returns