enable mapbox-rgb encoded terrain layers

electron-builder.yml

@@ -35,4 +35,4 @@ publish:
   - provider: github
     releaseType: release
 
-electronVersion: 26.6.0
+electronVersion: 31.2.1

package.json

@@ -5,7 +5,7 @@
   "description": "Open Source Command and Control Information System (C2IS)",
   "main": "dist/main.js",
   "scripts": {
-    "start": "electron . --cold",
+    "start": "electron . --cold --trace-warnings",
     "hot": "webpack serve",
     "webpack": "webpack",
     "webpack:production": "webpack --mode=production",
@@ -28,30 +28,30 @@
   },
   "license": "AGPLv3",
   "devDependencies": {
-    "@babel/core": "^7.21.4",
-    "@babel/eslint-parser": "^7.18.2",
-    "@babel/preset-env": "^7.21.4",
+    "@babel/core": "^7.24.9",
+    "@babel/eslint-parser": "^7.24.8",
+    "@babel/preset-env": "^7.24.8",
     "@babel/preset-react": "^7.17.12",
     "@babel/register": "^7.17.7",
     "babel-loader": "^9.1.0",
     "c8": "^10.1.2",
     "css-loader": "^7.1.2",
-    "electron": "^26.6.0",
+    "electron": "^31.2.1",
     "electron-builder": "^24.6.4",
     "electron-updater": "^6.1.4",
-    "eslint": "^8.57.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-react": "^7.34.4",
     "eslint-plugin-react-hooks": "^4.6.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "jsdoc": "^4.0.0",
     "memdown": "^6.1.1",
-    "mocha": "^10.5.2",
-    "sass": "^1.77.6",
+    "mocha": "^10.6.0",
+    "sass": "^1.77.8",
     "sass-loader": "^14.2.1",
+    "source-map-loader": "^5.0.0",
     "style-loader": "^4.0.0",
-    "webpack": "^5.92.1",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.0.0",
     "webpack-dev-server": "^5.0.4",
     "yaml": "^2.1.3"
@@ -64,12 +64,12 @@
   "dependencies": {
     "@mdi/js": "^7.0.96",
     "@mdi/react": "^1.6.0",
-    "@most/scheduler": "^1.3.0",
-    "@syncpoint/signs": "^1.0.1",
+    "@syncpoint/signal": "^1.2.0",
+    "@syncpoint/signs": "^1.1.0",
     "@syncpoint/wkx": "^0.5.2",
     "abstract-leveldown": "^7.2.0",
     "color": "^4.2.3",
-    "fuse.js": "^6.6.2",
+    "fuse.js": "^7.0.0",
     "geo-coordinates-parser": "^1.7.3",
     "geodesy": "^2.4.0",
     "jexl": "^2.3.0",
@@ -79,25 +79,25 @@
     "leveldown": "^6.1.1",
     "levelup": "^5.0.1",
     "luxon": "^3.1.0",
-    "minisearch": "^6.0.1",
-    "most-subject": "^6.0.0",
+    "minisearch": "^7.0.1",
     "mousetrap": "^1.6.5",
     "mousetrap-global-bind": "^1.1.0",
     "ol": "^9.2.4",
-    "path-to-regexp": "^6.2.1",
+    "path-to-regexp": "^7.1.0",
     "proj4": "^2.8.0",
     "ramda": "^0.30.1",
-    "rbush": "^3.0.1",
+    "rbush": "^4.0.0",
     "react": "^18.2.0",
     "react-cool-virtual": "^0.7.0",
     "react-dom": "^18.2.0",
     "react-easy-sort": "^1.5.1",
     "react-fast-compare": "^3.2.0",
-    "react-tooltip": "^5.27.0",
+    "react-tooltip": "^5.27.1",
     "reproject": "^1.2.7",
     "sanitize-filename": "^1.6.3",
     "subleveldown": "^6.0.1",
     "throttle-debounce": "^5.0.2",
-    "typeface-roboto": "^1.1.13"
+    "typeface-roboto": "^1.1.13",
+    "uniqolor": "^1.1.1"
   }
 }

paperwork/polygon-styles.md

@@ -0,0 +1,80 @@
+```mermaid
+graph LR;
+
+classDef common fill:#ff9;
+classDef graphics fill:#f99;
+classDef polygon fill:#efe;
+
+%% Inputs
+properties[[properties]];
+geometry[[geometry]];
+globalStyle[[globalStyle]];
+layerStyle[[layerStyle]];
+featureStyle[[featureStyle]];
+centerResolution[[centerResolution]];
+selectionMode[[selectionMode]];
+
+styleFactory[[styleFactory]];
+
+%% Common
+properties --> sidc:::common;
+sidc --> parameterizedSIDC:::common;
+globalStyle --> colorScheme:::common;
+layerStyle --> colorScheme;
+featureStyle --> colorScheme;
+sidc --> schemeStyle:::common;
+colorScheme --> schemeStyle;
+globalStyle --> effectiveStyle:::common;
+schemeStyle --> effectiveStyle;
+layerStyle --> effectiveStyle;
+featureStyle --> effectiveStyle;
+effectiveStyle --> styleRegistry:::common;
+
+%% Graphics
+geometry --> read:::graphics;
+geometry --> rewrite:::graphics;
+geometry --> pointResolution:::graphics;
+centerResolution --> resolution:::graphics;
+pointResolution --> resolution;
+geometry --> jtsGeometry:::graphics;
+read --> jtsGeometry;
+resolution --> clip:::graphics;
+sidc --> specialization:::graphics;
+specialization --> geometryProperties:::graphics;
+jtsGeometry --> geometryProperties;
+sidc --> evalSync:::graphics;
+properties --> evalSync;
+geometryProperties --> evalSync;
+
+%% Polygon
+geometry --> simplifiedGeometry:::polygon;
+centerResolution --> simplifiedGeometry;
+simplifiedGeometry --> jtsSimplifiedGeometry:::polygon;
+read --> jtsSimplifiedGeometry;
+effectiveStyle --> lineSmoothing:::polygon;
+simplifiedGeometry --> smoothenedGeometry:::polygon;
+lineSmoothing --> smoothenedGeometry;
+smoothenedGeometry --> jtsSmoothenedGeometry:::polygon;
+read --> jtsSmoothenedGeometry;
+jtsSmoothenedGeometry --> context:::polygon;
+resolution --> context;
+jtsSmoothenedGeometry --> placement:::polygon;
+context --> shape:::polygon;
+parameterizedSIDC --> shape;
+selectionMode --> selection:::polygon;
+jtsSimplifiedGeometry --> selection;
+parameterizedSIDC --> labels:::polygon;
+placement --> labels;
+shape --> styles:::polygon;
+labels --> styles;
+selection --> styles;
+
+%% Final
+A{{style}}
+styles --> A;
+styleRegistry --> A;
+evalSync --> A;
+clip --> A;
+rewrite --> A;
+styleFactory --> A;
+```

src/renderer/components/OSD.js

@@ -20,6 +20,7 @@ export const OSD = () => {
 
   React.useEffect(() => {
     emitter.on('osd', dispatch)
+    emitter.emit('osd-mounted')
   }, [emitter])
 
   return <div className="osd" id="osd">
@@ -31,6 +32,6 @@ export const OSD = () => {
     <div className='osd__cell' style={styles.C}>{ state.C2 }</div>
     <div className='osd__cell' style={styles.A}></div>
     <div className='osd__cell' style={styles.B}></div>
-    <div className='osd__cell' style={styles.C}></div>
+    <div className='osd__cell' style={styles.C}>{ state.C3 }</div>
   </div>
 }

src/renderer/components/Project-services.js

@@ -62,7 +62,7 @@ export default async projectUUID => {
   const coordinatesFormat = new CoordinatesFormat(emitter, preferencesStore)
   const optionStore = new OptionStore(coordinatesFormat, store, sessionStore)
   const nominatim = new Nominatim(store)
-  const featureStore = new FeatureStore(store, selection)
+  const featureStore = new FeatureStore(store)
   const searchIndex = new SearchIndex(jsonDB, documentStore, optionStore, emitter, nominatim, sessionStore, spatialIndex)
 
   // Key bindings.
@@ -128,7 +128,6 @@ export default async projectUUID => {
   await schema.bootstrap()
   await tileLayerStore.bootstrap()
   await searchIndex.bootstrap()
-  await featureStore.bootstrap()
   await spatialIndex.bootstrap()
 
   return services

src/renderer/components/map/eventHandlers.js

@@ -68,7 +68,7 @@ const sendPreview = (services, map) => {
  *
  */
 const mapHandlers = (services, map) => {
-  const { selection, osdDriver, dragAndDrop } = services
+  const { selection, osdDriver, dragAndDrop, emitter } = services
 
   map.addEventListener('keydown', event => {
     const { key } = event.originalEvent
@@ -85,6 +85,15 @@ const mapHandlers = (services, map) => {
     if (deselect.length) selection.deselect(deselect)
   })
 
+  let resolution
+  map.on('moveend', () => {
+    const updated = map.getView().getResolution()
+    if (updated !== resolution) {
+      resolution = updated
+      emitter.emit('view/resolution', { resolution })
+    }
+  })
+
   // Note: Neither dragstart nor dragend events are fired when dragging
   // a file into the browser from the OS.
   const target = document.getElementById('map')

src/renderer/components/map/vectorLayers.js

@@ -25,7 +25,7 @@ const highlightLayer = (sources, styles) => {
 
 
 export default (sources, styles) => {
-  const { deselectedSource, selectedSource } = sources
+  const { deselectedSource, selectedSource, featureSource } = sources
   const declutter = false
   const vectorLayer = source => new VectorLayer({
     source,
@@ -35,6 +35,7 @@ export default (sources, styles) => {
 
   return {
     featureLayer: vectorLayer(deselectedSource),
+    // featureLayer: vectorLayer(featureSource),
     highlightLayer: highlightLayer(sources, styles),
     selectedLayer: vectorLayer(selectedSource)
   }