Merge pull request #11 from syncpoint/current

SIGNS

Author: ThomasHalwax

electron-builder.yml

@@ -31,4 +31,4 @@ publish:
   - provider: github
     releaseType: release
 
-electronVersion: 20.3.10
+electronVersion: 24.1.3

package-lock.json

@@ -1,7 +1,7 @@
 {
-  "name": "nido",
+  "name": "odin",
   "productName": "ODINv2",
-  "version": "2.5.5",
+  "version": "2.6.1",
   "description": "Open Source Command and Control Information System (C2IS)",
   "main": "dist/main.js",
   "scripts": {
@@ -27,20 +27,19 @@
   },
   "license": "AGPLv3",
   "devDependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.21.4",
     "@babel/eslint-parser": "^7.18.2",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "^7.21.4",
     "@babel/preset-react": "^7.17.12",
     "@babel/register": "^7.17.7",
-    "@welldone-software/why-did-you-render": "^7.0.1",
     "babel-loader": "^9.1.0",
     "c8": "^7.11.3",
     "css-loader": "^6.7.2",
-    "electron": "^20.3.7",
+    "electron": "^24.1.3",
     "electron-builder": "^23.6.0",
     "electron-notarize": "^1.2.2",
     "electron-updater": "^5.3.0",
-    "eslint": "^8.28.0",
+    "eslint": "^8.37.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -50,17 +49,18 @@
     "memdown": "^6.1.1",
     "mocha": "^10.1.0",
     "node-sass": "^8.0.0",
-    "sass-loader": "^13.2.0",
+    "sass-loader": "^13.2.2",
     "style-loader": "^3.3.1",
-    "webpack": "^5.75.0",
+    "webpack": "^5.77.0",
     "webpack-cli": "^5.0.0",
-    "webpack-dev-server": "^4.10.1",
+    "webpack-dev-server": "^4.13.2",
     "yaml": "^2.1.3"
   },
   "dependencies": {
     "@mdi/js": "^7.0.96",
     "@mdi/react": "^1.6.0",
     "@most/scheduler": "^1.3.0",
+    "@syncpoint/signs": "^1.0.0",
     "@syncpoint/wkx": "^0.5.2",
     "abstract-leveldown": "^7.2.0",
     "color": "^4.2.3",
@@ -74,12 +74,11 @@
     "leveldown": "^6.1.1",
     "levelup": "^5.0.1",
     "luxon": "^3.1.0",
-    "milsymbol": "github:syncpoint/milsymbol",
-    "minisearch": "^5.1.0",
+    "minisearch": "^6.0.1",
     "most-subject": "^6.0.0",
     "mousetrap": "^1.6.5",
     "mousetrap-global-bind": "^1.1.0",
-    "ol": "^7.2.2",
+    "ol": "^7.3.0",
     "path-to-regexp": "^6.2.1",
     "proj4": "^2.8.0",
     "ramda": "^0.28.0",

package.json

@@ -5,7 +5,7 @@ import EventEmitter from '../../shared/emitter'
 import SessionStore from '../store/SessionStore'
 import PreferencesStore from '../store/PreferencesStore'
 import Store from '../store/Store'
-import MigrationTool from '../store/MigrationTool'
+import Schema from '../store/schema/Schema'
 import ProjectStore from '../store/ProjectStore'
 import SearchIndex from '../store/SearchIndex'
 import DocumentStore from '../store/DocumentStore'
@@ -29,7 +29,6 @@ export default async projectUUID => {
   const locator = () => services
   services.locator = locator
 
-
   const selection = new Selection()
   const undo = new Undo()
 
@@ -113,18 +112,20 @@ export default async projectUUID => {
 
   services.commandRegistry = new CommandRegistry(services)
 
-  const migrationsOptions = {}
-  migrationsOptions[MigrationTool.REDUNDANT_IDENTIFIERS] = false
-  migrationsOptions[MigrationTool.INLINE_TAGS] = false
-  migrationsOptions[MigrationTool.INLINE_FLAGS] = false
-  migrationsOptions[MigrationTool.DEFAULT_TAG] = false
-  migrationsOptions[MigrationTool.INLINE_STYLES] = false
-  const migration = new MigrationTool(db, migrationsOptions)
+  const schema = new Schema(db, {
+    ids: 'KEY-ONLY',
+    tags: 'SEPARATE',
+    flags: 'SEPARATE',
+    'default-tag': 'SEPARATE',
+    styles: 'SEPARATE',
+    ms2525c: 'LOADED', // NOTE: also deletes SKKM on UNLOADED.
+    skkm: 'LOADED',
+    'default-style': 'LOADED'
+  })
 
   // Orderly bootstrapping:
   //
-  await migration.bootstrap()
-  await store.bootstrap()
+  await schema.bootstrap()
   await tileLayerStore.bootstrap()
   await searchIndex.bootstrap()
   await featureStore.bootstrap()

src/renderer/components/Project-services.js

@@ -14,6 +14,9 @@ import PointProperties from './PointProperties'
 import MarkerProperties from './MarkerProperties'
 import TileServiceProperties from './TileServiceProperties'
 import TilePresetProperties from './TilePresetProperties'
+import SKKMStandardProperties from './SKKMStandardProperties'
+import SKKMUnitProperties from './SKKMUnitProperties'
+import SKKMCommandProperties from './SKKMCommandProperties'
 import './Properties.css'
 
 const propertiesPanels = {
@@ -26,15 +29,16 @@ const propertiesPanels = {
   'feature:POINT': props => <PointProperties {...props}/>,
   marker: props => <MarkerProperties {...props}/>,
   'tile-service': props => <TileServiceProperties {...props}/>,
-  'tile-preset': props => <TilePresetProperties {...props}/>
+  'tile-preset': props => <TilePresetProperties {...props}/>,
+  'feature:SKKM/K': props => <SKKMStandardProperties {...props}/>,
+  'feature:SKKM/KU': props => <SKKMUnitProperties {...props}/>,
+  'feature:SKKM/KC': props => <SKKMCommandProperties {...props}/>
+
 }
 
 const singletons = ['tile-service', 'tile-layers']
 
-const sidc = feature =>
-  feature &&
-  feature.properties &&
-  feature.properties.sidc
+const sidc = feature => feature?.properties?.sidc
 
 /**
  *
@@ -47,6 +51,7 @@ const propertiesClasses = features => Object
       ? `feature:${MILSTD.className(sidc(value)) || ''}`
       : scope(key)
 
+    console.log('className', className)
     return push(className)
   }, [])
 

src/renderer/components/properties/Properties.js

@@ -0,0 +1,25 @@
+import React from 'react'
+import Name from './Name'
+import UniqueDesignationHigherFormation from './UniqueDesignationHigherFormation'
+import SpecialC2HQEchelon from './SpecialC2HQEchelon'
+import DateTimeGroup from './DateTimeGroup'
+import Speed from './Speed'
+import Direction from './Direction'
+import AdditionalInformation from './AdditionalInformation'
+import GridCols2 from './GridCols2'
+
+const SKKMUnitProperties = props => {
+  return (
+    <GridCols2>
+      <Name {...props}/>
+      <UniqueDesignationHigherFormation {...props}/>
+      <SpecialC2HQEchelon {...props}/>
+      <DateTimeGroup {...props}/>
+      <Speed {...props}/>
+      <Direction {...props}/>
+      <AdditionalInformation {...props}/>
+    </GridCols2>
+  )
+}
+
+export default SKKMUnitProperties

src/renderer/components/properties/SKKMCommandProperties.js

@@ -0,0 +1,25 @@
+import React from 'react'
+import Name from './Name'
+import UniqueDesignation from './UniqueDesignation'
+import DateTimeGroup from './DateTimeGroup'
+import Speed from './Speed'
+import Direction from './Direction'
+import AdditionalInformation from './AdditionalInformation'
+import GridCols2 from './GridCols2'
+import ColSpan2 from './ColSpan2'
+
+
+const SKKMStandardProperties = props => {
+  return (
+    <GridCols2>
+      <Name {...props}/>
+      <ColSpan2><UniqueDesignation {...props}/></ColSpan2>
+      <DateTimeGroup {...props}/>
+      <Speed {...props}/>
+      <Direction {...props}/>
+      <AdditionalInformation {...props}/>
+    </GridCols2>
+  )
+}
+
+export default SKKMStandardProperties

src/renderer/components/properties/SKKMStandardProperties.js

@@ -0,0 +1,27 @@
+import React from 'react'
+import Name from './Name'
+import UniqueDesignationHigherFormation from './UniqueDesignationHigherFormation'
+import SpecialC2HQEchelon from './SpecialC2HQEchelon'
+import DateTimeGroup from './DateTimeGroup'
+import Speed from './Speed'
+import Direction from './Direction'
+import AdditionalInformation from './AdditionalInformation'
+import UnitModifiers from './UnitModifiers'
+import GridCols2 from './GridCols2'
+
+const SKKMUnitProperties = props => {
+  return (
+    <GridCols2>
+      <Name {...props}/>
+      <UniqueDesignationHigherFormation {...props}/>
+      <SpecialC2HQEchelon {...props}/>
+      <DateTimeGroup {...props}/>
+      <Speed {...props}/>
+      <Direction {...props}/>
+      <AdditionalInformation {...props}/>
+      <UnitModifiers {...props}/>
+    </GridCols2>
+  )
+}
+
+export default SKKMUnitProperties

src/renderer/components/properties/SKKMUnitProperties.js

@@ -118,7 +118,7 @@ describe('ids', function () {
     assert(ID.isUUID(uuid))
   })
 
-  it.only('measureId :: () -> MeasureId', function () {
+  it('measureId :: () -> MeasureId', function () {
     console.log(ID.measureId())
     const [scope, uuid] = ID.measureId().split(ID.COLON)
     assert.equal(scope, ID.MEASURE)

src/renderer/ids.test.js

@@ -12,7 +12,7 @@ const type = ([parameterized, descriptor]) => ({
 })
 
 const TYPES = Object
-  .entries(MILSTD.index)
+  .entries(MILSTD.symbols)
   .map(type)
 
 

src/renderer/model/actions/Type.js

@@ -1,7 +1,7 @@
 import * as R from 'ramda'
 import * as olStyle from 'ol/style'
 import { PI_OVER_2, PI } from '../../../shared/Math'
-import ms from 'milsymbol'
+import { Symbol } from '@syncpoint/signs'
 import * as patterns from './patterns'
 
 const Styles = {
@@ -148,7 +148,7 @@ const makeSymbol = props => {
     ...props['symbol-modifiers']
   })
 
-  const symbol = new ms.Symbol(props['symbol-code'], { ...options })
+  const symbol = new Symbol(props['symbol-code'], { ...options, infoFields: true })
   const { width, height } = symbol.getSize()
 
   return Styles.icon({