fix floor parsing

src/utils/translate-address-to-english.ts

@@ -56,16 +56,21 @@ const numberMatchingPatterns: {
     render: (match) => `No. ${match[1]}`,
   },
   {
-    regex: /((\d+)(-\d+)?) *樓/,
-    render: (match) => `${match[1]}F.`,
+    regex: /((\d+)(-(\d+))?) *樓/,
+    render(match) {
+      // if extra number is found, format it to 1F.-2 (e.g. 1-1樓 => 1F.-1)
+      if (match[4]) return `${match[2]}F.-${match[4]}`;
+
+      return `${match[1]}F.`;
+    },
   },
   {
     regex: /(\d+) *[室房]/,
     render: (match) => `Rm. ${match[1]}`,
   },
   {
     regex: /(\d+) *鄰/,
-    render: (match) => `${nth(Number(match[1]))} Neighborhood`,
+    render: (match) => `${match[1]}${nth(Number(match[1]))} Neighborhood`,
   },
 ];
 
@@ -131,14 +136,14 @@ export function translateAddressToEnglish(
     }
   }
 
-  // decode all numbers back to arabic numbers,
-  // format ${number}之${extra} to ${number}-${extra}${type} (e.g. 11號之1 => 11-1號)
+  // decode all numbers back to arabic numbers
   mutableAddress = mutableAddress
     .replace(/[零一二三四五六七八九十百]+/g, (ch) =>
       nzhInstance.decodeS(ch, {
         tenMin: true,
       }),
     )
+    // format ${number}之${extra} to ${number}-${extra}${type} (e.g. 11號之1 => 11-1號)
     .replace(/(\d+)(.)?之(\d+)/g, (ch, number, type = "", extra) =>
       ch.replace(`${number}${type}之${extra}`, `${number}-${extra}${type}`),
     );

test/address-to-english.spec.ts

@@ -24,6 +24,10 @@ const testCases = [
     "105台灣台北市松山區南京東路四段1號6樓",
     "6F., No. 1, Sec. 4, Nanjing E. Rd., Songshan Dist., Taipei City 105, Taiwan (R.O.C.)",
   ],
+  [
+    "105台灣台北市松山區南京東路四段六鄰1號6樓之2",
+    "6th Neighborhood, 6F.-2, No. 1, Sec. 4, Nanjing E. Rd., Songshan Dist., Taipei City 105, Taiwan (R.O.C.)",
+  ],
 ] as const;
 
 test("address-to-english", async () => {