Fall back to by population when there are cities with the same name i…

…n different time zones Refs #31
PREreview · Jul 26, 2024 · bb0e459 · bb0e459
1 parent 31134c4
commit bb0e459
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/lib/Iso3166.ts b/src/lib/Iso3166.ts
@@ -35,11 +35,21 @@ export const guessCountry: (location: string) => Option.Option<Alpha2Code> = flo
       ),
       Option.orElse(() =>
         Option.map(
-          Array.findFirst(rawTimeZones, timezone =>
-            Array.some(
-              timezone.mainCities,
-              mainCity => diacritics.remove(location).toLowerCase() === diacritics.remove(mainCity).toLowerCase(),
+          Array.matchLeft(
+            Array.filter(rawTimeZones, timezone =>
+              Array.some(
+                timezone.mainCities,
+                mainCity => diacritics.remove(location).toLowerCase() === diacritics.remove(mainCity).toLowerCase(),
+              ),
             ),
+            {
+              onEmpty: () => Option.none(),
+              onNonEmpty: (head, tail) =>
+                Array.match(tail, {
+                  onEmpty: () => Option.some(head),
+                  onNonEmpty: Option.none,
+                }),
+            },
           ),
           timeZone => timeZone.countryCode,
         ),

diff --git a/test/Iso3166.test.ts b/test/Iso3166.test.ts
@@ -23,6 +23,7 @@ describe('guessCountry', () => {
     ['Québec', 'CA'],
     ['Rio de Janeiro, Brazil.', 'BR'],
     ['Sunnyvale, California', 'US'],
+    ['Sydney', 'AU'],
     ['The UK', 'GB'],
     ['UK', 'GB'],
     ['U.K.', 'GB'],