@finbheara/domain 0.36.0 → 0.38.0

package/dist/chunks/{place-75ms9pvh.js → place-k6y6fe1y.js}

@@ -7,6 +7,7 @@ import {
 } from "./place-q9kwsmzd.js";
 
 var FOREIGN_MEMBER_REGIONS = ["IDTANA-SRO"];
+var SPLIT_SUBDIVISIONS = ["USA-PA"];
 var PLACE_NODES = [
   {
     id: "world",
@@ -4540,6 +4541,15 @@ var PLACE_NODES = [
     prints: ["pennsylvania"],
     codes: ["PA", "PA-USA", "US-PA", "USA-PA"]
   },
+  {
+    id: "USA-WPA",
+    kind: "subdivision",
+    name: "Western Pennsylvania",
+    geo: "USA-PA",
+    admin: "IDTANA-MAO",
+    prints: ["western pennsylvania"],
+    codes: []
+  },
   {
     id: "USA-RI",
     kind: "subdivision",
@@ -6557,7 +6567,7 @@ var PLACE_NODES = [
     kind: "city",
     name: "Erie",
     geo: "USA-PA",
-    admin: "IDTANA-MARO",
+    admin: "IDTANA-MAO",
     prints: ["erie"],
     codes: [],
     runPrints: ["eire"]
@@ -6586,7 +6596,7 @@ var PLACE_NODES = [
     kind: "city",
     name: "Pittsburgh",
     geo: "USA-PA",
-    admin: "IDTANA-MARO",
+    admin: "IDTANA-MAO",
     prints: ["pittsburgh"],
     codes: []
   },
@@ -7394,12 +7404,28 @@ function inWebSpan(at, index) {
   return at.web.some(([start, end]) => index >= start && index < end);
 }
 
+var GENERIC_WORDS2 = {
+  saint: "st",
+  sainte: "ste",
+  fort: "ft",
+  mount: "mt"
+};
+var GENERIC_SHORT = new Set(Object.values(GENERIC_WORDS2));
+function genericKey2(folded) {
+  const sp = folded.indexOf(" ");
+  if (sp <= 0 || sp === folded.length - 1)
+    return;
+  const head = folded.slice(0, sp);
+  const short = GENERIC_WORDS2[head] ?? (GENERIC_SHORT.has(head) ? head : undefined);
+  return short === undefined ? undefined : `${short}${folded.slice(sp)}`;
+}
 var DEFAULT_PLACE_CAPACITY2 = 8192;
 var PLACE_CELL_SENTINELS = [...SHARED_ROW_SENTINELS2];
 var placeCellSentinelOf = sentinelIn2(PLACE_CELL_SENTINELS);
 function createPlaceReader2(options = {}) {
   const nodes = options.tree ?? PLACE_NODES;
   const withinTable = options.within ?? PLACE_WITHIN;
+  const generic = options.generic === true;
   let index;
   const given = options.refusals;
   const refusals = given === undefined ? () => {
@@ -7474,7 +7500,14 @@ function createPlaceReader2(options = {}) {
     const listedPhrases = new Set;
     const byHeading = new Map;
     const byRunPrint = new Map;
+    const byGeneric = new Map;
     for (const n of source) {
+      if (generic && n.kind === "city")
+        for (const p of [n.name, ...n.prints]) {
+          const k = genericKey2(fold(p));
+          if (k !== undefined)
+            push(byGeneric, k, n);
+        }
       for (const h of n.headings ?? [])
         push(byHeading, fold(h), n);
       for (const r of n.runPrints ?? [])
@@ -7551,16 +7584,32 @@ function createPlaceReader2(options = {}) {
       }
       return;
     };
+    const regionOf = (n) => n.admin !== null && byId.get(n.admin)?.kind === "region";
+    const shadowed = (n) => {
+      const seen = new Set;
+      let named = false;
+      for (let at = n;at !== undefined && !seen.has(at.id); ) {
+        if (SPLIT_SUBDIVISIONS.includes(at.id))
+          return named ? at.id : undefined;
+        named ||= regionOf(at);
+        seen.add(at.id);
+        at = at.geo === null ? undefined : byId.get(at.geo);
+      }
+      return;
+    };
     const ancestorsOf = new Map;
     for (const n of source) {
       const out = new Set;
       const todo = [n];
       const own = countryOnMap(n);
+      const split = shadowed(n);
       for (let at = todo.pop();at !== undefined; at = todo.pop()) {
         const foreign = at.kind === "region" && FOREIGN_MEMBER_REGIONS.includes(at.id) && own !== undefined && countryOnMap(at) !== own;
         for (const parent of parents.get(at.id) ?? []) {
           if (foreign && parent.id === at.geo)
             continue;
+          if (at.id === split && parent.id === at.admin)
+            continue;
           if (parent.id === n.id || out.has(parent.id))
             continue;
           out.add(parent.id);
@@ -7585,7 +7634,8 @@ function createPlaceReader2(options = {}) {
       phrases,
       listedPhrases,
       byHeading,
-      byRunPrint
+      byRunPrint,
+      byGeneric
     };
   }
   function idx() {
@@ -7808,7 +7858,13 @@ function createPlaceReader2(options = {}) {
       if (upper.length > 0)
         return { heads: upper, match: "code", truncated: false, refusal: null };
     }
+    const gk = generic ? genericKey2(folded) : undefined;
     const asPrint = keep(i.byPrint.get(folded));
+    if (gk !== undefined) {
+      for (const n of i.byGeneric.get(gk) ?? [])
+        if (!asPrint.includes(n))
+          asPrint.push(n);
+    }
     if (asPrint.length > 0) {
       const m = folded.includes(" ") ? "phrase" : "print";
       return { heads: asPrint, match: m, truncated: false, refusal: null };
@@ -8839,4 +8895,4 @@ function sameReading2(a, b) {
   return DEFAULT_PLACE_READER2.sameReading(a, b);
 }
 
-export { PLACE_NODES, NEVER_NAME, printZones, opensLocation, DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, placeWindows2, placeParts2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };
+export { PLACE_NODES, NEVER_NAME, printZones, opensLocation, GENERIC_WORDS2, genericKey2, DEFAULT_PLACE_CAPACITY2, createPlaceReader2, DEFAULT_PLACE_READER2, place2, isPlaceToken2, countryCodeOf2, areAllPlaceTokens2, placeFromId2, placeWindows2, placeParts2, oireachtasOfRegion2, regionOfOireachtas2, placeStats2, resetPlaceCache2, placeRelation2, placesRelation2, probablySamePlace2, sameReading2 };