leaflet-city-mapper 0.0.3 → 0.0.4

package/src/controls/compassAddHooks.js

@@ -2,14 +2,17 @@ import { compassOrientation } from './compassOrientation.js';
 import { finishCompassPermission } from './finishCompassPermission.js';
 
 export function compassAddHooks() {
-  this._compassGeneration = (this._generation = (this._generation || 0) + 1);
-  this._orientation = { handler: this, handleEvent: compassOrientation };
-  const permission = window.DeviceOrientationEvent?.requestPermission;
-  let request;
-  try {
-    request = permission ? permission.call(window.DeviceOrientationEvent) : 'granted';
-  } catch (error) {
-    request = Promise.reject(error);
-  }
-  Promise.allSettled([Promise.resolve({ handler: this, generation: this._generation }), request]).then(finishCompassPermission);
+  this._compassGeneration = (this._generation = (this._generation || 0) + 1);
+  this._orientation = /* alloc */ { handler: this, handleEvent: compassOrientation };
+  const permission = window.DeviceOrientationEvent?.requestPermission;
+  let request;
+  try {
+    request = permission ? permission.call(window.DeviceOrientationEvent) : 'granted';
+  } catch (error) {
+    request = Promise.reject(error);
+  }
+  Promise.allSettled(/* alloc */ [
+    Promise.resolve(/* alloc */ { handler: this, generation: this._generation }),
+    request,
+  ]).then(finishCompassPermission);
 }

package/src/controls/compassOrientation.js

@@ -1,6 +1,7 @@
+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)) handler._map.setBearing(bearing - orientation);
+  if (Number.isFinite(bearing)) mapSetBearing(handler._map, bearing - orientation);
 }

package/src/controls/containerResizeAddHooks.js

@@ -1,8 +1,8 @@
 import { resizeMap } from './resizeMap.js';
 
 export function containerResizeAddHooks() {
-  const container = this._map.getContainer();
-  container._containerResizeMap = this._map;
-  this._observer = new ResizeObserver(resizeMap);
+  const container = this._map.getContainer();
+  container._containerResizeMap = this._map;
+  this._observer = /* alloc */ new ResizeObserver(resizeMap);
   this._observer.observe(container);
 }

package/src/controls/dragCamera.js

@@ -1,4 +1,8 @@
-import { cameraControlsState } from '../constants/cameraControlsState.js';
+import { cameraDragSensitivity } from '../globals/cameraDragSensitivity.js';
+import { dragStates } from '../globals/dragStates.js';
+import { cameraDrags } from '../globals/cameraDrags.js';
+
+
 import { cameraDragDown } from './cameraDragDown.js';
 import { cameraDragMove } from './cameraDragMove.js';
 import { cameraDragEnd } from './cameraDragEnd.js';
@@ -6,17 +10,17 @@ import { cameraDragClick } from './cameraDragClick.js';
 import { cameraDragContextMenu } from './cameraDragContextMenu.js';
 import { endAllCameraDrags } from './endAllCameraDrags.js';
 
-export function dragCamera(map, element, accept, sensitivity = [0.8, 0.5], orbit = false) {
-  const state = { map, element, accept, sensitivity, orbit, drag: null, moved: false };
-  cameraControlsState.dragStates.set(element, state);
-  cameraControlsState.cameraDrags.add(state);
-  element.addEventListener('pointerdown', cameraDragDown, true);
-  element.addEventListener('pointermove', cameraDragMove);
-  element.addEventListener('pointerup', cameraDragEnd);
-  element.addEventListener('pointercancel', cameraDragEnd);
-  element.addEventListener('lostpointercapture', cameraDragEnd);
-  element.addEventListener('click', cameraDragClick, true);
-  element.addEventListener('contextmenu', cameraDragContextMenu);
-  window.addEventListener('blur', endAllCameraDrags);
-  return 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);
+  cameraDrags.value.add(state);
+  element.addEventListener('pointerdown', cameraDragDown, true);
+  element.addEventListener('pointermove', cameraDragMove);
+  element.addEventListener('pointerup', cameraDragEnd);
+  element.addEventListener('pointercancel', cameraDragEnd);
+  element.addEventListener('lostpointercapture', cameraDragEnd);
+  element.addEventListener('click', cameraDragClick, true);
+  element.addEventListener('contextmenu', cameraDragContextMenu);
+  window.addEventListener('blur', endAllCameraDrags);
+  return state;
 }

package/src/controls/endAllCameraDrags.js

@@ -1,7 +1,9 @@
-import { cameraControlsState } from '../constants/cameraControlsState.js';
+import { cameraDrags } from '../globals/cameraDrags.js';
+
+
 import { finishCameraDrag } from './finishCameraDrag.js';
 
 export function endAllCameraDrags() {
   let state;
-  for (state of cameraControlsState.cameraDrags) finishCameraDrag(state);
+  for (state of cameraDrags.value) finishCameraDrag(state);
 }

package/src/controls/endAllCameraTouches.js

@@ -1,7 +1,9 @@
-import { cameraControlsState } from '../constants/cameraControlsState.js';
+import { cameraTouchStates } from '../globals/cameraTouchStates.js';
+
+
 import { endCameraTouch } from './endCameraTouch.js';
 
 export function endAllCameraTouches() {
   let state;
-  for (state of cameraControlsState.cameraTouchStates) endCameraTouch(state);
+  for (state of cameraTouchStates) endCameraTouch(state);
 }

package/src/controls/endCameraTouch.js

@@ -5,7 +5,8 @@ export function endCameraTouch(state, event) {
   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, { animate: false });
+    map.setZoom(Math.round(map.getZoom() / touch.snap) * touch.snap,
+      /* alloc */ { animate: false });
   }
   state.touch = null;
-}
+}

package/src/controls/endCameraTouchEvent.js

@@ -1,5 +1,8 @@
+import { touchByContainer } from '../globals/touchByContainer.js';
+
+
 import { endCameraTouch } from './endCameraTouch.js';
 
-export function endCameraTouchEvent(event) {
-  endCameraTouch(this._cameraTouchState, event);
+export function endCameraTouchEvent(event) {
+  endCameraTouch(touchByContainer.get(this), event);
 }

package/src/controls/failCompassPermission.js

@@ -0,0 +1,4 @@
+export function failCompassPermission(handler, error) {
+  handler.disable();
+  handler._map.fire('error', /* alloc */ { error });
+}

package/src/controls/finishCompassPermission.js

@@ -1,16 +1,17 @@
+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 {
-    if (!handler.enabled() || handler._generation !== generation) return;
-    if (!window.DeviceOrientationEvent || permissionResult.status !== 'fulfilled' ||
-      permissionResult.value !== 'granted') {
-      throw permissionResult.status === 'rejected' ? permissionResult.reason :
-        new Error('Device compass permission unavailable or denied');
-    }
     window.addEventListener('deviceorientation', handler._orientation);
     window.addEventListener('deviceorientationabsolute', handler._orientation);
   } catch (error) {
-    handler.disable();
-    handler._map.fire('error', { error });
+    failCompassPermission(handler, error);
   }
-}
+}

package/src/controls/loadCameraControls.js

@@ -3,7 +3,7 @@ export async function loadCameraControls(map) {
     const { cameraControls } = await import('./cameraControls.js');
     if (map._container?._leaflet_id) cameraControls(map);
   } catch (error) {
-    map.fire('error', { error });
+    map.fire('error', /* alloc */ { error });
     throw error;
   }
-}
+}

package/src/controls/moveCameraTouch.js

@@ -1,22 +1,29 @@
+import { degrees } from '../globals/degrees.js';
+import { touchByContainer } from '../globals/touchByContainer.js';
+import { cameraByMap } from '../globals/cameraByMap.js';
+
+import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
+
 export function moveCameraTouch(event) {
-  const state = this._cameraTouchState, { map, container, touch } = state;
+  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 middle = new L.Point((a.clientX + b.clientX) / 2, (a.clientY + b.clientY) / 2)
-    .subtract(new L.Point(container.getBoundingClientRect().left, container.getBoundingClientRect().top));
-  const delta = Math.atan2(Math.sin(angle - touch.angle), Math.cos(angle - touch.angle)) * 180 / Math.PI;
-  map._setPitchAndBearing(map.touchPitch.enabled() ? touch.pitch - (middle.y - touch.middle.y) * 0.25 : touch.pitch,
-    map.touchRotate.enabled() ? touch.bearing + delta : touch.bearing);
+  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, cameraByMap.get(map).touchPitch.enabled() ? touch.pitch - (middle.y - touch.middle.y) * 0.25 : touch.pitch, cameraByMap.get(map).touchRotate.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, { animate: false });
+  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(), { animate: false });
+    map.setView(map.unproject(map.project(map.getCenter()).add(projected)), map.getZoom(),
+      /* alloc */ { animate: false });
   }
   event.preventDefault();
   event.stopImmediatePropagation();
-}
+}

package/src/controls/pitchDragAddHooks.js

@@ -1,6 +1,8 @@
+import { cameraDragSensitivity } from '../globals/cameraDragSensitivity.js';
 import { dragCamera } from './dragCamera.js';
 import { acceptPitchDrag } from './acceptPitchDrag.js';
 
+
 export function pitchDragAddHooks() {
-  this._dragState = dragCamera(this._map, this._map.getContainer(), acceptPitchDrag, [0.8, 0.5], true);
+  this._dragState = dragCamera(this._map, this._map.getContainer(), acceptPitchDrag, cameraDragSensitivity, true);
 }

package/src/controls/refreshRotateControl.js

@@ -1,7 +1,10 @@
-export function refreshRotateControl() {
-  const map = this._map, pitch = this.options.visualizePitch ? map.getPitch() : 0;
-  this._arrow.style.transform = `scale(${1 / Math.sqrt(Math.cos(pitch * Math.PI / 180))}) rotateX(${pitch}deg) rotate(${map.getBearing()}deg)`;
-  this._button.setAttribute('aria-description', `Bearing ${Math.round(map.getBearing())} degrees, pitch ${Math.round(map.getPitch())} degrees. Arrow keys adjust the camera; Home resets it.`);
-  this._container.style.display = this.options.closeOnZeroBearing && !map.getBearing() && !pitch &&
-    !this._container.contains(document.activeElement) ? 'none' : '';
+import { radians } from '../globals/radians.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+export function refreshRotateControl() {
+  const map = this._map, pitch = this.options.visualizePitch ? mapGetPitch(map) : 0;
+  this._arrow.style.transform = `scale(${1 / Math.sqrt(Math.max(0.01, Math.abs(Math.cos(pitch * radians))))}) rotateX(${pitch}deg) rotate(${mapGetBearing(map)}deg)`;
+  this._button.setAttribute('aria-description', `Bearing ${Math.round(mapGetBearing(map))} degrees, pitch ${Math.round(mapGetPitch(map))} degrees. Arrow keys adjust the camera; Home resets it.`);
+  this._container.style.display = this.options.closeOnZeroBearing && !mapGetBearing(map) && !pitch &&
+    !this._container.contains(document.activeElement) ? 'none' : '';
 }

package/src/controls/removeCameraDrag.js

@@ -1,10 +1,13 @@
+import { dragStates } from '../globals/dragStates.js';
+import { cameraDrags } from '../globals/cameraDrags.js';
+
 import { finishCameraDrag } from './finishCameraDrag.js';
 import { cameraDragDown } from './cameraDragDown.js';
 import { cameraDragMove } from './cameraDragMove.js';
 import { cameraDragEnd } from './cameraDragEnd.js';
 import { cameraDragClick } from './cameraDragClick.js';
 import { cameraDragContextMenu } from './cameraDragContextMenu.js';
-import { cameraControlsState } from '../constants/cameraControlsState.js';
+
 import { endAllCameraDrags } from './endAllCameraDrags.js';
 
 export function removeCameraDrag(state) {
@@ -17,7 +20,7 @@ export function removeCameraDrag(state) {
   element.removeEventListener('lostpointercapture', cameraDragEnd);
   element.removeEventListener('click', cameraDragClick, true);
   element.removeEventListener('contextmenu', cameraDragContextMenu);
-  cameraControlsState.dragStates.delete(element);
-  cameraControlsState.cameraDrags.delete(state);
-  if (!cameraControlsState.cameraDrags.size) window.removeEventListener('blur', endAllCameraDrags);
+  dragStates.value.delete(element);
+  cameraDrags.value.delete(state);
+  if (!cameraDrags.value.size) window.removeEventListener('blur', endAllCameraDrags);
 }

package/src/controls/rotateButtonClick.js

@@ -1,7 +1,11 @@
+import { cameraFocusOptions } from '../globals/cameraFocusOptions.js';
+import { mapResetNorthPitch } from '../camera/mapResetNorthPitch.js';
+import { mapResetNorth } from '../camera/mapResetNorth.js';
+
 export function rotateButtonClick(event) {
   const control = this._rotateControl, map = control._map;
   event.preventDefault();
-  if (control.options.visualizePitch) map.resetNorthPitch();
-  else map.resetNorth();
-  if (event.detail) map.getContainer().focus({ preventScroll: true });
-}
+  if (control.options.visualizePitch) mapResetNorthPitch(map);
+  else mapResetNorth(map);
+  if (event.detail) map.getContainer().focus(cameraFocusOptions);
+}

package/src/controls/rotateButtonKeydown.js

@@ -1,9 +1,13 @@
+import { mapSetBearing } from '../camera/mapSetBearing.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+import { mapSetPitch } from '../camera/mapSetPitch.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
 export function rotateButtonKeydown(event) {
   const control = this._rotateControl, map = control._map, step = event.shiftKey ? 15 : 5;
-  if (event.key === 'ArrowLeft') map.setBearing(map.getBearing() - step);
-  else if (event.key === 'ArrowRight') map.setBearing(map.getBearing() + step);
-  else if (event.key === 'ArrowUp' && control.options.visualizePitch) map.setPitch(map.getPitch() + step);
-  else if (event.key === 'ArrowDown' && control.options.visualizePitch) map.setPitch(map.getPitch() - step);
+  if (event.key === 'ArrowLeft') mapSetBearing(map, mapGetBearing(map) - step);
+  else if (event.key === 'ArrowRight') mapSetBearing(map, mapGetBearing(map) + step);
+  else if (event.key === 'ArrowUp' && control.options.visualizePitch) mapSetPitch(map, mapGetPitch(map) + step);
+  else if (event.key === 'ArrowDown' && control.options.visualizePitch) mapSetPitch(map, mapGetPitch(map) - step);
   else if (event.key === 'Home' || event.key === ' ') this.click();
   else return;
   event.preventDefault();

package/src/controls/rotateControl.js

@@ -1,3 +1,4 @@
+import { L } from '../globals/L.js';
 export function rotateControl(options) {
-  return new L.Control.Rotate(options);
-}
+  return /* alloc */ new L.Control.Rotate(options);
+}

package/src/controls/rotateOnAdd.js

@@ -1,3 +1,6 @@
+import { L } from '../globals/L.js';
+import { cameraDragSensitivity } from '../globals/cameraDragSensitivity.js';
+import { cameraBearingSensitivity } from '../globals/cameraBearingSensitivity.js';
 import { rotateButtonClick } from './rotateButtonClick.js';
 import { rotateButtonKeydown } from './rotateButtonKeydown.js';
 import { refreshRotateControl } from './refreshRotateControl.js';
@@ -5,34 +8,35 @@ import { dragCamera } from './dragCamera.js';
 import { acceptRotateDrag } from './acceptRotateDrag.js';
 import { refreshRotateFocus } from './refreshRotateFocus.js';
 
+
 export function rotateOnAdd(map) {
-  const container = L.DomUtil.create('div', 'leaflet-control-rotate leaflet-bar');
-  const button = L.DomUtil.create('a', 'leaflet-control-rotate-toggle', container);
-  this._map = map;
-  this._container = container;
-  this._button = button;
-  button._rotateControl = this;
-  button.href = '#';
-  button.draggable = false;
-  button.setAttribute('role', 'button');
-  button.title = this.options.visualizePitch ? 'Reset bearing and pitch' : 'Reset bearing to north';
-  button.setAttribute('aria-label', button.title);
-  button.style.cssText = 'cursor:grab;touch-action:none';
-  const arrow = L.DomUtil.create('span', 'leaflet-control-rotate-arrow', button);
-  this._arrow = arrow;
-  arrow.setAttribute('aria-hidden', 'true');
-  arrow.style.cssText = 'display:block;width:100%;height:100%;pointer-events:none;background: no-repeat center / 29px 29px';
-  arrow.style.backgroundImage = 'url("data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 29 29%27%3E%3Cpath fill=%27%23333%27 d=%27M10.5 14 14.5 6 18.5 14Z%27/%3E%3Cpath fill=%27%23ccc%27 d=%27M10.5 16 14.5 24 18.5 16Z%27/%3E%3C/svg%3E")';
-  button.onclick = rotateButtonClick;
-  button.onkeydown = rotateButtonKeydown;
-  this._refresh = refreshRotateControl;
-  map.on('rotate pitch', this._refresh, this);
-  this._refresh();
-  this._dragState = dragCamera(map, button, acceptRotateDrag,
-    [0.8, this.options.visualizePitch ? 0.5 : 0]);
-  button.addEventListener('focusout', refreshRotateFocus);
-  L.DomEvent.on(button, 'dblclick contextmenu', L.DomEvent.stop);
-  L.DomEvent.disableClickPropagation(container);
-  L.DomEvent.disableScrollPropagation(container);
+  const container = L.DomUtil.create('div', 'leaflet-control-rotate leaflet-bar');
+  const button = L.DomUtil.create('a', 'leaflet-control-rotate-toggle', container);
+  this._map = map;
+  this._container = container;
+  this._button = button;
+  button._rotateControl = this;
+  button.href = '#';
+  button.draggable = false;
+  button.setAttribute('role', 'button');
+  button.title = this.options.visualizePitch ? 'Reset bearing and pitch' : 'Reset bearing to north';
+  button.setAttribute('aria-label', button.title);
+  button.style.cssText = 'cursor:grab;touch-action:none';
+  const arrow = L.DomUtil.create('span', 'leaflet-control-rotate-arrow', button);
+  this._arrow = arrow;
+  arrow.setAttribute('aria-hidden', 'true');
+  arrow.style.cssText = 'display:block;width:100%;height:100%;pointer-events:none;background: no-repeat center / 29px 29px';
+  arrow.style.backgroundImage = 'url("data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 viewBox=%270 0 29 29%27%3E%3Cpath fill=%27%23333%27 d=%27M10.5 14 14.5 6 18.5 14Z%27/%3E%3Cpath fill=%27%23ccc%27 d=%27M10.5 16 14.5 24 18.5 16Z%27/%3E%3C/svg%3E")';
+  button.onclick = rotateButtonClick;
+  button.onkeydown = rotateButtonKeydown;
+  this._refresh = refreshRotateControl;
+  map.on('rotate pitch', this._refresh, this);
+  this._refresh();
+  this._dragState = dragCamera(map, button, acceptRotateDrag,
+    this.options.visualizePitch ? cameraDragSensitivity : cameraBearingSensitivity);
+  button.addEventListener('focusout', refreshRotateFocus);
+  L.DomEvent.on(button, 'dblclick contextmenu', L.DomEvent.stop);
+  L.DomEvent.disableClickPropagation(container);
+  L.DomEvent.disableScrollPropagation(container);
   return container;
 }

package/src/controls/shiftRotateAddHooks.js

@@ -1,8 +1,10 @@
+import { cameraListenerOptions } from '../globals/cameraListenerOptions.js';
 import { shiftRotateWheel } from './shiftRotateWheel.js';
 
+
 export function shiftRotateAddHooks() {
-  const container = this._map.getContainer();
-  container._cameraShiftRotate = this;
-  this._wheel = shiftRotateWheel;
-  container.addEventListener('wheel', this._wheel, { passive: false, capture: true });
+  const container = this._map.getContainer();
+  container._cameraShiftRotate = this;
+  this._wheel = shiftRotateWheel;
+  container.addEventListener('wheel', this._wheel, cameraListenerOptions);
 }

package/src/controls/shiftRotateWheel.js

@@ -1,3 +1,5 @@
+import { mapSetBearing } from '../camera/mapSetBearing.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
 import { editable } from './editable.js';
 
 export function shiftRotateWheel(event) {
@@ -5,5 +7,5 @@ export function shiftRotateWheel(event) {
   if (!event.shiftKey || editable(event.target) || event.target.closest('.leaflet-control')) return;
   event.preventDefault();
   event.stopImmediatePropagation();
-  handler._map.setBearing(handler._map.getBearing() + Math.sign(event.deltaY) * 5);
+  mapSetBearing(handler._map, mapGetBearing(handler._map) + Math.sign(event.deltaY) * 5);
 }

package/src/controls/startCameraTouch.js

@@ -1,23 +1,33 @@
-export function startCameraTouch(event) {
-  const state = this._cameraTouchState, { map, container } = state;
-  if (state.touch || event.touches.length !== 2 || event.target.closest('.leaflet-control')) return;
-  if (!map.touchRotate.enabled() && !map.touchPitch.enabled()) return;
-  const [a, b] = event.touches;
-  if (Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY) < 1) return;
-  map._stopPitchBearingAnimation();
-  const middle = new L.Point((a.clientX + b.clientX) / 2, (a.clientY + b.clientY) / 2)
-    .subtract(new L.Point(container.getBoundingClientRect().left, container.getBoundingClientRect().top));
-  state.touch = {
-    angle: Math.atan2(b.clientY - a.clientY, b.clientX - a.clientX),
-    distance: Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY), middle,
-    anchor: map.containerPointToLatLng(middle), zoom: map.getZoom(),
-    bearing: map.getBearing(), pitch: map.getPitch(), zooming: map.touchZoom?.enabled(),
-    dragging: map.dragging?.enabled(),
-  };
-  map.dragging?.disable();
-  event.preventDefault();
-  event.stopImmediatePropagation();
-  if (state.nativeZoom !== undefined) state.touch.zooming = state.nativeZoom;
-  state.touch.snap = map.options.zoomSnap;
-  map.options.zoomSnap = 0;
+import { L } from '../globals/L.js';
+import { touchByContainer } from '../globals/touchByContainer.js';
+import { cameraByMap } from '../globals/cameraByMap.js';
+
+import { mapStopPitchBearingAnimation } from '../camera/mapStopPitchBearingAnimation.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+
+export function startCameraTouch(event) {
+  const state = touchByContainer.get(this), { map, container } = state;
+  if (state.touch || event.touches.length !== 2 || event.target.closest('.leaflet-control')) return;
+  if (!cameraByMap.get(map).touchRotate.enabled() && !cameraByMap.get(map).touchPitch.enabled()) return;
+  const [a, b] = event.touches;
+  if (Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY) < 1) return;
+  mapStopPitchBearingAnimation(map);
+  const rect = container.getBoundingClientRect();
+  const middle = /* alloc */ new L.Point(
+    (a.clientX + b.clientX) / 2 - rect.left, (a.clientY + b.clientY) / 2 - rect.top);
+  state.touch = /* alloc */ {
+    angle: Math.atan2(b.clientY - a.clientY, b.clientX - a.clientX),
+    distance: Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY), middle,
+    anchor: map.containerPointToLatLng(middle), zoom: map.getZoom(),
+    bearing: mapGetBearing(map), pitch: mapGetPitch(map), zooming: map.touchZoom?.enabled(),
+    dragging: map.dragging?.enabled(),
+    currentMiddle: /* alloc */ new L.Point(middle.x, middle.y),
+  };
+  map.dragging?.disable();
+  event.preventDefault();
+  event.stopImmediatePropagation();
+  if (state.nativeZoom !== undefined) state.touch.zooming = state.nativeZoom;
+  state.touch.snap = map.options.zoomSnap;
+  map.options.zoomSnap = 0;
 }

package/src/core/addImageState.js

@@ -1,7 +1,8 @@
-import { nativeLayerState } from '../constants/nativeLayerState.js';
-
+import { imageStates } from '../globals/imageStates.js';
+
+
 export function addImageState(image, state) {
-  let states = nativeLayerState.imageStates.get(image);
-  if (!states) nativeLayerState.imageStates.set(image, states = new Set());
+  let states = imageStates.get(image);
+  if (!states) imageStates.set(image, states = /* alloc */ new Set());
   states.add(state);
-}
+}

package/src/core/addRasterImage.js

@@ -1,10 +1,12 @@
-import { indexState } from '../constants/indexState.js';
+import { pendingRasterLoads } from '../globals/pendingRasterLoads.js';
+
+
 import { fireRasterLoad } from './fireRasterLoad.js';
 
 export function addRasterImage() {
   if (!this._image) this._initImage();
   if (this._image.complete && this._image.naturalWidth) {
-    indexState.pendingRasterLoads.push(this);
+    pendingRasterLoads.push(this);
     queueMicrotask(fireRasterLoad);
   }
 }

package/src/core/adjustCameraMarkerPan.js

@@ -1,22 +1,28 @@
+import { L } from '../globals/L.js';
+import { dragByHandler } from '../globals/dragByHandler.js';
+
+import { mapGetPitch } from '../camera/mapGetPitch.js';
+import { mapGetBearing } from '../camera/mapGetBearing.js';
+
 import { pointOf } from '../camera/pointOf.js';
 import { scheduleMarkerPan } from './scheduleMarkerPan.js';
 
-export function adjustCameraMarkerPan(event) {
-  const marker = this._marker, map = marker._map;
-  if (!map.getPitch() && !map.getBearing()) return this._cameraOriginalAdjustPan.call(this, event);
-  const screen = L.DomUtil.getPosition(marker._icon).add(map._getMapPanePos());
-  const size = map.getSize(), padding = pointOf(marker.options.autoPanPadding);
-  const speed = marker.options.autoPanSpeed;
-  const movement = new L.Point(
-    (Math.max(0, screen.x - size.x + padding.x) - Math.max(0, padding.x - screen.x)) / Math.max(1, padding.x) * speed,
-    (Math.max(0, screen.y - size.y + padding.y) - Math.max(0, padding.y - screen.y)) / Math.max(1, padding.y) * speed);
-  if (!movement.x && !movement.y) return;
-  const pane = map._getMapPanePos();
-  map.panBy(movement, { animate: false });
-  const shift = pane.subtract(map._getMapPanePos());
-  this._draggable._newPos._add(shift);
-  this._draggable._startPos._add(shift);
-  L.DomUtil.setPosition(marker._icon, this._draggable._newPos);
-  this._onDrag(event);
-  scheduleMarkerPan(this, event);
+export function adjustCameraMarkerPan(event) {
+  const marker = this._marker, map = marker._map;
+  if (!mapGetPitch(map) && !mapGetBearing(map)) return dragByHandler.get(this)._cameraOriginalAdjustPan.call(this, event);
+  const screen = L.DomUtil.getPosition(marker._icon).add(map._getMapPanePos());
+  const size = map.getSize(), padding = pointOf(marker.options.autoPanPadding);
+  const speed = marker.options.autoPanSpeed;
+  const movement = screen;
+  movement.x = (Math.max(0, screen.x - size.x + padding.x) - Math.max(0, padding.x - screen.x)) / Math.max(1, padding.x) * speed;
+  movement.y = (Math.max(0, screen.y - size.y + padding.y) - Math.max(0, padding.y - screen.y)) / Math.max(1, padding.y) * speed;
+  if (!movement.x && !movement.y) return;
+  const pane = map._getMapPanePos();
+  map.panBy(movement, /* alloc */ { animate: false });
+  const shift = pane.subtract(map._getMapPanePos());
+  this._draggable._newPos._add(shift);
+  this._draggable._startPos._add(shift);
+  L.DomUtil.setPosition(marker._icon, this._draggable._newPos);
+  this._onDrag(event);
+  scheduleMarkerPan(this, event);
 }

package/src/core/beforeNativeRender.js

@@ -5,6 +5,6 @@ export function beforeNativeRender(state) {
     synchronizeNativeLayer(state);
   } catch (error) {
     state.failed = true;
-    state.source.fire('error', { error });
+    state.source.fire('error', /* alloc */ { error });
   }
 }

package/src/core/boundsQuad.js

@@ -1,11 +1,12 @@
 import { localPosition } from './localPosition.js';
 
 export function boundsQuad(state, bounds) {
-  const corners = [
-    bounds.getNorthWest(), bounds.getNorthEast(), bounds.getSouthWest(), bounds.getSouthEast(),
-  ];
-  const positions = [];
-  let corner;
-  for (corner of corners) positions.push(localPosition(state, corner));
+  const positions = /* alloc */ [];
+  let i, corner;
+  for (i = 0; i < 4; i++) {
+    corner = i === 0 ? bounds.getNorthWest() : i === 1 ? bounds.getNorthEast()
+      : i === 2 ? bounds.getSouthWest() : bounds.getSouthEast();
+    positions.push(localPosition(state, corner));
+  }
   return positions;
 }

package/src/core/bringNativeLayerToBack.js

@@ -1,3 +1,8 @@
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+
+import { reorderNativeLayer } from './reorderNativeLayer.js';
+
 export function bringNativeLayerToBack(layer = this) {
-  layer?._nativeGPU?.reorder?.(false);
+  const native = sceneByLayer.get(layer)?._nativeGPU;
+  if (native?.backend && !native.disposed) reorderNativeLayer.call(native, false);
 }

package/src/core/bringNativeLayerToFront.js

@@ -1,3 +1,8 @@
+import { sceneByLayer } from '../globals/sceneByLayer.js';
+
+import { reorderNativeLayer } from './reorderNativeLayer.js';
+
 export function bringNativeLayerToFront(layer = this) {
-  layer?._nativeGPU?.reorder?.(true);
+  const native = sceneByLayer.get(layer)?._nativeGPU;
+  if (native?.backend && !native.disposed) reorderNativeLayer.call(native, true);
 }