feat(map): merge אזור הרס variants and align pack chip counts with merged tiles

- Treat אזור_הרס-אזור / אזור_הרס-נקודה as one October 7 family with curated label
- Pack chip total and active n use virtual tile rows (buildLayerTileRows); family counts as one when all members on

Author: Tuvudel

src/map/layers/layerDisplayGlossary.ts

@@ -21,13 +21,15 @@ export type October7thMergedFamilyKey =
   | "מאבק_וגבורה"
   | "פגיעה_נקודתית"
   | "ביזה"
+  | "אזור_הרס"
   | `אירוע_נקודתי-${string}`;
 
 const OCTOBER_MERGED_FAMILY_LABEL: Partial<Record<string, string>> = {
   חדירה_לישוב: "חדירה לישוב",
   מאבק_וגבורה: "מאבק וגבורה",
   פגיעה_נקודתית: "פגיעה נקודתית",
   ביזה: "ביזה",
+  אזור_הרס: "אזור הרס",
   "אירוע_נקודתי-רציחה_חטיפה": "אירוע נקודתי — רציחה וחטיפה",
 };
 

src/map/layers/layerNameUtils.test.ts

@@ -3,6 +3,8 @@ import type { LayerManifestEntry } from "./types";
 import {
   buildLayerTileRows,
   buildOctober7thActiveLegendRows,
+  countMergedPackFullyActiveTileRows,
+  countMergedPackTileRows,
   october7thMergedFamilyKeyFromLayerId,
   packLayerKey,
   parsePackLayerKey,
@@ -39,9 +41,9 @@ describe("october7thMergedFamilyKeyFromLayerId", () => {
     expect(october7thMergedFamilyKeyFromLayerId("אירוע_נקודתי-רציחה_חטיפה")).toBe("אירוע_נקודתי-רציחה_חטיפה");
   });
 
-  it("does not merge אזור_הרס geometry variants (excluded from merged families until glossary adds a family key)", () => {
-    expect(october7thMergedFamilyKeyFromLayerId("אזור_הרס-אזור")).toBeNull();
-    expect(october7thMergedFamilyKeyFromLayerId("אזור_הרס-נקודה")).toBeNull();
+  it("merges אזור_הרס geometry variants into one family", () => {
+    expect(october7thMergedFamilyKeyFromLayerId("אזור_הרס-אזור")).toBe("אזור_הרס");
+    expect(october7thMergedFamilyKeyFromLayerId("אזור_הרס-נקודה")).toBe("אזור_הרס");
   });
 });
 
@@ -184,6 +186,27 @@ describe("buildOctober7thActiveLegendRows", () => {
   });
 });
 
+describe("countMergedPackTileRows / countMergedPackFullyActiveTileRows", () => {
+  it("counts october merged families as one virtual row each", () => {
+    const layers = [layer("ביזה-אזור"), layer("ביזה-נקודה"), layer("solo")];
+    expect(countMergedPackTileRows("october_7th", layers)).toBe(2);
+    const key = (id: string) => packLayerKey("october_7th", id);
+    const onBoth = { [key("ביזה-אזור")]: true, [key("ביזה-נקודה")]: true, [key("solo")]: false };
+    expect(countMergedPackFullyActiveTileRows("october_7th", layers, onBoth)).toBe(1);
+    const onPartial = { [key("ביזה-אזור")]: true, [key("ביזה-נקודה")]: false, [key("solo")]: true };
+    expect(countMergedPackFullyActiveTileRows("october_7th", layers, onPartial)).toBe(1);
+    const onAll = { [key("ביזה-אזור")]: true, [key("ביזה-נקודה")]: true, [key("solo")]: true };
+    expect(countMergedPackFullyActiveTileRows("october_7th", layers, onAll)).toBe(2);
+  });
+
+  it("matches raw layer count for non-october packs", () => {
+    const layers = [layer("a"), layer("b")];
+    expect(countMergedPackTileRows("greens", layers)).toBe(2);
+    const m = { [packLayerKey("greens", "a")]: true, [packLayerKey("greens", "b")]: false };
+    expect(countMergedPackFullyActiveTileRows("greens", layers, m)).toBe(1);
+  });
+});
+
 describe("pickOctober7thFamilyLayerForSwatch", () => {
   it("prefers point over line over polygon, then manifest order", () => {
     const manifest: LayerManifestEntry[] = [

src/map/layers/layerNameUtils.ts

@@ -111,16 +111,13 @@ function stripOctober7GeometrySuffix(layerId: string): string {
 /**
  * Maps a concrete layer id to its merged display family when it belongs to a
  * geometry-variant group (October 7 pack only).
- *
- * Intentional exclusions: some layers share a `-אזור` / `-נקודה` (or similar) pattern but are
- * not merged — for example `אזור_הרס-אזור` and `אזור_הרס-נקודה` stay separate rows until a
- * dedicated `אזור_הרס` family key and curated label are added to the product glossary.
  */
 export function october7thMergedFamilyKeyFromLayerId(layerId: string): October7thMergedFamilyKey | null {
   if (layerId.startsWith("חדירה_לישוב")) return "חדירה_לישוב";
   if (layerId.startsWith("מאבק_וגבורה")) return "מאבק_וגבורה";
   if (layerId.startsWith("פגיעה_נקודתית")) return "פגיעה_נקודתית";
   if (layerId.startsWith("ביזה-")) return "ביזה";
+  if (layerId.startsWith("אזור_הרס-")) return "אזור_הרס";
   if (layerId.startsWith("אירוע_נקודתי-")) {
     return stripOctober7GeometrySuffix(layerId) as October7thMergedFamilyKey;
   }
@@ -212,3 +209,29 @@ export function buildOctober7thActiveLegendRows(
   }
   return rows;
 }
+
+/** Virtual tile rows for pack UI (October 7 merges geometry-variant families into one row each). */
+export function countMergedPackTileRows(packId: string, layers: LayerManifestEntry[]): number {
+  return buildLayerTileRows(packId, layers).length;
+}
+
+/**
+ * How many of those virtual rows are fully on (single layer on, or merged family with every member on).
+ * Matches chip `n` when `total` is `countMergedPackTileRows` for the same pack.
+ */
+export function countMergedPackFullyActiveTileRows(
+  packId: string,
+  layers: LayerManifestEntry[],
+  layerOnByKey: Record<string, boolean>,
+): number {
+  const isOn = (layerId: string) => layerOnByKey[packLayerKey(packId, layerId)] === true;
+  let n = 0;
+  for (const row of buildLayerTileRows(packId, layers)) {
+    if (row.kind === "layer") {
+      if (isOn(row.layer.id)) n += 1;
+    } else if (row.members.length > 0 && row.members.every((m) => isOn(m.id))) {
+      n += 1;
+    }
+  }
+  return n;
+}

src/pages/MapPage/LayerPackChipsScroller.tsx

@@ -1,3 +1,4 @@
+import { countMergedPackTileRows } from "../../map/layers/layerNameUtils";
 import type { LayerRegistry } from "../../map/layers/types";
 
 type Props = {
@@ -23,7 +24,7 @@ export default function LayerPackChipsScroller({
 
   const renderChip = (p: (typeof packs)[0]) => {
     const n = activeCountForPack(p.id);
-    const total = p.manifest.layers.length;
+    const total = countMergedPackTileRows(p.id, p.manifest.layers);
     const focused = p.id === focusedPackId;
     return (
       <div key={p.id} className="layer-packs-sheet-pack-chip">

src/pages/MapPage/useLayerPackState.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { packLayerKey } from "../../map/layers/layerNameUtils";
+import { countMergedPackFullyActiveTileRows, packLayerKey } from "../../map/layers/layerNameUtils";
 import type { LayerRegistry } from "../../map/layers/types";
 
 const FUTURE_DEV_PARKING_LAYER_KEY = packLayerKey("future_development", "חניה");
@@ -156,7 +156,7 @@ export function useLayerPackState(registry: LayerRegistry | null) {
       if (!registry) return 0;
       const pack = registry.packs.find((p) => p.id === packId);
       if (!pack) return 0;
-      return pack.manifest.layers.filter((l) => layerOnByKey[getLayerKey(packId, l.id)]).length;
+      return countMergedPackFullyActiveTileRows(packId, pack.manifest.layers, layerOnByKey);
     },
     [registry, layerOnByKey]
   );