@fusion.dev/helix-map 0.223.1 → 0.225.0

package/dist/connect-map/connect-map.js

@@ -1,4 +1,4 @@
-import { HelixActivateEvent, HelixMapClusterEvent, HelixMapPanEvent, HelixMapPartChangeEvent, HelixMapRotateEvent, HelixMapTiltEvent, HelixMapZoomEvent, isRtl, watchTheme, } from '@fusion.dev/helix-core';
+import { HelixActivateEvent, isRtl, watchTheme, } from '@fusion.dev/helix-core';
 import { CREDIT, creditParts } from '../credit/credit.js';
 import { motionOf } from '../motion/motion.js';
 import { pointsFrom } from '../points/points.js';
@@ -162,8 +162,8 @@ export const connectMap = (frame, driver, options = {}) => {
             driver.zoomBy(by > 0 ? 1 : -1, motionOf(frame, 'step'));
         }
     };
-    frame.addEventListener(HelixMapPanEvent.eventName, handlePan);
-    frame.addEventListener(HelixMapZoomEvent.eventName, handleZoom);
+    frame.addEventListener('helix-map-pan', handlePan);
+    frame.addEventListener('helix-map-zoom', handleZoom);
     const handleRotate = (event) => {
         const { by, to } = event.detail;
         driver.rotate?.({ by, to }, motionOf(frame, 'step'));
@@ -172,8 +172,8 @@ export const connectMap = (frame, driver, options = {}) => {
         const { by, to } = event.detail;
         driver.tilt?.({ by, to }, motionOf(frame, 'step'));
     };
-    frame.addEventListener(HelixMapRotateEvent.eventName, handleRotate);
-    frame.addEventListener(HelixMapTiltEvent.eventName, handleTilt);
+    frame.addEventListener('helix-map-rotate', handleRotate);
+    frame.addEventListener('helix-map-tilt', handleTilt);
     const holder = frame;
     const syncBearing = () => {
         const bearing = Math.round((driver.bearing?.() ?? 0) * 10) / 10;
@@ -446,7 +446,7 @@ export const connectMap = (frame, driver, options = {}) => {
                     encoding: layer.encoding === 'mapbox' ? 'mapbox' : 'terrarium',
                     id: idOf(layer),
                     kind: 'contours',
-                    label: layer.label ?? '',
+                    label: layer.label || layer.fallbackLabel || '',
                     ...(typeof layer.maxZoom === 'number' ? { maxZoom: layer.maxZoom } : {}),
                     points: [],
                     src: layer.src,
@@ -456,7 +456,13 @@ export const connectMap = (frame, driver, options = {}) => {
         }
         if (layer.layerKind === 'landcover') {
             return [
-                { color, id: idOf(layer), kind: 'landcover', label: layer.label ?? '', points: [] },
+                {
+                    color,
+                    id: idOf(layer),
+                    kind: 'landcover',
+                    label: layer.label || layer.fallbackLabel || '',
+                    points: [],
+                },
             ];
         }
         if (layer.layerKind === 'terrain') {
@@ -472,7 +478,7 @@ export const connectMap = (frame, driver, options = {}) => {
                     highlight: settledColor(layer, 'border-top-color'),
                     id: idOf(layer),
                     kind: 'terrain',
-                    label: layer.label ?? '',
+                    label: layer.label || layer.fallbackLabel || '',
                     ...(typeof layer.maxZoom === 'number' ? { maxZoom: layer.maxZoom } : {}),
                     points: [],
                     raised: layer.raised === true,
@@ -482,7 +488,13 @@ export const connectMap = (frame, driver, options = {}) => {
         }
         if (layer.layerKind === 'buildings') {
             return [
-                { color, id: idOf(layer), kind: 'buildings', label: layer.label ?? '', points: [] },
+                {
+                    color,
+                    id: idOf(layer),
+                    kind: 'buildings',
+                    label: layer.label || layer.fallbackLabel || '',
+                    points: [],
+                },
             ];
         }
         if (layer.layerKind === 'raster') {
@@ -500,7 +512,7 @@ export const connectMap = (frame, driver, options = {}) => {
                     ...(layer.ground ? { ground: true } : {}),
                     id: idOf(layer),
                     kind: 'raster',
-                    label: layer.label ?? '',
+                    label: layer.label || layer.fallbackLabel || '',
                     ...(typeof layer.maxZoom === 'number' ? { maxZoom: layer.maxZoom } : {}),
                     opacity: Math.min(Math.max(0, layer.opacity ?? 0.7), 1),
                     points: [],
@@ -522,7 +534,7 @@ export const connectMap = (frame, driver, options = {}) => {
                     id,
                     ink: settledColor(layer, 'outline-color'),
                     kind: 'points',
-                    label: layer.label ?? '',
+                    label: layer.label || layer.fallbackLabel || '',
                     points,
                 },
             ];
@@ -539,7 +551,7 @@ export const connectMap = (frame, driver, options = {}) => {
             color,
             id: idOf(layer),
             kind: layer.layerKind,
-            label: layer.label ?? '',
+            label: layer.label || layer.fallbackLabel || '',
             ...(dotted ? { pattern: 'dotted' } : {}),
             points: (layer.points ?? []).map(({ lat, lng }) => ({ lat, lng })),
         };
@@ -832,7 +844,7 @@ export const connectMap = (frame, driver, options = {}) => {
             soon(kind === 'layer' ? { draw: true } : { place: true });
         }
     };
-    frame.addEventListener(HelixMapPartChangeEvent.eventName, handlePartChange);
+    frame.addEventListener('helix-map-part-change', handlePartChange);
     const styled = new MutationObserver(() => soon({ draw: true }));
     const watchLayers = () => {
         styled.disconnect();
@@ -897,7 +909,7 @@ export const connectMap = (frame, driver, options = {}) => {
         }
         driver.fit(bounds, 96, motionOf(frame, 'travel'));
     };
-    frame.addEventListener(HelixMapClusterEvent.eventName, handleCluster);
+    frame.addEventListener('helix-map-cluster', handleCluster);
     const closeFan = () => {
         const lead = fanned?.members[0];
         fanned = undefined;
@@ -939,9 +951,9 @@ export const connectMap = (frame, driver, options = {}) => {
             stopTheming?.();
             styled.disconnect();
             children.disconnect();
-            frame.removeEventListener(HelixMapPartChangeEvent.eventName, handlePartChange);
+            frame.removeEventListener('helix-map-part-change', handlePartChange);
             frame.removeEventListener('focusin', reveal);
-            frame.removeEventListener(HelixMapClusterEvent.eventName, handleCluster);
+            frame.removeEventListener('helix-map-cluster', handleCluster);
             frame.removeEventListener('keydown', handleFanKey);
             frame.removeEventListener('pointerdown', handleFanDown);
             frame.removeEventListener('click', handleFanPress);
@@ -974,10 +986,10 @@ export const connectMap = (frame, driver, options = {}) => {
             for (const position of positions()) {
                 placeOn(position, UNPLACED_POSITION);
             }
-            frame.removeEventListener(HelixMapPanEvent.eventName, handlePan);
-            frame.removeEventListener(HelixMapZoomEvent.eventName, handleZoom);
-            frame.removeEventListener(HelixMapRotateEvent.eventName, handleRotate);
-            frame.removeEventListener(HelixMapTiltEvent.eventName, handleTilt);
+            frame.removeEventListener('helix-map-pan', handlePan);
+            frame.removeEventListener('helix-map-zoom', handleZoom);
+            frame.removeEventListener('helix-map-rotate', handleRotate);
+            frame.removeEventListener('helix-map-tilt', handleTilt);
             stopBearing?.();
             stopView?.();
             stopWatchingPreviews?.();

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fusion.dev/helix-map",
   "description": "Connects the Helix Map frame to a map renderer: MapLibre, Leaflet, or a driver of your own.",
-  "version": "0.223.1",
+  "version": "0.225.0",
   "license": "MIT",
-  "author": "Ross Sheppard <ross.sheppard@fusion.dev>",
+  "author": "Fusion Development Group",
   "repository": {
     "directory": "helix/map",
     "type": "git",
@@ -44,19 +44,19 @@
   },
   "bugs": "https://github.com/project-fusion/fusion/issues",
   "dependencies": {
-    "@fusion.dev/helix-core": "0.223.1",
-    "@fusion.dev/helix-icons": "0.223.1",
+    "@fusion.dev/helix-core": "0.225.0",
+    "@fusion.dev/helix-icons": "0.225.0",
     "@mapbox/vector-tile": "^3.0.0",
     "pbf": "^5.1.2"
   },
   "devDependencies": {
-    "@fusion.dev/helix-headless": "0.223.1",
-    "@fusion.dev/helix-testing": "0.223.1",
+    "@fusion.dev/helix-headless": "0.225.0",
+    "@fusion.dev/helix-testing": "0.225.0",
     "@maplibre/maplibre-gl-style-spec": "^26.4.4",
-    "@types/bun": "^1.4.3",
+    "@types/bun": "^1.4.4",
     "@types/leaflet": "^1.9.20",
     "leaflet": "^1.9.4",
-    "maplibre-gl": "^6.13.0"
+    "maplibre-gl": "^6.16.0"
   },
   "homepage": "https://fusion.dev",
   "keywords": [
@@ -66,6 +66,6 @@
     "accessibility"
   ],
   "publishConfig": {
-    "access": "restricted"
+    "access": "public"
   }
 }