@finbheara/domain 0.28.0 → 0.30.0

package/README.md

@@ -121,8 +121,16 @@ geocode("Yonkers, NY").region;   // "IDTANA-MARO"
 geocode("Brooklyn").isPlace();   // false: a town of six US states and more, so only
                                  // `Brooklyn, NY` reads
 place("Drogheda").arm;           // "unread": the store holds no Drogheda
+geocode("Prague", { near: "RCCEA", declared: true }).isPlace();
+                                 // false: the context lies outside the layer's
+                                 // countries, so no namesake town is read
 ```
 
+A context (a `country` or `near`) that reads to a place outside those six countries stops the
+layer for a bare town, so a city elsewhere is never read as its namesake in them. With no
+context `geocode("Prague")` is Prague, Oklahoma, the one Prague the layer holds. A print with a
+qualifier (`Yonkers, NY`) is never stopped: the context never overrules the print.
+
 A `Place` is one of four arms: `resolved`, `plural` (a print naming more than one place),
 `ambiguous` (one print, several readings) and `unread`. Only `conflict` between two readings
 says they cannot be one place; `same`, `contains` and `overlaps` do not.

package/dist/geocode.js

@@ -2,7 +2,9 @@ import"./chunks/place-tcgfvemw.js";
 import {
   PLACE_NODES,
   createPlaceReader2,
-  place2
+  place2,
+  placeFromId2,
+  placeParts2
 } from "./chunks/place-h2s1w0tq.js";
 
 var PLACE_TOWNS = {
@@ -199,6 +201,31 @@ function oneTown(t) {
 function townInside(t, s) {
   return oneTown(t) && t.nodes.some((n) => n.id === s.pl3);
 }
+var layerCountries;
+function townCountries() {
+  if (layerCountries !== undefined)
+    return layerCountries;
+  const out = new Set;
+  for (const parent of Object.keys(PLACE_TOWNS)) {
+    const c = placeFromId2(parent).country;
+    if (c !== undefined)
+      out.add(c);
+  }
+  layerCountries = [...out].sort();
+  return layerCountries;
+}
+function outsideLayer(want) {
+  const byId = placeFromId2(want);
+  const p = byId.isPlace() ? byId : place2(want);
+  return p.isPlace() && !townCountries().some((c) => p.overlaps(c));
+}
+function ruledOut(print, t, ctx) {
+  if (ctx === undefined || typeof ctx === "string")
+    return false;
+  if (placeParts2(print).length !== 1)
+    return false;
+  return [ctx.country, ctx.near].some((w) => w !== undefined && w.trim() !== "" && t.misses.includes(w) && outsideLayer(w));
+}
 function geocode(print, ctx) {
   const s = place2(print, ctx);
   if (s.refusal !== null)
@@ -206,6 +233,8 @@ function geocode(print, ctx) {
   if (s.isPlace() && !(s.isSingular() && s.level === "subdivision"))
     return s;
   const t = layerReader().place(print, ctx);
+  if (ruledOut(print, t, ctx))
+    return s;
   if (!s.isPlace())
     return oneTown(t) ? t : s;
   return townInside(t, s) ? t : s;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@finbheara/domain",
-	"version": "0.28.0",
+	"version": "0.30.0",
 	"description": "Places, CLRG regions, school names, ages, dances and a person's print in its role, as they are printed: read, compared and told apart",
 	"keywords": [
 		"places",