react-native-maplibre-gl-js 1.4.2 → 1.4.3

package/lib/module/web/controllers/MapSourcesController.js

@@ -73,7 +73,7 @@ export default class MapSourcesController {
     });
   };
   #updateSourceAndItsLayers = (source, reactNativeBridge, map) => {
-    const oldSourceAsString = stableStringify(this.#sources.get(source.id));
+    const oldSourceAsString = stableStringify(this.#sources.get(source.id)?.source);
     const newSourceAsString = stableStringify(source.source);
 
     // Update everything it the source changed.
@@ -82,41 +82,29 @@ export default class MapSourcesController {
       this.#addSourceAndItsLayers(source, reactNativeBridge, map);
       return;
     }
-    // Update only the layers if they changed.
-    source.layers.forEach(({
-      layer,
-      beforeId
-    }, index) => {
-      const oldLayerAsString = stableStringify(this.#sources.get(source.id)?.layers[index]);
-      const newLayerAsString = stableStringify(layer);
-      if (oldLayerAsString !== newLayerAsString) {
-        map.removeLayer(layer.id);
+    const oldLayersAsString = stableStringify(this.#sources.get(source.id)?.layers.map(item => item.layer));
+    const newLayersAsString = stableStringify(source.layers.map(item => item.layer));
+
+    // Update the layers only if at least one changed (if one changed, the
+    // orders of the layers might have changed, so we need to update all of
+    // them).
+    if (oldLayersAsString !== newLayersAsString) {
+      this.#getAssociatedLayers(source.id, map).forEach(layerId => {
+        if (map.getLayer(layerId)) {
+          map.removeLayer(layerId);
+        }
+      });
+      source.layers.forEach(({
+        layer,
+        beforeId
+      }) => {
         map.addLayer({
           source: source.id,
           ...layer
         }, beforeId);
-      }
-    });
-    map.addSource(source.id, source.source);
-    source.layers.forEach(({
-      layer,
-      beforeId
-    }) => {
-      // Add the layer to the map.
-      map.addLayer({
-        source: source.id,
-        ...layer
-      }, beforeId);
-      // Send the "mount" event to the React Native listener.
-      reactNativeBridge.postMessage({
-        type: 'mapSourceListenerEvent',
-        payload: {
-          sourceId: source.id,
-          layerId: layer.id,
-          eventName: 'mount'
-        }
       });
-    });
+      return;
+    }
   };
   #removeSourceAndItsLayers = (sourceId, reactNativeBridge, map) => {
     const style = map.getStyle();

package/lib/module/web/controllers/MapSourcesController.js.map

@@ -1 +1 @@
-{"version":3,"names":["stableStringify","MapSourcesController","sources","Map","addExistingSourcesToMap","reactNativeBridge","map","entries","forEach","source","isStyleLoaded","addSourceAndItsLayers","setSourceListeners","once","handleMountMessage","message","run","mapReady","payload","set","id","handleUpdateMessage","updateSourceAndItsLayers","handleUnmountMessage","get","sourceId","removeSourceAndItsLayers","delete","#addSourceAndItsLayers","addSource","layers","layer","beforeId","addLayer","postMessage","type","layerId","eventName","#updateSourceAndItsLayers","oldSourceAsString","newSourceAsString","index","oldLayerAsString","newLayerAsString","removeLayer","#removeSourceAndItsLayers","style","getStyle","getAssociatedLayers","getLayer","getSource","removeSource","#setSourceListeners","listeners","Object","sendEventToReactNative","event","target","on","#getAssociatedLayers","filter"],"sourceRoot":"../../../../src","sources":["web/controllers/MapSourcesController.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["stableStringify","MapSourcesController","sources","Map","addExistingSourcesToMap","reactNativeBridge","map","entries","forEach","source","isStyleLoaded","addSourceAndItsLayers","setSourceListeners","once","handleMountMessage","message","run","mapReady","payload","set","id","handleUpdateMessage","updateSourceAndItsLayers","handleUnmountMessage","get","sourceId","removeSourceAndItsLayers","delete","#addSourceAndItsLayers","addSource","layers","layer","beforeId","addLayer","postMessage","type","layerId","eventName","#updateSourceAndItsLayers","oldSourceAsString","newSourceAsString","oldLayersAsString","item","newLayersAsString","getAssociatedLayers","getLayer","removeLayer","#removeSourceAndItsLayers","style","getStyle","getSource","removeSource","#setSourceListeners","listeners","Object","sendEventToReactNative","event","target","on","#getAssociatedLayers","filter"],"sourceRoot":"../../../../src","sources":["web/controllers/MapSourcesController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/generated/webview_static_html.js

@@ -23620,21 +23620,27 @@ uniform mat4 u_projection_matrix;
       });
     };
     #updateSourceAndItsLayers = (source, reactNativeBridge, map) => {
-      const oldSourceAsString = stableStringify(this.#sources.get(source.id));
+      const oldSourceAsString = stableStringify(
+        this.#sources.get(source.id)?.source
+      );
       const newSourceAsString = stableStringify(source.source);
       if (oldSourceAsString !== newSourceAsString) {
         this.#removeSourceAndItsLayers(source.id, reactNativeBridge, map);
         this.#addSourceAndItsLayers(source, reactNativeBridge, map);
-        return;
-      }
-      source.layers.forEach(
-        ({ layer, beforeId }, index) => {
-          const oldLayerAsString = stableStringify(
-            this.#sources.get(source.id)?.layers[index]
-          );
-          const newLayerAsString = stableStringify(layer);
-          if (oldLayerAsString !== newLayerAsString) {
-            map.removeLayer(layer.id);
+      } else {
+        const oldLayersAsString = stableStringify(
+          this.#sources.get(source.id)?.layers.map((item) => item.layer)
+        );
+        const newLayersAsString = stableStringify(
+          source.layers.map((item) => item.layer)
+        );
+        if (oldLayersAsString !== newLayersAsString) {
+          this.#getAssociatedLayers(source.id, map).forEach((layerId) => {
+            if (map.getLayer(layerId)) {
+              map.removeLayer(layerId);
+            }
+          });
+          source.layers.forEach(({ layer, beforeId }) => {
             map.addLayer(
               {
                 source: source.id,
@@ -23642,27 +23648,9 @@ uniform mat4 u_projection_matrix;
               },
               beforeId
             );
-          }
+          });
         }
-      );
-      map.addSource(source.id, source.source);
-      source.layers.forEach(({ layer, beforeId }) => {
-        map.addLayer(
-          {
-            source: source.id,
-            ...layer
-          },
-          beforeId
-        );
-        reactNativeBridge.postMessage({
-          type: "mapSourceListenerEvent",
-          payload: {
-            sourceId: source.id,
-            layerId: layer.id,
-            eventName: "mount"
-          }
-        });
-      });
+      }
     };
     #removeSourceAndItsLayers = (sourceId, reactNativeBridge, map) => {
       const style = map.getStyle();