Attach mapId to feature inspection nodes.

ndsev · Sep 18, 2024 · 4c209ec · 4c209ec
1 parent aa4692d
commit 4c209ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/erdblick_app/app/pointmerge.service.ts b/erdblick_app/app/pointmerge.service.ts
@@ -26,8 +26,8 @@ type Cartographic = {x: number, y: number, z: number};
 export interface MergedPointVisualization {
     position: Cartographic,
     positionHash: PositionHash,
-    pointParameters?: Record<string, any>|null,  // Point Visualization Parameters for call to PointPrimitiveCollection.add().
-    labelParameters?: Record<string, any>|null,  // Label Visualization Parameters for call to LabelCollection.add().
+    pointParameters: any,  // Point Visualization Parameters for call to PointPrimitiveCollection.add().
+    labelParameters: any,  // Label Visualization Parameters for call to LabelCollection.add().
     featureIds: Array<TileFeatureId>
 }
 
@@ -60,10 +60,10 @@ export class MergedPointsTile {
                     existingPoint.featureIds.push(fid);
                 }
             }
-            if (point.pointParameters !== undefined) {
+            if (point.pointParameters) {
                 existingPoint.pointParameters = point.pointParameters;
             }
-            if (point.labelParameters !== undefined) {
+            if (point.labelParameters) {
                 existingPoint.labelParameters = point.labelParameters;
             }
         }

diff --git a/erdblick_app/app/search.panel.component.ts b/erdblick_app/app/search.panel.component.ts
@@ -529,7 +529,7 @@ export class SearchPanelComponent implements AfterViewInit {
                 return;
             }
             this.dialog.close(event);
-        }``
+        }
     }
 
     selectHistoryEntry(index: number) {

diff --git a/libs/core/include/erdblick/inspection.h b/libs/core/include/erdblick/inspection.h
@@ -29,7 +29,7 @@ class InspectionConverter
     {
         JsValue key_;
         JsValue value_;
-        JsValue mapId_;
+        std::optional<JsValue> mapId_;
         ValueType type_ = ValueType::Null;
         std::string hoverId_;  // For highlight attribs/relations on hovering.
         std::string info_;

diff --git a/libs/core/src/inspection.cpp b/libs/core/src/inspection.cpp
@@ -384,6 +384,8 @@ JsValue InspectionConverter::InspectionNode::toJsValue() const
         newDict.set("children", childrenToJsValue());
     if (!geoJsonPath_.empty())
         newDict.set("geoJsonPath", JsValue(geoJsonPath_));
+    if (mapId_)
+        newDict.set("mapId", *mapId_);
     if (!sourceDataRefs_.empty()) {
         auto list = JsValue::List();
         for (const auto& ref : sourceDataRefs_) {
-Original file line number
+Diff line change
@@ Expand Up @@
                     return;
                 }
                 this.dialog.close(event);
-            }``
+            }
         }
         selectHistoryEntry(index: number) {
@@ Expand Down @@