leaflet-city-mapper 0.0.4 → 0.0.6

package/src/controls/cameraControls.js

@@ -1,11 +1,16 @@
+import { cameraTouchStateByMap } from '../weakmaps/cameraTouchStateByMap.js';
+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';
 import { PitchDrag } from '../globals/PitchDrag.js';
 import { ShiftRotate } from '../globals/ShiftRotate.js';
 import { TouchMode } from '../globals/TouchMode.js';
-import { cameraByMap } from '../globals/cameraByMap.js';
-import { touchByContainer } from '../globals/touchByContainer.js';
+import { touchByContainer } from '../weakmaps/touchByContainer.js';
 import { cameraTouchStates } from '../globals/cameraTouchStates.js';
 import { cameraListenerOptions } from '../globals/cameraListenerOptions.js';
 import { cameraEmptyOptions } from '../globals/cameraEmptyOptions.js';
@@ -73,8 +78,11 @@ export function cameraControls(map) {
   addCameraHandler(map, 'compassBearing', Compass.value);
   addCameraHandler(map, 'touchRotate', TouchMode.value);
   addCameraHandler(map, 'touchPitch', TouchMode.value);
+  touchRotateByMap.set(map, cameraHandlersByMap.get(map).get('touchRotate'));
+  touchPitchByMap.set(map, cameraHandlersByMap.get(map).get('touchPitch'));
   const container = map.getContainer();
-  const state = cameraByMap.get(map)._cameraTouchState = /* alloc */ { map, container, touch: null, nativeZoom: undefined };
+  const state = /* alloc */ { map, container, touch: null, nativeZoom: undefined };
+  cameraTouchStateByMap.set(map, state);
   touchByContainer.set(container, state);
   cameraTouchStates.add(state);
   container.addEventListener('touchstart', startCameraTouch, cameraListenerOptions);
@@ -83,9 +91,10 @@ export function cameraControls(map) {
   container.addEventListener('touchcancel', endCameraTouchEvent, true);
   window.addEventListener('blur', endAllCameraTouches);
   map.on('cameratouchchange', changeCameraTouch, map);
+  changeCameraTouch.call(map);
   if (map.options.rotateControl) {
-    cameraByMap.get(map).rotateControl = /* alloc */ new L.Control.Rotate(typeof map.options.rotateControl === 'object' ? map.options.rotateControl : cameraEmptyOptions);
-    cameraByMap.get(map).rotateControl.addTo(map);
+    rotateControlByMap.set(map, /* alloc */ new L.Control.Rotate(typeof map.options.rotateControl === 'object' ? map.options.rotateControl : cameraEmptyOptions));
+    rotateControlByMap.get(map).addTo(map);
   }
   map.once('unload', cleanupCameraTouch, map);
 }

package/src/controls/cameraDragClick.js

@@ -1,10 +1,10 @@
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 
 
-export function cameraDragClick(event) {
-  const state = dragStates.value.get(this);
-  if (!state.moved) return;
-  event.preventDefault();
-  event.stopPropagation();
-  state.moved = false;
+export function cameraDragClick(event) {
+  const state = dragStates.value.get(this);
+  if (!state.moved) return;
+  event.preventDefault();
+  event.stopPropagation();
+  state.moved = false;
 }

package/src/controls/cameraDragContextMenu.js

@@ -1,4 +1,4 @@
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 
 
 export function cameraDragContextMenu(event) {

package/src/controls/cameraDragDown.js

@@ -1,8 +1,8 @@
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 import { cameraFocusOptions } from '../globals/cameraFocusOptions.js';
 
 
-import { editable } from './editable.js';
+import { editable } from './isEditableTarget.js';
 
 export function cameraDragDown(event) {
   const state = dragStates.value.get(this);

package/src/controls/cameraDragEnd.js

@@ -1,4 +1,4 @@
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 
 import { finishCameraDrag } from './finishCameraDrag.js';
 

package/src/controls/cameraDragMove.js

@@ -1,7 +1,7 @@
 import { degrees } from '../globals/degrees.js';
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 
-import { mapStopPitchBearingAnimation } from '../camera/mapStopPitchBearingAnimation.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';

package/src/controls/changeCameraTouch.js

@@ -1,11 +1,14 @@
-import { cameraByMap } from '../globals/cameraByMap.js';
+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 = cameraByMap.get(this)._cameraTouchState, { map, container } = state;
-  const active = cameraByMap.get(map).touchRotate.enabled() || cameraByMap.get(map).touchPitch.enabled();
+  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();

package/src/controls/cleanupCameraTouch.js

@@ -1,6 +1,8 @@
-import { cameraByMap } from '../globals/cameraByMap.js';
+import { cameraTouchStateByMap } from '../weakmaps/cameraTouchStateByMap.js';
+import { rotateControlByMap } from '../weakmaps/rotateControlByMap.js';
+
 import { cameraTouchStates } from '../globals/cameraTouchStates.js';
-import { touchByContainer } from '../globals/touchByContainer.js';
+import { touchByContainer } from '../weakmaps/touchByContainer.js';
 
 
 import { endCameraTouch } from './endCameraTouch.js';
@@ -12,7 +14,7 @@ import { endAllCameraTouches } from './endAllCameraTouches.js';
 import { changeCameraTouch } from './changeCameraTouch.js';
 
 export function cleanupCameraTouch() {
-  const state = cameraByMap.get(this)._cameraTouchState;
+  const state = cameraTouchStateByMap.get(this);
   if (!state) return;
   const { container, map } = state;
   endCameraTouch(state);
@@ -23,7 +25,7 @@ export function cleanupCameraTouch() {
   cameraTouchStates.delete(state);
   if (!cameraTouchStates.size) window.removeEventListener('blur', endAllCameraTouches);
   map.off('cameratouchchange', changeCameraTouch, map);
-  cameraByMap.get(map).rotateControl?.remove();
+  rotateControlByMap.get(map)?.remove();
   touchByContainer.delete(container);
-  delete cameraByMap.get(map)._cameraTouchState;
+  cameraTouchStateByMap.delete(map);
 }

package/src/controls/dragCamera.js

@@ -1,5 +1,5 @@
 import { cameraDragSensitivity } from '../globals/cameraDragSensitivity.js';
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 import { cameraDrags } from '../globals/cameraDrags.js';
 
 

package/src/controls/endCameraTouchEvent.js

@@ -1,4 +1,4 @@
-import { touchByContainer } from '../globals/touchByContainer.js';
+import { touchByContainer } from '../weakmaps/touchByContainer.js';
 
 
 import { endCameraTouch } from './endCameraTouch.js';

package/src/controls/moveCameraTouch.js

@@ -1,6 +1,8 @@
+import { touchPitchByMap } from '../weakmaps/touchPitchByMap.js';
+import { touchRotateByMap } from '../weakmaps/touchRotateByMap.js';
+
 import { degrees } from '../globals/degrees.js';
-import { touchByContainer } from '../globals/touchByContainer.js';
-import { cameraByMap } from '../globals/cameraByMap.js';
+import { touchByContainer } from '../weakmaps/touchByContainer.js';
 
 import { mapSetPitchAndBearing } from '../camera/mapSetPitchAndBearing.js';
 
@@ -13,7 +15,7 @@ export function moveCameraTouch(event) {
   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);
+  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(),

package/src/controls/removeCameraDrag.js

@@ -1,4 +1,4 @@
-import { dragStates } from '../globals/dragStates.js';
+import { dragStates } from '../weakmaps/dragStates.js';
 import { cameraDrags } from '../globals/cameraDrags.js';
 
 import { finishCameraDrag } from './finishCameraDrag.js';

package/src/controls/shiftRotateWheel.js

@@ -1,6 +1,6 @@
 import { mapSetBearing } from '../camera/mapSetBearing.js';
 import { mapGetBearing } from '../camera/mapGetBearing.js';
-import { editable } from './editable.js';
+import { editable } from './isEditableTarget.js';
 
 export function shiftRotateWheel(event) {
   const handler = this._cameraShiftRotate;

package/src/controls/startCameraTouch.js

@@ -1,15 +1,17 @@
+import { touchPitchByMap } from '../weakmaps/touchPitchByMap.js';
+import { touchRotateByMap } from '../weakmaps/touchRotateByMap.js';
+
 import { L } from '../globals/L.js';
-import { touchByContainer } from '../globals/touchByContainer.js';
-import { cameraByMap } from '../globals/cameraByMap.js';
+import { touchByContainer } from '../weakmaps/touchByContainer.js';
 
-import { mapStopPitchBearingAnimation } from '../camera/mapStopPitchBearingAnimation.js';
+import { mapStopPitchBearingAnimation } from '../animations/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;
+  if (!touchRotateByMap.get(map).enabled() && !touchPitchByMap.get(map).enabled()) return;
   const [a, b] = event.touches;
   if (Math.hypot(b.clientX - a.clientX, b.clientY - a.clientY) < 1) return;
   mapStopPitchBearingAnimation(map);

package/src/core/adjustCameraMarkerPan.js

@@ -1,11 +1,11 @@
 import { L } from '../globals/L.js';
-import { dragByHandler } from '../globals/dragByHandler.js';
+import { dragByHandler } from '../weakmaps/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';
+import { pointOf } from '../projections/toPoint.js';
+import { scheduleMarkerPan } from '../animations/scheduleMarkerPan.js';
 
 export function adjustCameraMarkerPan(event) {
   const marker = this._marker, map = marker._map;

package/src/core/cameraCircleBounds.js

@@ -1,4 +1,4 @@
-import { boundsMethods } from '../globals/boundsMethods.js';
+import { boundsMethods } from '../weakmaps/boundsMethods.js';
 
 
 export function cameraCircleBounds() {

package/src/core/cameraMarkerDrag.js

@@ -1,4 +1,4 @@
-import { dragByHandler } from '../globals/dragByHandler.js';
+import { dragByHandler } from '../weakmaps/dragByHandler.js';
 
 
 import { cameraMarkerOnDrag } from './cameraMarkerOnDrag.js';

package/src/core/cameraMarkerOnDrag.js

@@ -1,5 +1,5 @@
 import { L } from '../globals/L.js';
-import { dragByHandler } from '../globals/dragByHandler.js';
+import { dragByHandler } from '../weakmaps/dragByHandler.js';
 
 
 

package/src/core/closestCameraLayerPoint.js

@@ -1,4 +1,4 @@
-import { closestMethods } from '../globals/closestMethods.js';
+import { closestMethods } from '../weakmaps/closestMethods.js';
 
 
 export function closestCameraLayerPoint(point) {

package/src/core/initializeGridContainer.js

@@ -1,4 +1,4 @@
-import { gridInitializers } from '../globals/gridInitializers.js';
+import { gridInitializers } from '../weakmaps/gridInitializers.js';
 
 
 export function initializeGridContainer() {

package/src/core/initializeNativeLayer.js

@@ -1,26 +1,27 @@
+import { kindByLayer } from '../weakmaps/kindByLayer.js';
+
 import { L } from '../globals/L.js';
-import { sceneByLayer } from '../globals/sceneByLayer.js';
-import { closestMethods } from '../globals/closestMethods.js';
-import { boundsMethods } from '../globals/boundsMethods.js';
-import { gridInitializers } from '../globals/gridInitializers.js';
+import { closestMethods } from '../weakmaps/closestMethods.js';
+import { boundsMethods } from '../weakmaps/boundsMethods.js';
+import { gridInitializers } from '../weakmaps/gridInitializers.js';
 
 
 import { noOperation } from '../utils/noOperation.js';
 import { emptyEvents } from '../scene/emptyEvents.js';
-import { refreshNativeLayerContract } from './refreshNativeLayerContract.js';
+import { refreshNativeLayerContract } from '../native/refreshNativeLayerContract.js';
 
 import { closestCameraLayerPoint } from './closestCameraLayerPoint.js';
 import { cameraCircleBounds } from './cameraCircleBounds.js';
 import { initializeGridContainer } from './initializeGridContainer.js';
 import { updateGridOpacity } from './updateGridOpacity.js';
-import { addRasterImage } from './addRasterImage.js';
+import { addRasterImage } from '../textures/attachRasterImage.js';
 import { redrawPath } from './redrawPath.js';
 
 export function initializeNativeLayer() {
   if (this instanceof L.Polyline || this instanceof L.CircleMarker) {
     this.beforeAdd = this._updateBounds = noOperation;
     this.redraw = redrawPath;
-    sceneByLayer.get(this).kind = 'path';
+    kindByLayer.set(this, 'path');
     if (this instanceof L.Polyline) {
       closestMethods.set(this, this.closestLayerPoint);
       this.closestLayerPoint = closestCameraLayerPoint;
@@ -34,7 +35,7 @@ export function initializeNativeLayer() {
     this._initContainer = initializeGridContainer;
     this._updateOpacity = updateGridOpacity;
   } else if (this instanceof L.ImageOverlay && !(this instanceof L.VideoOverlay) && !(this instanceof L.SVGOverlay)) {
-    sceneByLayer.get(this).kind = 'image';
+    kindByLayer.set(this, 'image');
     this._reset = refreshNativeLayerContract;
   }
 }

package/src/core/layerCallInitHooks.js

@@ -1,12 +1,13 @@
-import { sceneByLayer } from '../globals/sceneByLayer.js';
+import { sceneLayers } from '../weakmaps/sceneLayers.js';
+
 import { layerCallInitHooks as sharedLayerCallInitHooks } from '../globals/layerCallInitHooks.js';
 
 
 import { initializeNativeLayer } from './initializeNativeLayer.js';
 
 export function layerCallInitHooks() {
-  if (!sceneByLayer.has(this)) {
-    sceneByLayer.set(this, /* alloc */ {});
+  if (!sceneLayers.has(this)) {
+    sceneLayers.add(this);
   }
   const initialized = this._initHooksCalled;
   sharedLayerCallInitHooks.value.call(this);

package/src/core/markerSetIcon.js

@@ -2,7 +2,7 @@ import { L } from '../globals/L.js';
 import { markerMethods } from '../globals/markerMethods.js';
 
 
-import { initNativeGPU } from './initNativeGPU.js';
+import { initNativeGPU } from '../native/initNativeGPU.js';
 
 export function markerSetIcon(icon) {
   if (!(icon instanceof L.DivIcon)) icon.options.crossOrigin ||= true;

package/src/core/markerSetPos.js

@@ -1,8 +1,8 @@
 import { markerMethods } from '../globals/markerMethods.js';
 
-import { markerCameraIconPoint } from './markerCameraIconPoint.js';
+import { markerCameraIconPoint } from '../projections/markerCameraIconPoint.js';
 
-import { displayPoint } from '../camera/displayPoint.js';
+import { displayPoint } from '../projections/displayContainerPoint.js';
 
 export function markerSetPos(point) {
   markerMethods.value._setPos.call(this, displayPoint(this._map, point));

package/src/core/markerSetRotation.js

@@ -1,4 +1,4 @@
-import { refreshNativeLayerContract } from './refreshNativeLayerContract.js';
+import { refreshNativeLayerContract } from '../native/refreshNativeLayerContract.js';
 
 export function markerSetRotation(marker, rotation) {
   if (!Number.isFinite(rotation)) throw /* alloc */ new TypeError('Marker rotation must be finite');

package/src/core/markerUpdateZIndex.js

@@ -1,12 +1,13 @@
+import { cameraZIndexOffsetByLayer } from '../weakmaps/cameraZIndexOffsetByLayer.js';
+
 import { markerMethods } from '../globals/markerMethods.js';
-import { sceneByLayer } from '../globals/sceneByLayer.js';
 
 
 
 export function markerUpdateZIndex(offset) {
   markerMethods.value._updateZIndex.call(this, offset);
-  const changed = sceneByLayer.get(this)._cameraZIndexOffset !== offset;
-  sceneByLayer.get(this)._cameraZIndexOffset = offset;
+  const changed = cameraZIndexOffsetByLayer.get(this) !== offset;
+  cameraZIndexOffsetByLayer.set(this, offset);
   if (changed) refreshNativeLayerContract(this);
 }
-import { refreshNativeLayerContract } from './refreshNativeLayerContract.js';
+import { refreshNativeLayerContract } from '../native/refreshNativeLayerContract.js';

package/src/core/popupAdjustPan.js

@@ -3,7 +3,7 @@ import { popupPan } from '../globals/popupPan.js';
 import { mapGetPitch } from '../camera/mapGetPitch.js';
 import { mapGetBearing } from '../camera/mapGetBearing.js';
 
-import { pointOf } from '../camera/pointOf.js';
+import { pointOf } from '../projections/toPoint.js';
 
 export function popupAdjustPan() {
   const map = this._map;

package/src/core/popupUpdatePosition.js

@@ -2,7 +2,7 @@ import { L } from '../globals/L.js';
 import { popupPosition } from '../globals/popupPosition.js';
 
 
-import { displayPoint } from '../camera/displayPoint.js';
+import { displayPoint } from '../projections/displayContainerPoint.js';
 
 export function popupUpdatePosition() {
   popupPosition.value.call(this);

package/src/core/redrawPath.js

@@ -1,4 +1,4 @@
-import { refreshNativeLayerContract } from './refreshNativeLayerContract.js';
+import { refreshNativeLayerContract } from '../native/refreshNativeLayerContract.js';
 
 export function redrawPath() {
   refreshNativeLayerContract(this);

package/src/core/removeLayer.js

@@ -1,5 +1,6 @@
+import { kindByLayer } from '../weakmaps/kindByLayer.js';
+
 import { L } from '../globals/L.js';
-import { sceneByLayer } from '../globals/sceneByLayer.js';
 import { removeLayer as sharedRemoveLayer } from '../globals/removeLayer.js';
 
 import { removeSceneLayer } from '../scene/removeSceneLayer.js';
@@ -9,8 +10,8 @@ import { removeSceneLayer } from '../scene/removeSceneLayer.js';
 export function removeLayer(layer) {
   const id = L.Util.stamp(layer);
   if (!this._layers[id]) return this;
-  const state = sceneByLayer.get(layer);
-  if (!state.kind) return sharedRemoveLayer.value.call(this, layer);
+
+  if (!kindByLayer.get(layer)) return sharedRemoveLayer.value.call(this, layer);
   if (this._loaded) removeSceneLayer(layer, this);
   delete this._layers[id];
   if (this._loaded) {

package/src/core/tooltipSetPosition.js

@@ -2,7 +2,7 @@ import { L } from '../globals/L.js';
 import { tooltipPosition } from '../globals/tooltipPosition.js';
 
 
-import { displayPoint } from '../camera/displayPoint.js';
+import { displayPoint } from '../projections/displayContainerPoint.js';
 
 export function tooltipSetPosition(point) {
   tooltipPosition.value.call(this, point);

package/src/core/updateGridOpacity.js

@@ -1,6 +1,6 @@
 
-import { cancelGridFade } from './cancelGridFade.js';
-import { scheduleGridFade } from './scheduleGridFade.js';
+import { cancelGridFade } from '../animations/cancelGridFade.js';
+import { scheduleGridFade } from '../animations/scheduleGridFade.js';
 
 export function updateGridOpacity() {
   if (!this._map) return;
@@ -24,4 +24,4 @@ export function updateGridOpacity() {
   cancelGridFade(layer);
   if (fading) scheduleGridFade(layer);
 }
-import { refreshNativeLayerContract } from './refreshNativeLayerContract.js';
+import { refreshNativeLayerContract } from '../native/refreshNativeLayerContract.js';

package/src/core/whenReady.js

@@ -0,0 +1,11 @@
+import { readyByLayer } from '../weakmaps/readyByLayer.js';
+import { cameraReadyByMap } from '../weakmaps/cameraReadyByMap.js';
+
+
+
+
+
+export function ready(instance) {
+  return readyByLayer.get(instance) ||
+    cameraReadyByMap.get(instance) || Promise.resolve(instance);
+}

package/src/geometry/addBridges.js

@@ -1,5 +1,10 @@
+import { bridgeMeshByLayer } from '../weakmaps/bridgeMeshByLayer.js';
+import { bridgesByLayer } from '../weakmaps/bridgesByLayer.js';
+import { locationByLayer } from '../weakmaps/locationByLayer.js';
+import { rootByLayer } from '../weakmaps/rootByLayer.js';
+import { terrainZoomByLayer } from '../weakmaps/terrainZoomByLayer.js';
+
 import { radians } from '../globals/radians.js';
-import { sceneByLayer } from '../globals/sceneByLayer.js';
 import { createMesh } from '../rendering/createMesh.js';
 import { bridgePolygon } from './bridgePolygon.js';
 
@@ -8,13 +13,13 @@ import { bridgePolygon } from './bridgePolygon.js';
  * Polygon/MultiPolygon with Z, e.g. IGN BD TOPO), and one mesh draws the 1.2 m thick decks.
  * ponytail: anything under a deck (quays, boats asking `getElevation`) also gets the deck height.
  */
-export function addBridges(backend, geojson) {
-  const map = backend._map, crs = map.options.crs, zoom = sceneByLayer.get(backend)._terrainZoom;
-  const origin = crs.project(sceneByLayer.get(backend).location), metres = Math.cos(sceneByLayer.get(backend).location.lat * radians);
-  const base = sceneByLayer.get(backend).root.position[1];
+export function addBridges(layer, geojson) {
+  const map = layer._map, crs = map.options.crs, zoom = terrainZoomByLayer.get(layer);
+  const origin = crs.project(locationByLayer.get(layer)), metres = Math.cos(locationByLayer.get(layer).lat * radians);
+  const base = rootByLayer.get(layer).position[1];
   const position = /* alloc */ [], normal = /* alloc */ [], color = /* alloc */ [];
-  sceneByLayer.get(backend)._bridges = /* alloc */ new Map();
-  const context = /* alloc */ { backend, map, crs, zoom, origin, metres, base, position, normal, color };
+  bridgesByLayer.set(layer, /* alloc */ new Map());
+  const context = /* alloc */ { backend: layer, map, crs, zoom, origin, metres, base, position, normal, color };
   let geometry, polygons, polygonIndex;
   for ({ geometry } of geojson.features) {
     if (geometry.type !== 'Polygon' && geometry.type !== 'MultiPolygon') continue;
@@ -24,6 +29,6 @@ export function addBridges(backend, geojson) {
     }
   }
   if (position.length) {
-    sceneByLayer.get(backend)._bridgeMesh = createMesh(backend, /* alloc */ { position, normal, color });
+    bridgeMeshByLayer.set(layer, createMesh(layer, /* alloc */ { position, normal, color }));
   }
 }

package/src/{sources → geometry}/addGeneratedTriangle.js

@@ -1,6 +1,6 @@
 import { triangleContexts } from '../globals/triangleContexts.js';
 
-import { addTriangle } from './addTriangle.js';
+import { addTriangle } from './appendAreaTriangle.js';
 
 export function addGeneratedTriangle(...args) {
   addTriangle(triangleContexts[triangleContexts.length - 1], ...args);

package/src/{sources/addTriangle.js → geometry/appendAreaTriangle.js}

@@ -1,7 +1,7 @@
-import { groundOffset } from './groundOffset.js';
-
+import { groundOffset } from '../sources/groundOffset.js';
+
 export function addTriangle(context, a, ah, b, bh, c, ch, nx, ny, nz, color) {
-  const { backend, positions, normals, colors, uvs } = context;
+  const { backend: layer, positions, normals, colors, uvs } = context;
   const ux = b.x - a.x, uy = bh - ah, uz = a.y - b.y;
   const vx = c.x - a.x, vy = ch - ah, vz = a.y - c.y;
   if ((uy * vz - uz * vy) * nx + (uz * vx - ux * vz) * ny + (ux * vy - uy * vx) * nz < 0) {
@@ -13,5 +13,5 @@ export function addTriangle(context, a, ah, b, bh, c, ch, nx, ny, nz, color) {
     c.x, ch + groundOffset(c), -c.y);
   normals.push(nx, ny, nz, nx, ny, nz, nx, ny, nz);
   colors.push(color.r, color.g, color.b, color.r, color.g, color.b, color.r, color.g, color.b);
-  if (backend.options.nightLight) uvs.push(...a.uv, ...b.uv, ...c.uv);
-}
+  if (layer.options.nightLight) uvs.push(...a.uv, ...b.uv, ...c.uv);
+}

package/src/geometry/assembleAreaGeometry.js

@@ -0,0 +1,41 @@
+import { buildProjectedPolygon } from './buildProjectedPolygon.js';
+import { buildProjectedPoint } from './buildProjectedPoint.js';
+import { instanceAreaGeometry } from './instanceAreaGeometry.js';
+import { computeBounds } from './computeBounds.js';
+
+export function assembleAreaGeometry({ jobs, nightLight }) {
+  const context = /* alloc */ {
+    backend: /* alloc */ { options: /* alloc */ { nightLight } },
+    positions: /* alloc */ [], normals: /* alloc */ [], colors: /* alloc */ [], uvs: /* alloc */ [],
+    featureFaces: /* alloc */ [], lights: /* alloc */ [], supports: /* alloc */ new Set(),
+  };
+  let job, polygon, start, end;
+  for (job of jobs) {
+    start = context.positions.length / 3;
+    if (job.point) buildProjectedPoint(context, job.point, job.style, job.baseColor, job.support);
+    for (polygon of job.polygons) {
+      buildProjectedPolygon(context, polygon, job.style.top, job.style.bottom, job.baseColor);
+    }
+    end = context.positions.length / 3;
+    context.featureFaces.push(/* alloc */ { vertexStart: start, vertexEnd: end, faceStart: start / 3, faceEnd: end / 3 });
+  }
+  const data = instanceAreaGeometry(context);
+  const result = /* alloc */ {
+    positions: /* alloc */ new Float32Array(data.positions),
+    normals: /* alloc */ new Float32Array(data.normals),
+    colors: /* alloc */ new Float32Array(data.colors),
+    uvs: /* alloc */ new Float32Array(context.uvs),
+    instanceOffsets: data.instanceOffsets,
+    ranges: context.featureFaces,
+    lights: context.lights,
+  };
+  if (result.positions.length) {
+    const geometry = /* alloc */ { attributes: /* alloc */ {
+      position: /* alloc */ { data: result.positions },
+      instanceOffset: result.instanceOffsets ? /* alloc */ { data: result.instanceOffsets, size: 4 } : undefined,
+    } };
+    computeBounds(geometry);
+    result.bounds = geometry.bounds;
+  }
+  return result;
+}

package/src/{core → geometry}/boundsQuad.js

@@ -1,4 +1,4 @@
-import { localPosition } from './localPosition.js';
+import { localPosition } from '../projections/localPosition.js';
 
 export function boundsQuad(state, bounds) {
   const positions = /* alloc */ [];

package/src/geometry/bridgePolygon.js

@@ -1,12 +1,12 @@
 import { triangulate } from '../triangulation/triangulate.js';
-import { local } from './bridgeLocal.js';
+import { local } from '../projections/projectBridgePoint.js';
 import { bridgePaths } from './bridgePaths.js';
 import { indexBridge } from './indexBridge.js';
 import { bridgeFaces } from './bridgeFaces.js';
 import { bridgeSides } from './bridgeSides.js';
 
 export function bridgePolygon(context, polygon) {
-  const { backend, map, zoom, crs, origin, metres, base } = context;
+  const { backend: layer, map, zoom, crs, origin, metres, base } = context;
   const rings = /* alloc */ [];
   let ring, path, lng, lat, z, p, coordinate, paths, contour, holes, triangles;
   for (ring of polygon) {
@@ -25,7 +25,7 @@ export function bridgePolygon(context, polygon) {
     [contour, ...holes] = paths;
     triangles = triangulate(contour, holes);
   } catch { return; }
-  indexBridge(backend, pixels, triangles);
+  indexBridge(layer, pixels, triangles);
   bridgeFaces(context, points, triangles);
   bridgeSides(context, points, rings);
 }