@abi-software/flatmapvuer 1.13.5-demo.8 → 1.14.1

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.13.5-demo.8",
+  "version": "1.14.1",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=20"
+  },
   "files": [
     "dist/*",
     "src/*",
@@ -44,9 +47,9 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/map-utilities": "1.8.3",
+    "@abi-software/map-utilities": "1.9.0",
     "@abi-software/sparc-annotation": "0.3.2",
-    "@abi-software/svg-sprite": "1.0.3",
+    "@abi-software/svg-sprite": "1.1.0",
     "@element-plus/icons-vue": "^2.3.1",
     "css-element-queries": "^1.2.2",
     "element-plus": "2.8.4",
@@ -77,7 +80,9 @@
   },
   "optionalDependencies": {
     "@esbuild/linux-x64": "0.25.3",
-    "@rollup/rollup-linux-x64-gnu": "4.23.0"
+    "@rollup/rollup-darwin-arm64": "4.59.0",
+    "@rollup/rollup-linux-x64-gnu": "4.59.0",
+    "@rollup/rollup-win32-x64-msvc": "4.59.0"
   },
   "eslintConfig": {
     "root": true,

package/src/components/FlatmapVuer.vue

@@ -634,7 +634,6 @@ import { capitalise, normaliseAlertToStringArray } from './utilities.js'
 import yellowstar from '../icons/yellowstar'
 import ResizeSensor from 'css-element-queries/src/ResizeSensor'
 import flatmap from '../services/flatmapLoader.js'
-import { attachSomaLocationMarkerMethods } from '../services/somaLocationMarkers.js'
 import { AnnotationService } from '@abi-software/sparc-annotation'
 import { mapState } from 'pinia'
 import { useMainStore } from '@/store/index'
@@ -2846,7 +2845,7 @@ export default {
           }
         )
         promise1.then((returnedObject) => {
-          this.mapImp = attachSomaLocationMarkerMethods(returnedObject)
+          this.mapImp = returnedObject
           this.serverURL = this.mapImp.makeServerUrl('').slice(0, -1)
           let mapVersion = this.mapImp.details.version
           this.setFlightPathInfo(mapVersion)

package/src/services/flatmapLoader.js

@@ -1,6 +1,6 @@
 /**
  * a single source for the flatmap-viewer library import
  */
-import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.4.4/+esm';
+import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.4.5/+esm';
 
 export default flatmap;

package/src/services/somaLocationMarkers.js

@@ -1,125 +0,0 @@
-const SOMA_MARKER_COLOUR = '#1b7f6b'
-const SOMA_MARKER_SECONDARY_COLOUR = '#f4f1de'
-const SOMA_MARKER_TEXT_COLOUR = '#12312b'
-const SOMA_MARKER_MAX_COUNT_LABEL = '99+'
-
-const normalizeSomaLocations = function (somaLocations) {
-  return (Array.isArray(somaLocations) ? somaLocations : [])
-    .map((item) => ({
-      label: String(item?.label || '').trim(),
-      curie: String(item?.curie || '').trim(),
-      count: Number(item?.count || 0),
-    }))
-    .filter((item) => item.curie && item.count > 0)
-}
-
-const formatCount = function (count) {
-  if (count > 99) return SOMA_MARKER_MAX_COUNT_LABEL
-  return String(count)
-}
-
-const createSomaLocationMarkerElement = function (somaLocation) {
-  const wrapper = document.createElement('div')
-  wrapper.className = 'flatmapvuer-soma-location-marker'
-  wrapper.title = somaLocation.label || somaLocation.curie
-  wrapper.style.width = '34px'
-  wrapper.style.height = '48px'
-  wrapper.style.display = 'flex'
-  wrapper.style.alignItems = 'center'
-  wrapper.style.justifyContent = 'center'
-  wrapper.style.transform = 'translate(-50%, -100%)'
-
-  const countLabel = formatCount(somaLocation.count)
-  wrapper.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 27 42" width="34" height="48" aria-hidden="true">
-    <ellipse style="fill: rgb(0, 0, 0); fill-opacity: 0.18;" cx="12" cy="36" rx="8" ry="4"/>
-    <path d="M12.25.25a12.254 12.254 0 0 0-12 12.494
-             c0 6.444 6.488 12.109 11.059 22.564.549 1.256 1.333 1.256 1.882 0
-             C17.762 24.853 24.25 19.186 24.25 12.744A12.254 12.254 0 0 0 12.25.25Z"
-          style="fill:${SOMA_MARKER_COLOUR};stroke:${SOMA_MARKER_SECONDARY_COLOUR};stroke-width:1.1"/>
-    <circle cx="12.5" cy="12.5" r="8" fill="${SOMA_MARKER_SECONDARY_COLOUR}"/>
-    <text x="12.5" y="16.1" text-anchor="middle" style="font-size:7.5px;font-weight:700;fill:${SOMA_MARKER_TEXT_COLOUR};font-family:Arial, sans-serif">${countLabel}</text>
-  </svg>`
-
-  return wrapper
-}
-
-const resolveMarkerPlacement = function (mapImp, curie) {
-  const featureIds = Array.isArray(mapImp?.modelFeatureIds?.(curie)) ? mapImp.modelFeatureIds(curie) : []
-  const placements = []
-  const seenFeatureUris = new Set()
-
-  for (const featureId of featureIds) {
-    const annotation = mapImp.annotation(featureId)
-    const featureUri = String(annotation?.uri || '').trim()
-    if (featureUri && !seenFeatureUris.has(featureUri)) {
-      seenFeatureUris.add(featureUri)
-      placements.push({
-        type: 'feature-uri',
-        value: featureUri,
-      })
-    }
-  }
-
-  // Fall back to model placement only when no feature URI can be resolved.
-  if (!placements.length && featureIds.length) {
-    placements.push({
-      type: 'model',
-      value: curie,
-    })
-  }
-
-  return placements
-}
-
-export const attachSomaLocationMarkerMethods = function (mapImp) {
-  if (!mapImp || mapImp.addSomaLocationMarkers) {
-    return mapImp
-  }
-
-  let markerIds = []
-
-  mapImp.clearSomaLocationMarkers = function () {
-    markerIds.forEach((markerId) => {
-      mapImp.removeMarker(markerId)
-    })
-    markerIds = []
-  }
-
-  mapImp.addSomaLocationMarkers = function (somaLocations) {
-    const normalizedSomaLocations = normalizeSomaLocations(somaLocations)
-    const placedSomaLocations = []
-
-    mapImp.clearSomaLocationMarkers()
-
-    normalizedSomaLocations.forEach((somaLocation) => {
-      const placements = resolveMarkerPlacement(mapImp, somaLocation.curie)
-      if (!placements.length) return
-
-      let somaLocationPlaced = false
-      placements.forEach((placement) => {
-        const markerElement = createSomaLocationMarkerElement(somaLocation)
-        let addedMarkerIds = []
-
-        if (placement.type === 'feature-uri') {
-          addedMarkerIds = mapImp.addMarkerByFeatureUri(placement.value, { element: markerElement })
-        } else if (placement.type === 'model') {
-          const markerId = mapImp.addMarker(placement.value, { element: markerElement })
-          addedMarkerIds = markerId > -1 ? [markerId] : []
-        }
-
-        if (!addedMarkerIds.length) return
-
-        markerIds.push(...addedMarkerIds)
-        somaLocationPlaced = true
-      })
-
-      if (somaLocationPlaced) {
-        placedSomaLocations.push(somaLocation)
-      }
-    })
-
-    return placedSomaLocations
-  }
-
-  return mapImp
-}