universal-parcel-scraper 0.49.2-main.551 → 0.49.2-main.556

package/README.md

@@ -149,7 +149,7 @@ createTracker({ providers: ['ParcelsApp', 'Ship24', '17TRACK', 'Postal Ninja', '
 <!-- GENERATED:stages -->
 <img src="docs/assets/stages.svg" alt="DHL: Die Sendung wurde in das Zustellfahrzeug geladen.; Mondial Relay: En cours de livraison; Correios Brazil: Objeto saiu para entrega ao destinatário; Correos Express: EN REPARTO; Yamato Transport: 配達中; La Poste / Colissimo: DISTOU. All are filed under out_for_delivery." width="760">
 
-The carrier folders record 2,758 such statuses, each filed under one stage.
+The carrier folders record 2,771 such statuses, each filed under one stage.
 <!-- /GENERATED:stages -->
 
 Wording nobody recorded yet goes through a classifier that reads seven European languages.

package/data/catalog.json

@@ -2584,6 +2584,11 @@
       }
     ],
     "detectionRules": [
+      {
+        "pattern": "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$",
+        "confidence": "high",
+        "checksum": "usps"
+      },
       {
         "pattern": "^9[1-5]\\d{20}(?:\\d{4})?$",
         "confidence": "low",

package/data/detection-golden.json

@@ -11032,6 +11032,14 @@
       "austrian-post"
     ]
   },
+  {
+    "input": "9101900000000123456788",
+    "carrier": "usps",
+    "confidence": "high",
+    "candidates": [
+      "usps"
+    ]
+  },
   {
     "input": "91346097123456789012",
     "carrier": "planzer",
@@ -11051,6 +11059,43 @@
       "usps"
     ]
   },
+  {
+    "input": "9205510000000012345670",
+    "carrier": "unknown",
+    "confidence": "low",
+    "candidates": [
+      "usps",
+      "austrian-post",
+      "estafeta"
+    ],
+    "preferred": [
+      "usps"
+    ],
+    "asked": [
+      "austrian-post"
+    ]
+  },
+  {
+    "input": "9205590000000012345672",
+    "carrier": "usps",
+    "confidence": "high",
+    "candidates": [
+      "usps"
+    ]
+  },
+  {
+    "input": "9205590000000012345673",
+    "carrier": "unknown",
+    "confidence": "low",
+    "candidates": [
+      "austrian-post",
+      "usps",
+      "estafeta"
+    ],
+    "asked": [
+      "austrian-post"
+    ]
+  },
   {
     "input": "9261269903500013618305",
     "carrier": "unknown",
@@ -11206,6 +11251,14 @@
       "heppner"
     ]
   },
+  {
+    "input": "9300100000012345678902",
+    "carrier": "usps",
+    "confidence": "high",
+    "candidates": [
+      "usps"
+    ]
+  },
   {
     "input": "93005001081690801339400",
     "carrier": "unknown",
@@ -11276,82 +11329,42 @@
   },
   {
     "input": "9400111201080805483016",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
     "input": "9400111206206406260787",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
     "input": "9405803699300124287899",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
     "input": "9434611206206406227577",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
     "input": "9434611206217011894085",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
@@ -11394,18 +11407,10 @@
   },
   {
     "input": "9500113562366007585132",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
@@ -11451,34 +11456,18 @@
   },
   {
     "input": "9589071052700675045600",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {
     "input": "9589071052702449080343",
-    "carrier": "unknown",
-    "confidence": "low",
+    "carrier": "usps",
+    "confidence": "high",
     "candidates": [
-      "usps",
-      "austrian-post",
-      "estafeta"
-    ],
-    "preferred": [
       "usps"
-    ],
-    "asked": [
-      "austrian-post"
     ]
   },
   {

package/dist/browser/scraper.js

@@ -2146,6 +2146,11 @@ var ve = {
 			params: ["tLabels"]
 		}],
 		detectionRules: [
+			{
+				pattern: "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$",
+				confidence: "high",
+				checksum: "usps"
+			},
 			{
 				pattern: "^9[1-5]\\d{20}(?:\\d{4})?$",
 				confidence: "low",
@@ -4180,6 +4185,7 @@ var ve = {
 	tipsa: ["tipsa-1", "tipsa-2"],
 	ukrposhta: ["ukrposhta-1"],
 	usps: [
+		"usps-impb",
 		"usps-3",
 		"usps-1",
 		"usps-2",

package/dist/carriers/correos-spain/adapter.d.ts

@@ -13,11 +13,18 @@ export declare class CorreosSpainTracker {
     readonly timeoutMs: number;
     readonly fetcher: typeof fetch | undefined;
     private readonly userAgent;
+    /** An office's address does not change. */
+    private readonly offices;
     constructor(options?: {
         timeoutMs?: number;
         fetcher?: typeof fetch;
         userAgent?: string;
     });
     fetch(rawTrackingNumber: string, context?: TrackingContext): Promise<CarrierResult>;
+    /**
+     * The office locator places its search text and lists the offices around it, so the
+     * office's own name finds it. The reply is read only for the office of that unit code.
+     */
+    private officeAddress;
 }
 export declare const adapter: AdapterFactory;

package/dist/carriers/correos-spain/adapter.js

@@ -2,7 +2,7 @@ import { lookupBudget } from '../../core/adapter/index.js';
 import { isCorreosSpainExpeditionCode } from '../../core/detection/correosSpain.js';
 import { IndeterminateError, InvalidInputError, NotFoundError, SchemaError } from '../../core/errors/index.js';
 import { zonedTime } from '../../core/time/index.js';
-import { clean, fetchBounded, parseJsonBytes, UpstreamHttpError, userAgentOf } from '../../core/transport/index.js';
+import { clean, cleanScalar, fetchBounded, parseJsonBytes, UpstreamHttpError, userAgentOf } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
 import { classifyCorreosSpainStatus } from './status.js';
 // Protocol provenance:
@@ -20,6 +20,15 @@ const TRACKING_ENDPOINT = 'https://localizador.correos.es/canonico/eventos_envio
 // The localizador only knows parcel codes. The public tracker's own search
 // names the parcels of an expedition code, and answers 204 for an unknown one.
 const EXPEDITION_ENDPOINT = 'https://api1.correos.es/digital-services/searchengines/api/v1/envios';
+// The office locator's search on correos.es, keyless like the tracker's. It
+// places free text and lists the offices around that place.
+const OFFICE_SEARCH_ENDPOINT = 'https://api1.correos.es/digital-services/searchloc/api/v1/offices';
+/** The locator answers within a second. */
+const OFFICE_TIMEOUT_MS = 3_000;
+/** Offices whose address a tracker remembers: a waiting parcel is looked up again and again. */
+const MAX_REMEMBERED_OFFICES = 500;
+/** Metres around the place an office's name points to: ten kilometres reach a city's branches from its centre. */
+const OFFICE_SEARCH_RADIUS_M = 10_000;
 const DEFAULT_TIMEOUT_MS = 15_000;
 /** `fetchBounded` repeats a request that failed in transit once, after this pause. */
 const TRANSIENT_RETRY_DELAY_MS = 1_000;
@@ -72,8 +81,31 @@ export function parseCorreosSpainExpeditionResponse(payload, expeditionCode) {
     }
     return parcel;
 }
+/**
+ * The street and town of the office the locator's reply lists under `codired`, a line
+ * each. Its phone, email, opening hours and coordinates are not read.
+ */
+function officeAddress(payload, codired) {
+    const others = isRecord(payload) ? payload.others : undefined;
+    const offices = isRecord(others) ? others.offices : undefined;
+    if (!Array.isArray(offices))
+        return '';
+    // The locator's officeId is the unit code: correos.es books an office's appointments with it as codired.
+    const office = offices.find((candidate) => isRecord(candidate) && cleanScalar(candidate.officeId, 16) === codired);
+    if (!isRecord(office))
+        return '';
+    const street = clean(office.address, 120);
+    const town = clean(office.cityName, 80);
+    if (!street || !town)
+        return '';
+    return `${street}\n${[clean(office.postalCode, 10), town].filter(Boolean).join(' ')}`;
+}
 /** `expeditionCode` binds a parcel found through its expedition to that expedition. */
 export function parseCorreosSpainTrackingResponse(payload, trackingNumber, expeditionCode) {
+    return parseTracking(payload, trackingNumber, expeditionCode).result;
+}
+/** `office` is the unit code of the office the result names as its pickup point, else empty. */
+function parseTracking(payload, trackingNumber, expeditionCode) {
     const requested = normalizeCorreosSpainTrackingNumber(trackingNumber);
     // The endpoint answers a single-element array; bare objects are accepted too
     // since some error bodies come back unwrapped.
@@ -139,6 +171,7 @@ export function parseCorreosSpainTrackingResponse(payload, trackingNumber, exped
     // the envelope. The office is only a pickup signal when the parcel is
     // actually awaiting collection; weight/dims are operational parcel data.
     const office = clean(envelope.nom_codired, 300) || null;
+    const officeCode = cleanScalar(envelope.codired, 16);
     const grams = Number(envelope.peso);
     const weightKg = Number.isFinite(grams) && grams > 0 ? Math.round((grams / 1000) * 1000) / 1000 : null;
     const dims = [envelope.largo, envelope.ancho, envelope.alto].map((value) => Number(value));
@@ -153,45 +186,59 @@ export function parseCorreosSpainTrackingResponse(payload, trackingNumber, exped
         ...(weightKg != null ? { weight_kg: weightKg } : {}),
         ...(dimensionsText ? { dimensions_text: dimensionsText } : {}),
     };
-    const pickupExtras = (stage) => (stage === 'ready_for_pickup' && office ? { pickup_point: office } : {});
+    // codired is the unit holding the parcel, whose address the office locator gives.
+    const waiting = latest?.event.stage === 'ready_for_pickup' && office;
+    const pickupExtras = waiting ? { pickup_point: office } : {};
+    const pickupOffice = waiting && /^\d{1,16}$/.test(officeCode) ? officeCode : '';
     if (!latest) {
         return {
-            status: 'unknown',
-            last_status_text: clean(envelope.resumen_ultimo, 500) || 'Tracking information received',
-            last_update: null,
-            expected_delivery: null,
-            ...extras,
-            events,
+            result: {
+                status: 'unknown',
+                last_status_text: clean(envelope.resumen_ultimo, 500) || 'Tracking information received',
+                last_update: null,
+                expected_delivery: null,
+                ...extras,
+                events,
+            },
+            office: '',
         };
     }
     if (!latest.classified) {
         return {
-            status: 'unknown',
+            result: {
+                status: 'unknown',
+                last_status_text: latest.event.description,
+                last_update: latest.event.time ?? null,
+                expected_delivery: null,
+                ...extras,
+                ...pickupExtras,
+                events,
+            },
+            office: pickupOffice,
+        };
+    }
+    const deliveredAt = latest.classified.status === 'delivered' ? latest.event.time ?? null : null;
+    return {
+        result: {
+            status: latest.classified.status,
+            current_stage: latest.classified.stage,
             last_status_text: latest.event.description,
             last_update: latest.event.time ?? null,
             expected_delivery: null,
             ...extras,
-            ...pickupExtras(latest.event.stage),
+            ...pickupExtras,
+            ...(deliveredAt ? { delivered_at: deliveredAt } : {}),
             events,
-        };
-    }
-    const deliveredAt = latest.classified.status === 'delivered' ? latest.event.time ?? null : null;
-    return {
-        status: latest.classified.status,
-        current_stage: latest.classified.stage,
-        last_status_text: latest.event.description,
-        last_update: latest.event.time ?? null,
-        expected_delivery: null,
-        ...extras,
-        ...pickupExtras(latest.classified.stage),
-        ...(deliveredAt ? { delivered_at: deliveredAt } : {}),
-        events,
+        },
+        office: pickupOffice,
     };
 }
 export class CorreosSpainTracker {
     timeoutMs;
     fetcher;
     userAgent;
+    /** An office's address does not change. */
+    offices = new Map();
     constructor(options = {}) {
         this.timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
         this.fetcher = options.fetcher;
@@ -203,8 +250,8 @@ export class CorreosSpainTracker {
     async fetch(rawTrackingNumber, context = {}) {
         const trackingNumber = normalizeCorreosSpainTrackingNumber(rawTrackingNumber);
         const expedition = isCorreosSpainExpeditionCode(trackingNumber);
-        // The default budget covers each request, its pause and its one transient retry.
-        const budget = lookupBudget(context, (expedition ? 2 : 1) * (2 * this.timeoutMs + TRANSIENT_RETRY_DELAY_MS));
+        // The default budget covers each request, its pause and its one transient retry, and the office's address.
+        const budget = lookupBudget(context, (expedition ? 2 : 1) * (2 * this.timeoutMs + TRANSIENT_RETRY_DELAY_MS) + OFFICE_TIMEOUT_MS);
         const request = async (url) => {
             const { response, bytes } = await fetchBounded(url, {
                 signal: budget.signal,
@@ -235,7 +282,51 @@ export class CorreosSpainTracker {
         const { bytes } = await request(`${TRACKING_ENDPOINT}/${encodeURIComponent(parcel)}`
             + '?codAplicacion=60&codCanal=3&codIdioma=ES&indUltEvento=N');
         // A code the search returns as its own parcel is tracked as any parcel code.
-        return parseCorreosSpainTrackingResponse(parseJsonBytes(bytes, 'Correos tracking'), parcel, parcel === trackingNumber ? undefined : trackingNumber);
+        const { result, office } = parseTracking(parseJsonBytes(bytes, 'Correos tracking'), parcel, parcel === trackingNumber ? undefined : trackingNumber);
+        // The localizador names the office holding the parcel without its address, which the office locator adds.
+        if (office && result.pickup_point) {
+            const address = await this.officeAddress(office, result.pickup_point, budget.signal, budget.remainingMs());
+            if (address)
+                result.pickup_point = `${result.pickup_point}\n${address}`;
+        }
+        return result;
+    }
+    /**
+     * The office locator places its search text and lists the offices around it, so the
+     * office's own name finds it. The reply is read only for the office of that unit code.
+     */
+    async officeAddress(codired, name, signal, remainingMs) {
+        const known = this.offices.get(codired);
+        if (known)
+            return known;
+        const timeoutMs = Math.floor(Math.min(OFFICE_TIMEOUT_MS, remainingMs / 2));
+        if (timeoutMs < 1)
+            return '';
+        try {
+            // The parameters correos.es's map sends to list offices only, over a wider radius.
+            const query = new URLSearchParams({ text: name, searchType: 'otros', specialSearch: 'true', sendDelivery: 'OFI',
+                distance: String(OFFICE_SEARCH_RADIUS_M) });
+            const { bytes } = await fetchBounded(`${OFFICE_SEARCH_ENDPOINT}?${query}`, {
+                signal,
+                headers: { Accept: 'application/json, text/plain, */*', 'Accept-Language': 'en-US,en;q=0.9', 'User-Agent': this.userAgent },
+            }, {
+                provider: 'Correos office locator',
+                timeoutMs,
+                maxBytes: MAX_RESPONSE_BYTES,
+                fetcher: this.fetcher,
+            });
+            const address = officeAddress(parseJsonBytes(bytes, 'Correos office locator'), codired);
+            if (address) {
+                if (this.offices.size >= MAX_REMEMBERED_OFFICES)
+                    this.offices.delete(this.offices.keys().next().value);
+                this.offices.set(codired, address);
+            }
+            return address;
+        }
+        catch {
+            signal.throwIfAborted();
+            return '';
+        }
     }
 }
 export const adapter = (environment) => {

package/dist/carriers/fedex/adapter.js

@@ -21,8 +21,9 @@ import { FEDEX_CODE_STAGE, fedexStage, fedexStatus } from './status.js';
  *
  * Response shape provenance: the page bundle's package model (`trackingNbr`,
  * `keyStatus`/`keyStatusCD`, `scanEventList` items with
- * `date`/`time`/`gmtOffset`/`scanLocation`/`status`/`statusCD`/`scanDetails`),
- * inspected 2026-09-20.
+ * `date`/`time`/`gmtOffset`/`scanLocation`/`status`/`statusCD`/`scanDetails`,
+ * and the hold location's `halCmpnyName`/`halAddress`), inspected 2026-09-20
+ * and 2026-10-08.
  */
 const TRACKING_BASE = 'https://www.fedex.com/fedextrack/';
 const TRACK_API = 'https://api.fedex.com/track/v2/shipments';
@@ -84,6 +85,30 @@ function expectedDelivery(value) {
 function deliveredAt(value) {
     return explicitOffsetTime(value)?.iso ?? null;
 }
+/**
+ * The hold location, read only while the parcel waits there: its name, then
+ * its street and its town on their own lines when FedEx gives both. These are
+ * the `halCmpnyName` and `halAddress` the page reads for a held parcel. The
+ * recipient and shipper blocks are never a fallback, and a residential hold
+ * address is someone's home, so it is never projected.
+ */
+function holdLocation(shipment) {
+    const name = clean(shipment.halCmpnyName, 200);
+    const address = isRecord(shipment.halAddress) ? shipment.halAddress : {};
+    if (!name || shipment.halresidential === true || address.residential === true)
+        return '';
+    const street = Array.isArray(address.streetLines)
+        ? address.streetLines.map((line) => clean(line, 120)).filter(Boolean)
+        : [];
+    const city = clean(address.city, 80);
+    if (street.length === 0 || !city)
+        return name;
+    const postcode = cleanScalar(address.postalCode, 16);
+    // A US state or Canadian province comes before the postcode, after the town.
+    const region = clean(address.stateOrProvinceCode, 40);
+    const town = region ? `${city}, ${[region, postcode].filter(Boolean).join(' ')}` : [postcode, city].filter(Boolean).join(' ');
+    return [name, street[0], street.slice(1).join(', '), town].filter(Boolean).join('\n');
+}
 function errorCode(error) {
     return isRecord(error) ? cleanScalar(error.code).toLocaleUpperCase('en-US') : '';
 }
@@ -170,6 +195,7 @@ export function parseFedExTrackingResponse(payload, trackingNumber) {
     const status = fedexStatus(keyStatusCD, `${keyStatus} ${statusDetails}`, trimmed.length > 0);
     const delivered = stage === 'delivered';
     const estimate = delivered ? null : expectedDelivery(shipment.estDeliveryDt);
+    const pickupPoint = stage === 'ready_for_pickup' ? holdLocation(shipment) : '';
     return {
         status,
         ...(stage ? { current_stage: stage } : {}),
@@ -178,6 +204,7 @@ export function parseFedExTrackingResponse(payload, trackingNumber) {
         expected_delivery: estimate,
         ...(delivered && deliveredAt(shipment.actDeliveryDt)
             ? { delivered_at: deliveredAt(shipment.actDeliveryDt) } : {}),
+        ...(pickupPoint ? { pickup_point: pickupPoint } : {}),
         events: trimmed,
     };
 }

package/dist/carriers/fedex/carrier.json

@@ -24,7 +24,8 @@
     "history",
     "location",
     "eta",
-    "delivered_at"
+    "delivered_at",
+    "pickup_point"
   ],
   "portal": {
     "url": "https://www.fedex.com/fedextrack/?trknbr={trackingNumber}",
@@ -33,13 +34,15 @@
       "status",
       "history",
       "eta",
-      "location"
+      "location",
+      "pickup_point"
     ],
     "scraped": [
       "status",
       "history",
       "eta",
-      "location"
+      "location",
+      "pickup_point"
     ],
     "discarded": [
       "recipient name and address",

package/dist/carriers/fedex/status.d.ts

@@ -12,6 +12,13 @@
  * delay flags, `DL`/`OD`/`OC`/`PU`/`AR`/`DP` come from the page bundle and
  * FedEx's tracking documentation; `IT`/`SE`/`CA` match the official Track API
  * vocabulary (prior art). `statuses.json` holds the full list.
+ *
+ * Hold at location: FedEx documents `HP` as "Ready for pickup (Hold at
+ * Location)", and the page puts an `HL` package on its "Ready for pickup"
+ * step. `RR` (delivery option requested) and `HA` (hold request accepted)
+ * come before, while the parcel still travels to the location. A hold for a
+ * problem, such as clearance or a wrong address, carries another code (`SE`,
+ * `DE`, `CD`) and is never read as ready for pickup.
  */
 import type { CarrierStatus } from '../../core/result/index.js';
 import type { Stage } from '../../core/status/index.js';

package/dist/carriers/fedex/status.js

@@ -5,7 +5,11 @@ export const FEDEX_CODE_STAGE = {
     AR: 'in_transit',
     DP: 'in_transit',
     IT: 'in_transit',
+    RR: 'in_transit',
+    HA: 'in_transit',
     OD: 'out_for_delivery',
+    HL: 'ready_for_pickup',
+    HP: 'ready_for_pickup',
     DL: 'delivered',
     DE: 'failed_attempt',
     DY: 'exception',
@@ -35,6 +39,7 @@ const EXCEPTION_TERMS = [
     'action required',
     'clearance delay',
 ];
+const READY_FOR_PICKUP_TERMS = ['ready for pickup'];
 const DELIVERED_TERMS = ['delivered', 'signed for', 'left at', 'received by'];
 const CUSTOMS_TERMS = ['clearance', 'customs'];
 const OUT_FOR_DELIVERY_TERMS = ['out for delivery', 'on fedex vehicle for delivery', 'on vehicle for delivery'];
@@ -70,6 +75,8 @@ export function fedexStage(text) {
         return 'returned';
     if (FAILED_ATTEMPT_TERMS.some((term) => value.includes(term)))
         return 'failed_attempt';
+    if (READY_FOR_PICKUP_TERMS.some((term) => value.includes(term)))
+        return 'ready_for_pickup';
     if (DELIVERED_TERMS.some((term) => value.includes(term)))
         return 'delivered';
     if (OUT_FOR_DELIVERY_TERMS.some((term) => value.includes(term)))

package/dist/carriers/fedex/statuses.json

@@ -7,6 +7,10 @@
     { "code": "DP", "language": "en", "stage": "in_transit", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "keyStatusCD; departed FedEx location." },
     { "code": "IT", "language": "en", "stage": "in_transit", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "keyStatusCD; in transit." },
     { "code": "OD", "language": "en", "stage": "out_for_delivery", "confirmedBy": "bundle", "firstSeen": "2026-09-20", "note": "keyStatusCD; on FedEx vehicle for delivery." },
+    { "code": "RR", "language": "en", "stage": "in_transit", "confirmedBy": "official-doc", "firstSeen": "2026-10-08", "note": "Delivery option requested. With exception code A12 the recipient asked to hold the parcel at a location." },
+    { "code": "HA", "language": "en", "stage": "in_transit", "confirmedBy": "official-doc", "firstSeen": "2026-10-08", "note": "Hold at location request accepted; the parcel still travels to the location." },
+    { "code": "HL", "language": "en", "stage": "ready_for_pickup", "confirmedBy": "bundle", "firstSeen": "2026-10-08", "note": "keyStatusCD; the page puts it on its Ready for pickup step and shows the hold location. Adapter result status: out_for_delivery." },
+    { "code": "HP", "language": "en", "stage": "ready_for_pickup", "confirmedBy": "official-doc", "firstSeen": "2026-10-08", "note": "Ready for pickup (Hold at Location); the page dates its ready-for-pickup step from this scan. Adapter result status: out_for_delivery." },
     { "code": "DL", "language": "en", "stage": "delivered", "confirmedBy": "bundle", "firstSeen": "2026-09-20", "note": "keyStatusCD; terminal, outranks the wording." },
     { "code": "DE", "language": "en", "stage": "failed_attempt", "confirmedBy": "bundle", "firstSeen": "2026-09-20", "note": "keyStatusCD; drives the page's own delivery-exception flag. Adapter result status: exception." },
     { "code": "DY", "language": "en", "stage": "exception", "confirmedBy": "bundle", "firstSeen": "2026-09-20", "note": "keyStatusCD; drives the page's own delay flag." },
@@ -23,6 +27,7 @@
     { "wording": "Clearance delay", "language": "en", "stage": "customs", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "Adapter result status: in_transit." },
     { "wording": "Clearance in progress", "language": "en", "stage": "customs", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "Adapter result status: in_transit." },
     { "wording": "On FedEx vehicle for delivery", "language": "en", "stage": "out_for_delivery", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "" },
+    { "wording": "Ready for pickup", "language": "en", "stage": "ready_for_pickup", "confirmedBy": "official-doc", "firstSeen": "2026-10-08", "note": "Checked before the delivered and exception wordings. Adapter result status: out_for_delivery." },
     { "wording": "Delivered", "language": "en", "stage": "delivered", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "A delivered scan's description is replaced by this word because the original names the signatory." },
     { "wording": "Delivery exception", "language": "en", "stage": "failed_attempt", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "Adapter result status: exception." },
     { "wording": "Customer not available or business closed", "language": "en", "stage": "failed_attempt", "confirmedBy": "prior-art", "firstSeen": "2026-09-20", "note": "Adapter result status: exception." },

package/dist/carriers/paack/adapter.js

@@ -15,18 +15,20 @@
  * does echo the delivery postcode, which must agree with the requested one.
  *
  * Privacy: the loader payload carries the retailer, the recipient's name,
- * e-mail, phone and address, and per-event `variables` that repeat them.
- * `parse()` copies nothing from those objects: each event is rebuilt from its
- * timestamp, our own description and the mapped stage, and the only order-level
- * fields read are the delivery postcode, compared and never copied, the
- * delivery country, which picks the window's clock, and the delivery window.
+ * e-mail, phone and address, the PaackGo Point pickup code and QR link, and
+ * per-event `variables` that repeat them. `parse()` copies nothing from those:
+ * each event is rebuilt from its timestamp, our own description and the mapped
+ * stage, and the only order-level fields read are the delivery postcode,
+ * compared and never copied, the delivery country, which picks the window's
+ * clock, the delivery window, and the PaackGo Point's name and address while
+ * the parcel waits there.
  */
 import { load } from 'cheerio';
 import { DateTime } from 'luxon';
 import { lookupBudget } from '../../core/adapter/index.js';
 import { IndeterminateError, InputRequiredError, InvalidInputError, NotFoundError, SchemaError } from '../../core/errors/index.js';
 import { countryCode, countryTimeZone, explicitOffsetTime } from '../../core/time/index.js';
-import { decodeText, fetchBounded, UpstreamHttpError, userAgentOf } from '../../core/transport/index.js';
+import { clean, decodeText, fetchBounded, UpstreamHttpError, userAgentOf } from '../../core/transport/index.js';
 import { isRecord } from '../../core/types.js';
 import { classifyPaackEvent } from './status.js';
 const TRACKING_ENDPOINT = 'https://mydeliveries.paack.app/tracking/order';
@@ -196,6 +198,22 @@ function redirectTarget(location, from, trackingNumber, postcode) {
         return null;
     return { url: trackingOrderUrl(`${target.origin}${target.pathname}`, trackingNumber, postcode) };
 }
+/**
+ * The PaackGo Point the page names: `pudo_name`, then `pudo_address` on the
+ * following lines. The address is one string Paack formats itself; the page
+ * prints it as it comes and breaks it only where it holds a line break. The
+ * pickup code (`pudo_passcode`), QR link and collection deadline beside them
+ * are never read.
+ */
+function pickupPoint(order) {
+    const name = clean(order.pudo_name, 120);
+    if (!name)
+        return '';
+    const address = typeof order.pudo_address === 'string'
+        ? order.pudo_address.split('\n').map((line) => clean(line, 200)).filter(Boolean)
+        : [];
+    return [name, ...address].join('\n');
+}
 /** Letters and digits only, so "SW1A 1AA" and "4445-027" compare by content. */
 function postcodeKey(value) {
     return value.toLocaleUpperCase('en-US').replace(/[^A-Z0-9]/g, '');
@@ -258,12 +276,14 @@ export function parsePaackTrackingResponse(payload, rawPostcode) {
     const expected = isRecord(order.expected_delivery_ts) && !['delivered', 'exception'].includes(current.status)
         ? expectedDelivery(order.expected_delivery_ts, zone, newest)
         : null;
+    const pickup = current.stage === 'ready_for_pickup' ? pickupPoint(order) : '';
     return {
         status: current.status,
         current_stage: current.stage,
         last_status_text: current.description,
         last_update: activeTime?.iso ?? events[0]?.time ?? null,
         expected_delivery: expected,
+        ...(pickup ? { pickup_point: pickup } : {}),
         timezone: zone,
         events,
     };

package/dist/carriers/paack/carrier.json

@@ -40,7 +40,8 @@
   },
   "capabilities": [
     "history",
-    "eta"
+    "eta",
+    "pickup_point"
   ],
   "portal": {
     "url": "https://mydeliveries.paack.app/tracking?tracking_number={trackingNumber}",
@@ -50,6 +51,8 @@
       "history",
       "eta",
       "eta_window",
+      "pickup_point",
+      "pickup_code",
       "sender_name",
       "recipient_name",
       "recipient_address"
@@ -58,9 +61,11 @@
       "status",
       "history",
       "eta",
-      "eta_window"
+      "eta_window",
+      "pickup_point"
     ],
     "discarded": [
+      "pickup_code",
       "sender_name",
       "recipient_name",
       "recipient_address"

package/dist/carriers/paack/status.d.ts

@@ -10,6 +10,10 @@
  *
  * Order matters: return and failure identifiers are tested before the broader
  * delivery ones, so "notDelivered" can never match the "delivered" substring.
+ * PaackGo Point identifiers come from the page's own vocabulary and are tested
+ * before the generic words they contain: "rejectedByPudo" is a retried
+ * delivery, not a rejection, and "collectedByCustomer" is the recipient
+ * collecting the parcel, not a transit collection.
  * The provider's own wording is never returned; each mapped entry supplies the
  * English description we display.
  *

package/dist/carriers/paack/status.js

@@ -15,6 +15,7 @@ const OUT_FOR_DELIVERY = {
     description: 'Out for delivery',
 };
 const DELIVERED = { status: 'delivered', stage: 'delivered', description: 'Delivered' };
+const DELIVERY_ISSUE = { status: 'exception', stage: 'failed_attempt', description: 'Delivery issue' };
 /** Paack's English timeline labels, keyed like `statusKey`, with the identifier each one renders. */
 const RELAYED = new Map([
     ['orderdetailsreceived', REGISTERED], // manifested
@@ -36,6 +37,18 @@ export function classifyPaackEvent(value) {
     ])) {
         return { status: 'exception', stage: 'returned', description: 'Shipment returned' };
     }
+    // Expired, refused or unpaid at the PaackGo Point: on its way back to the retailer.
+    if (includesAny(key, [
+        'inpudotoreturnexpired',
+        'inpudotoreturnrejected',
+        'inpudotoreturncodnotaccepted',
+    ])) {
+        return { status: 'exception', stage: 'returned', description: 'Returning to sender' };
+    }
+    // The point was closed, full or refused the parcel; Paack tries again.
+    if (includesAny(key, ['pudoclosed', 'pudofull', 'rejectedbypudo'])) {
+        return { ...DELIVERY_ISSUE };
+    }
     if (includesAny(key, [
         'incorrectaddress',
         'notaccepted',
@@ -59,10 +72,10 @@ export function classifyPaackEvent(value) {
         'notdelivered',
         'undelivered',
     ]))
-        return { status: 'exception', stage: 'failed_attempt', description: 'Delivery issue' };
-    if (includesAny(key, ['delivered', 'deliverycompleted']))
+        return { ...DELIVERY_ISSUE };
+    if (includesAny(key, ['delivered', 'deliverycompleted', 'collectedbycustomer']))
         return { ...DELIVERED };
-    if (includesAny(key, ['readyforpickup', 'atpickuppoint'])) {
+    if (includesAny(key, ['droppedinpudo'])) {
         return { status: 'out_for_delivery', stage: 'ready_for_pickup', description: 'Ready for pickup' };
     }
     if (includesAny(key, ['outfordelivery', 'indelivery', 'driverassigned', 'inprogress']))

package/dist/carriers/paack/statuses.json

@@ -25,6 +25,54 @@
       "firstSeen": "2026-09-12",
       "note": "Identifier substring inherited from the pre-package adapter; source not recorded."
     },
+    {
+      "code": "inpudotoreturnexpired",
+      "language": "en",
+      "stage": "returned",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label inPudoToReturnExpired, \"Expired at PaackGo Point\": not collected in time, returned to the retailer."
+    },
+    {
+      "code": "inpudotoreturnrejected",
+      "language": "en",
+      "stage": "returned",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label inPudoToReturnRejected: refused at the PaackGo Point, returned to the retailer. Tested before the rejected exception rule."
+    },
+    {
+      "code": "inpudotoreturncodnotaccepted",
+      "language": "en",
+      "stage": "returned",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label inPudoToReturnCODNotAccepted: cash on delivery not paid at the PaackGo Point, returned to the retailer."
+    },
+    {
+      "code": "pudoclosed",
+      "language": "en",
+      "stage": "failed_attempt",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label pudoClosed, \"Has been rescheduled\": the PaackGo Point was closed; Paack tries again."
+    },
+    {
+      "code": "pudofull",
+      "language": "en",
+      "stage": "failed_attempt",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label pudoFull, \"Has been rescheduled\": the PaackGo Point was full; Paack tries again."
+    },
+    {
+      "code": "rejectedbypudo",
+      "language": "en",
+      "stage": "failed_attempt",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label rejectedByPudo, \"Has been rescheduled\": the PaackGo Point refused the parcel; Paack tries again. Tested before the rejected exception rule."
+    },
     {
       "code": "returntosenderscheduled",
       "language": "en",
@@ -145,6 +193,22 @@
       "firstSeen": "2026-09-12",
       "note": "Identifier substring inherited from the pre-package adapter; source not recorded. Reclassified to exception 2026-09-12."
     },
+    {
+      "code": "inpudotoreturndamaged",
+      "language": "en",
+      "stage": "exception",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label inPudoToReturnDamaged, \"Logistic issue\": no longer available at the PaackGo Point. Reached through damaged."
+    },
+    {
+      "code": "lostbypudo",
+      "language": "en",
+      "stage": "exception",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label lostByPudo, \"Logistic issue\". Reached through lost."
+    },
     {
       "code": "integrationerror",
       "language": "en",
@@ -186,20 +250,20 @@
       "note": "Identifier substring inherited from the pre-package adapter; source not recorded."
     },
     {
-      "code": "readyforpickup",
+      "code": "collectedbycustomer",
       "language": "en",
-      "stage": "ready_for_pickup",
-      "confirmedBy": "prior-art",
-      "firstSeen": "2026-09-12",
-      "note": "Identifier substring inherited from the pre-package adapter; source not recorded."
+      "stage": "delivered",
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label collectedByCustomer, \"Collected from PaackGo Point\". Tested before the collected transit rule."
     },
     {
-      "code": "atpickuppoint",
+      "code": "droppedinpudo",
       "language": "en",
       "stage": "ready_for_pickup",
-      "confirmedBy": "prior-art",
-      "firstSeen": "2026-09-12",
-      "note": "Identifier substring inherited from the pre-package adapter; source not recorded."
+      "confirmedBy": "bundle",
+      "firstSeen": "2026-10-08",
+      "note": "Page label droppedInPudo, \"At PaackGo Point\": the parcel waits at the point named by pudo_name and pudo_address."
     },
     {
       "code": "outfordelivery",

package/dist/carriers/usps/carrier.json

@@ -63,6 +63,12 @@
     }
   ],
   "detection": [
+    {
+      "id": "usps-impb",
+      "pattern": "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$",
+      "confidence": "high",
+      "checksum": "usps"
+    },
     {
       "id": "usps-3",
       "pattern": "^9[1-5]\\d{20}(?:\\d{4})?$",

package/dist/carriers/usps/numbers.json

@@ -114,15 +114,10 @@
         "url": "https://github.com/jkeen/tracking_number_data/blob/main/couriers/usps.json"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Open-source project example, not a real shipment. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Open-source project example, not a real shipment. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "9400111206206406260787",
@@ -132,15 +127,10 @@
         "url": "https://github.com/jkeen/tracking_number_data/blob/main/couriers/usps.json"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Open-source project example, not a real shipment. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Open-source project example, not a real shipment. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "9405803699300124287899",
@@ -150,15 +140,10 @@
         "url": "https://github.com/jkeen/tracking_number_data/blob/main/couriers/usps.json"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Open-source project example, not a real shipment. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Open-source project example, not a real shipment. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "9434611206206406227577",
@@ -168,15 +153,10 @@
         "url": "https://github.com/jkeen/tracking_number_data/blob/main/couriers/usps.json"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Open-source project example, not a real shipment. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Open-source project example, not a real shipment. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "9500113562366007585132",
@@ -186,15 +166,10 @@
         "url": "https://www.govinfo.gov/content/pkg/USCOURTS-ilsd-3_25-cv-02196/pdf/USCOURTS-ilsd-3_25-cv-02196-0.pdf"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Tracking number quoted in a public court record. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Tracking number quoted in a public court record. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "9589071052702449080343",
@@ -204,15 +179,10 @@
         "url": "https://www.govinfo.gov/content/pkg/USCOURTS-ilsd-3_25-cv-02196/pdf/USCOURTS-ilsd-3_25-cv-02196-0.pdf"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
-      "note": "Tracking number quoted in a public court record. The source attributes it to USPS, which stays one candidate among several."
+      "note": "Tracking number quoted in a public court record. The source attributes it to USPS; its PIC structure and check digit select USPS."
     },
     {
       "number": "4201002334249200190132607600833457",
@@ -414,13 +384,8 @@
         "assessment": "candidate"
       },
       "expect": {
-        "carrier": "unknown",
-        "confidence": "low",
-        "candidates": [
-          "usps",
-          "austrian-post",
-          "estafeta"
-        ]
+        "carrier": "usps",
+        "confidence": "high"
       },
       "note": "Public sandbox example; not evidence of a consumer shipment."
     },
@@ -524,6 +489,54 @@
       "context": {
         "assessment": "candidate"
       },
+      "expect": {
+        "carrier": "usps",
+        "confidence": "high"
+      },
+      "note": "A public court exhibit contains a USPS tracking printout for this identifier."
+    },
+    {
+      "number": "9205590000000012345672",
+      "role": "shipment",
+      "evidence": "synthetic",
+      "derivedFrom": "official_shape",
+      "shapeConfirmed": "2026-10-08",
+      "expect": {
+        "carrier": "usps",
+        "confidence": "high"
+      },
+      "note": "Made-up commercial PIC: channel 92, a service type code, a nine-digit Mailer ID starting with 9, a seven-digit serial and the check digit."
+    },
+    {
+      "number": "9300100000012345678902",
+      "role": "shipment",
+      "evidence": "synthetic",
+      "derivedFrom": "official_shape",
+      "shapeConfirmed": "2026-10-08",
+      "expect": {
+        "carrier": "usps",
+        "confidence": "high"
+      },
+      "note": "Made-up commercial PIC: channel 93, a service type code, a six-digit Mailer ID starting with 0 to 8, a ten-digit serial and the check digit."
+    },
+    {
+      "number": "9101900000000123456788",
+      "role": "shipment",
+      "evidence": "synthetic",
+      "derivedFrom": "official_shape",
+      "shapeConfirmed": "2026-10-08",
+      "expect": {
+        "carrier": "usps",
+        "confidence": "high"
+      },
+      "note": "Made-up legacy PIC: channel 91, a two-digit service type code, a nine-digit Mailer ID starting with 9, an eight-digit serial and the check digit."
+    },
+    {
+      "number": "9205510000000012345670",
+      "role": "negative",
+      "evidence": "synthetic",
+      "derivedFrom": "official_shape",
+      "shapeConfirmed": "2026-10-08",
       "expect": {
         "carrier": "unknown",
         "confidence": "low",
@@ -533,7 +546,24 @@
           "estafeta"
         ]
       },
-      "note": "A public court exhibit contains a USPS tracking printout for this identifier."
+      "note": "Made-up channel 92 PIC whose nine-digit Mailer ID does not start with 9. The check digit passes, so USPS is listed first but not selected."
+    },
+    {
+      "number": "9205590000000012345673",
+      "role": "negative",
+      "evidence": "synthetic",
+      "derivedFrom": "official_shape",
+      "shapeConfirmed": "2026-10-08",
+      "expect": {
+        "carrier": "unknown",
+        "confidence": "low",
+        "candidates": [
+          "austrian-post",
+          "usps",
+          "estafeta"
+        ]
+      },
+      "note": "Made-up channel 92 PIC with a wrong check digit, so USPS is one suggestion among several."
     }
   ]
 }

package/dist/data/catalog.json

@@ -2584,6 +2584,11 @@
             }
         ],
         "detectionRules": [
+            {
+                "pattern": "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$",
+                "confidence": "high",
+                "checksum": "usps"
+            },
             {
                 "pattern": "^9[1-5]\\d{20}(?:\\d{4})?$",
                 "confidence": "low",

package/dist/generated/catalog.d.ts

@@ -1724,6 +1724,10 @@ export declare const CARRIER_CATALOG: {
             readonly params: readonly ["tLabels"];
         }];
         readonly detectionRules: readonly [{
+            readonly pattern: "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$";
+            readonly confidence: "high";
+            readonly checksum: "usps";
+        }, {
             readonly pattern: "^9[1-5]\\d{20}(?:\\d{4})?$";
             readonly confidence: "low";
             readonly checksum: "usps";

package/dist/generated/catalog.js

@@ -2585,6 +2585,11 @@ export const CARRIER_CATALOG = {
             }
         ],
         "detectionRules": [
+            {
+                "pattern": "^(?!9[23]61)(?:91\\d{2}9\\d{17}|92\\d{3}9\\d{16}|93\\d{3}[0-8]\\d{16}|9[45]\\d{20})$",
+                "confidence": "high",
+                "checksum": "usps"
+            },
             {
                 "pattern": "^9[1-5]\\d{20}(?:\\d{4})?$",
                 "confidence": "low",
@@ -5272,7 +5277,7 @@ export const DETECTION_RULE_IDS = {
     "ecoscooting": ["ecoscooting-1", "ecoscooting-2"],
     "tipsa": ["tipsa-1", "tipsa-2"],
     "ukrposhta": ["ukrposhta-1"],
-    "usps": ["usps-3", "usps-1", "usps-2", "usps-4"],
+    "usps": ["usps-impb", "usps-3", "usps-1", "usps-2", "usps-4"],
     "canada-post": ["canada-post-1", "canada-post-2"],
     "purolator": ["purolator-1", "purolator-2"],
     "canpar": ["canpar-1"],

package/dist/places/hubs.json

@@ -2,5 +2,7 @@
   { "country": "FR", "names": ["Roissy"], "town": "Roissy-en-France", "airport": "CDG" },
   { "country": "GB", "names": ["Heathrow"], "town": "London", "airport": "LHR" },
   { "country": "GB", "names": ["East Midlands"], "town": "Castle Donington", "airport": "EMA" },
-  { "country": "PL", "names": ["Sękocin Stary"], "town": "Sękocin Stary", "latitude": 52.108, "longitude": 20.88, "source": "https://download.geonames.org/export/zip/PL.zip" }
+  { "country": "PL", "names": ["Sękocin Stary"], "town": "Sękocin Stary", "latitude": 52.108, "longitude": 20.88, "source": "https://download.geonames.org/export/zip/PL.zip" },
+  { "country": "CN", "names": ["Fenggang Town"], "town": "Fenggang", "latitude": 22.757, "longitude": 114.149, "source": "https://www.geonames.org/1916217" },
+  { "country": "FR", "names": ["Terrasson"], "town": "Terrasson-Lavilledieu", "latitude": 45.129, "longitude": 1.32, "source": "https://www.openstreetmap.org/relation/19894168" }
 ]

package/dist/places/index.js

@@ -47,15 +47,14 @@ const UNCONFIRMED_MIN_THOUSANDS = 15;
 const POINT_MAX_KM = 30;
 // An airport a scan names has to be this close to the town it names.
 const AIRPORT_MAX_KM = 60;
-// A hub nickname ranks like a town of this many thousand people, so a longer
-// name that contains it ("Roissy-en-Brie") still wins.
+// A hub's name ranks like a town of this many thousand people.
 const HUB_THOUSANDS = 50;
 /** The city a region is named after ("Santo Domingo Province") has at least this many thousand people. */
 const NAMESAKE_THOUSANDS = 100;
 // Swiss Post scans end in the site's six-digit number: "Zürich Briefzentrum 801050".
 const FACILITIES = new Map(facilityList.map((facility) => [`${facility.country}:${facility.code}`, facility]));
 // Names carriers give a hub instead of its town ("ROISSY" is Paris-Charles de Gaulle, not
-// Roissy-en-Brie), and hubs in villages the gazetteer is too coarse for ("SEKOCIN STARY").
+// Roissy-en-Brie), and hubs the gazetteer cannot place by name ("SEKOCIN STARY", "Fenggang Town", "TERRASSON").
 const HUBS = new Map(hubList.flatMap((hub) => hub.names.map((name) => [nameKey(name), hub])));
 let loaded = null;
 let pincodes = null;
@@ -337,7 +336,11 @@ export function locatePlace(location, hints = {}) {
             // ("Santa Catarina" on a Brazilian parcel).
             const named = phrase.whole ? own.filter((region) => (!country || region.country === country)
                 && (fieldIndex > 0 || region.country === country || hinted.includes(region.country))) : [];
-            const towns = candidates(data, phrase.key);
+            // A hub's name inside a longer place name is part of that name: "Beauregard-de-Terrasson"
+            // is a village, not the agency at Terrasson, and "Roissy-en-Brie" is no airport.
+            const partOfName = list.some((other) => other.start <= phrase.start && other.end >= phrase.end
+                && other.key.length > phrase.key.length && data.keys.has(other.key));
+            const towns = candidates(data, phrase.key).filter((place) => !place.hub || !partOfName);
             namesTown ||= towns.length > 0;
             for (const place of towns) {
                 // A town may still be named like the region it lies in: Moscow in "…, Moscow",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-parcel-scraper",
-  "version": "0.49.2-main.551",
+  "version": "0.49.2-main.556",
   "description": "Self-hosted parcel tracking: carrier detection, dedicated scrapers and optional universal providers.",
   "type": "module",
   "license": "Apache-2.0",