@abi-software/flatmap-viewer 2.7.0 → 2.7.1-a.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmap-viewer",
-  "version": "2.7.0",
+  "version": "2.7.1-a.1",
   "description": "Flatmap viewer using Maplibre GL",
   "repository": {
     "type": "git",

package/src/interactions.js

@@ -1020,6 +1020,10 @@ export class UserInteractions
         // Simulate `mouseenter` events on features
 
         const feature = features[0];
+
+//is feature a marker??
+console.log('mm', event.type, feature)
+
         const featureModels = ('properties' in feature && 'models' in feature.properties)
                             ? feature.properties.models
                             : null;
@@ -1444,6 +1448,7 @@ export class UserInteractions
     markerMouseEvent_(marker, anatomicalId, event)
     //============================================
     {
+console.log('mk', event.type)
         // No tooltip when context menu is open
         if (this._modal
          || (this.__activeMarker !== null && event.type === 'mouseleave')) {
@@ -1464,6 +1469,7 @@ export class UserInteractions
 
             this.markerEvent_(event, markerId, marker.getLngLat(),
                                      anatomicalId, annotation)
+console.log('mk handled...')
             event.stopPropagation()
         }
     }

package/src/layers/cluster.js

@@ -113,6 +113,7 @@ export class ClusteredMarkerLayer
             const features = this.#map.queryRenderedFeatures(e.point, {
                 layers: ['clustered-markers']
             })
+            console.log('Cluster marker', features)
             const clusterId = features[0].properties.cluster_id
             const zoom = await this.#map.getSource('markers').getClusterExpansionZoom(clusterId)
             this.#map.easeTo({
@@ -121,10 +122,10 @@ export class ClusteredMarkerLayer
             })
         })
 
-            console.log('Unclustered click', e, features)
         this.#map.on('click', 'single-points', this.singleMarkerEvent.bind(this))
         this.#map.on('mouseenter', 'single-points', this.singleMarkerEvent.bind(this))
         this.#map.on('mousemove', 'single-points', this.singleMarkerEvent.bind(this))
+//        this.#map.on('mouseleave', 'single-points', this.singleMarkerEvent.bind(this))
 
         this.#map.on('mouseenter', 'clustered-markers', () => {
             this.#map.getCanvas().style.cursor = 'pointer'
@@ -138,6 +139,7 @@ export class ClusteredMarkerLayer
     singleMarkerEvent(event)
     //======================
     {
+console.log('cl', event.type)
         const features = this.#map.queryRenderedFeatures(event.point, {
             layers: ['single-points']
         })
@@ -146,6 +148,7 @@ export class ClusteredMarkerLayer
             const position = properties.markerPosition.slice(1, -1).split(',').map(p => +p)
             this.#ui.markerEvent_(event, feature.id, position, properties.models, properties)
         }
+console.log('cl handled...')
         event.originalEvent.stopPropagation()
     }
 

package/src/layers/index.js

@@ -425,10 +425,14 @@ export class LayerManager
             mapLayer.setFilter(this.__layerOptions);
         }
         if (this.#flightPathLayer) {
+//    * @arg options.layerOptions.sckan {string} Show neuron paths known to SCKAN: values are ``valid`` (default),
+//    *                                        ``invalid``, ``all`` or ``none``.
+
+
             const sckanState = options.sckan || 'valid'
             const sckanFilter = (sckanState == 'none') ? {NOT: {HAS: 'sckan'}} :
                                 (sckanState == 'valid') ? {sckan: true} :
-                                (sckanState == 'invalid') ? {NOT: {sckan: true}} :
+                                (sckanState == 'invalid') ? {NOT: {sckan: true}} :  // {sckan: false} is different...
                                 true
             const featureFilter = new PropertiesFilter(sckanFilter)
             if ('taxons' in options) {

package/src/main.js

@@ -49,12 +49,15 @@ const ALL_MARKERS = [
     'UBERON:0037094',
     'ILX:0738305',
 
-    'UBERON:0000948', // {className: 'heart-marker'}); // Heart
+//    'UBERON:0000948', // {className: 'heart-marker'}); // Heart
     'UBERON:0002048', // Lung
     'UBERON:0000945', // Stomach
     'UBERON:0001155', // Colon
     'UBERON:0001255', // Bladder
     'UBERON:0001759', // Vagus
+
+    'UBERON:0016508', // Pelvic ganglion
+
 ]
 
 //==============================================================================
@@ -172,6 +175,8 @@ export async function standaloneViewer(map_endpoint=null, options={})
                     mapOptions.background = args[0].value;
                 } else if (eventType === 'annotation') {
                     drawControl.handleEvent(...args)
+                } else if (args[0].type === 'marker') {
+                    console.log(eventType, ...args)
                 }
             }, mapOptions)
             .then(map => {
@@ -183,7 +188,11 @@ export async function standaloneViewer(map_endpoint=null, options={})
                 map.addMarker('UBERON:0001255'); // Bladder
                 map.addMarker('UBERON:0001759'); // Vagus
 */
-                map.addMarkers(ALL_MARKERS, {cluster: true})
+                map.addMarker('UBERON:0000945', {cluster: true}); // Stomach
+//                map.addMarker('UBERON:0016508', {cluster: false}); // Pelvic ganglion
+                map.addMarker('UBERON:0016508', {cluster: true}); // Pelvic ganglion
+                map.addMarker('UBERON:0000948', {cluster: true, className: 'heart-marker'}); // Heart
+//                map.addMarkers(ALL_MARKERS)
                 currentMap = map;
                 drawControl = new DrawControl(map)
             })

package/src/types.ts

@@ -0,0 +1,26 @@
+/******************************************************************************
+
+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.
+
+******************************************************************************/
+
+export type Constructor<T> = new(...args: any[]) => T
+
+export type ObjectRecord = Record<string, any>
+
+//==============================================================================
+

package/src/utils.js

@@ -120,6 +120,7 @@ export function normaliseId(id)
 
 export function setDefaults(options, defaultOptions)
 {
+// c.f. Object.assign({}, defaultOptions, options)
     if (options === undefined || options === null) {
         return defaultOptions;
     }