@opendfieldmap/map 0.2.1-beta → 0.2.2-beta

package/dist/{runtime-YB3JS7EZ.js → runtime-6E7MGGCD.js}

@@ -1,5 +1,5 @@
-// packages/map/src/runtime.ts
-import L4 from "leaflet";
+// packages/map/src/runtime/oem.ts
+import L5 from "leaflet";
 import "leaflet.markercluster";
 import {
   createOEMPointUrl,
@@ -13,25 +13,8 @@ import {
   toOEMLeafletPosition
 } from "@opendfieldmap/core";
 
-// packages/map/src/atlos/smoothTileLayer.ts
-import L from "leaflet";
-var SmoothTileLayer = class extends L.TileLayer {
-  _setZoomTransform(level, center, zoom) {
-    const map = this._map;
-    if (!map)
-      return;
-    const scale = map.getZoomScale(zoom, level.zoom);
-    const translate = level.origin.multiplyBy(scale).subtract(map._getNewPixelOrigin(center, zoom));
-    if (L.Browser.any3d) {
-      L.DomUtil.setTransform(level.el, translate, scale);
-    } else {
-      L.DomUtil.setPosition(level.el, translate);
-    }
-  }
-};
-
 // packages/map/src/atlos/smoothWheelZoom.ts
-import L2 from "leaflet";
+import L from "leaflet";
 import { WHEEL_GESTURE_IDLE_MS, WheelInputRouter } from "trackpad-input";
 var ZOOM_PER_WHEEL_PIXEL = 3e-3;
 var TRACKPAD_PINCH_ZOOM_PER_PIXEL = 0.01;
@@ -74,7 +57,7 @@ var SmoothWheelZoom = class {
   lastZoomInputTime = null;
   inertiaStep = 0;
   lastFrameTime = null;
-  pendingPanOffset = L2.point(0, 0);
+  pendingPanOffset = L.point(0, 0);
   panRawCenterPoint = null;
   gestureMode = null;
   gestureActive = false;
@@ -138,7 +121,7 @@ var SmoothWheelZoom = class {
     this.handleZoom(event);
   }
   handleZoom(event) {
-    const wheelDelta = L2.DomEvent.getWheelDelta(event);
+    const wheelDelta = L.DomEvent.getWheelDelta(event);
     if (!wheelDelta)
       return;
     const zoomDelta = event.ctrlKey && event.deltaMode === 0 ? -event.deltaY * TRACKPAD_PINCH_ZOOM_PER_PIXEL : wheelDelta * ZOOM_PER_WHEEL_PIXEL;
@@ -160,7 +143,7 @@ var SmoothWheelZoom = class {
     this.scheduleGestureEnd();
   }
   handleTrackpadPan(event) {
-    const offset = L2.point(event.deltaX, event.deltaY);
+    const offset = L.point(event.deltaX, event.deltaY);
     if (offset.x === 0 && offset.y === 0) {
       if (this.gestureActive && !this.overdragSettling) {
         this.scheduleGestureEnd();
@@ -251,7 +234,7 @@ var SmoothWheelZoom = class {
     if (!this.gestureActive || this.gestureMode !== "pan")
       return;
     const offset = this.pendingPanOffset;
-    this.pendingPanOffset = L2.point(0, 0);
+    this.pendingPanOffset = L.point(0, 0);
     if (offset.x !== 0 || offset.y !== 0) {
       const overdragAmount = this.applyConstrainedPan(offset);
       this.map.fire("move").fire("drag");
@@ -277,12 +260,12 @@ var SmoothWheelZoom = class {
       this.map._rawPanBy(offset);
       return 0;
     }
-    const maxBounds = configuredBounds instanceof L2.LatLngBounds ? configuredBounds : L2.latLngBounds(configuredBounds);
+    const maxBounds = configuredBounds instanceof L.LatLngBounds ? configuredBounds : L.latLngBounds(configuredBounds);
     const rawCenter = this.map.unproject(this.panRawCenterPoint, zoom);
     const limitedCenter = this.map._limitCenter(rawCenter, zoom, maxBounds);
     const limitedCenterPoint = this.map.project(limitedCenter, zoom);
     const rawOverdrag = this.panRawCenterPoint.subtract(limitedCenterPoint);
-    const visualOverdrag = L2.point(this.resistOverdrag(rawOverdrag.x), this.resistOverdrag(rawOverdrag.y));
+    const visualOverdrag = L.point(this.resistOverdrag(rawOverdrag.x), this.resistOverdrag(rawOverdrag.y));
     const visualCenterPoint = limitedCenterPoint.add(visualOverdrag);
     const visualOffset = visualCenterPoint.subtract(currentCenterPoint);
     if (visualOffset.x !== 0 || visualOffset.y !== 0) {
@@ -329,7 +312,7 @@ var SmoothWheelZoom = class {
     let center = this.map.unproject(this.map.project(this.anchorLatLng, zoom).subtract(cursorOffset), zoom);
     const configuredBounds = this.map.options.maxBounds;
     if (configuredBounds) {
-      const maxBounds = configuredBounds instanceof L2.LatLngBounds ? configuredBounds : L2.latLngBounds(configuredBounds);
+      const maxBounds = configuredBounds instanceof L.LatLngBounds ? configuredBounds : L.latLngBounds(configuredBounds);
       center = this.map._limitCenter(center, zoom, maxBounds);
     }
     this.map._move(center, zoom, CONTINUOUS_ZOOM_EVENT_DATA);
@@ -384,7 +367,7 @@ var SmoothWheelZoom = class {
     this.lastZoomInputTime = null;
     this.inertiaStep = 0;
     this.lastFrameTime = null;
-    this.pendingPanOffset = L2.point(0, 0);
+    this.pendingPanOffset = L.point(0, 0);
     this.panRawCenterPoint = null;
     this.gestureMode = null;
     this.trackpadDragging = false;
@@ -411,13 +394,13 @@ var SmoothWheelZoom = class {
 var enableSmoothWheelZoom = (map, options) => new SmoothWheelZoom(map, options);
 
 // packages/map/src/atlos/mapOverdrag.ts
-import L3 from "leaflet";
+import L2 from "leaflet";
 var toMapBounds = (bounds) => {
   if (!bounds)
     return null;
-  if (bounds instanceof L3.LatLngBounds)
+  if (bounds instanceof L2.LatLngBounds)
     return bounds;
-  return Array.isArray(bounds) && bounds.length === 2 ? L3.latLngBounds(bounds[0], bounds[1]) : null;
+  return Array.isArray(bounds) && bounds.length === 2 ? L2.latLngBounds(bounds[0], bounds[1]) : null;
 };
 var isMapOverdragged = (map, bounds) => {
   const constrainedMap = map;
@@ -426,6 +409,64 @@ var isMapOverdragged = (map, bounds) => {
   return map.project(center, map.getZoom()).distanceTo(map.project(constrainedCenter, map.getZoom())) > 1;
 };
 
+// packages/map/src/assets/ghicon.svg
+var ghicon_default = '<svg width="83" height="81" viewBox="0 0 83 81" xmlns="http://www.w3.org/2000/svg">\n<path fill-rule="evenodd" clip-rule="evenodd" d="M41.3763 0C18.4963 0 0 18.5625 0 41.5268C0 59.8835 11.8512 75.422 28.292 80.9215C30.3475 81.335 31.1004 80.028 31.1004 78.9286C31.1004 77.9659 31.0327 74.666 31.0327 71.2277C19.5228 73.7032 17.1259 66.2774 17.1259 66.2774C15.2762 61.4647 12.5355 60.2277 12.5355 60.2277C8.76836 57.6838 12.8099 57.6838 12.8099 57.6838C16.9887 57.9589 19.1815 61.9464 19.1815 61.9464C22.8801 68.2712 28.84 66.4841 31.2376 65.3839C31.5798 62.7024 32.6766 60.8462 33.8411 59.8151C24.6612 58.8524 15.0027 55.2774 15.0027 39.3263C15.0027 34.7887 16.6457 31.0762 19.2492 28.1888C18.8385 27.1578 17.3995 22.8943 19.6608 17.188C19.6608 17.188 23.1545 16.0878 31.0318 21.4507C34.4044 20.5417 37.8825 20.0792 41.3763 20.0753C44.87 20.0753 48.4314 20.5571 51.72 21.4507C59.5982 16.0878 63.0919 17.188 63.0919 17.188C65.3532 22.8943 63.9134 27.1578 63.5026 28.1888C66.1747 31.0762 67.75 34.7887 67.75 39.3263C67.75 55.2774 58.0915 58.7832 48.843 59.8151C50.3505 61.1213 51.6514 63.596 51.6514 67.5152C51.6514 73.0839 51.5837 77.5533 51.5837 78.9277C51.5837 80.028 52.3374 81.335 54.3921 80.9224C70.8329 75.4211 82.6841 59.8835 82.6841 41.5268C82.7518 18.5625 64.1878 0 41.3763 0Z"/>\n</svg>\n';
+
+// packages/map/src/runtime/geometry.ts
+var pointOnSegment = (point, start, end) => {
+  const cross = (point.x - start.x) * (end.z - start.z) - (point.z - start.z) * (end.x - start.x);
+  if (Math.abs(cross) > 1e-7) return false;
+  return point.x >= Math.min(start.x, end.x) - 1e-7 && point.x <= Math.max(start.x, end.x) + 1e-7 && point.z >= Math.min(start.z, end.z) - 1e-7 && point.z <= Math.max(start.z, end.z) + 1e-7;
+};
+var pointInRing = (point, ring) => {
+  let inside = false;
+  for (let index = 0, previous = ring.length - 1; index < ring.length; previous = index++) {
+    const current = ring[index];
+    const prior = ring[previous];
+    if (pointOnSegment(point, prior, current)) return true;
+    const crosses = current.z > point.z !== prior.z > point.z;
+    if (crosses && point.x < (prior.x - current.x) * (point.z - current.z) / (prior.z - current.z) + current.x) inside = !inside;
+  }
+  return inside;
+};
+var distanceSquaredToSegment = (point, start, end) => {
+  const dx = end.x - start.x;
+  const dz = end.z - start.z;
+  const lengthSquared = dx * dx + dz * dz;
+  if (!lengthSquared) return (point.x - start.x) ** 2 + (point.z - start.z) ** 2;
+  const projection = Math.max(0, Math.min(1, ((point.x - start.x) * dx + (point.z - start.z) * dz) / lengthSquared));
+  const nearestX = start.x + projection * dx;
+  const nearestZ = start.z + projection * dz;
+  return (point.x - nearestX) ** 2 + (point.z - nearestZ) ** 2;
+};
+var boundaryScore = (boundary, point) => {
+  const rings = boundary.rings.map((ring) => ring);
+  const distances = rings.flatMap((ring) => ring.map((start, index) => distanceSquaredToSegment(point, start, ring[(index + 1) % ring.length])));
+  const insideOuter = rings.length > 0 && pointInRing(point, rings[0]);
+  const insideHole = rings.slice(1).some((ring) => pointInRing(point, ring));
+  return { id: boundary.id, inside: insideOuter && !insideHole, distance: Math.min(...distances, Infinity) };
+};
+
+// packages/map/src/runtime/layers.ts
+import L4 from "leaflet";
+
+// packages/map/src/atlos/smoothTileLayer.ts
+import L3 from "leaflet";
+var SmoothTileLayer = class extends L3.TileLayer {
+  _setZoomTransform(level, center, zoom) {
+    const map = this._map;
+    if (!map)
+      return;
+    const scale = map.getZoomScale(zoom, level.zoom);
+    const translate = level.origin.multiplyBy(scale).subtract(map._getNewPixelOrigin(center, zoom));
+    if (L3.Browser.any3d) {
+      L3.DomUtil.setTransform(level.el, translate, scale);
+    } else {
+      L3.DomUtil.setPosition(level.el, translate);
+    }
+  }
+};
+
 // packages/map/src/tileVersion.ts
 var lookupOEMTile = (coverage, floor, zoom, x, y) => {
   const ranges = coverage[String(zoom)]?.[floor.id]?.[String(y)] ?? [];
@@ -445,32 +486,7 @@ var lookupOEMTile = (coverage, floor, zoom, x, y) => {
 };
 var appendOEMTileVersion = (url, version) => version ? `${url}${url.includes("?") ? "&" : "?"}v=${encodeURIComponent(version)}` : url;
 
-// packages/map/src/assets/ghicon.svg
-var ghicon_default = '<svg width="83" height="81" viewBox="0 0 83 81" xmlns="http://www.w3.org/2000/svg">\n<path fill-rule="evenodd" clip-rule="evenodd" d="M41.3763 0C18.4963 0 0 18.5625 0 41.5268C0 59.8835 11.8512 75.422 28.292 80.9215C30.3475 81.335 31.1004 80.028 31.1004 78.9286C31.1004 77.9659 31.0327 74.666 31.0327 71.2277C19.5228 73.7032 17.1259 66.2774 17.1259 66.2774C15.2762 61.4647 12.5355 60.2277 12.5355 60.2277C8.76836 57.6838 12.8099 57.6838 12.8099 57.6838C16.9887 57.9589 19.1815 61.9464 19.1815 61.9464C22.8801 68.2712 28.84 66.4841 31.2376 65.3839C31.5798 62.7024 32.6766 60.8462 33.8411 59.8151C24.6612 58.8524 15.0027 55.2774 15.0027 39.3263C15.0027 34.7887 16.6457 31.0762 19.2492 28.1888C18.8385 27.1578 17.3995 22.8943 19.6608 17.188C19.6608 17.188 23.1545 16.0878 31.0318 21.4507C34.4044 20.5417 37.8825 20.0792 41.3763 20.0753C44.87 20.0753 48.4314 20.5571 51.72 21.4507C59.5982 16.0878 63.0919 17.188 63.0919 17.188C65.3532 22.8943 63.9134 27.1578 63.5026 28.1888C66.1747 31.0762 67.75 34.7887 67.75 39.3263C67.75 55.2774 58.0915 58.7832 48.843 59.8151C50.3505 61.1213 51.6514 63.596 51.6514 67.5152C51.6514 73.0839 51.5837 77.5533 51.5837 78.9277C51.5837 80.028 52.3374 81.335 54.3921 80.9224C70.8329 75.4211 82.6841 59.8835 82.6841 41.5268C82.7518 18.5625 64.1878 0 41.3763 0Z"/>\n</svg>\n';
-
-// packages/map/src/runtime.ts
-var mounted = /* @__PURE__ */ new WeakSet();
-var CLUSTER_SUBCATEGORIES = /* @__PURE__ */ new Set(["boss", "collection", "mob", "natural", "valuable", "exploration"]);
-var FEATURE_NAMES = ["points", "labels", "boundaries"];
-var BRAND_URL = "https://oem.re/";
-var GITHUB_URL = "https://github.com/Terra-Online/OEM-SDK";
-var TERMS_URL = "https://blog.opendfieldmap.org/docs/tos#intellectual-property-and-copyright";
-var cloneFilter = (filter) => ({
-  types: filter.types ? [...filter.types] : void 0,
-  subregions: filter.subregions ? [...filter.subregions] : void 0,
-  floorOnly: filter.floorOnly
-});
-var sameList = (left, right) => left === right || !!left && !!right && left.length === right.length && left.every((value, index) => value === right[index]);
-var sameFilter = (left, right) => left.floorOnly === right.floorOnly && sameList(left.types, right.types) && sameList(left.subregions, right.subregions);
-var clonePoint = (point) => ({
-  ...point,
-  raw: { ...point.raw },
-  position: { ...point.position }
-});
-var cloneCustomPoint = (point) => ({
-  ...point,
-  position: { ...point.position }
-});
+// packages/map/src/runtime/layers.ts
 var OEMMarker = class extends L4.Marker {
   update() {
     const marker = this;
@@ -497,6 +513,56 @@ var CoveredTileLayer = class extends SmoothTileLayer {
     return prototype._isValidTile.call(this, coords) && lookupOEMTile(this.coverage, this.floor, coords.z, coords.x, coords.y).covered;
   }
 };
+
+// packages/map/src/runtime/helpers.ts
+var cloneFilter = (filter) => ({
+  types: filter.types ? [...filter.types] : void 0,
+  subregions: filter.subregions ? [...filter.subregions] : void 0,
+  floorOnly: filter.floorOnly
+});
+var sameList = (left, right) => left === right || !!left && !!right && left.length === right.length && left.every((value, index) => value === right[index]);
+var sameFilter = (left, right) => left.floorOnly === right.floorOnly && sameList(left.types, right.types) && sameList(left.subregions, right.subregions);
+var clonePoint = (point) => ({
+  ...point,
+  raw: { ...point.raw },
+  position: { ...point.position }
+});
+var cloneCustomPoint = (point) => ({
+  ...point,
+  position: { ...point.position }
+});
+var CLUSTER_SUBCATEGORIES = /* @__PURE__ */ new Set(["boss", "collection", "mob", "natural", "valuable", "exploration"]);
+var FEATURE_NAMES = ["points", "labels", "boundaries"];
+var BRAND_URL = "https://oem.re/";
+var GITHUB_URL = "https://github.com/Terra-Online/OEM-SDK";
+var TERMS_URL = "https://blog.opendfieldmap.org/docs/tos#intellectual-property-and-copyright";
+
+// packages/map/src/runtime/oem.ts
+var mounted = /* @__PURE__ */ new WeakSet();
+var decodeAtlosPoint = (raw, region, fallbackSubregionId) => {
+  if (!Array.isArray(raw) && raw && "position" in raw && "raw" in raw) return raw;
+  const value = Array.isArray(raw) ? { id: raw[0], z: raw[1], x: raw[2], y: raw[3], tier: raw[4], type: raw[5] } : raw;
+  if (value?.id == null) return void 0;
+  const x = value.x ?? value.pos?.[1] ?? 0;
+  const z = value.z ?? value.pos?.[0] ?? 0;
+  const y = value.y ?? value.pos?.[2] ?? 0;
+  const tier = value.tier ?? 0;
+  if (![x, y, z, tier].every(Number.isFinite)) return void 0;
+  const subregionId = value.subregId ?? fallbackSubregionId;
+  const floorId = tier === 0 ? "M" : `${tier < 0 ? "B" : "L"}${Math.abs(Math.trunc(tier))}`;
+  const mapPosition = { regionId: region.id, subregionId, x, z, floorId };
+  const game = mapToGameXZPosition(mapPosition, region, subregionId);
+  const scale = 2 ** region.maxNativeZoom;
+  return {
+    id: String(value.id),
+    regionId: region.id,
+    subregionId,
+    type: value.type ?? "",
+    tier,
+    raw: { x: game.x, y, z: game.z },
+    position: { ...mapPosition, x: x * scale, z: z * scale }
+  };
+};
 var OEM = class {
   constructor(container, manifest, options) {
     this.container = container;
@@ -518,8 +584,8 @@ var OEM = class {
     this.root.dataset.theme = options.theme ?? "light";
     container.append(this.root);
     mounted.add(container);
-    this.map = L4.map(this.root, {
-      crs: L4.CRS.Simple,
+    this.map = L5.map(this.root, {
+      crs: L5.CRS.Simple,
       minZoom: 0,
       maxZoom: 3,
       zoomControl: false,
@@ -599,11 +665,11 @@ var OEM = class {
   requests = /* @__PURE__ */ new Map();
   baseTiles;
   floorTiles;
-  pointsLayer = L4.layerGroup();
-  customPointsLayer = L4.layerGroup();
+  pointsLayer = L5.layerGroup();
+  customPointsLayer = L5.layerGroup();
   pointClusters = /* @__PURE__ */ new Map();
-  labelsLayer = L4.layerGroup();
-  boundariesLayer = L4.layerGroup();
+  labelsLayer = L5.layerGroup();
+  boundariesLayer = L5.layerGroup();
   points = [];
   customPoints = [];
   clickPoints = [];
@@ -613,6 +679,8 @@ var OEM = class {
   pointIndex;
   pointIndexRequest;
   pointShardRequests = /* @__PURE__ */ new Map();
+  boundaryData = /* @__PURE__ */ new Map();
+  boundaryDataRequests = /* @__PURE__ */ new Map();
   types = {};
   labels = [];
   visibleLabelType;
@@ -651,21 +719,22 @@ var OEM = class {
       if (!point.position || typeof point.position.regionId !== "string") {
         throw new Error(`Invalid custom point position: ${id}`);
       }
+      const position = point.position;
       if (point.style !== "framed" && point.style !== "no-frame") {
         throw new Error(`Invalid custom point style: ${id}`);
       }
       if (typeof point.icon !== "string" || !point.icon) {
         throw new Error(`Custom point icon must be a non-empty URL: ${id}`);
       }
-      const pointRegion = getOEMRegion(this.manifest, point.position.regionId);
-      toOEMLeafletMapPosition(point.position);
-      if (point.position.subregionId && !pointRegion.subregions.some((subregion) => subregion.id === point.position.subregionId)) {
-        throw new Error(`Unknown custom point subregion ${point.position.subregionId} in ${point.position.regionId}`);
+      const pointRegion = getOEMRegion(this.manifest, position.regionId);
+      toOEMLeafletMapPosition(position);
+      if (position.subregionId && !pointRegion.subregions.some((subregion) => subregion.id === position.subregionId)) {
+        throw new Error(`Unknown custom point subregion ${position.subregionId} in ${position.regionId}`);
       }
-      if (point.position.floorId && !pointRegion.floors.some((floor) => floor.id === point.position.floorId)) {
-        throw new Error(`Unknown custom point floor ${point.position.floorId} in ${point.position.regionId}`);
+      if (position.floorId && !pointRegion.floors.some((floor) => floor.id === position.floorId)) {
+        throw new Error(`Unknown custom point floor ${position.floorId} in ${position.regionId}`);
       }
-      return { ...cloneCustomPoint(point), id };
+      return { ...cloneCustomPoint({ ...point, position }), id };
     });
   }
   normalizeClickPointOptions(options) {
@@ -684,25 +753,70 @@ var OEM = class {
   position(latlng) {
     return fromOEMLeafletPosition(latlng.lat, latlng.lng, this.region, this.floorId);
   }
+  loadOEMBoundaryData(reference) {
+    const cached = this.boundaryData.get(reference.path);
+    if (cached) return Promise.resolve(cached);
+    const pending = this.boundaryDataRequests.get(reference.path);
+    if (pending) return pending;
+    const request = fetchOEMJson(resolveOEMAsset(this.options.resources.baseUrl, reference.path), this.options.signal).then((value) => {
+      if (!Array.isArray(value)) throw new Error(`Invalid OEM boundary data: ${reference.path}`);
+      const boundaries = value;
+      this.boundaryData.set(reference.path, boundaries);
+      return boundaries;
+    }).finally(() => {
+      if (this.boundaryDataRequests.get(reference.path) === request) this.boundaryDataRequests.delete(reference.path);
+    });
+    this.boundaryDataRequests.set(reference.path, request);
+    return request;
+  }
+  /** Preloads OEM subregion geometry so map clicks can resolve an exact subregion. */
+  async prepareSubregionBoundaries() {
+    if (!this.region.boundaries) return;
+    try {
+      await this.loadOEMBoundaryData(this.region.boundaries);
+    } catch {
+    }
+  }
   inferSubregionId(x, z) {
     const selected = this.filter.subregions?.filter((id) => this.region.subregions.some((subregion) => subregion.id === id));
-    if (selected?.length === 1) {
-      const subregion = this.region.subregions.find((entry) => entry.id === selected[0]);
-      if (!subregion?.bounds) return subregion?.id;
-      const scale2 = 2 ** this.region.maxNativeZoom;
-      const [[minX, minY], [maxX, maxY]] = subregion.bounds;
-      const pixelX2 = x * scale2;
-      const pixelZ2 = z * scale2;
-      if (pixelX2 >= minX && pixelX2 <= maxX && pixelZ2 >= minY && pixelZ2 <= maxY) return subregion.id;
-    }
     const scale = 2 ** this.region.maxNativeZoom;
-    const pixelX = x * scale;
-    const pixelZ = z * scale;
-    return this.region.subregions.find((subregion) => {
-      if (!subregion.bounds) return false;
-      const [[minX, minY], [maxX, maxY]] = subregion.bounds;
-      return pixelX >= minX && pixelX <= maxX && pixelZ >= minY && pixelZ <= maxY;
-    })?.id;
+    const point = { x: x * scale, z: z * scale };
+    const allowed = selected?.length ? new Set(selected) : void 0;
+    const geometries = this.region.boundaries ? this.boundaryData.get(this.region.boundaries.path) ?? [] : [];
+    const scores = geometries.filter((boundary) => this.region.subregions.some((subregion) => subregion.id === boundary.id) && (!allowed || allowed.has(boundary.id))).map((boundary) => boundaryScore(boundary, point));
+    const inside = scores.filter((score) => score.inside);
+    if (inside.length) {
+      const ranked = inside.map((score) => ({ ...score, wins: 0, margin: 0 }));
+      for (let leftIndex = 0; leftIndex < ranked.length; leftIndex += 1) {
+        for (let rightIndex = leftIndex + 1; rightIndex < ranked.length; rightIndex += 1) {
+          const left = ranked[leftIndex];
+          const right = ranked[rightIndex];
+          const delta = left.distance - right.distance;
+          if (Math.abs(delta) <= 1e-9) continue;
+          if (delta > 0) {
+            left.wins += 1;
+            left.margin += delta;
+            right.margin -= delta;
+          } else {
+            right.wins += 1;
+            right.margin -= delta;
+            left.margin += delta;
+          }
+        }
+      }
+      ranked.sort((left, right) => right.wins - left.wins || right.margin - left.margin || right.distance - left.distance || left.id.localeCompare(right.id));
+      return ranked[0].id;
+    }
+    const bounds = this.region.subregions.filter((subregion) => subregion.bounds && (!allowed || allowed.has(subregion.id))).map((subregion) => {
+      const [[minX, minZ], [maxX, maxZ]] = subregion.bounds;
+      const insideX = point.x >= minX && point.x <= maxX;
+      const insideZ = point.z >= minZ && point.z <= maxZ;
+      const dx = insideX ? Math.min(point.x - minX, maxX - point.x) : Math.min(Math.abs(point.x - minX), Math.abs(point.x - maxX));
+      const dz = insideZ ? Math.min(point.z - minZ, maxZ - point.z) : Math.min(Math.abs(point.z - minZ), Math.abs(point.z - maxZ));
+      return { id: subregion.id, inside: insideX && insideZ, distance: dx * dx + dz * dz };
+    }).sort((left, right) => Number(right.inside) - Number(left.inside) || left.distance - right.distance || left.id.localeCompare(right.id));
+    if (bounds.length) return bounds[0].id;
+    return scores.sort((left, right) => left.distance - right.distance || left.id.localeCompare(right.id))[0]?.id;
   }
   emitMapClick = (event) => {
     if (this.destroyed) return;
@@ -781,7 +895,7 @@ var OEM = class {
     this.floorTiles?.remove();
     this.floorTiles = void 0;
     this.floorId = "M";
-    this.map.setMaxBounds(L4.latLngBounds([]));
+    this.map.setMaxBounds(L5.latLngBounds([]));
     this.map.setMinZoom(this.region.minZoom);
     this.map.setMaxZoom(this.region.maxZoom);
     const target = view ?? this.region.initialView;
@@ -793,7 +907,7 @@ var OEM = class {
   /** Converts the region's published pixel extent to Simple CRS bounds. */
   regionBounds() {
     const { x, z } = this.region.boundsOffset;
-    return L4.latLngBounds(
+    return L5.latLngBounds(
       toOEMLeafletPosition({ regionId: this.region.id, x, z }, this.region),
       toOEMLeafletPosition({ regionId: this.region.id, x: x + this.region.dimensions[0], z: z + this.region.dimensions[1] }, this.region)
     );
@@ -840,7 +954,7 @@ var OEM = class {
   /** Fits the map to an OEM pixel-coordinate extent. */
   fitBounds(bounds) {
     this.assertAlive();
-    this.map.fitBounds(L4.latLngBounds(toOEMLeafletPosition(bounds[0], this.region), toOEMLeafletPosition(bounds[1], this.region)), { animate: false });
+    this.map.fitBounds(L5.latLngBounds(toOEMLeafletPosition(bounds[0], this.region), toOEMLeafletPosition(bounds[1], this.region)), { animate: false });
   }
   /** Switches regions and reloads only the features currently enabled. */
   async setRegion(regionId) {
@@ -860,6 +974,7 @@ var OEM = class {
     this.emit("regionchange", { regionId });
     this.emit("floorchange", { floorId: "M" });
     this.emitView();
+    await this.prepareSubregionBoundaries();
     await this.loadFeatures();
   }
   /** Switches the rendered floor while retaining the current region view. */
@@ -926,7 +1041,7 @@ var OEM = class {
         this.labelsLayer.clearLayers();
       } else this.boundariesLayer.clearLayers();
     }
-    await Promise.all(loads);
+    await Promise.allSettled(loads);
   }
   /** Replaces host-defined points without reloading static map data. */
   setCustomPoints(points) {
@@ -1047,8 +1162,9 @@ var OEM = class {
     const cached = this.pointShardRequests.get(path);
     if (cached) return cached;
     const request = fetchOEMJson(resolveOEMAsset(this.options.resources.baseUrl, path), this.options.signal).then((value) => {
-      if (!Array.isArray(value)) throw new Error(`Invalid OEM point shard: ${path}`);
-      return value;
+      const region = this.manifest.regions.find((entry) => entry.points.some((ref) => ref.path === path));
+      if (!region || !Array.isArray(value)) throw new Error(`Invalid OEM point shard: ${path}`);
+      return this.decodePointShard(value, path, region);
     }).catch((error) => {
       if (this.pointShardRequests.get(path) === request) this.pointShardRequests.delete(path);
       throw error;
@@ -1056,6 +1172,10 @@ var OEM = class {
     this.pointShardRequests.set(path, request);
     return request;
   }
+  decodePointShard(value, shardPath, region = this.region) {
+    const fallbackSubregionId = shardPath.split("/").at(-1)?.replace(/\.json$/, "") ?? "";
+    return value.map((entry) => decodeAtlosPoint(entry, region, fallbackSubregionId)).filter((entry) => !!entry);
+  }
   cancelRequest(feature) {
     if (!this.requests.has(feature)) return;
     this.requests.get(feature).abort();
@@ -1066,7 +1186,7 @@ var OEM = class {
     for (const feature of this.requests.keys()) this.cancelRequest(feature);
   }
   async loadFeatures() {
-    await Promise.all(FEATURE_NAMES.filter((feature) => this.features[feature]).map((feature) => this.loadFeature(feature)));
+    await Promise.allSettled(FEATURE_NAMES.filter((feature) => this.features[feature]).map((feature) => this.loadFeature(feature)));
   }
   /** Loads one feature with a request token so stale responses are ignored. */
   async loadFeature(feature) {
@@ -1078,7 +1198,11 @@ var OEM = class {
     try {
       if (feature === "points") {
         const [groups, types] = await Promise.all([
-          Promise.all(this.region.points.map((ref) => read(ref))),
+          Promise.all(this.region.points.map(async (ref) => {
+            const value = await read(ref);
+            if (!Array.isArray(value)) throw new Error(`Invalid OEM point shard: ${ref.path}`);
+            return this.decodePointShard(value, ref.path);
+          })),
           Object.keys(this.types).length ? this.types : read(this.manifest.types)
         ]);
         if (request.signal.aborted) return;
@@ -1096,7 +1220,7 @@ var OEM = class {
         this.renderLabels(true);
       } else {
         const reference = this.boundarySource === "game" ? this.region.gameBoundaries : this.region.boundaries;
-        const boundaries = reference ? await read(reference) : [];
+        const boundaries = reference ? this.boundarySource === "oem" ? await this.loadOEMBoundaryData(reference) : await read(reference) : [];
         if (request.signal.aborted) return;
         this.renderBoundaries(boundaries);
       }
@@ -1164,7 +1288,7 @@ var OEM = class {
         interactive: false,
         keyboard: false,
         bubblingMouseEvents: false,
-        icon: L4.divIcon({
+        icon: L5.divIcon({
           html: this.createCustomPointVisual(point),
           className: `${point.style === "no-frame" ? "noFrameMarkerIcon" : "frameMarkerIcon"} incompleteMarker`,
           iconSize: point.style === "no-frame" ? [50, 50] : [32, 32],
@@ -1223,7 +1347,7 @@ var OEM = class {
       interactive: true,
       keyboard: false,
       bubblingMouseEvents: false,
-      icon: L4.divIcon({
+      icon: L5.divIcon({
         html: this.createMarkerVisual(type, point),
         className: `${type.noFrame ? "noFrameMarkerIcon" : "frameMarkerIcon"} incompleteMarker`,
         iconSize: type.noFrame ? [50, 50] : [32, 32],
@@ -1232,13 +1356,13 @@ var OEM = class {
     });
   }
   createPointCluster(type) {
-    return L4.markerClusterGroup({
+    return L5.markerClusterGroup({
       showCoverageOnHover: false,
       zoomToBoundsOnClick: !this.options.lockZoom,
       spiderfyOnMaxZoom: !this.options.lockZoom,
       disableClusteringAtZoom: 2,
       maxClusterRadius: 60,
-      iconCreateFunction: (cluster) => L4.divIcon({
+      iconCreateFunction: (cluster) => L5.divIcon({
         html: this.createMarkerVisual(type, void 0, cluster.getChildCount()),
         className: `${type.noFrame ? "noFrameMarkerIcon" : "frameMarkerIcon"} markerClusterCustom`,
         iconSize: type.noFrame ? [50, 50] : [32, 32],
@@ -1274,13 +1398,13 @@ var OEM = class {
     this.boundariesLayer.clearLayers();
     for (const boundary of boundaries) {
       const rings = boundary.rings.map((ring) => ring.map((position) => toOEMLeafletPosition(position, this.region)));
-      L4.polygon(rings, {
+      L5.polygon(rings, {
         color: "transparent",
         fillOpacity: 0.2,
         interactive: false,
         className: "subregionBoundaryFill"
       }).addTo(this.boundariesLayer);
-      L4.polygon(rings, {
+      L5.polygon(rings, {
         weight: 2,
         opacity: 0.8,
         fill: false,
@@ -1305,7 +1429,7 @@ var OEM = class {
         pane: "placeLabels",
         interactive: false,
         keyboard: false,
-        icon: L4.divIcon({ className: "mapLabel", html: inner, iconSize: [0, 0] })
+        icon: L5.divIcon({ className: "mapLabel", html: inner, iconSize: [0, 0] })
       }).addTo(this.labelsLayer);
     }
   }
@@ -1339,4 +1463,4 @@ var OEM = class {
 export {
   OEM
 };
-//# sourceMappingURL=runtime-YB3JS7EZ.js.map
+//# sourceMappingURL=runtime-6E7MGGCD.js.map