@trackunit/react-map-adapter-google 0.0.152 → 0.0.154

package/index.cjs.js

@@ -5,6 +5,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var reactGoogleMaps = require('@vis.gl/react-google-maps');
 var react = require('react');
 var geoJsonUtils = require('@trackunit/geo-json-utils');
+var reactMapDraw = require('@trackunit/react-map-draw');
 var markerclusterer = require('@googlemaps/markerclusterer');
 var reactMapColorUtils = require('@trackunit/react-map-color-utils');
 var esToolkit = require('es-toolkit');
@@ -55,6 +56,29 @@ const GoogleApiProvider = ({ apiKey, language, children }) => {
     return (jsxRuntime.jsx(reactGoogleMaps.APIProvider, { apiKey: apiKey, language: language, libraries: libraries, version: GOOGLE_MAPS_API_VERSION, children: children }));
 };
 
+/**
+ * Builds the Google Maps bridge for the shared drawing engine (ADR 0030).
+ *
+ * One loader per `google.maps.Map` instance: theme switches and traffic toggles
+ * recreate the map, and `GoogleMapsAdapterInstance.connect` hands the controller a
+ * fresh loader each time so the engine is rebuilt on the live map. Terra Draw and its
+ * Google adapter are only downloaded when the loader runs, which the controller
+ * defers until drawing is actually needed.
+ */
+const createGoogleDrawEngineLoader = (map) => async () => {
+    const { TerraDrawGoogleMapsAdapter } = await import('terra-draw-google-maps-adapter');
+    return reactMapDraw.loadTerraDrawEngine({
+        adapter: new TerraDrawGoogleMapsAdapter({
+            lib: google.maps,
+            map,
+            // Keep drawn features in their own Data layer so nothing else on the map
+            // (or a future layer port feature) shares styling or click handling with them.
+            isolatedData: true,
+            coordinatePrecision: reactMapDraw.DRAW_COORDINATE_PRECISION,
+        }),
+    });
+};
+
 let runtimePromise = null;
 /**
  * Lazily dynamic-imports {@link createDeckGlGoogleMapsOverlayRuntime} and caches the promise.
@@ -2900,6 +2924,7 @@ class GoogleMapsAdapterInstance {
             initializationFailed: reactMapAdapterShared.INITIAL_MAP_STATE.initializationFailed,
             appearance: reactMapAdapterShared.INITIAL_MAP_STATE.appearance,
             tileSize: reactMapAdapterShared.INITIAL_MAP_STATE.tileSize,
+            drawing: reactMapAdapterShared.INITIAL_MAP_STATE.drawing,
         };
         this.cameraListeners = new Set();
         this.statusListeners = new Set();
@@ -2933,6 +2958,11 @@ class GoogleMapsAdapterInstance {
         };
         this.layers = new GoogleMapsLayerPort();
         this.layers.setTheme(this.appearance.theme);
+        // Engine load failures are not surfaced here (same as the deck.gl runtime): the
+        // controller keeps mode and value and loads again on the next connect, setMode
+        // or setValue that needs an engine.
+        this.draw = new reactMapDraw.DrawController();
+        this.draw.subscribe(() => this.syncDrawingStatus());
         this.state = reactMapAdapterShared.computeInitialState(this.appearance, config.initialViewport);
         this.cachedCameraState = {
             center: this.state.center,
@@ -2945,6 +2975,7 @@ class GoogleMapsAdapterInstance {
             initializationFailed: this.state.initializationFailed,
             appearance: this.state.appearance,
             tileSize: this.state.tileSize,
+            drawing: this.state.drawing,
         };
     }
     // ============================================================================
@@ -2981,11 +3012,13 @@ class GoogleMapsAdapterInstance {
         // `state` to defaults while `this.appearance` keeps the real values, so a
         // StrictMode destroy → revive would otherwise report stale defaults, and the
         // appearance controls' sync-back would overwrite persisted preferences with them.
-        this.state = { ...this.state, appearance: this.appearance };
+        this.state = { ...this.state, appearance: this.appearance, drawing: this.draw.getMode() !== "idle" };
         this.updateStatusCache();
         this.layers.connect(map);
-        // Theme changes recreate the google.maps.Map, so traffic must re-attach on every (re)connect
+        // Theme changes recreate the google.maps.Map, so traffic and drawing must re-attach on every (re)connect.
+        // The draw controller rebuilds its engine from the committed value on the new map (ADR 0030).
         this.syncTrafficLayer();
+        this.draw.connect(createGoogleDrawEngineLoader(map));
         this.setupEventListeners();
         this.layers.setPointerMoveReporter(position => {
             this.reportPointerMove(position);
@@ -3216,6 +3249,7 @@ class GoogleMapsAdapterInstance {
         this.removeGoogleEventListeners();
         this.trafficLayer?.setMap(null);
         this.trafficLayer = null;
+        this.draw.disconnect();
         this.layers.setPointerMoveReporter(null);
         this.layers.destroy();
         // Clear our listeners
@@ -3373,8 +3407,17 @@ class GoogleMapsAdapterInstance {
         this.cachedCameraState = { center, zoom, bounds, isIdle };
     }
     updateStatusCache() {
-        const { isReady, initializationFailed, appearance, tileSize } = this.state;
-        this.cachedStatus = { isReady, initializationFailed, appearance, tileSize };
+        const { isReady, initializationFailed, appearance, tileSize, drawing } = this.state;
+        this.cachedStatus = { isReady, initializationFailed, appearance, tileSize, drawing };
+    }
+    /** Mirrors the draw controller's mode into `MapStatus.drawing` (ADR 0030). */
+    syncDrawingStatus() {
+        const drawing = this.draw.getMode() !== "idle";
+        if (this.state.drawing === drawing)
+            return;
+        this.state = { ...this.state, drawing };
+        this.updateStatusCache();
+        this.notifyStatusListeners();
     }
     notifyCameraListeners() {
         this.cameraListeners.forEach(listener => listener());

package/index.esm.js

@@ -4,6 +4,7 @@ import { jsx } from 'react/jsx-runtime';
 import { APIProvider, RenderingType, APIProviderContext, useMap, useApiLoadingStatus, APILoadingStatus, Map as Map$1 } from '@vis.gl/react-google-maps';
 import { useMemo, useCallback, useSyncExternalStore, useId, useContext, useEffect } from 'react';
 import { validateBbox, validatePosition } from '@trackunit/geo-json-utils';
+import { loadTerraDrawEngine, DRAW_COORDINATE_PRECISION, DrawController } from '@trackunit/react-map-draw';
 import { MarkerClusterer, SuperClusterAlgorithm } from '@googlemaps/markerclusterer';
 import { colorWithOpacity } from '@trackunit/react-map-color-utils';
 import { isEqual } from 'es-toolkit';
@@ -54,6 +55,29 @@ const GoogleApiProvider = ({ apiKey, language, children }) => {
     return (jsx(APIProvider, { apiKey: apiKey, language: language, libraries: libraries, version: GOOGLE_MAPS_API_VERSION, children: children }));
 };
 
+/**
+ * Builds the Google Maps bridge for the shared drawing engine (ADR 0030).
+ *
+ * One loader per `google.maps.Map` instance: theme switches and traffic toggles
+ * recreate the map, and `GoogleMapsAdapterInstance.connect` hands the controller a
+ * fresh loader each time so the engine is rebuilt on the live map. Terra Draw and its
+ * Google adapter are only downloaded when the loader runs, which the controller
+ * defers until drawing is actually needed.
+ */
+const createGoogleDrawEngineLoader = (map) => async () => {
+    const { TerraDrawGoogleMapsAdapter } = await import('terra-draw-google-maps-adapter');
+    return loadTerraDrawEngine({
+        adapter: new TerraDrawGoogleMapsAdapter({
+            lib: google.maps,
+            map,
+            // Keep drawn features in their own Data layer so nothing else on the map
+            // (or a future layer port feature) shares styling or click handling with them.
+            isolatedData: true,
+            coordinatePrecision: DRAW_COORDINATE_PRECISION,
+        }),
+    });
+};
+
 let runtimePromise = null;
 /**
  * Lazily dynamic-imports {@link createDeckGlGoogleMapsOverlayRuntime} and caches the promise.
@@ -2899,6 +2923,7 @@ class GoogleMapsAdapterInstance {
             initializationFailed: INITIAL_MAP_STATE.initializationFailed,
             appearance: INITIAL_MAP_STATE.appearance,
             tileSize: INITIAL_MAP_STATE.tileSize,
+            drawing: INITIAL_MAP_STATE.drawing,
         };
         this.cameraListeners = new Set();
         this.statusListeners = new Set();
@@ -2932,6 +2957,11 @@ class GoogleMapsAdapterInstance {
         };
         this.layers = new GoogleMapsLayerPort();
         this.layers.setTheme(this.appearance.theme);
+        // Engine load failures are not surfaced here (same as the deck.gl runtime): the
+        // controller keeps mode and value and loads again on the next connect, setMode
+        // or setValue that needs an engine.
+        this.draw = new DrawController();
+        this.draw.subscribe(() => this.syncDrawingStatus());
         this.state = computeInitialState(this.appearance, config.initialViewport);
         this.cachedCameraState = {
             center: this.state.center,
@@ -2944,6 +2974,7 @@ class GoogleMapsAdapterInstance {
             initializationFailed: this.state.initializationFailed,
             appearance: this.state.appearance,
             tileSize: this.state.tileSize,
+            drawing: this.state.drawing,
         };
     }
     // ============================================================================
@@ -2980,11 +3011,13 @@ class GoogleMapsAdapterInstance {
         // `state` to defaults while `this.appearance` keeps the real values, so a
         // StrictMode destroy → revive would otherwise report stale defaults, and the
         // appearance controls' sync-back would overwrite persisted preferences with them.
-        this.state = { ...this.state, appearance: this.appearance };
+        this.state = { ...this.state, appearance: this.appearance, drawing: this.draw.getMode() !== "idle" };
         this.updateStatusCache();
         this.layers.connect(map);
-        // Theme changes recreate the google.maps.Map, so traffic must re-attach on every (re)connect
+        // Theme changes recreate the google.maps.Map, so traffic and drawing must re-attach on every (re)connect.
+        // The draw controller rebuilds its engine from the committed value on the new map (ADR 0030).
         this.syncTrafficLayer();
+        this.draw.connect(createGoogleDrawEngineLoader(map));
         this.setupEventListeners();
         this.layers.setPointerMoveReporter(position => {
             this.reportPointerMove(position);
@@ -3215,6 +3248,7 @@ class GoogleMapsAdapterInstance {
         this.removeGoogleEventListeners();
         this.trafficLayer?.setMap(null);
         this.trafficLayer = null;
+        this.draw.disconnect();
         this.layers.setPointerMoveReporter(null);
         this.layers.destroy();
         // Clear our listeners
@@ -3372,8 +3406,17 @@ class GoogleMapsAdapterInstance {
         this.cachedCameraState = { center, zoom, bounds, isIdle };
     }
     updateStatusCache() {
-        const { isReady, initializationFailed, appearance, tileSize } = this.state;
-        this.cachedStatus = { isReady, initializationFailed, appearance, tileSize };
+        const { isReady, initializationFailed, appearance, tileSize, drawing } = this.state;
+        this.cachedStatus = { isReady, initializationFailed, appearance, tileSize, drawing };
+    }
+    /** Mirrors the draw controller's mode into `MapStatus.drawing` (ADR 0030). */
+    syncDrawingStatus() {
+        const drawing = this.draw.getMode() !== "idle";
+        if (this.state.drawing === drawing)
+            return;
+        this.state = { ...this.state, drawing };
+        this.updateStatusCache();
+        this.notifyStatusListeners();
     }
     notifyCameraListeners() {
         this.cameraListeners.forEach(listener => listener());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-map-adapter-google",
-  "version": "0.0.152",
+  "version": "0.0.154",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -14,14 +14,16 @@
     "@loaders.gl/core": "~4.5.2",
     "@luma.gl/core": "^9.4.1",
     "@luma.gl/engine": "^9.4.1",
-    "@trackunit/react-map-adapter-shared": "0.0.162",
-    "@trackunit/react-map-color-utils": "0.0.136",
-    "@trackunit/geo-json-utils": "1.18.10",
+    "@trackunit/react-map-adapter-shared": "0.0.164",
+    "@trackunit/react-map-color-utils": "0.0.138",
+    "@trackunit/geo-json-utils": "1.19.0",
     "@googlemaps/markerclusterer": "^2.6.2",
     "@vis.gl/react-google-maps": "^1.7.1",
     "es-toolkit": "^1.52.0",
     "react-device-detect": "^2.2.3",
-    "zod": "^3.25.76"
+    "zod": "^3.25.76",
+    "@trackunit/react-map-draw": "0.0.2",
+    "terra-draw-google-maps-adapter": "^1.6.2"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/GoogleMapsAdapterInstance.d.ts

@@ -1,4 +1,5 @@
 import { type AdapterInstance, type BaseAdapterConfig, type CameraState, type FitBoundsOptions, type GeoJsonBbox, type GeoJsonPosition, type MapEvent, type MapEventHandler, type MapStatus, type MapTheme, type MapType } from "@trackunit/react-map-adapter-shared";
+import { DrawController } from "@trackunit/react-map-draw";
 import { GoogleMapsLayerPort } from "./GoogleMapsLayerPort";
 /**
  * Configuration for Google Maps adapter
@@ -21,6 +22,11 @@ export declare class GoogleMapsAdapterInstance implements AdapterInstance {
     private readonly config;
     /** Layer rendering capabilities, provided via MapLayerContext to <Layers>. */
     readonly layers: GoogleMapsLayerPort;
+    /**
+     * Drawing capability (ADR 0030). The controller keeps mode and value across map
+     * recreations; `connect()` rebinds it to every new `google.maps.Map`.
+     */
+    readonly draw: DrawController;
     private map;
     private isDestroyedFlag;
     private state;
@@ -104,6 +110,8 @@ export declare class GoogleMapsAdapterInstance implements AdapterInstance {
     private mapTypeToGoogleMapTypeId;
     private updateCameraCache;
     private updateStatusCache;
+    /** Mirrors the draw controller's mode into `MapStatus.drawing` (ADR 0030). */
+    private syncDrawingStatus;
     private notifyCameraListeners;
     private notifyStatusListeners;
     private emitEvent;

package/src/draw/createGoogleDrawEngineLoader.d.ts

@@ -0,0 +1,11 @@
+import { type DrawEngineLoader } from "@trackunit/react-map-draw";
+/**
+ * Builds the Google Maps bridge for the shared drawing engine (ADR 0030).
+ *
+ * One loader per `google.maps.Map` instance: theme switches and traffic toggles
+ * recreate the map, and `GoogleMapsAdapterInstance.connect` hands the controller a
+ * fresh loader each time so the engine is rebuilt on the live map. Terra Draw and its
+ * Google adapter are only downloaded when the loader runs, which the controller
+ * defers until drawing is actually needed.
+ */
+export declare const createGoogleDrawEngineLoader: (map: google.maps.Map) => DrawEngineLoader;