@abi-software/flatmap-viewer 2.6.0-a.1 → 2.6.1

package/src/layers/paths3d.js

@@ -26,6 +26,7 @@ import GL from '@luma.gl/constants'
 //==============================================================================
 
 import {pathColourArray} from '../pathways'
+import {PropertiesFilter} from './filter'
 
 //==============================================================================
 
@@ -60,6 +61,7 @@ class ArcMapLayer extends ArcLayer
         shaders.vs = `#version 300 es\n${shaders.vs}`
         return shaders
     }
+
     setDataProperty(featureId, key, enabled)
     //======================================
     {
@@ -139,10 +141,12 @@ export class Paths3DLayer
     #deckOverlay = null
     #dimmed = false
     #enabled = false
+    #featureFilter = new PropertiesFilter()
     #featureToLayer = new Map()
     #knownTypes = []
     #map
     #pathData
+    #pathFilters
     #pathManager
     #pathStyles
     #ui
@@ -162,7 +166,27 @@ export class Paths3DLayer
                                              && 'pathEndPosition' in ann)
                                  .map(ann => [ann.featureId, ann]))
         this.#pathStyles = new Map(this.#pathManager.pathStyles().map(s => [s.type, s]))
-        this.#knownTypes = [...this.#pathStyles.keys()].filter(t => t !== 'other')
+        const knownTypes = [...this.#pathStyles.keys()].filter(t => t !== 'other')
+        this.#pathFilters = new Map(
+            [...this.#pathStyles.keys()]
+                .map(pathType => [pathType, new PropertiesFilter({
+                    OR: [{
+                        AND: [
+                            {kind: knownTypes},
+                            {kind: pathType}
+                        ],
+                    },
+                    {
+                        AND: [
+                            {
+                                NOT: {kind: knownTypes}
+                            },
+                            (pathType === 'other')
+                        ]
+                    }]
+                })
+            ])
+        )
     }
 
     enable(enable=true)
@@ -223,6 +247,30 @@ export class Paths3DLayer
         }
     }
 
+    setFilter(featureFilter)
+    //======================
+    {
+        this.#featureFilter = featureFilter
+        if (this.#deckOverlay) {
+            const updatedLayers = new Map()
+            for (const [pathType, layer] of this.#arcLayers.entries()) {
+                layer.featureIds.forEach(id => this.#featureToLayer.delete(+id))
+                const pathStyle = this.#pathStyles.get(pathType)
+                if (pathStyle) {
+                    const updatedLayer = pathStyle.dashed
+                                    ? new ArcDashedLayer(this.#layerOptions(pathType))
+                                    : new ArcMapLayer(this.#layerOptions(pathType))
+                    updatedLayer.featureIds.forEach(id => this.#featureToLayer.set(+id, layer))
+                    updatedLayers.set(pathType, updatedLayer)
+                }
+            }
+            this.#arcLayers = updatedLayers
+            this.#deckOverlay.setProps({
+                layers:  [...this.#arcLayers.values()]
+            })
+        }
+    }
+
     setPaint(options)
     //===============
     {
@@ -236,11 +284,14 @@ export class Paths3DLayer
     #addArcLayer(pathType)
     //====================
     {
-        const layer = this.#pathStyles.get(pathType).dashed
-                        ? new ArcDashedLayer(this.#layerOptions(pathType))
-                        : new ArcMapLayer(this.#layerOptions(pathType))
-        layer.featureIds.forEach(id => this.#featureToLayer.set(+id, layer))
-        this.#arcLayers.set(pathType, layer)
+        const pathStyle = this.#pathStyles.get(pathType)
+        if (pathStyle) {
+            const layer = pathStyle.dashed
+                            ? new ArcDashedLayer(this.#layerOptions(pathType))
+                            : new ArcMapLayer(this.#layerOptions(pathType))
+            layer.featureIds.forEach(id => this.#featureToLayer.set(+id, layer))
+            this.#arcLayers.set(pathType, layer)
+        }
     }
 
     #removeArcLayer(pathType)
@@ -283,13 +334,12 @@ export class Paths3DLayer
         }
     }
 
-
     #layerOptions(pathType)
     //=====================
     {
-        const pathData = [...this.#pathData.values()]
-                                 .filter(ann => (this.#knownTypes.includes(ann.kind) && (ann.kind === pathType)
-                                             || !this.#knownTypes.includes(ann.kind) && (pathType === 'other')))
+        const filter = this.#pathFilters.get(pathType)
+        const pathData = (filter ? [...this.#pathData.values()].filter(ann => filter.match(ann))
+                                 : []).filter(ann => this.#featureFilter.match(ann))
         return {
             id: `arc-${pathType}`,
             data: pathData,

package/src/main.js

@@ -64,10 +64,7 @@ class DrawControl
     //================
     {
         console.log(event)
-
-this._flatmap.showPopup(event.feature.id, '<div>event</div>')
-
-        if (this._idField) {
+        if (this._idField && event.type !== 'modeChanged' && event.type !== 'selectionChanged') {
             this._idField.innerText = `Annotation ${event.type}, Id: ${event.feature.id}`
             this._lastEvent = event
         }

package/src/layers/filter.ts

@@ -1,187 +0,0 @@
-/******************************************************************************
-
-Flatmap viewer and annotation tool
-
-Copyright (c) 2019 - 2024 David Brooks
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-******************************************************************************/
-
-type FilterExpression = Record<string, any>
-
-//==============================================================================
-
-export class FeatureFilter
-{
-    #filter: FilterExpression
-
-    constructor(filter: FilterExpression)
-    {
-        this.#filter = filter
-    }
-
-    makeStyleFilter()
-    //===============
-    {
-        return this.#makeStyleFilter(this.#filter)
-    }
-
-    #makeStyleFilter(filter: FilterExpression): Array<any>
-    //====================================================
-    {
-        // We expect an object, so check and warn...
-        if (!filter || filter.constructor !== Object) {
-            console.warn(`makeFilter: Invalid filter expression: ${filter}`)
-            return []
-        }
-
-        const styleFilter = []
-        for (const [key, expr] of Object.entries(filter)) {
-            if (key === 'AND' || key === 'OR') {
-                if (Array.isArray(expr) && expr.length >= 2) {
-                    styleFilter.push((key === 'AND') ? 'all' : 'any',
-                                      ...expr.map(e => this.#makeStyleFilter(e)))
-                } else {
-                    console.warn(`makeFilter: Invalid ${key} operands: ${expr}`)
-                }
-            } else if (key === 'HAS') {
-                styleFilter.push('has', expr)
-            } else if (key === 'NOT') {
-                const filterExpr = this.#makeStyleFilter(expr)
-                if (filterExpr.length === 2 && ['has', '!has'].includes(filterExpr[0])) {
-                    if (filterExpr[0] === 'has') {
-                        styleFilter.push('!has', filterExpr[1])
-                    } else {
-                        styleFilter.push('has', filterExpr[1])
-                    }
-                } else if (filterExpr.length === 3 && ['==', '!='].includes(filterExpr[0])) {
-                    if (filterExpr[0] === '==') {
-                        styleFilter.push('!=', filterExpr[1], filterExpr[2])
-                    } else {
-                        styleFilter.push('==', filterExpr[1], filterExpr[2])
-                    }
-                } else {
-                    styleFilter.push('!', filterExpr)
-                }
-            } else {
-                if (Array.isArray(expr)) {
-                    styleFilter.push('any', ...expr.map(e => ['==', key, e]))
-                } else {
-                    styleFilter.push('==', key, expr)
-                }
-            }
-        }
-        return styleFilter
-    }
-
-}
-
-//==============================================================================
-
-function testFilter(f: FilterExpression)
-//======================================
-{
-    const featureFilter = new FeatureFilter(f)
-    console.log(f, '--->', featureFilter.makeStyleFilter())
-}
-
-export function testFilters()
-//===========================
-{
-    /*
-        { HAS: 'prop' } ---> [ 'has', 'prop' ]
-        { prop: 1 } ---> [ '==', 'prop', 1 ]
-        { NOT: { prop: 1 } } ---> [ '!=', 'prop', 1 ]
-        { NOT: { prop: [ 1, 2 ] } } ---> [ '!', [ 'any', [ '==', 'prop', 1 ], [ '==', 'prop', 2 ] ] ]
-        { OR: [ { prop1: 10 }, { prop2: 11 } ] } ---> [ 'any', [ '==', 'prop1', 10 ], [ '==', 'prop2', 11 ] ]
-        { AND: [ { prop1: 10 }, { prop2: 11 } ] } ---> [ 'all', [ '==', 'prop1', 10 ], [ '==', 'prop2', 11 ] ]
-        { OR: [ { AND: [Array] }, { AND: [Array] } ] } ---> [
-          'any',
-          [ 'all', [ '!=', 'prop1', 10 ], [ '==', 'prop2', 11 ] ],
-          [ 'all', [ '==', 'prop3', 10 ], [ '==', 'prop4', 11 ] ]
-        ]
-        { NOT: { OR: [ [Object], [Object] ] } } ---> [
-          '!',
-          [ 'any', [ 'all', [Array], [Array] ], [ 'all', [Array], [Array] ] ]
-        ]
-    */
-
-    testFilter({
-        "HAS": "prop"
-    })
-
-    testFilter({
-        "prop": 1
-    })
-
-    testFilter({
-        "NOT": {
-            "prop": 1
-        }
-    })
-
-    testFilter({
-        "NOT": {
-            "prop": [1, 2]
-        }
-    })
-
-    testFilter({
-        "OR": [
-            {"prop1": 10},
-            {"prop2": 11}
-        ]
-    })
-
-    testFilter({
-        "AND": [
-            {"prop1": 10},
-            {"prop2": 11}
-        ]
-    })
-
-    testFilter({
-        "OR": [{
-            "AND": [
-                { "NOT": {"prop1": 10}},
-                {"prop2": 11}
-            ]}, {
-            "AND": [
-                {"prop3": 10},
-                {"prop4": 11}
-            ]}
-        ]
-    })
-
-    testFilter({
-        "NOT": {
-            "OR": [{
-                "AND": [
-                    {"prop1": 10},
-                    {"prop2": 11}
-                ]}, {
-                "AND": [
-                    {"prop3": 10},
-                    {"prop4": 11}
-                ]}
-            ]
-        }
-    })
-}
-
-//==============================================================================
-
-//testFilters()
-
-//==============================================================================