fix(geocode): keep a leading "the" in keyless name matching

foldPlaceName drops a leading "the", so "The Hague" over upstate New
York accepted Hague, NY as an exact nearby match. Split the script-aware
fold into foldPlaceText and use it for keyless toponyms; foldPlaceName
keeps its behaviour for the packs and street matchers.

Also: changelog fragment credits #1585, folding test pins the Latin
letters NFD does not decompose (ß, ø, ł), and CURRENT-STATE notes that
non-Latin names match only when spelled with their marks.
This commit is contained in:
Said Turksever committed 2026-11-05 17:13:00 +00:00
1 parent e4fda9d4e6
commit bc65c274da
5 files changed
+48 -14

No files matched your search

+23
View File
@@ -229,6 +229,7 @@ const HUE = {
extent: [107.3763, 16.7739, 108.0518, 16.1276],
},
};
/** Answers biased requests with `nearby`, unbiased ones with `anywhere`. */
function photonPair(nearby, anywhere) {
const urls = [];
@@ -277,6 +278,10 @@ test('toponym folding preserves non-Latin scripts', () => {
['القاهرة', 'القاهرة'],
['東京', '東京'],
['São 東京', 'sao 東京'],
['Straße', 'strasse'],
['Tromsø', 'tromso'],
['Łódź', 'lodz'],
['The Hague', 'the hague'],
];
for (const [input, expected] of cases) {
@@ -284,6 +289,24 @@ test('toponym folding preserves non-Latin scripts', () => {
}
});
test('a leading "the" is part of the name a nearby match must equal', async () => {
// "The Hague" over upstate New York means the Dutch city, not Hague, NY.
const hagueNy = {
geometry: { type: 'Point', coordinates: [-73.5004, 43.6967] },
properties: { osm_key: 'place', osm_value: 'town', type: 'city', name: 'Hague', country: 'United States' },
};
const theHague = {
geometry: { type: 'Point', coordinates: [4.3113, 52.0799] },
properties: { osm_key: 'place', osm_value: 'city', type: 'city', name: 'The Hague', country: 'Nederland' },
};
const fetchImpl = photonPair([hagueNy], [theHague]);
const result = await geocodeKeyless('The Hague', { bias: '43.65,-73.55|43.75,-73.45', fetchImpl });
assert.equal(Math.round(result.lat), 52, `got ${result.label}`);
assert.equal(fetchImpl.urls.length, 2);
});
test('a biased match that leads with the name is taken without a second request', async () => {
// The other half of the rule, and the reason bias exists at all: "Sixth
// Street" over Austin must stay Austin's.