@foodmarketmaker/mapag 0.0.13 → 0.0.15

package/fesm2022/foodmarketmaker-mapag.mjs

@@ -252,7 +252,10 @@ class Styles {
             throw new Error(`HTTP ${response.status}: ${response.statusText}`);
         }
         const styleSpec = await response.json();
-        styleSpec.glyphs = 'https://demotiles.maplibre.org/font/{fontstack}/{range}.pbf';
+        console.debug("Glyphs property:", styleSpec.glyphs);
+        if (!styleSpec.glyphs) {
+            styleSpec.glyphs = 'https://geoserveis.icgc.cat/contextmaps/glyphs/{fontstack}/{range}.pbf';
+        }
         return styleSpec;
     }
     async fetchAndCacheStyle(styleData) {
@@ -272,8 +275,9 @@ class Styles {
             }
             const styleSpec = await response.json();
             // Add Glyphs
+            console.debug("Glyphs property:", styleSpec.glyphs);
             if (!styleSpec.glyphs) {
-                styleSpec.glyphs = 'https://demotiles.maplibre.org/font/{fontstack}/{range}.pbf';
+                styleSpec.glyphs = 'https://geoserveis.icgc.cat/contextmaps/glyphs/{fontstack}/{range}.pbf';
             }
             // Extract source and layer IDs
             const sourceIds = Object.keys(styleSpec.sources || {});
@@ -14980,6 +14984,7 @@ class WatershedMapper {
         map.setPaintProperty(this.LABEL_LAYER_ID, 'text-halo-width', settings.labelsHaloWidth);
         map.setPaintProperty(this.LABEL_LAYER_ID, 'text-opacity', settings.labelsOpacity);
         map.setLayoutProperty(this.LABEL_LAYER_ID, 'text-size', settings.labelsSize);
+        map.setLayoutProperty(this.LABEL_LAYER_ID, 'text-allow-overlap', settings.labelOverlap);
     }
     create() {
         if (!this.map) {
@@ -15040,8 +15045,9 @@ class WatershedMapper {
             type: 'symbol',
             layout: {
                 'text-field': ['get', 'name'],
+                'text-font': ['Open Sans Regular'],
                 'text-size': this.settings().labelsSize,
-                'text-allow-overlap': true,
+                'text-allow-overlap': this.settings().labelOverlap,
             },
             paint: {
                 'text-color': this.settings().labelsColor,
@@ -15134,7 +15140,7 @@ class WatershedSettings {
     visible = true;
     fillColor = '#0000ff';
     fillOpacity = 0.1;
-    borderColor = '#01018bff';
+    borderColor = '#01018b';
     borderWidth = 1;
     borderOpacity = 1.0;
     labelsVisible = true;
@@ -15143,6 +15149,7 @@ class WatershedSettings {
     labelsHaloColor = '#ffffff';
     labelsHaloWidth = 1;
     labelsOpacity = 1.0;
+    labelOverlap = false;
     autoSelectLayer = false;
 }