leaflet-city-mapper 0.0.9 → 0.1.1

package/src/controls/acceptRotateDrag.js

@@ -1,3 +1,10 @@
-export function acceptRotateDrag(event) {
-  return event.button === 0;
+/**
+ * Accept a primary-button drag on the rotate control.
+ *
+ * @param {PointerEvent} event Pointer event.
+ *
+ * @returns {boolean} Whether the drag can start.
+ */
+export function acceptRotateDrag(event) {
+  return event.button === 0;
 }

package/src/controls/addCameraHandler.js

@@ -1,11 +1,18 @@
-
-import { cameraHandlersByMap } from '../weakmaps/cameraHandlersByMap.js';
-
-export function addCameraHandler(map, name, Type) {
-  let handlers = cameraHandlersByMap.get(map);
-  if (!handlers) cameraHandlersByMap.set(map, handlers = /* alloc */ new Map());
-  const handler = /* alloc */ new Type(map);
-  handlers.set(name, handler);
-  map._handlers.push(handler);
-  if (map.options[name]) handler.enable();
-}
+
+import { cameraHandlersByMap } from '../weakmaps/cameraHandlersByMap.js';
+
+/**
+ * Register a camera handler and enable it when its map option is set.
+ *
+ * @param {L.Map} map Map owning the handler.
+ * @param {string} name Handler and option name.
+ * @param {Function} Type Handler constructor.
+ */
+export function addCameraHandler(map, name, Type) {
+  let handlers = cameraHandlersByMap.get(map);
+  if (!handlers) cameraHandlersByMap.set(map, handlers = /* alloc */ new Map());
+  const handler = /* alloc */ new Type(map);
+  handlers.set(name, handler);
+  map._handlers.push(handler);
+  if (map.options[name]) handler.enable();
+}

package/src/controls/adjustCameraDrag.js

@@ -1,16 +1,14 @@
 import { cameraDraggableByMap } from '../weakmaps/cameraDraggableByMap.js';
-
-
 import { mapGetPitch } from '../camera/mapGetPitch.js';
 import { mapGetBearing } from '../camera/mapGetBearing.js';
-
 import { project } from '../projections/projectCameraPoint.js';
 
-export function adjustCameraDrag() {
-  const map = this;
-  const draggable = cameraDraggableByMap.get(map);
-  if (!mapGetPitch(map) && !mapGetBearing(map)) return;
-  const half = map.getSize().divideBy(2), delta = draggable._newPos.subtract(draggable._startPos);
-  const ground = half.subtract(project(map, half.subtract(delta), true));
-  draggable._newPos = draggable._startPos.add(ground);
+/** Convert this map's draggable displacement into ground-space camera movement. */
+export function adjustCameraDrag() {
+  const map = this;
+  const draggable = cameraDraggableByMap.get(map);
+  if (!mapGetPitch(map) && !mapGetBearing(map)) return;
+  const half = map.getSize().divideBy(2), delta = draggable._newPos.subtract(draggable._startPos);
+  const ground = half.subtract(project(map, half.subtract(delta), true));
+  draggable._newPos = draggable._startPos.add(ground);
 }

package/src/controls/cameraControls.js

@@ -3,7 +3,6 @@ import { cameraHandlersByMap } from '../weakmaps/cameraHandlersByMap.js';
 import { rotateControlByMap } from '../weakmaps/rotateControlByMap.js';
 import { touchPitchByMap } from '../weakmaps/touchPitchByMap.js';
 import { touchRotateByMap } from '../weakmaps/touchRotateByMap.js';
-
 import { L } from '../globals/L.js';
 import { Compass } from '../globals/Compass.js';
 import { ContainerResize } from '../globals/ContainerResize.js';
@@ -15,9 +14,6 @@ import { cameraTouchStates } from '../globals/cameraTouchStates.js';
 import { cameraListenerOptions } from '../globals/cameraListenerOptions.js';
 import { cameraEmptyOptions } from '../globals/cameraEmptyOptions.js';
 import { notifyCameraTouchChange } from './notifyCameraTouchChange.js';
-
-
-
 import { rotateOnAdd } from './rotateOnAdd.js';
 import { rotateOnRemove } from './rotateOnRemove.js';
 import { rotateControl } from './rotateControl.js';
@@ -75,6 +71,11 @@ L.Control.Rotate = RotateControl;
 
 if (L.control) L.control.rotate = rotateControl;
 
+/**
+ * Install camera handlers, touch listeners and the optional rotate control.
+ *
+ * @param {L.Map} map Map receiving the controls.
+ */
 export function cameraControls(map) {
   addCameraHandler(map, 'trackContainerMutation', ContainerResize.value);
   if (!map.options.rotate) return;

package/src/controls/cameraDragClick.js

@@ -1,6 +1,10 @@
 import { dragStates } from '../weakmaps/dragStates.js';
 
-
+/**
+ * Suppress the click following a camera drag.
+ *
+ * @param {MouseEvent} event Click event.
+ */
 export function cameraDragClick(event) {
   const state = dragStates.value.get(this);
   if (!state.moved) return;

package/src/controls/cameraDragContextMenu.js

@@ -1,9 +1,13 @@
 import { dragStates } from '../weakmaps/dragStates.js';
 
-
-export function cameraDragContextMenu(event) {
-  const state = dragStates.value.get(this);
-  if (!state.drag && !state.moved) return;
-  event.preventDefault();
-  event.stopPropagation();
+/**
+ * Suppress the context menu while or after a camera drag.
+ *
+ * @param {MouseEvent} event Context-menu event.
+ */
+export function cameraDragContextMenu(event) {
+  const state = dragStates.value.get(this);
+  if (!state.drag && !state.moved) return;
+  event.preventDefault();
+  event.stopPropagation();
 }

package/src/controls/cameraDragDown.js

@@ -1,9 +1,12 @@
 import { dragStates } from '../weakmaps/dragStates.js';
 import { cameraFocusOptions } from '../globals/cameraFocusOptions.js';
-
-
 import { editable } from './isEditableTarget.js';
 
+/**
+ * Begin an accepted camera pointer drag and temporarily disable map dragging.
+ *
+ * @param {PointerEvent} event Pointer-down event.
+ */
 export function cameraDragDown(event) {
   const state = dragStates.value.get(this);
   if (state.drag || !state.accept(event) || editable(event.target)) return;

package/src/controls/cameraDragEnd.js

@@ -1,7 +1,11 @@
 import { dragStates } from '../weakmaps/dragStates.js';
-
 import { finishCameraDrag } from './finishCameraDrag.js';
 
-export function cameraDragEnd(event) {
-  finishCameraDrag(dragStates.value.get(this), event);
+/**
+ * Finish the camera drag associated with this element.
+ *
+ * @param {PointerEvent} event Pointer completion event.
+ */
+export function cameraDragEnd(event) {
+  finishCameraDrag(dragStates.value.get(this), event);
 }

package/src/controls/cameraDragMove.js

@@ -1,28 +1,32 @@
 import { degrees } from '../globals/degrees.js';
 import { dragStates } from '../weakmaps/dragStates.js';
-
 import { mapStopPitchBearingAnimation } from '../animations/mapStopPitchBearingAnimation.js';
 import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
 import { mapGetPitch } from '../camera/mapGetPitch.js';
 import { mapGetBearing } from '../camera/mapGetBearing.js';
 
-export function cameraDragMove(event) {
-  const state = dragStates.value.get(this);
-  if (!state.drag || state.drag.id !== event.pointerId) return;
-  const x = event.clientX - state.drag.x, y = event.clientY - state.drag.y;
-  if (Math.hypot(x, y) < 3 && !state.moved) return;
-  mapStopPitchBearingAnimation(state.map);
-  state.moved = true;
-  event.preventDefault();
-  let bearing = x * state.sensitivity[0];
-  if (state.orbit) {
-    if (Math.abs(state.drag.cy - state.drag.y) > 100) {
-      const angle = Math.atan2(event.clientY - state.drag.cy, event.clientX - state.drag.cx) -
-        Math.atan2(event.clientY - state.drag.cy, state.drag.x - state.drag.cx);
-      bearing = Math.atan2(Math.sin(angle), Math.cos(angle)) * degrees;
-    } else bearing *= event.clientY < state.drag.cy ? 1 : -1;
-  }
-  mapSetPitchAndBearing(state.map, mapGetPitch(state.map) - y * state.sensitivity[1], mapGetBearing(state.map) + bearing);
-  state.drag.x = event.clientX;
-  state.drag.y = event.clientY;
+/**
+ * Update camera pitch and bearing from an active pointer drag.
+ *
+ * @param {PointerEvent} event Pointer-move event.
+ */
+export function cameraDragMove(event) {
+  const state = dragStates.value.get(this);
+  if (!state.drag || state.drag.id !== event.pointerId) return;
+  const x = event.clientX - state.drag.x, y = event.clientY - state.drag.y;
+  if (Math.hypot(x, y) < 3 && !state.moved) return;
+  mapStopPitchBearingAnimation(state.map);
+  state.moved = true;
+  event.preventDefault();
+  let bearing = x * state.sensitivity[0];
+  if (state.orbit) {
+    if (Math.abs(state.drag.cy - state.drag.y) > 100) {
+      const angle = Math.atan2(event.clientY - state.drag.cy, event.clientX - state.drag.cx) -
+        Math.atan2(event.clientY - state.drag.cy, state.drag.x - state.drag.cx);
+      bearing = Math.atan2(Math.sin(angle), Math.cos(angle)) * degrees;
+    } else bearing *= event.clientY < state.drag.cy ? 1 : -1;
+  }
+  mapSetPitchAndBearing(state.map, mapGetPitch(state.map) - y * state.sensitivity[1], mapGetBearing(state.map) + bearing);
+  state.drag.x = event.clientX;
+  state.drag.y = event.clientY;
 }

package/src/controls/changeCameraTouch.js

@@ -1,20 +1,18 @@
 import { cameraTouchStateByMap } from '../weakmaps/cameraTouchStateByMap.js';
 import { touchPitchByMap } from '../weakmaps/touchPitchByMap.js';
 import { touchRotateByMap } from '../weakmaps/touchRotateByMap.js';
-
-
-
 import { endCameraTouch } from './endCameraTouch.js';
 
-export function changeCameraTouch() {
-  const state = cameraTouchStateByMap.get(this), { map, container } = state;
-  const active = touchRotateByMap.get(map).enabled() || touchPitchByMap.get(map).enabled();
-  if (active && state.nativeZoom === undefined) {
-    state.nativeZoom = map.touchZoom?.enabled();
-    map.touchZoom?.disable();
-  } else if (!active && state.nativeZoom !== undefined) {
-    endCameraTouch(state);
-    if (state.nativeZoom && container._leaflet_id) map.touchZoom.enable();
-    state.nativeZoom = undefined;
-  }
+/** Coordinate this map's native touch zoom with its camera touch handlers. */
+export function changeCameraTouch() {
+  const state = cameraTouchStateByMap.get(this), { map, container } = state;
+  const active = touchRotateByMap.get(map).enabled() || touchPitchByMap.get(map).enabled();
+  if (active && state.nativeZoom === undefined) {
+    state.nativeZoom = map.touchZoom?.enabled();
+    map.touchZoom?.disable();
+  } else if (!active && state.nativeZoom !== undefined) {
+    endCameraTouch(state);
+    if (state.nativeZoom && container._leaflet_id) map.touchZoom.enable();
+    state.nativeZoom = undefined;
+  }
 }

package/src/controls/cleanupCameraTouch.js

@@ -1,18 +1,15 @@
 import { cameraTouchStateByMap } from '../weakmaps/cameraTouchStateByMap.js';
 import { rotateControlByMap } from '../weakmaps/rotateControlByMap.js';
-
 import { cameraTouchStates } from '../globals/cameraTouchStates.js';
 import { touchByContainer } from '../weakmaps/touchByContainer.js';
-
-
 import { endCameraTouch } from './endCameraTouch.js';
 import { startCameraTouch } from './startCameraTouch.js';
 import { moveCameraTouch } from './moveCameraTouch.js';
 import { endCameraTouchEvent } from './endCameraTouchEvent.js';
-
 import { endAllCameraTouches } from './endAllCameraTouches.js';
 import { changeCameraTouch } from './changeCameraTouch.js';
 
+/** Remove this map's camera touch listeners, state and rotate control. */
 export function cleanupCameraTouch() {
   const state = cameraTouchStateByMap.get(this);
   if (!state) return;

package/src/controls/compassAddHooks.js

@@ -1,6 +1,7 @@
 import { compassOrientation } from './compassOrientation.js';
 import { finishCompassPermission } from './finishCompassPermission.js';
 
+/** Request device compass permission for this handler and install listeners when granted. */
 export function compassAddHooks() {
   this._compassGeneration = (this._generation = (this._generation || 0) + 1);
   this._orientation = /* alloc */ { handler: this, handleEvent: compassOrientation };

package/src/controls/compassOrientation.js

@@ -1,7 +1,13 @@
 import { mapSetBearing } from '../camera/mapSetBearing.js';
-export function compassOrientation(event) {
-  const handler = this.handler;
-  const bearing = Number.isFinite(event.webkitCompassHeading) ? -event.webkitCompassHeading : event.alpha;
-  const orientation = event.absolute ? 0 : (screen.orientation?.angle ?? window.orientation ?? 0);
-  if (Number.isFinite(bearing)) mapSetBearing(handler._map, bearing - orientation);
+
+/**
+ * Update the handler's map bearing from a device orientation event.
+ *
+ * @param {DeviceOrientationEvent} event Device orientation reading.
+ */
+export function compassOrientation(event) {
+  const handler = this.handler;
+  const bearing = Number.isFinite(event.webkitCompassHeading) ? -event.webkitCompassHeading : event.alpha;
+  const orientation = event.absolute ? 0 : (screen.orientation?.angle ?? window.orientation ?? 0);
+  if (Number.isFinite(bearing)) mapSetBearing(handler._map, bearing - orientation);
 }

package/src/controls/compassRemoveHooks.js

@@ -1,5 +1,6 @@
+/** Invalidate pending compass permission and remove this handler's orientation listeners. */
 export function compassRemoveHooks() {
-  this._generation++;
-  window.removeEventListener('deviceorientation', this._orientation);
+  this._generation++;
+  window.removeEventListener('deviceorientation', this._orientation);
   window.removeEventListener('deviceorientationabsolute', this._orientation);
 }

package/src/controls/containerResizeAddHooks.js

@@ -1,5 +1,6 @@
 import { resizeMap } from './resizeMap.js';
 
+/** Observe this handler's map container for size changes. */
 export function containerResizeAddHooks() {
   const container = this._map.getContainer();
   container._containerResizeMap = this._map;

package/src/controls/containerResizeRemoveHooks.js

@@ -1,5 +1,6 @@
+/** Disconnect this handler's container resize observer. */
 export function containerResizeRemoveHooks() {
-  const container = this._map.getContainer();
-  this._observer.disconnect();
+  const container = this._map.getContainer();
+  this._observer.disconnect();
   delete container._containerResizeMap;
 }

package/src/controls/dragCamera.js

@@ -1,8 +1,6 @@
 import { cameraDragSensitivity } from '../globals/cameraDragSensitivity.js';
 import { dragStates } from '../weakmaps/dragStates.js';
 import { cameraDrags } from '../globals/cameraDrags.js';
-
-
 import { cameraDragDown } from './cameraDragDown.js';
 import { cameraDragMove } from './cameraDragMove.js';
 import { cameraDragEnd } from './cameraDragEnd.js';
@@ -10,6 +8,17 @@ import { cameraDragClick } from './cameraDragClick.js';
 import { cameraDragContextMenu } from './cameraDragContextMenu.js';
 import { endAllCameraDrags } from './endAllCameraDrags.js';
 
+/**
+ * Install camera drag listeners on an element.
+ *
+ * @param {L.Map} map Map to manipulate.
+ * @param {HTMLElement} element Drag target.
+ * @param {Function} accept Predicate for starting a drag.
+ * @param {Array<number>} [sensitivity] Bearing and pitch sensitivities.
+ * @param {boolean} [orbit] Whether horizontal movement can orbit around the map center.
+ *
+ * @returns {Object} Registered drag state.
+ */
 export function dragCamera(map, element, accept, sensitivity = cameraDragSensitivity, orbit = false) {
   const state = /* alloc */ { map, element, accept, sensitivity, orbit, drag: null, moved: false };
   dragStates.value.set(element, state);

package/src/controls/endAllCameraDrags.js

@@ -1,8 +1,7 @@
 import { cameraDrags } from '../globals/cameraDrags.js';
-
-
 import { finishCameraDrag } from './finishCameraDrag.js';
 
+/** Finish every active camera drag, such as when the window loses focus. */
 export function endAllCameraDrags() {
   let state;
   for (state of cameraDrags.value) finishCameraDrag(state);

package/src/controls/endAllCameraTouches.js

@@ -1,8 +1,7 @@
 import { cameraTouchStates } from '../globals/cameraTouchStates.js';
-
-
 import { endCameraTouch } from './endCameraTouch.js';
 
+/** End all active camera touch gestures. */
 export function endAllCameraTouches() {
   let state;
   for (state of cameraTouchStates) endCameraTouch(state);

package/src/controls/endCameraTouch.js

@@ -1,12 +1,18 @@
-export function endCameraTouch(state, event) {
-  if (!state.touch) return;
-  if (event?.touches?.length >= 2) return;
-  const { map, container, touch } = state;
-  if (touch.dragging && container._leaflet_id) map.dragging.enable();
-  map.options.zoomSnap = touch.snap;
-  if (touch.zooming && touch.snap && container._leaflet_id) {
-    map.setZoom(Math.round(map.getZoom() / touch.snap) * touch.snap,
-      /* alloc */ { animate: false });
-  }
-  state.touch = null;
-}
+/**
+ * End a camera touch gesture and restore map dragging and zoom snapping.
+ *
+ * @param {Object} state Camera touch state.
+ * @param {TouchEvent} [event] Touch completion event.
+ */
+export function endCameraTouch(state, event) {
+  if (!state.touch) return;
+  if (event?.touches?.length >= 2) return;
+  const { map, container, touch } = state;
+  if (touch.dragging && container._leaflet_id) map.dragging.enable();
+  map.options.zoomSnap = touch.snap;
+  if (touch.zooming && touch.snap && container._leaflet_id) {
+    map.setZoom(Math.round(map.getZoom() / touch.snap) * touch.snap,
+      /* alloc */ { animate: false });
+  }
+  state.touch = null;
+}

package/src/controls/endCameraTouchEvent.js

@@ -1,8 +1,11 @@
 import { touchByContainer } from '../weakmaps/touchByContainer.js';
-
-
 import { endCameraTouch } from './endCameraTouch.js';
 
+/**
+ * End the camera touch gesture associated with this container.
+ *
+ * @param {TouchEvent} event Touch completion event.
+ */
 export function endCameraTouchEvent(event) {
   endCameraTouch(touchByContainer.get(this), event);
 }

package/src/controls/failCompassPermission.js

@@ -1,4 +1,10 @@
-export function failCompassPermission(handler, error) {
-  handler.disable();
-  handler._map.fire('error', /* alloc */ { error });
-}
+/**
+ * Disable a compass handler and emit its permission error.
+ *
+ * @param {Object} handler Compass handler.
+ * @param {Error} error Permission or listener error.
+ */
+export function failCompassPermission(handler, error) {
+  handler.disable();
+  handler._map.fire('error', /* alloc */ { error });
+}

package/src/controls/finishCameraDrag.js

@@ -1,9 +1,15 @@
-export function finishCameraDrag(state, event) {
-  if (!state?.drag) return;
-  if (event?.pointerId !== undefined && event.pointerId !== state.drag.id) return;
-  const finished = state.drag;
-  state.drag = null;
-  if (state.element.hasPointerCapture?.(finished.id)) state.element.releasePointerCapture(finished.id);
-  if (finished.dragging && state.map.getContainer()._leaflet_id) state.map.dragging.enable();
-  state.element.style.cursor = finished.cursor;
+/**
+ * Finish an active camera drag and restore pointer capture, map dragging and cursor.
+ *
+ * @param {Object} state Camera drag state.
+ * @param {PointerEvent} [event] Pointer completion event.
+ */
+export function finishCameraDrag(state, event) {
+  if (!state?.drag) return;
+  if (event?.pointerId !== undefined && event.pointerId !== state.drag.id) return;
+  const finished = state.drag;
+  state.drag = null;
+  if (state.element.hasPointerCapture?.(finished.id)) state.element.releasePointerCapture(finished.id);
+  if (finished.dragging && state.map.getContainer()._leaflet_id) state.map.dragging.enable();
+  state.element.style.cursor = finished.cursor;
 }

package/src/controls/finishCompassPermission.js

@@ -1,17 +1,24 @@
-import { failCompassPermission } from './failCompassPermission.js';
-
-export function finishCompassPermission([handlerResult, permissionResult]) {
-  const { handler, generation } = handlerResult.value;
-  if (!handler.enabled() || handler._generation !== generation) return;
-  if (!window.DeviceOrientationEvent || permissionResult.status !== 'fulfilled' ||
-    permissionResult.value !== 'granted') {
-    return failCompassPermission(handler, permissionResult.status === 'rejected' ? permissionResult.reason :
-      /* alloc */ new Error('Device compass permission unavailable or denied'));
-  }
-  try {
-    window.addEventListener('deviceorientation', handler._orientation);
-    window.addEventListener('deviceorientationabsolute', handler._orientation);
-  } catch (error) {
-    failCompassPermission(handler, error);
-  }
-}
+import { failCompassPermission } from './failCompassPermission.js';
+
+/**
+ * Install compass listeners if the current permission request succeeded.
+ *
+ * @param {Array<Object>} results Settled handler-generation and permission results.
+ *
+ * @returns {*} Permission failure handler result when permission is unavailable or denied.
+ */
+export function finishCompassPermission([handlerResult, permissionResult]) {
+  const { handler, generation } = handlerResult.value;
+  if (!handler.enabled() || handler._generation !== generation) return;
+  if (!window.DeviceOrientationEvent || permissionResult.status !== 'fulfilled' ||
+    permissionResult.value !== 'granted') {
+    return failCompassPermission(handler, permissionResult.status === 'rejected' ? permissionResult.reason :
+      /* alloc */ new Error('Device compass permission unavailable or denied'));
+  }
+  try {
+    window.addEventListener('deviceorientation', handler._orientation);
+    window.addEventListener('deviceorientationabsolute', handler._orientation);
+  } catch (error) {
+    failCompassPermission(handler, error);
+  }
+}

package/src/controls/isEditableTarget.js

@@ -1,3 +1,10 @@
-export function editable(target) {
-  return target.closest?.('input,textarea,select,[contenteditable="true"]');
+/**
+ * Find an editable ancestor of an event target.
+ *
+ * @param {Element} target Event target.
+ *
+ * @returns {Element|null|undefined} Editable ancestor, if supported and found.
+ */
+export function editable(target) {
+  return target.closest?.('input,textarea,select,[contenteditable="true"]');
 }

package/src/controls/loadCameraControls.js

@@ -1,9 +1,18 @@
-export async function loadCameraControls(map) {
-  try {
-    const { cameraControls } = await import('./cameraControls.js');
-    if (map._container?._leaflet_id) cameraControls(map);
-  } catch (error) {
-    map.fire('error', /* alloc */ { error });
-    throw error;
-  }
-}
+/**
+ * Load and initialize camera controls for a map that is still mounted.
+ *
+ * @param {L.Map} map Map receiving the controls.
+ *
+ * @returns {Promise<void>} Completion of control loading.
+ *
+ * @throws {Error} If loading or initialization fails, after emitting a map error.
+ */
+export async function loadCameraControls(map) {
+  try {
+    const { cameraControls } = await import('./cameraControls.js');
+    if (map._container?._leaflet_id) cameraControls(map);
+  } catch (error) {
+    map.fire('error', /* alloc */ { error });
+    throw error;
+  }
+}

package/src/controls/moveCameraTouch.js

@@ -1,31 +1,34 @@
 import { touchPitchByMap } from '../weakmaps/touchPitchByMap.js';
 import { touchRotateByMap } from '../weakmaps/touchRotateByMap.js';
-
 import { degrees } from '../globals/degrees.js';
 import { touchByContainer } from '../weakmaps/touchByContainer.js';
-
-import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
-
-export function moveCameraTouch(event) {
-  const state = touchByContainer.get(this), { map, container, touch } = state;
-  if (!touch || event.touches.length !== 2) return;
-  const [a, b] = event.touches;
-  const angle = Math.atan2(b.clientY - a.clientY, b.clientX - a.clientX);
-  const rect = container.getBoundingClientRect(), middle = touch.currentMiddle;
-  middle.x = (a.clientX + b.clientX) / 2 - rect.left;
-  middle.y = (a.clientY + b.clientY) / 2 - rect.top;
-  const delta = Math.atan2(Math.sin(angle - touch.angle), Math.cos(angle - touch.angle)) * degrees;
-  mapSetPitchAndBearing(map, touchPitchByMap.get(map).enabled() ? touch.pitch - (middle.y - touch.middle.y) * 0.25 : touch.pitch, touchRotateByMap.get(map).enabled() ? touch.bearing + delta : touch.bearing);
-  const distance = Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY);
-  if (distance < 1) return;
-  const zoom = touch.zooming ? Math.max(map.getMinZoom(), Math.min(map.getMaxZoom(),
-    touch.zoom + Math.log2(distance / touch.distance))) : touch.zoom;
-  map.setView(map.getCenter(), zoom, /* alloc */ { animate: false });
-  if (map.options.touchZoom !== 'center') {
-    const projected = map.project(touch.anchor).subtract(map.project(map.containerPointToLatLng(middle)));
-    map.setView(map.unproject(map.project(map.getCenter()).add(projected)), map.getZoom(),
-      /* alloc */ { animate: false });
-  }
-  event.preventDefault();
-  event.stopImmediatePropagation();
-}
+import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
+
+/**
+ * Update camera angles and anchored zoom during a two-finger gesture.
+ *
+ * @param {TouchEvent} event Touch-move event.
+ */
+export function moveCameraTouch(event) {
+  const state = touchByContainer.get(this), { map, container, touch } = state;
+  if (!touch || event.touches.length !== 2) return;
+  const [a, b] = event.touches;
+  const angle = Math.atan2(b.clientY - a.clientY, b.clientX - a.clientX);
+  const rect = container.getBoundingClientRect(), middle = touch.currentMiddle;
+  middle.x = (a.clientX + b.clientX) / 2 - rect.left;
+  middle.y = (a.clientY + b.clientY) / 2 - rect.top;
+  const delta = Math.atan2(Math.sin(angle - touch.angle), Math.cos(angle - touch.angle)) * degrees;
+  mapSetPitchAndBearing(map, touchPitchByMap.get(map).enabled() ? touch.pitch - (middle.y - touch.middle.y) * 0.25 : touch.pitch, touchRotateByMap.get(map).enabled() ? touch.bearing + delta : touch.bearing);
+  const distance = Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY);
+  if (distance < 1) return;
+  const zoom = touch.zooming ? Math.max(map.getMinZoom(), Math.min(map.getMaxZoom(),
+    touch.zoom + Math.log2(distance / touch.distance))) : touch.zoom;
+  map.setView(map.getCenter(), zoom, /* alloc */ { animate: false });
+  if (map.options.touchZoom !== 'center') {
+    const projected = map.project(touch.anchor).subtract(map.project(map.containerPointToLatLng(middle)));
+    map.setView(map.unproject(map.project(map.getCenter()).add(projected)), map.getZoom(),
+      /* alloc */ { animate: false });
+  }
+  event.preventDefault();
+  event.stopImmediatePropagation();
+}

package/src/controls/notifyCameraTouchChange.js

@@ -1 +1,2 @@
+/** Notify this handler's map that its camera touch configuration changed. */
 export function notifyCameraTouchChange() { this._map.fire('cameratouchchange'); }