Merge pull request #170 from ndsev/release/2024.5.0

Release 2024.5.0

CMakeLists.txt

@@ -6,23 +6,30 @@ include(FetchContent)
 set(CMAKE_CXX_STANDARD 20)
 
 # Treat warnings as errors, with some exceptions for Cesium.
-set (ERDBLICK_CXX_FLAGS
+set(ERDBLICK_CXX_FLAGS
   "-Wall -Wno-error=sign-conversion -Wno-sign-compare -Wno-sign-conversion -Wno-unused-local-typedefs -Wno-comment -Wno-effc++")
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ERDBLICK_CXX_FLAGS} -Wno-bool-compare")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ERDBLICK_CXX_FLAGS} -Wno-error=shorten-64-to-32")
 endif()
 
-# External dependencies.
+# Adjust CXX_FLAGS for Debug builds
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+endif()
 
+# External dependencies
 message("Building for ${CMAKE_SYSTEM_NAME}.")
 
-FetchContent_Declare(mapget
-  GIT_REPOSITORY "https://github.com/Klebert-Engineering/mapget"
-  GIT_TAG        "v2024.4.1"
-  GIT_SHALLOW    ON)
-FetchContent_MakeAvailable(mapget)
+
+if (NOT TARGET mapget)
+  FetchContent_Declare(mapget
+    GIT_REPOSITORY "https://github.com/Klebert-Engineering/mapget"
+    GIT_TAG        "v2024.5.0"
+    GIT_SHALLOW    ON)
+  FetchContent_MakeAvailable(mapget)
+endif()
 
 FetchContent_Declare(yaml-cpp
   GIT_REPOSITORY "https://github.com/jbeder/yaml-cpp.git"
@@ -44,4 +51,3 @@ else()
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     DEPENDS erdblick-core)
 endif()
-

CMakePresets.json

@@ -19,6 +19,18 @@
                 "CMAKE_BUILD_TYPE": "Debug"
             }
         },
+        {
+            "name": "debug-wasm",
+            "inherits": "common",
+            "displayName": "Debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_CXX_FLAGS_DEBUG": "-g"
+            },
+            "environment": {
+                "EMCC_DEBUG": "1"
+            }
+        },
         {
             "name": "release",
             "inherits": "common",
@@ -37,6 +49,14 @@
                 "NG_DEVELOP": "TRUE"
             }
         },
+        {
+            "name": "debug-wasm",
+            "configurePreset": "debug-wasm",
+            "displayName": "Debug",
+            "environment": {
+                "NG_DEVELOP": "TRUE"
+            }
+        },
         {
             "name": "release",
             "configurePreset": "release",

VERSION

@@ -1 +1 @@
-2024.4.1
+2024.5.0

angular.json

@@ -27,7 +27,7 @@
                         "assets": [
                             {
                                 "glob": "**/*",
-                                "input": "node_modules/cesium/Build/Cesium",
+                                "input": "node_modules/cesium/Build/CesiumUnminified",
                                 "output": "/bundle/cesium"
                             },
                             {
@@ -58,9 +58,7 @@
                             "node_modules/material-icons/iconfont/material-icons.css",
                             "erdblick_app/styles.scss"
                         ],
-                        "scripts": [
-
-                        ],
+                        "scripts": [],
                         "customWebpackConfig": {
                             "path": "./webpack.config.js"
                         },
@@ -80,7 +78,34 @@
                                     "maximumError": "4kb"
                                 }
                             ],
-                            "outputHashing": "all"
+                            "outputHashing": "all",
+                            "assets": [
+                                {
+                                    "glob": "**/*",
+                                    "input": "node_modules/cesium/Build/Cesium",
+                                    "output": "/bundle/cesium"
+                                },
+                                {
+                                    "glob": "**/*",
+                                    "input": "config/styles",
+                                    "output": "/bundle/styles"
+                                },
+                                {
+                                    "glob": "**/*",
+                                    "input": "images",
+                                    "output": "/bundle/images"
+                                },
+                                {
+                                    "glob": "**/*.json",
+                                    "input": "config",
+                                    "output": "/"
+                                },
+                                {
+                                    "glob": "VERSION",
+                                    "input": ".",
+                                    "output": "/bundle/"
+                                }
+                            ]
                         },
                         "development": {
                             "buildOptimizer": false,
@@ -123,8 +148,7 @@
                             "zone.js/testing"
                         ],
                         "tsConfig": "tsconfig.spec.json",
-                        "assets": [
-                        ],
+                        "assets": [],
                         "styles": [
                             "erdblick_app/styles.scss"
                         ],
@@ -136,6 +160,6 @@
         }
     },
     "cli": {
-      "analytics": false
+        "analytics": false
     }
 }

config/styles/default-style.yaml

@@ -33,36 +33,36 @@ rules:
 
   # Hover/Selection styles
   - geometry: ["mesh", "polygon"]
-    color: orange
-    opacity: 1.0
+    color: green
+    opacity: 0.8
     mode: hover
     offset: [0, 0, -0.3]
   - geometry: ["line"]
-    color: orange
-    opacity: 1.0
+    color: green
+    opacity: 0.8
     width: 10.0
     mode: hover
     offset: [0, 0, -0.1]
   - geometry: ["point"]
-    color: orange
-    opacity: 1.0
+    color: green
+    opacity: 0.8
     width: 20.0
     mode: hover
     offset: [0, 0, 0.1]
   - geometry: ["mesh", "polygon"]
-    color: red
-    opacity: 1.0
+    color: yellow
+    opacity: 0.8
     mode: selection
     offset: [0, 0, -0.3]
   - geometry: ["line"]
-    color: red
-    opacity: 1.0
+    color: yellow
+    opacity: 0.8
     width: 10.0
     mode: selection
     offset: [0, 0, -0.1]
   - geometry: ["point"]
-    color: red
-    opacity: 1.0
+    color: yellow
+    opacity: 0.8
     width: 20.0
     mode: selection
     offset: [0, 0, 0.1]

erdblick_app/app/debugapi.component.ts

@@ -89,4 +89,15 @@ export class ErdblickDebugApi {
     coreLib(): ErdblickCore_ {
         return coreLib;
     }
+
+    /** Run some simfil query to reproduce problems with search. */
+    runSimfilQuery(query: string = "**.transition") {
+        for (const [_, tile] of this.mapService.loadedTileLayers) {
+            tile.peek(parsedTile => {
+                let search = new coreLib.FeatureLayerSearch(parsedTile);
+                const matchingFeatures = search.filter(query);
+                search.delete();
+            })
+        }
+    }
 }

erdblick_app/app/editor.component.ts

@@ -15,6 +15,7 @@ const completionsList = [
     {label: "name", type: "property"},
     {label: "rules", type: "property"},
     {label: "geometry", type: "property"},
+    {label: "geometry-name", type: "property"},
     {label: "aspect", type: "property"},
     {label: "mode", type: "property"},
     {label: "type", type: "property"},
@@ -60,6 +61,7 @@ const completionsList = [
     {label: "offset-scale-by-distance", type: "property"},
     {label: "first-of", type: "property"},
     {label: "attribute-type", type: "property"},
+    {label: "attribute-filter", type: "property"},
     {label: "attribute-layer-type", type: "property"},
     {label: "point-merge-grid-cell", type: "property"},
     {label: "FILL", type: "keyword"},

erdblick_app/app/feature.panel.component.ts

@@ -79,7 +79,10 @@ interface Column {
                                 <p-treeTableToggler [rowNode]="rowNode" (click)="$event.stopPropagation()">
                                 </p-treeTableToggler>
                                 <span (click)="onKeyClick($event, rowData)"
-                                      style="cursor: pointer">{{ rowData['key'] }}
+                                      (mouseover)="onKeyHover($event, rowData)"
+                                      (mouseout)="onKeyHoverExit($event, rowData)"
+                                      style="cursor: pointer">
+                                    {{ rowData['key'] }}
                                 </span>
                                 <p-buttonGroup *ngIf="rowData['sourceDataReferences']"
                                                class="source-data-ref-container">
@@ -402,6 +405,11 @@ export class FeaturePanelComponent implements OnInit, AfterViewInit, OnDestroy
                 rowData["mapId"],
                 rowData["value"],
                 coreLib.HighlightMode.HOVER_HIGHLIGHT).then();
+        } else if (rowData["hoverId"]) {
+            this.mapService.highlightFeatures([{
+                mapTileKey: this.inspectionService.selectedFeatures[rowData["featureIndex"]].featureTile.mapTileKey,
+                featureId: rowData["hoverId"]
+            }], false, coreLib.HighlightMode.HOVER_HIGHLIGHT).then();
         }
     }
 
@@ -412,6 +420,23 @@ export class FeaturePanelComponent implements OnInit, AfterViewInit, OnDestroy
         }
     }
 
+    onKeyHover(event: any, rowData: any) {
+        event.stopPropagation();
+        if (rowData["hoverId"]) {
+            this.mapService.highlightFeatures([{
+                mapTileKey: this.inspectionService.selectedFeatures[rowData["featureIndex"]].featureTile.mapTileKey,
+                featureId: rowData["hoverId"]
+            }], false, coreLib.HighlightMode.HOVER_HIGHLIGHT).then();
+        }
+    }
+
+    onKeyHoverExit(event: any, rowData: any) {
+        event.stopPropagation();
+        if (rowData["type"] == this.InspectionValueType.FEATUREID.value) {
+            this.mapService.highlightFeatures([], false, coreLib.HighlightMode.HOVER_HIGHLIGHT).then();
+        }
+    }
+
     getStyleClassByType(valueType: number): string {
         switch (valueType) {
             case this.InspectionValueType.SECTION.value:

erdblick_app/app/features.model.ts

@@ -151,6 +151,10 @@ export class FeatureTile {
     }
 
     has(featureId: string) {
+        const index = featureId.indexOf(':attribute');
+        if (index > -1) {
+            featureId = featureId.slice(0, index);
+        }
         return this.peek((tileFeatureLayer: TileFeatureLayer) => {
             let feature = tileFeatureLayer.find(featureId);
             let result = !feature.isNull();

erdblick_app/app/inspection.service.ts

@@ -131,7 +131,7 @@ export class InspectionService {
     }
 
     getFeatureTreeDataFromModel() {
-        let convertToTreeTableNodes = (dataNodes: Array<InspectionModelData>): TreeTableNode[] => {
+        let convertToTreeTableNodes = (dataNodes: Array<InspectionModelData>, featureIndex: number): TreeTableNode[] => {
             let treeNodes: Array<TreeTableNode> = [];
             for (const data of dataNodes) {
                 const node: TreeTableNode = {};
@@ -164,6 +164,8 @@ export class InspectionService {
                 }
                 if (data.hasOwnProperty("hoverId")) {
                     node.data["hoverId"] = data.hoverId;
+                    // Necessary to query one of the selectedFeatures for its mapTileKey
+                    node.data["featureIndex"] = featureIndex;
                 }
                 if (data.hasOwnProperty("mapId")) {
                     node.data["mapId"] = data.mapId;
@@ -174,15 +176,16 @@ export class InspectionService {
                 if (data.hasOwnProperty("sourceDataReferences")) {
                     node.data["sourceDataReferences"] = data.sourceDataReferences;
                 }
-                node.children = data.hasOwnProperty("children") ? convertToTreeTableNodes(data.children) : [];
+                node.children = data.hasOwnProperty("children") ? convertToTreeTableNodes(data.children, featureIndex) : [];
                 treeNodes.push(node);
             }
             return treeNodes;
         }
 
         let treeNodes: Array<TreeTableNode> = [];
         if (this.selectedFeatureInspectionModel) {
-            for (const section of this.selectedFeatureInspectionModel) {
+            for (let i = 0; i < this.selectedFeatureInspectionModel.length; i++) {
+                const section = this.selectedFeatureInspectionModel[i];
                 const node: TreeTableNode = {};
                 node.data = {key: section.key, value: section.value, type: section.type};
                 if (section.hasOwnProperty("info")) {
@@ -191,7 +194,7 @@ export class InspectionService {
                 if (section.hasOwnProperty("sourceDataReferences")) {
                     node.data["sourceDataReferences"] = section.sourceDataReferences;
                 }
-                node.children = convertToTreeTableNodes(section.children);
+                node.children = convertToTreeTableNodes(section.children, i);
                 treeNodes.push(node);
             }
         }