@mailwoman/resolver-wof-sqlite 10.7.0 → 10.8.0

package/lib/nsul/lookup.ts

@@ -25,9 +25,10 @@
  */
 
 import type { UkCountryCode } from "@mailwoman/codex/gb/country"
+import { compactPostcode } from "@mailwoman/postcode/display-form"
 import { SQLiteLookup, type SQLiteLookupOptions } from "@mailwoman/sqlite/lookup"
 
-import { compactPostcode, type NSULDatabase } from "#nsul/schema"
+import type { NSULDatabase } from "#nsul/schema"
 import { prepareAll, prepareGet } from "#sqlite-utils"
 
 /**

package/lib/nsul/schema.ts

@@ -70,13 +70,6 @@ export interface NSULDatabase extends layerschemadatabase {
 	nsul_meta: NSULMetaTable
 }
 
-/**
- * The compact form of a unit postcode, every space removed and upper-cased.
- */
-export function compactPostcode(pcds: string): string {
-	return pcds.replaceAll(/\s+/g, "").toUpperCase()
-}
-
 export async function createUPRNPostcodeTable(db: Kysely<NSULDatabase>): Promise<void> {
 	await db.schema
 		.createTable("uprn_postcode")
@@ -102,7 +95,8 @@ export async function createNSULMetaTable(db: Kysely<NSULDatabase>): Promise<voi
 /**
  * The `pcds_compact` index the `uprnsForPostcode` probe reads.
  *
- * There is no index on the spaced `pcds` because it is derivable through {@link compactPostcode}.
+ * There is no index on the spaced `pcds` because `compactPostcode` from
+ * `@mailwoman/postcode/display-form` derives the compact column from it.
  */
 export async function createNSULIndexes(db: Kysely<NSULDatabase>): Promise<void> {
 	await db.schema.createIndex("uprn_postcode_pcds_compact").on("uprn_postcode").column("pcds_compact").execute()

package/lib/place-importance-schema.ts

@@ -262,7 +262,7 @@ export function loadImportanceSplit<DB>(db: DatabaseClient<DB>): ImportanceSplit
 		for (const row of rows) {
 			const split = splitLegacyImportance(row.importance, population.get(row.id))
 
-			if (split.encyclopedic === undefined) {
+			if (!split.encyclopedic) {
 				legacyFallbackRows++
 			} else {
 				encyclopedic.set(row.id, split.encyclopedic)

package/lib/poi/lookup.ts

@@ -7,16 +7,16 @@
  *   `without rowid` B-tree `poi-schema.ts` builds. Category, brand and name searches share one
  *   artifact. Each path has a method that returns its details.
  *
- *   `latLngToCell` and `gridDisk` come from `h3-js`. The 48-bit short-cell packing that turns a raw
+ *   `latLngToCell` and `gridDisk` come from `@sister.software/h3`. The 48-bit short-cell packing that turns a raw
  *   H3 cell into the integer `poi.h3_cell` stores is `@mailwoman/spatial`'s `shortCellToInt`, and
  *   that math is never reimplemented here.
  */
 
 import { allRows } from "@mailwoman/core/utils"
-import { haversineKm, shortCellToInt, type H3Cell } from "@mailwoman/spatial"
+import { haversine, shortCellToInt } from "@mailwoman/spatial"
 import type { DatabaseClient } from "@mailwoman/sqlite/client"
 import { SQLiteLookup, type SQLiteLookupOptions } from "@mailwoman/sqlite/lookup"
-import { gridDisk, latLngToCell } from "h3-js"
+import { gridDisk, latLngToCell } from "@sister.software/h3"
 
 import type { POICategoryCodeTable, POIDatabase, POITable } from "#poi/schema"
 /**
@@ -79,7 +79,7 @@ export interface POISearchQuery {
 	 *
 	 * Required for category/brand queries (k-ring expansion).
 	 */
-	center?: { latitude: number; longitude: number }
+	center?: { latitude: number; longitude: number } | null
 	/**
 	 * Ring budget: the count of res-9 k-rings to expand before giving up.
 	 *
@@ -88,7 +88,7 @@ export interface POISearchQuery {
 	 * @defaultValue `16` ≈ ~5.4 km
 	 */
 	maxRings?: number
-	limit?: number
+	limit?: number | null
 }
 
 export interface POISearchHit {
@@ -183,7 +183,7 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 		const limit = Math.max(1, query.limit ?? DEFAULT_LIMIT)
 
 		if (query.name) {
-			return this.#searchByName(query.name, limit, query.center)
+			return this.#searchByName(query.name, limit, query.center ?? undefined)
 		}
 
 		if (query.categoryIDs?.length || query.brandWikidata) {
@@ -216,7 +216,7 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 
 		return sortByDistance(rows, center)
 			.filter(
-				(row) => haversineKm(center.latitude, center.longitude, row.latitude, row.longitude) <= BRAND_MAX_DISTANCE_KM
+				(row) => haversine(center.latitude, center.longitude, row.latitude, row.longitude) <= BRAND_MAX_DISTANCE_KM
 			)
 			.slice(0, limit)
 			.map((row) => toHit(row, this.#idToCategory, center))
@@ -235,7 +235,7 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 		for (const id of query.categoryIDs ?? []) {
 			const resolved = this.#categoryToID.get(id)
 
-			if (resolved !== undefined) {
+			if (resolved) {
 				categoryIDs.push(resolved)
 			}
 		}
@@ -244,7 +244,7 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 		// This is a clean miss instead of a throw.
 		if (!categoryIDs.length) return []
 
-		const origin = latLngToCell(center.latitude, center.longitude, POI_H3_RESOLUTION) as H3Cell
+		const origin = latLngToCell(center.latitude, center.longitude, POI_H3_RESOLUTION)
 		const seenCells = new Set<string>()
 		let rows: POIRow[] = []
 
@@ -252,12 +252,12 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 		for (let ring = 0; ring < maxRings; ring++) {
 			// gridDisk(origin, ring) returns the whole disk out to `ring`, so diffing against
 			// the already-probed set derives only this ring's new cells.
-			const diskCells = gridDisk(origin, ring) as string[]
+			const diskCells = gridDisk(origin, ring)
 			const newCells = diskCells.filter((cell) => !seenCells.has(cell))
 
 			for (const cell of newCells) {
 				seenCells.add(cell)
-				const shortCell = shortCellToInt(cell as H3Cell)
+				const shortCell = shortCellToInt(cell)
 
 				for (const categoryID of categoryIDs) {
 					rows.push(...allRows<POIRow>(this.#categoryCellProbe, shortCell, categoryID, limit))
@@ -344,8 +344,8 @@ export class POILookup<DB extends POIDatabase = POIDatabase> extends SQLiteLooku
 function sortByDistance(rows: POIRow[], center: { latitude: number; longitude: number }): POIRow[] {
 	return [...rows].toSorted(
 		(a, b) =>
-			haversineKm(center.latitude, center.longitude, a.latitude, a.longitude) -
-			haversineKm(center.latitude, center.longitude, b.latitude, b.longitude)
+			haversine(center.latitude, center.longitude, a.latitude, a.longitude) -
+			haversine(center.latitude, center.longitude, b.latitude, b.longitude)
 	)
 }
 
@@ -363,7 +363,7 @@ function toHit(
 		country: row.country,
 		confidence: row.confidence,
 		gersID: row.gers_id,
-		distanceM: center ? haversineKm(center.latitude, center.longitude, row.latitude, row.longitude) * 1000 : null,
+		distanceM: center ? haversine(center.latitude, center.longitude, row.latitude, row.longitude) * 1000 : null,
 	}
 }
 

package/lib/proximity-rerank.ts

@@ -23,7 +23,7 @@
  *      ordering silently discarded downstream.
  */
 
-import { haversineKm } from "@mailwoman/spatial"
+import { haversine } from "@mailwoman/spatial/geometries/point/distance"
 
 /**
  * Full magnitude of the nearness term at distance 0, before decay.
@@ -92,7 +92,7 @@ export function combinedProminence(candidate: ProximityRerankable, bias: readonl
 	// A 0,0 pair interpreted as a real coordinate would receive an enormous score.
 	if (!(candidate.lat === 0 && candidate.lon === 0)) {
 		for (const b of bias) {
-			const d = haversineKm(b.lat, b.lon, candidate.lat, candidate.lon)
+			const d = haversine(b.lat, b.lon, candidate.lat, candidate.lon)
 			const term = (BIAS_BOOST * (b.weight ?? 1)) / (1 + d / PROX_SCALE_KM)
 
 			if (term > proxTerm) {

package/lib/reverse.ts

@@ -24,7 +24,10 @@
 
 import { tryParsingJSON } from "@mailwoman/core/json"
 import { allRows } from "@mailwoman/core/utils"
-import { bboxAround, geometryContains, haversineKm, type ParsedGeometry } from "@mailwoman/spatial"
+import type { ParsedGeometry } from "@mailwoman/spatial"
+import { bboxAround } from "@mailwoman/spatial/bbox"
+import { haversine } from "@mailwoman/spatial/geometries/point/distance"
+import { geometryContains } from "@mailwoman/spatial/geometries/polygon"
 import { DatabaseClient } from "@mailwoman/sqlite/client"
 import { tableExists } from "@mailwoman/sqlite/introspection"
 import type { PathBuilderLike } from "path-ts"
@@ -311,7 +314,7 @@ export class WOFReverseGeocoder implements Disposable {
 			let bestKm = Infinity
 
 			for (const c of pointOnly) {
-				const km = haversineKm(lat, lon, c.lat, c.lon)
+				const km = haversine(lat, lon, c.lat, c.lon)
 
 				if (km < bestKm) {
 					bestKm = km
@@ -325,7 +328,7 @@ export class WOFReverseGeocoder implements Disposable {
 		// Approximate descent into finer tiers than the winner.
 		let current = winner
 		let currentConfirmed = winnerConfirmed
-		let currentDistanceKm = currentConfirmed ? null : haversineKm(lat, lon, current.lat, current.lon)
+		let currentDistanceKm = currentConfirmed ? null : haversine(lat, lon, current.lat, current.lon)
 
 		for (const tier of DESCENT_TIERS) {
 			if (placetypeDepth(tier) <= placetypeDepth(current.placetype)) continue
@@ -349,7 +352,7 @@ export class WOFReverseGeocoder implements Disposable {
 				}
 
 				if (contains === false) continue // known not-here, polygon rejected
-				const km = haversineKm(lat, lon, k.lat, k.lon)
+				const km = haversine(lat, lon, k.lat, k.lon)
 
 				if (km <= maxApproximateKm && km < bestKm) {
 					bestKm = km
@@ -494,7 +497,7 @@ export class WOFReverseGeocoder implements Disposable {
 		if (!this.#polygons) return null
 		const cached = this.#geometryCache.get(id)
 
-		if (cached !== undefined) return cached
+		if (cached) return cached
 
 		if (this.#geometryCache.size >= WOFReverseGeocoder.#GEOMETRY_CACHE_CAP) {
 			this.#geometryCache.clear()

package/lib/search-fetch.ts

@@ -13,7 +13,7 @@
  */
 
 import { allRows } from "@mailwoman/core/utils"
-import { bboxAround } from "@mailwoman/spatial"
+import { bboxAround } from "@mailwoman/spatial/bbox"
 import type { DatabaseClient, SQLInputValue } from "@mailwoman/sqlite/client"
 
 import { PLACE_BBOX_TABLE, PLACE_POPULATION_TABLE } from "#fts"
@@ -142,7 +142,7 @@ export function fetchSearchRows<DB>(options: {
 		params.push(query.country)
 	}
 
-	if (query.parentID !== undefined) {
+	if (query.parentID) {
 		where.push(`(spr.parent_id = ? OR spr.id IN (SELECT id FROM ${sch}.ancestors WHERE ancestor_id = ?))`)
 		params.push(query.parentID, query.parentID)
 	}
@@ -152,7 +152,7 @@ export function fetchSearchRows<DB>(options: {
 	// A requested filter on a legacy extract is silently treated as no bbox filter
 	// so the query does not crash.
 	const extractHasBbox = hasBboxIndex.get(sch) === true
-	const useBboxJoin = (query.bbox || query.near?.maxDistanceKm !== undefined) && extractHasBbox
+	const useBboxJoin = (query.bbox || query.near?.maxDistanceKm) && extractHasBbox
 	let joinClause = `JOIN ${sch}.spr ON spr.id = place_search.wof_id`
 
 	if (useBboxJoin) {

package/lib/sqlite/convention-source.ts

@@ -35,7 +35,7 @@ export class SqliteConventionSource<DB> implements ConventionSource {
 	get(wofID: number): Convention | null {
 		const cached = this.#cache.get(wofID)
 
-		if (cached !== undefined) return cached
+		if (cached) return cached
 		let value: Convention | null = null
 
 		try {

package/lib/street/centroid.ts

@@ -6,7 +6,7 @@
  */
 
 import type { StreetCentroidHit, StreetCentroidLookup } from "@mailwoman/core/resolver"
-import { haversineKm } from "@mailwoman/spatial"
+import { haversine } from "@mailwoman/spatial/geometries/point/distance"
 import { DatabaseClient } from "@mailwoman/sqlite/client"
 import type { PathBuilderLike } from "path-ts"
 
@@ -51,7 +51,7 @@ const AGG_SELECT =
  * Half the bounding-box diagonal in meters, used as a coarse uncertainty radius for a street centroid.
  */
 function extentRadiusM(minLat: number, maxLat: number, minLon: number, maxLon: number): number {
-	return Math.round(haversineKm(minLat, minLon, maxLat, maxLon) * 500)
+	return Math.round(haversine(minLat, minLon, maxLat, maxLon) * 500)
 }
 
 /**

package/lib/street/morphology/fst/builder.ts

@@ -17,7 +17,7 @@
  *   Design rationale + the four-layer street-supplement architecture lives in
  *   `docs/articles/concepts/street-supplement-architecture.md`.
  *
- *   Source: `core/data/libpostal/dictionaries/{locale}/street_types.txt`. Each line is pipe-delimited
+ *   Source: `dictionaries/data/libpostal/dictionaries/{locale}/street_types.txt`. Each line is pipe-delimited
  *   surface forms with the canonical form first: avenue|av|ave|aven|avenu|avn|avnu|avnue
  *
  *   Output: an `FSTMatcher` ready to serialize via `serializeFST` to e.g.
@@ -61,7 +61,7 @@ export const REGION_ABBREVIATION_VARIANTS: ReadonlySet<string> = new Set(
 
 export interface BuildStreetMorphologyFSTOpts {
 	/**
-	 * Path to the `core/data/libpostal/dictionaries` directory containing per-locale subfolders.
+	 * Path to the `dictionaries/data/libpostal/dictionaries` directory containing per-locale subfolders.
 	 */
 	dictionariesDir: PathBuilderLike
 	/**
@@ -213,7 +213,7 @@ export async function buildStreetMorphologyFST(
 			const node = nodes[stateID]!
 			let next = node.edges.get(t)
 
-			if (next === undefined) {
+			if (!next) {
 				next = nodes.length
 				nodes.push({ edges: new Map(), places: [] })
 				node.edges.set(t, next)

package/lib/street/morphology/fst/loader.ts

@@ -10,7 +10,7 @@
  *   1. An explicit `artifactPath`, e.g. the weights-package sibling surfaced by
  *      `NeuralAddressClassifier.streetMorphologyPath`. When given, it is the only artifact probed.
  *   2. Otherwise the staged sealed artifact at `$MAILWOMAN_DATA_ROOT/db/wof/fst-street-morphology.bin`.
- *   3. A build-from-dictionaries fallback: `buildStreetMorphologyFST` over core's bundled libpostal
+ *   3. A build-from-dictionaries fallback: `buildStreetMorphologyFST` over `@mailwoman/dictionaries`' libpostal
  *      `street_types.txt` files, kept so a missing artifact degrades to a per-process build instead
  *      of a crash.
  *
@@ -21,7 +21,7 @@
 
 import { readLocalBuffer } from "@mailwoman/core/fs/readers"
 import { pathExists } from "@mailwoman/core/fs/readers/stat"
-import { resourceDictionaryPath } from "@mailwoman/core/paths"
+import { resourceDictionaryPath } from "@mailwoman/dictionaries/paths"
 import type { PathBuilder, PathBuilderLike } from "path-ts"
 
 import type { FSTMatcher } from "#fst/matcher"
@@ -54,7 +54,7 @@ export interface LoadStreetMorphologyFSTOpts {
 	/**
 	 * Dictionaries dir for the build fallback.
 	 *
-	 * @defaultValue core's bundled libpostal dictionaries.
+	 * @defaultValue the libpostal dictionaries `@mailwoman/dictionaries` ships.
 	 */
 	dictionariesDir?: PathBuilderLike
 	/**

package/lib/street/normalize.ts

@@ -68,6 +68,16 @@ function fold(input: string): string {
 		.trim()
 }
 
+/**
+ * The name and version of the street-key normalization {@link normalizeStreetForKeyLocale} applies.
+ *
+ * An artifact manifest of a street-keyed role records this pair with its locale,
+ * and a reader refuses an artifact keyed by another version.
+ * Version `1` is the normalization in this module when versions began to be recorded, on 2026-10-29.
+ * A change to any key it produces is a new version.
+ */
+export const STREET_KEY_NORMALIZATION = { algorithm: "street-key", version: "1" } as const
+
 /**
  * Normalizes a US or English street name into an address-point key, folding directionals,
  * spelled ordinals and the USPS street-type suffix.
@@ -90,7 +100,7 @@ export function normalizeStreetForKey(street: string): StreetKey {
 		AbbreviationToDirectional.get(raw.toUpperCase())?.toLowerCase().replace(" ", "")
 
 	const mergePair = (a?: string, b?: string) =>
-		a && b && /^(north|south)$/.test(a) && /^(east|west)$/.test(b) ? a + b : undefined
+		a && b && /^(north|south)$/.test(a) && /^(east|west)$/.test(b) ? a + b : null
 
 	const leadPair = mergePair(tokens[0], tokens[1])
 
@@ -138,6 +148,23 @@ export function normalizeStreetForKey(street: string): StreetKey {
  */
 export type StreetLocale = "us" | "en" | "es" | "fr" | "de" | "it" | "nl" | "pl" | "vn" | "id" | "zh"
 
+/**
+ * Every locale {@link normalizeStreetForKeyLocale} keys streets under.
+ */
+export const STREET_LOCALES = [
+	"us",
+	"en",
+	"es",
+	"fr",
+	"de",
+	"it",
+	"nl",
+	"pl",
+	"vn",
+	"id",
+	"zh",
+] as const satisfies readonly StreetLocale[]
+
 function foldHan(input: string): string {
 	return input.normalize("NFKC").replaceAll("臺", "台").replaceAll(/\s+/g, "").toLowerCase()
 }
@@ -434,6 +461,14 @@ const CANONICAL_TYPE_WORDS: ReadonlySet<string> = new Set(
 	[...US_STREET_SUFFIX_LOOKUP.values()].map((v) => v.toLowerCase())
 )
 
+const ENGLISH_ORDINAL_RULES = new Intl.PluralRules("en-US", { type: "ordinal" })
+
+const ENGLISH_ORDINAL_SUFFIX: Record<string, string> = { one: "st", two: "nd", few: "rd", other: "th" }
+
+function ordinalOf(n: number): string {
+	return `${n}${ENGLISH_ORDINAL_SUFFIX[ENGLISH_ORDINAL_RULES.select(n)] ?? "th"}`
+}
+
 /**
  * Lists the lookup keys to probe for a street span, most literal first, adding doubled-type
  * and Saint/St-swap recovery forms for `us` and `en`.
@@ -463,6 +498,29 @@ export function streetKeyVariants(street: string, locale: StreetLocale = "us"):
 		}
 	}
 
+	// NAD writes a numbered street with its ordinal suffix ("48th St")
+	// and NYC Open Data writes the bare number ("48 ST").
+	// The build keys each row as written, so the reader probes both forms.
+	for (const variant of variants.slice()) {
+		const parts = variant.split(" ")
+
+		const toggled = parts
+			.map((token, i) => {
+				// Only a number followed by a street type is an ordinal ("48 street"), not "us route 9".
+				if (!CANONICAL_TYPE_WORDS.has(parts[i + 1] ?? "")) return token
+				const bare = /^(\d+)(?:st|nd|rd|th)$/.exec(token)?.[1]
+
+				if (bare) return bare
+
+				return /^\d+$/.test(token) ? ordinalOf(Number(token)) : token
+			})
+			.join(" ") as StreetKey
+
+		if (toggled !== variant && !variants.includes(toggled)) {
+			variants.push(toggled)
+		}
+	}
+
 	const preSwap = variants.slice()
 
 	for (const variant of preSwap) {

package/lib/types.ts

@@ -155,6 +155,14 @@ export interface FindPlaceQuery {
 	 */
 	parentID?: number
 
+	/**
+	 * A resolved parent place whose containment orders the rows and admits contained sub-locality
+	 * rows the placetype filter excludes, read through the ancestors sidecar (#2804).
+	 *
+	 * It ranks rather than filters, so a query sets this or `parentID`.
+	 */
+	parentQualifierID?: number
+
 	/**
 	 * The sibling postcode for a `locality` query.
 	 *

package/lib/uprn/existence.ts

@@ -18,7 +18,6 @@ import { shortCellToParentInt } from "@mailwoman/spatial"
 
 import type { UPRNLookup } from "#uprn/lookup"
 import { UPRN_COVERAGE_H3_RESOLUTION, UPRN_H3_RESOLUTION, uprnH3Cell } from "#uprn/schema"
-
 /**
  * The identity fold, on purpose: this probe keys on a coordinate rather than a name,
  * so there is no string folding for the builder and the probe to disagree about.

package/lib/uprn/lookup.ts

@@ -7,9 +7,9 @@
  */
 
 import { allRows } from "@mailwoman/core/utils"
-import { haversineKm, shortCellToInt, type GeoCoordinate, type H3Cell } from "@mailwoman/spatial"
+import { haversine, shortCellToInt, type GeoCoordinate } from "@mailwoman/spatial"
 import { DatabaseClient } from "@mailwoman/sqlite/client"
-import { gridDisk } from "h3-js"
+import { gridDisk } from "@sister.software/h3"
 import type { PathBuilderLike } from "path-ts"
 
 import type { UPRNDatabase } from "#uprn/schema"
@@ -128,13 +128,13 @@ export class UPRNLookup implements Disposable {
 
 			if (closestPossibleM > Math.min(radiusM, best?.distanceM ?? radiusM)) break
 
-			const diskCells = gridDisk(origin, ring) as string[]
+			const diskCells = gridDisk(origin, ring)
 			const newCells: number[] = []
 
 			for (const cell of diskCells) {
 				if (!seenCells.has(cell)) {
 					seenCells.add(cell)
-					newCells.push(shortCellToInt(cell as H3Cell))
+					newCells.push(shortCellToInt(cell))
 				}
 			}
 
@@ -148,7 +148,7 @@ export class UPRNLookup implements Disposable {
 				)
 
 				for (const row of rows) {
-					const distanceM = haversineKm(latitude, longitude, row.lat, row.lon) * 1000
+					const distanceM = haversine(latitude, longitude, row.lat, row.lon) * 1000
 
 					if (distanceM <= radiusM && (!best || distanceM < best.distanceM)) {
 						best = { uprn: row.uprn, latitude: row.lat, longitude: row.lon, distanceM }

package/lib/uprn/schema.ts

@@ -7,10 +7,9 @@
  */
 
 import type { layerschemadatabase } from "@mailwoman/core/layers"
-import { shortCellToInt, type H3Cell } from "@mailwoman/spatial"
-import { latLngToCell } from "h3-js"
+import { shortCellToInt } from "@mailwoman/spatial"
+import { latLngToCell, type H3Cell } from "@sister.software/h3"
 import type { Kysely } from "kysely"
-
 /**
  * Resolution the `uprn` table's `h3_cell` column is keyed at, shared with the other layer spines.
  */
@@ -65,7 +64,7 @@ export interface UPRNDatabase extends layerschemadatabase {
  * This is the one derivation the builder and its consumers share so their cells cannot disagree.
  */
 export function uprnFullCell(latitude: number, longitude: number): H3Cell {
-	return latLngToCell(latitude, longitude, UPRN_H3_RESOLUTION) as H3Cell
+	return latLngToCell(latitude, longitude, UPRN_H3_RESOLUTION)
 }
 
 /**

package/lib/weights-overlay-linker.ts

@@ -385,7 +385,7 @@ async function pairIndexIsFresh(
 			return false
 		}
 
-		if (minimumPlausibleBytes !== undefined && (await statPath(dest)).size < minimumPlausibleBytes) {
+		if (minimumPlausibleBytes && (await statPath(dest)).size < minimumPlausibleBytes) {
 			console.log(
 				`rebuilding ${artifact} — ${(await statPath(dest)).size.toLocaleString()} bytes is implausibly small ` +
 					`for this recipe (wrong-source clobber)`
@@ -508,8 +508,8 @@ export async function buildPairIndexOverlay(overlay: PairIndexOverlay): Promise<
 			country,
 			"--delta",
 			String(delta),
-			...(transitionBeta === undefined ? [] : ["--transition-beta", String(transitionBeta)]),
-			...(parentDelta === undefined ? [] : ["--parent-delta", String(parentDelta)]),
+			...(!transitionBeta ? [] : ["--transition-beta", String(transitionBeta)]),
+			...(!parentDelta ? [] : ["--parent-delta", String(parentDelta)]),
 			...extraArgs,
 		],
 		{ stdio: "inherit" }
@@ -727,7 +727,7 @@ async function linkBaseModelPair(destDir: PathBuilder, digestCard: string | null
 	const recipe = await readReleaseConfig()
 
 	const dataRoot = dataRootPath()
-	const digests = digestCard ? (await readWeightsCard(digestCard))?.files_md5 : undefined
+	const digests = digestCard ? (await readWeightsCard(digestCard))?.files_md5 : null
 
 	const pair = [
 		{ label: "model", name: "model.onnx", override: $public.MAILWOMAN_DEV_MODEL, recipe: recipe.weights.model },

package/out/address/point/interpolation.js

@@ -28,7 +28,7 @@
  *
  *   Standalone like the segment tier, wired through the ordered `spatialTiers` list.
  */
-import { haversineKm } from "@mailwoman/spatial";
+import { haversine } from "@mailwoman/spatial/geometries/point/distance";
 import { DatabaseClient } from "@mailwoman/sqlite/client";
 import { hasTable, prepareAll } from "#sqlite-utils";
 import { canonicalizeRouteKey, streetKeyVariants } from "#street/normalize";
@@ -137,7 +137,7 @@ function interpolateFromNeighbors(rows, n) {
     }
     if (below && above) {
         const t = (n - below.n) / (above.n - below.n);
-        const spanM = haversineKm(below.lat, below.lon, above.lat, above.lon) * 1000;
+        const spanM = haversine(below.lat, below.lon, above.lat, above.lon) * 1000;
         return {
             lat: below.lat + (above.lat - below.lat) * t,
             lon: below.lon + (above.lon - below.lon) * t,
@@ -161,8 +161,8 @@ function interpolateFromNeighbors(rows, n) {
         return null;
     const lat = far.lat + (near.lat - far.lat) * t;
     const lon = far.lon + (near.lon - far.lon) * t;
-    const pairM = haversineKm(near.lat, near.lon, far.lat, far.lon) * 1000;
-    const overshootM = haversineKm(lat, lon, near.lat, near.lon) * 1000;
+    const pairM = haversine(near.lat, near.lon, far.lat, far.lon) * 1000;
+    const overshootM = haversine(lat, lon, near.lat, near.lon) * 1000;
     return {
         lat,
         lon,

package/out/address/point/interpolation.js.map

@@ -1 +1 @@
-{"version":3,"file":"interpolation.js","sourceRoot":"","sources":["../../../lib/address/point/interpolation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interpolation.js","sourceRoot":"","sources":["../../../lib/address/point/interpolation.ts"],"names":[],"mappings":"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"}

package/out/address/point/spine-schema.d.ts

@@ -0,0 +1,40 @@
+/**
+ * @copyright Sister Software.
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ * @file The shared rooftop schema with an H3 spine column and the layer-interface tables.
+ *
+ *   The OpenStreetMap and G-NAF rooftop builders write this shape. Readers of existing address points
+ *   project only the columns of `address_point` in `#address/point/schema`, so the H3 spine and the
+ *   layer-interface tables leave their query path unchanged.
+ */
+import { type layerschemadatabase } from "@mailwoman/core/layers";
+import type { Kysely } from "kysely";
+import { type AddressPointTable } from "#address/point/schema";
+/**
+ * Jitter-stable address/POI join cell.
+ * Matches @mailwoman/address-id.
+ */
+export declare const ADDRESS_POINT_H3_RESOLUTION = 9;
+export interface SpineAddressPointTable extends AddressPointTable {
+    /**
+     * 48-bit shortened H3 cell stored as a safe SQLite integer.
+     */
+    h3_cell: number;
+}
+export interface SpineAddressPointDatabase extends layerschemadatabase {
+    address_point: SpineAddressPointTable;
+}
+/**
+ * Positional insert order: the shared address-point fields followed by the H3 spine.
+ */
+export declare const SPINE_ADDRESS_POINT_COLUMNS: readonly ["street_norm", "street_key", "number", "unit", "postcode", "locality_norm", "street_raw", "lat", "lon", "source", "release", "admin_code", "certified", "h3_cell"];
+/**
+ * Create the legacy-compatible domain table plus the H3 spine and the layer-interface tables.
+ */
+export declare function createSpineAddressPointTables(db: Kysely<SpineAddressPointDatabase>): Promise<void>;
+/**
+ * Build after the bulk load so the spine index is not updated on every streaming insert.
+ */
+export declare function createSpineAddressPointIndexes(db: Kysely<SpineAddressPointDatabase>): Promise<void>;
+//# sourceMappingURL=spine-schema.d.ts.map

package/out/address/point/spine-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spine-schema.d.ts","sourceRoot":"","sources":["../../../lib/address/point/spine-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAsD,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACrH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEpC,OAAO,EAAyB,KAAK,iBAAiB,EAA2B,MAAM,uBAAuB,CAAA;AAE9G;;;GAGG;AACH,eAAO,MAAM,2BAA2B,IAAI,CAAA;AAE5C,MAAM,WAAW,sBAAuB,SAAQ,iBAAiB;IAChE;;OAEG;IACH,OAAO,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACrE,aAAa,EAAE,sBAAsB,CAAA;CACrC;AAED;;GAEG;AACH,eAAO,MAAM,2BAA2B,8KAAiD,CAAA;AAEzF;;GAEG;AACH,wBAAsB,6BAA6B,CAAC,EAAE,EAAE,MAAM,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUxG;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAAC,EAAE,EAAE,MAAM,CAAC,yBAAyB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzG"}