Match koaza

geolonia · Oct 4, 2024 · af293ef · af293ef
1 parent 2eecf0e
commit af293ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/create-data.yml b/.github/workflows/create-data.yml
@@ -58,6 +58,15 @@ jobs:
         run: |
           aws s3 sync \
             --cache-control="max-age=86400, public" \
+            --exclude="*" \
+            --include="*.txt" \
+            --content-type="text/plain; charset=utf-8" \
+            ./out/ s3://japanese-addresses-v2.geoloniamaps.com/
+          aws s3 sync \
+            --cache-control="max-age=86400, public" \
+            --exclude="*" \
+            --include="*.json" \
+            --content-type="application/json; charset=utf-8" \
             ./out/ s3://japanese-addresses-v2.geoloniamaps.com/
 
       - name: Purge Cloudflare cache

diff --git a/src/lib/abr_mlit_merge_tools.ts b/src/lib/abr_mlit_merge_tools.ts
@@ -9,7 +9,10 @@ export function createMergedApiData(abrData: SingleMachiAza[], mlitData: NlftpMl
   const out = abrData;
 
   for (const row of mlitData) {
-    if (abrData.find(a => a.oaza_cho === row.oaza_cho && a.chome === row.chome)) {
+    if (abrData.find(a => (
+      (a.oaza_cho === row.oaza_cho && a.chome === row.chome) ||
+      a.koaza === row.oaza_cho
+    ))) {
       continue;
     }
     out.push({