Fix merged feature tile contributions.

ndsev · Aug 29, 2024 · 95a28ec · 95a28ec
1 parent f7381a8
commit 95a28ec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/erdblick_app/app/visualization.model.ts b/erdblick_app/app/visualization.model.ts
@@ -233,7 +233,11 @@ export class TileVisualization {
                         }
                     });
                 }
+
                 this.primitiveCollection = visualization.primitiveCollection();
+                for (const [mapLayerStyleRuleId, mergedPointVisualizations] of Object.entries(visualization.mergedPointFeatures())) {
+                    this.pointMergeService.insert(mergedPointVisualizations as MergedPointVisualization[], this.tile.tileId, mapLayerStyleRuleId);
+                }
                 visualization.delete();
                 return true;
             });
@@ -265,6 +269,11 @@ export class TileVisualization {
             return;
         }
 
+        // Remove point-merge contributions that were made by this map-layer+style visualization combo.
+        this.pointMergeService.remove(
+            this.tile.tileId,
+            `${this.tile.mapName}:${this.tile.layerName}:${this.style.name()}`);
+
         if (this.primitiveCollection) {
             viewer.scene.primitives.remove(this.primitiveCollection);
             if (!this.primitiveCollection.isDestroyed())

diff --git a/libs/core/src/bindings.cpp b/libs/core/src/bindings.cpp
@@ -371,7 +371,8 @@ EMSCRIPTEN_BINDINGS(erdblick)
     ////////// FeatureLayerStyle
     em::register_vector<FeatureStyleOption>("FeatureStyleOptions");
     em::class_<FeatureLayerStyle>("FeatureLayerStyle").constructor<SharedUint8Array&>()
-        .function("options", &FeatureLayerStyle::options, em::allow_raw_pointers());
+        .function("options", &FeatureLayerStyle::options, em::allow_raw_pointers())
+        .function("name", &FeatureLayerStyle::name);
 
     em::enum_<mapget::TileSourceDataLayer::SourceDataAddressFormat>("SourceDataAddressFormat")
         .value("UNKNOWN", mapget::TileSourceDataLayer::SourceDataAddressFormat::Unknown)