Merge pull request #146 from ndsev/zoom-feature

Release 2024.4
ndsev · Sep 25, 2024 · 0485b48 · 0485b48
2 parents ae679a1 + 76196e8
commit 0485b48
Show file tree

Hide file tree

Showing 76 changed files with 6,411 additions and 3,257 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -2,8 +2,6 @@ name: build-release
 
 on:
   push:
-    branches:
-      - 'feature/renderer-wasm-demo'
   pull_request:
   workflow_dispatch:
 

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -0,0 +1,27 @@
+name: build-test
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install build dependencies
+        run: sudo apt-get install ninja-build
+
+      - name: Compile
+        run: |
+          mkdir build-test && cd build-test
+          cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
+          cmake --build .
+
+      - name: Run Tests
+        run: |
+          cd build-test/test
+          ctest --verbose --no-tests=error
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ message("Building for ${CMAKE_SYSTEM_NAME}.")
 
 FetchContent_Declare(mapget
   GIT_REPOSITORY "https://github.com/Klebert-Engineering/mapget"
-  GIT_TAG        "main"
+  GIT_TAG        "v2024.4.0"
   GIT_SHALLOW    ON)
 FetchContent_MakeAvailable(mapget)
 
@@ -33,17 +33,15 @@ FetchContent_MakeAvailable(yaml-cpp)
 include(cmake/cesium.cmake)
 
 # Erdblick Core Library
-
 add_subdirectory(libs/core)
 
 if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
   add_subdirectory(test)
+else()
+  # Angular Build
+  add_custom_target(erdblick-ui ALL
+    COMMAND bash "${CMAKE_SOURCE_DIR}/build-ui.bash" "${CMAKE_SOURCE_DIR}"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    DEPENDS erdblick-core)
 endif()
 
-# Angular Build
-
-add_custom_target(erdblick-ui ALL
-  COMMAND bash "${CMAKE_SOURCE_DIR}/build-ui.bash" "${CMAKE_SOURCE_DIR}"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  DEPENDS erdblick-core
-)
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Each rule within the YAML `rules` array can have the following fields:
 |-------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|--------------------------------------|
 | `geometry`                    | List of geometry type(s) or single type the rule applies to.                                                                                                                                                | At least one of `"point"`,`"mesh"`, `"line"`, `"polygon"`. | `["point", "mesh"]`, `line`          |
 | `aspect`                      | Specifies the aspect to which the rule applies: `"feature"`, `"relation"`, or `"attribute"`.                                                                                                                | String                                                     | `"feature"`, `"relation"`            |
-| `mode`                        | Specifies the mode: `"normal"` or `"highlight"`.                                                                                                                                                            | String                                                     | `"normal"`, `"highlight"`            |
+| `mode`                        | Specifies the highlight mode: `"none"` or `"hover"` or `"selection"`.                                                                                                                                       | String                                                     | `"none"`, `"hover"`                  |
 | `type`                        | A regular expression to match against a feature type.                                                                                                                                                       | String                                                     | `"Lane\|Boundary"`                   |
 | `filter`                      | A [simfil](https://github.com/klebert-engineering/simfil) filter expression over the feature's JSON representation.                                                                                         | String                                                     | `*roadClass == 4`                    |
 | `selectable`                  | Indicates if the feature is selectable.                                                                                                                                                                     | Boolean                                                    | `true`, `false`                      |
@@ -80,6 +80,7 @@ Each rule within the YAML `rules` array can have the following fields:
 | `flat`                        | Clamps the feature to the ground (Does not work for meshes).                                                                                                                                                | Boolean                                                    | `true`, `false`                      |
 | `outline-color`               | Point outline color.                                                                                                                                                                                        | String                                                     | `green`, `#fff`                      |
 | `outline-width`               | Point outline width in px.                                                                                                                                                                                  | Float                                                      | `3.6`                                |
+| `point-merge-grid-cell`       | WGS84/altutide meter tolerance for merging point visualizations.                                                                                                                                            | Array of three Floats.                                     | `[0.000000084, 0.000000084, 0.01]`   |
 | `near-far-scale`              | For points, indicate (`near-alt-meters`, `near-scale`, `far-alt-meters`, `far-scale`).                                                                                                                      | Array of four Floats.                                      | `[1.5e2,10,8.0e6,0]`                 |
 | `offset`                      | Apply a fixed offset to each shape-point in meters. Can be used for z-ordering.                                                                                                                             | Array of three Floats.                                     | `[0, 0, 5]`                          |
 | `arrow`                       | For arrow-heads: One of `none`, `forward`, `backward`, `double`. Not compatible with `dashed`.                                                                                                              | String                                                     | `single`                             |
@@ -230,6 +231,17 @@ For attributes, style expressions (e.g. `color-expression`) are evaluated in a c
 set the `offset` field. The spatial `offset` will be multiplied, so it is possible to "stack" attributes
 over a feature.
 
+### About Merged Point Visualizations
+
+By setting `point-merge-grid-cell`, a tolerance may be defined which allows merging the visual representations
+of point features which share the same 3D spatial cell, map, layer, and style rule. This has two advantages:
+
+* **Multi-Selection**: When selecting the merged representation, a multi-selection of all merged features happens.
+* **Logical Evaluation using `$mergeCount`**: In some map formats, it may be desirable to apply a style based on the number of merged points.
+  This may be done to display a warning, or to check a matching requirement.
+  To this end, the `$mergeCount` variable is injected into each simfil evaluation context of a merged-point style rule.
+  Check out the default style for an example.
+
 ### About `first-of`
 
 Normally, all style rules from a style sheet are naively applied to all matching features.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2024.3.2
+2024.4.0
diff --git a/cmake/cesium.cmake b/cmake/cesium.cmake
@@ -15,15 +15,18 @@ set(CESIUM_LIBS
   CesiumGltf
   CesiumGltfWriter)
 
-# Use fetch content for cloning the repository durring
+# Use fetch content for cloning the repository during
 # configure phase. We do not call `FetchContent_MakeAvailable`,
 # but instead use `ExternalProject_Add` to compile Cesium in
 # isolation.
 FetchContent_Declare(cesiumnative_src
   GIT_REPOSITORY "https://github.com/Klebert-Engineering/cesium-native.git"
   GIT_TAG "main"
   GIT_SUBMODULES_RECURSE YES
-  GIT_PROGRESS YES)
+  GIT_PROGRESS YES
+  PATCH_COMMAND git reset --hard HEAD && git -C extern/draco reset --hard HEAD && git apply "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cesium.patch"
+  UPDATE_DISCONNECTED YES
+  UPDATE_COMMAND "")
 
 FetchContent_GetProperties(cesiumnative_src)
 if (NOT cesiumnative_src_POPULATED)
@@ -49,6 +52,11 @@ foreach (lib ${CESIUM_LIBS})
 endforeach()
 message(STATUS "cesium byproducts: ${CESIUM_BYPRODUCTS}")
 
+set(CESIUM_EXTRA_ARGS)
+if (CMAKE_TOOLCHAIN_FILE)
+  list(APPEND CESIUM_EXTRA_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+endif()
+
 ExternalProject_Add(cesiumnative
   SOURCE_DIR ${cesiumnative_src_SOURCE_DIR}
   CMAKE_ARGS
@@ -58,8 +66,8 @@ ExternalProject_Add(cesiumnative
     -DCESIUM_TRACING_ENABLED=OFF
     -DDRACO_JS_GLUE=OFF
     -DBUILD_SHARED_LIBS=OFF
-    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    ${CESIUM_EXTRA_ARGS}
   BUILD_BYPRODUCTS
     ${CESIUM_BYPRODUCTS}
   INSTALL_COMMAND ""

diff --git a/cmake/cesium.patch b/cmake/cesium.patch
@@ -0,0 +1,47 @@
+index c928fdf..cf6a63b 100644
+--- a/extern/draco/src/draco/io/file_utils.h
++++ b/extern/draco/src/draco/io/file_utils.h
+@@ -17,6 +17,7 @@
+
+ #include <string>
+ #include <vector>
++#include <cstdint>
+
+ namespace draco {
+
+diff --git a/CesiumAsync/include/CesiumAsync/CacheItem.h b/CesiumAsync/include/CesiumAsync/CacheItem.h
+index 20d1ca80..bd47492b 100644
+--- a/CesiumAsync/include/CesiumAsync/CacheItem.h
++++ b/CesiumAsync/include/CesiumAsync/CacheItem.h
+@@ -9,6 +9,7 @@
+ #include <ctime>
+ #include <map>
+ #include <vector>
++#include <cstdint>
+
+ namespace CesiumAsync {
+
+diff --git a/CesiumAsync/include/CesiumAsync/IAssetResponse.h b/CesiumAsync/include/CesiumAsync/IAssetResponse.h
+index 10519057..0944b26b 100644
+--- a/CesiumAsync/include/CesiumAsync/IAssetResponse.h
++++ b/CesiumAsync/include/CesiumAsync/IAssetResponse.h
+@@ -8,6 +8,7 @@
+ #include <cstddef>
+ #include <map>
+ #include <string>
++#include <cstdint>
+
+ namespace CesiumAsync {
+
+diff --git a/CesiumIonClient/src/fillWithRandomBytes.h b/CesiumIonClient/src/fillWithRandomBytes.h
+index 55765c72..654d09df 100644
+--- a/CesiumIonClient/src/fillWithRandomBytes.h
++++ b/CesiumIonClient/src/fillWithRandomBytes.h
+@@ -1,6 +1,7 @@
+ #pragma once
+
+ #include <gsl/span>
++#include <cstdint>
+
+ namespace CesiumIonClient {
+
diff --git a/config/styles/default-style.yaml b/config/styles/default-style.yaml
@@ -1,15 +1,68 @@
 name: DefaultStyle
 version: 1.0
+options:
+  - label: Show Meshes/Polygons
+    id: showMesh
+  - label: Show Points
+    id: showPoint
+  - label: Show Lines
+    id: showLine
+
 rules:
+  # Normal styles
   - geometry: ["mesh", "polygon"]
+    filter: showMesh
     color: teal
     opacity: 0.8
-  - geometry: ["point", "line"]
+    offset: [0, 0, -0.4]
+  - geometry: ["line"]
+    filter: showLine
     color: moccasin
     opacity: 1.0
-    width: 1.0
-  - geometry: ["point", "line", "mesh", "polygon"]
+    width: 5.0
+    offset: [0, 0, -0.2]
+  - geometry: ["point"]
+    point-merge-grid-cell: [0.000000084, 0.000000084, 0.01]
+    filter: showPoint
+    color-expression: "$mergeCount > 1 and 'red' or 'moccasin'"
+    label-text-expression: "$mergeCount > 1 and ($mergeCount as string) or ''"
+    label-color: black
+    label-font: "12px Helvetica"
+    opacity: 1.0
+    width: 15.0
+
+  # Hover/Selection styles
+  - geometry: ["mesh", "polygon"]
+    color: orange
+    opacity: 1.0
+    mode: hover
+    offset: [0, 0, -0.3]
+  - geometry: ["line"]
+    color: orange
+    opacity: 1.0
+    width: 10.0
+    mode: hover
+    offset: [0, 0, -0.1]
+  - geometry: ["point"]
+    color: orange
+    opacity: 1.0
+    width: 20.0
+    mode: hover
+    offset: [0, 0, 0.1]
+  - geometry: ["mesh", "polygon"]
+    color: red
+    opacity: 1.0
+    mode: selection
+    offset: [0, 0, -0.3]
+  - geometry: ["line"]
+    color: red
+    opacity: 1.0
+    width: 10.0
+    mode: selection
+    offset: [0, 0, -0.1]
+  - geometry: ["point"]
     color: red
     opacity: 1.0
-    width: 4.0
-    mode: highlight
+    width: 20.0
+    mode: selection
+    offset: [0, 0, 0.1]
diff --git a/erdblick_app/app/app.component.ts b/erdblick_app/app/app.component.ts
@@ -13,7 +13,7 @@ import {filter} from "rxjs";
         <erdblick-view></erdblick-view>
         <map-panel></map-panel>
         <p-toast position="top-center" key="tc"></p-toast>
-        <search-panel #searchoverlay></search-panel>
+        <search-panel></search-panel>
         <inspection-panel></inspection-panel>
         <pref-components></pref-components>
         <coordinates-panel></coordinates-panel>
@@ -33,9 +33,8 @@ import {filter} from "rxjs";
 })
 export class AppComponent {
 
-    title: string = 'erdblick';
-    version: string = "v0.3.0";
-    searchValue: string = ""
+    title: string = "erdblick";
+    version: string = "";
 
     constructor(private httpClient: HttpClient,
                 private router: Router,