fix coderabbitai requested changes

Author: thangqd

packages/plugins/src/plugins/maplibre-a5.ts

@@ -274,11 +274,30 @@ export function setA5GridSettings(patch: Partial<A5GridSettings>): void {
   if (panelContainer) renderPanel(panelContainer);
 }
 
+/**
+ * Unwrap antimeridian-crossing A5 rings so longitudes stay contiguous.
+ * a5-js returns raw ±180 jumps; MapLibre needs the adjacent world copy.
+ */
+export function a5UnwrapBoundary(ring: [number, number][]): [number, number][] {
+  if (ring.length === 0) return ring;
+  const out: [number, number][] = [];
+  for (const [lng, lat] of ring) {
+    let lon = lng;
+    if (out.length > 0) {
+      const reference = out[0][0];
+      if (lon - reference > 180) lon -= 360;
+      if (lon - reference < -180) lon += 360;
+    }
+    out.push([lon, lat]);
+  }
+  return out;
+}
+
 /** Convert an A5 cell (hex identifier) to a GeoJSON polygon with export attributes. */
 export function a5CellFeature(cell: string): Feature<Polygon> {
   const id = hexToU64(cell);
   const [lng, lat] = cellToLonLat(id);
-  const boundary = cellToBoundary(id) as [number, number][];
+  const boundary = a5UnwrapBoundary(cellToBoundary(id) as [number, number][]);
   return {
     type: "Feature",
     id: cell,
@@ -559,9 +578,9 @@ function gridCsv(grid: FeatureCollection<Polygon>): string {
 
 function fitSelected(): void {
   if (!selectedCell || !appRef) return;
-  // The ring is contiguous even across the antimeridian, so min/max longitudes
-  // never span the world.
-  const ring = cellToBoundary(hexToU64(selectedCell));
+  // The ring is unwrapped to stay contiguous across the antimeridian, so
+  // min/max longitudes never span the world.
+  const ring = a5UnwrapBoundary(cellToBoundary(hexToU64(selectedCell)) as [number, number][]);
   const lons = ring.map(([lng]) => lng);
   const lats = ring.map(([, lat]) => lat);
   appRef.fitBounds?.([Math.min(...lons), Math.min(...lats), Math.max(...lons), Math.max(...lats)]);

packages/plugins/src/plugins/maplibre-dggal.ts

@@ -194,18 +194,23 @@ let currentGrid: FeatureCollection<Polygon> = { type: "FeatureCollection", featu
 let currentError: string | null = null;
 let cachedTextFont: string[] | null = null;
 let pendingRefresh: number | null = null;
+/** Bumped on every activate/deactivate so an in-flight WASM load cannot attach after teardown. */
+let activationGeneration = 0;
 
 let dggalPromise: Promise<DggalEngine> | null = null;
 
 /**
  * Load the DGGAL WASM module once and reuse the handle. Imported dynamically
  * so the ~1 MB module stays out of the main bundle until the plugin is
- * activated.
+ * activated. A failed load clears the cache so the next activate can retry.
  */
 export function loadDggal(): Promise<DggalEngine> {
-  dggalPromise ??= import("dggal").then(
-    (module) => module.DGGAL.init() as unknown as Promise<DggalEngine>,
-  );
+  dggalPromise ??= import("dggal")
+    .then((module) => module.DGGAL.init() as unknown as Promise<DggalEngine>)
+    .catch((error) => {
+      dggalPromise = null;
+      throw error;
+    });
   return dggalPromise;
 }
 
@@ -459,6 +464,24 @@ export function dggalGridForBounds(
   let [west, south, east, north] = bounds;
   south = Math.max(-90, Math.min(90, south));
   north = Math.max(-90, Math.min(90, north));
+  // Wrapped antimeridian bounds (west > east) must be split — a negative span
+  // undercounts area and feeds listZones an inverted bbox.
+  if (east < west) {
+    const left = dggalGridForBounds(engine, [west, south, 180, north], resolution, limit);
+    const right = dggalGridForBounds(engine, [-180, south, east, north], resolution, limit);
+    const seen = new Set<string>();
+    const features: Feature<Polygon>[] = [];
+    for (const feature of [...left.features, ...right.features]) {
+      const id = String(feature.properties?.dggal ?? feature.id);
+      if (seen.has(id)) continue;
+      seen.add(id);
+      features.push(feature);
+      if (features.length > limit) {
+        throw new RangeError(`DGGAL zone limit exceeded: ${limit}`);
+      }
+    }
+    return { type: "FeatureCollection", features };
+  }
   if (east - west >= 360) {
     west = -180;
     east = 180;
@@ -613,7 +636,20 @@ function refresh(): void {
   applyStyle();
   (map.getSource(SOURCE_ID) as GeoJSONSource | undefined)?.setData(currentGrid);
   updateSelectedSource();
-  if (panelContainer) renderPanel(panelContainer);
+  // Pan/zoom only changes the cell count status — rebuild the whole panel and
+  // the open color picker / focused inputs are destroyed mid-gesture.
+  updatePanelStatus();
+}
+
+/** Update the status line without recreating the rest of the panel controls. */
+function updatePanelStatus(): void {
+  const status = panelContainer?.querySelector<HTMLElement>("[data-dggal-status]");
+  if (!status) {
+    if (panelContainer) renderPanel(panelContainer);
+    return;
+  }
+  status.textContent = currentError ?? labels.cellCount(currentGrid.features.length);
+  status.style.color = currentError ? "#dc2626" : "";
 }
 
 /**
@@ -857,6 +893,7 @@ function renderPanel(container: HTMLElement): void {
   }
 
   const status = document.createElement("div");
+  status.dataset.dggalStatus = "";
   status.textContent = currentError ?? labels.cellCount(currentGrid.features.length);
   status.style.color = currentError ? "#dc2626" : "";
   section.appendChild(status);
@@ -989,7 +1026,12 @@ export const maplibreDggalPlugin: GeoLibrePlugin = {
   activate: async (app) => {
     const activeMap = app.getMap?.();
     if (!activeMap) return false;
-    dggal = await loadDggal();
+    const generation = (activationGeneration += 1);
+    // Await WASM before mutating map/panel state so a deactivate during the
+    // load cannot race a late attach (leaked listeners / panels / layers).
+    const engine = await loadDggal();
+    if (generation !== activationGeneration) return false;
+    dggal = engine;
     map = activeMap;
     appRef = app;
     moveHandler = () => scheduleRefresh();
@@ -1029,6 +1071,7 @@ export const maplibreDggalPlugin: GeoLibrePlugin = {
     app.openRightPanel?.(PANEL_ID);
   },
   deactivate: (app) => {
+    activationGeneration += 1;
     cancelScheduledRefresh();
     if (map && moveHandler) map.off("moveend", moveHandler);
     if (map && clickHandler) map.off("click", clickHandler);
@@ -1047,6 +1090,7 @@ export const maplibreDggalPlugin: GeoLibrePlugin = {
     currentGrid = { type: "FeatureCollection", features: [] };
     currentError = null;
     cachedTextFont = null;
+    dggal = null;
     map = null;
     appRef = null;
     app.closeRightPanel?.(PANEL_ID);

packages/plugins/src/plugins/maplibre-dggrid.ts

@@ -204,21 +204,29 @@ let currentGrid: FeatureCollection<Polygon> = { type: "FeatureCollection", featu
 let currentError: string | null = null;
 let cachedTextFont: string[] | null = null;
 let pendingRefresh: number | null = null;
+/** Bumped on every activate/deactivate so an in-flight WASM load cannot attach after teardown. */
+let activationGeneration = 0;
 
 let dggsPromise: Promise<DggridEngine> | null = null;
 
 /**
  * Load the webdggrid WASM module once and reuse the instance. Imported
  * dynamically so the ~270 kB module stays out of the main bundle until the
  * plugin is activated. `Webdggrid.load()` is typed as returning the class but
- * resolves to an instance, hence the cast.
+ * resolves to an instance, hence the cast. A failed load clears the cache so
+ * the next activate can retry.
  */
 export function loadDggrid(): Promise<DggridEngine> {
-  dggsPromise ??= import("webdggrid").then(async (module) => {
-    const instance = (await module.Webdggrid.load()) as unknown as DggridEngine;
-    instance.setDggs({ ...DGGRID_CONFIG }, DEFAULT_DGGRID_GRID_SETTINGS.resolution);
-    return instance;
-  });
+  dggsPromise ??= import("webdggrid")
+    .then(async (module) => {
+      const instance = (await module.Webdggrid.load()) as unknown as DggridEngine;
+      instance.setDggs({ ...DGGRID_CONFIG }, DEFAULT_DGGRID_GRID_SETTINGS.resolution);
+      return instance;
+    })
+    .catch((error) => {
+      dggsPromise = null;
+      throw error;
+    });
   return dggsPromise;
 }
 
@@ -496,13 +504,32 @@ function ringIntersectsBounds(
   north: number,
 ): boolean {
   if (!ring?.length) return false;
-  const last = ring.length - 1;
-  const closed = ring[0][0] === ring[last][0] && ring[0][1] === ring[last][1];
-  const count = closed ? ring.length - 1 : ring.length;
+  // Unwrap for continuity, then shift into the rect's longitude window so
+  // vertex / containment / segment tests share one frame (raw ±180 mixes break
+  // antimeridian cells).
+  const framed: Position[] = [];
+  for (const [rawLon, lat] of ring) {
+    let lon = rawLon;
+    if (framed.length > 0) {
+      const reference = framed[0][0];
+      while (lon - reference > 180) lon -= 360;
+      while (lon - reference < -180) lon += 360;
+    }
+    framed.push([lon, lat]);
+  }
+  const mid = (west + east) / 2;
+  const shift = Math.round((mid - framed[0][0]) / 360) * 360;
+  const normalized =
+    shift === 0 ? framed : framed.map(([lon, lat]) => [lon + shift, lat] as Position);
+
+  const last = normalized.length - 1;
+  const closed =
+    normalized[0][0] === normalized[last][0] && normalized[0][1] === normalized[last][1];
+  const count = closed ? normalized.length - 1 : normalized.length;
 
   for (let i = 0; i < count; i += 1) {
-    const lon = normalizeLon(ring[i][0]);
-    const lat = ring[i][1];
+    const lon = normalized[i][0];
+    const lat = normalized[i][1];
     if (lon >= west && lon <= east && lat >= south && lat <= north) return true;
   }
   for (const [lon, lat] of [
@@ -512,16 +539,16 @@ function ringIntersectsBounds(
     [east, north],
     [(west + east) / 2, (south + north) / 2],
   ]) {
-    if (pointInRing(lon, lat, ring)) return true;
+    if (pointInRing(lon, lat, normalized)) return true;
   }
   for (let i = 0; i < count; i += 1) {
     const j = (i + 1) % count;
     if (
       segmentCrossesLonLatRect(
-        normalizeLon(ring[i][0]),
-        ring[i][1],
-        normalizeLon(ring[j][0]),
-        ring[j][1],
+        normalized[i][0],
+        normalized[i][1],
+        normalized[j][0],
+        normalized[j][1],
         west,
         south,
         east,
@@ -833,7 +860,20 @@ function refresh(): void {
   applyStyle();
   (map.getSource(SOURCE_ID) as GeoJSONSource | undefined)?.setData(currentGrid);
   updateSelectedSource();
-  if (panelContainer) renderPanel(panelContainer);
+  // Pan/zoom only changes the cell count status — rebuild the whole panel and
+  // the open color picker / focused inputs are destroyed mid-gesture.
+  updatePanelStatus();
+}
+
+/** Update the status line without recreating the rest of the panel controls. */
+function updatePanelStatus(): void {
+  const status = panelContainer?.querySelector<HTMLElement>("[data-dggrid-status]");
+  if (!status) {
+    if (panelContainer) renderPanel(panelContainer);
+    return;
+  }
+  status.textContent = currentError ?? labels.cellCount(currentGrid.features.length);
+  status.style.color = currentError ? "#dc2626" : "";
 }
 
 /**
@@ -1085,6 +1125,7 @@ function renderPanel(container: HTMLElement): void {
   }
 
   const status = document.createElement("div");
+  status.dataset.dggridStatus = "";
   status.textContent = currentError ?? labels.cellCount(currentGrid.features.length);
   status.style.color = currentError ? "#dc2626" : "";
   section.appendChild(status);
@@ -1210,7 +1251,12 @@ export const maplibreDggridPlugin: GeoLibrePlugin = {
   activate: async (app) => {
     const activeMap = app.getMap?.();
     if (!activeMap) return false;
-    dggs = await loadDggrid();
+    const generation = (activationGeneration += 1);
+    // Await WASM before mutating map/panel state so a deactivate during the
+    // load cannot race a late attach (leaked listeners / panels / layers).
+    const engine = await loadDggrid();
+    if (generation !== activationGeneration) return false;
+    dggs = engine;
     map = activeMap;
     appRef = app;
     moveHandler = () => scheduleRefresh();
@@ -1249,6 +1295,7 @@ export const maplibreDggridPlugin: GeoLibrePlugin = {
     app.openRightPanel?.(PANEL_ID);
   },
   deactivate: (app) => {
+    activationGeneration += 1;
     cancelScheduledRefresh();
     if (map && moveHandler) map.off("moveend", moveHandler);
     if (map && clickHandler) map.off("click", clickHandler);
@@ -1265,6 +1312,7 @@ export const maplibreDggridPlugin: GeoLibrePlugin = {
     currentGrid = { type: "FeatureCollection", features: [] };
     currentError = null;
     cachedTextFont = null;
+    dggs = null;
     map = null;
     appRef = null;
     app.closeRightPanel?.(PANEL_ID);

packages/plugins/src/plugins/maplibre-olc.ts

@@ -368,13 +368,20 @@ export function olcGridForBounds(
   const startLat = Math.max(-90, Math.floor((south + 90) / latHeight) * latHeight - 90);
 
   const features: Feature<Polygon>[] = [];
+  // Floating-point walks of the grid can land on the same cell twice near
+  // cell boundaries; key by (id, world copy) so a dateline-crossing view can
+  // still draw the same code in two adjacent copies.
+  const seen = new Set<string>();
   for (let lng = startLng; lng < east; lng += lngWidth) {
     for (let lat = startLat; lat < north && lat < 90; lat += latHeight) {
       const centerLng = lng + lngWidth / 2;
       const cell = OpenLocationCode.encode(lat + latHeight / 2, centerLng, codeLength);
       // 360° multiple between the drawn column and the normalized cell.
       const lngOffset =
         Math.round((centerLng - OpenLocationCode.decode(cell).longitudeCenter) / 360) * 360;
+      const key = `${cell}@${lngOffset}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
       features.push(olcCellFeature(cell, lngOffset));
       if (features.length > limit) {
         throw new RangeError(`OLC cell limit exceeded: ${limit}`);