japanese_address_parser 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 555a4597440df04e4b0cc11e22af2a53914098e4088a505e03fb9ca416cc2e36
-  data.tar.gz: 0dd0bc8273ff38526422196b6cdc2117bb22b40bbbc9ea87880f64a8977b3a2d
+  metadata.gz: b8bebe68508e9dda25fe439597b469a72186ebe2d4110ca49d9938f03f538fc3
+  data.tar.gz: d530731112138b397cb406ae6b9f9770852a4967b1efa31bf4fb9ed0a697a8fe
 SHA512:
-  metadata.gz: 577ba2efc0710072f96a4fb043d5d159e141990cf73ffbd88d26daa315b9ffb5e3d3936933ca9206063c7936a4afe54c9d08d10482fb16e6a9b08027f2252bd6
-  data.tar.gz: d2d34c02cb98eb5b7b8f50a9f4c7cdb5eab4bb7f657da04738d268f4137a3287a5a34e520ef0e2ac0deda7d84196c871eb32cfa27c9d26103d4953b7d1d95891
+  metadata.gz: dec81bd1fdee99845f5c4254f65794f5146677b5acdb6c0442436bbc2e0c3c9d050cf4e87915f43fbf8b71ad66560f530a1de0ee3d0ccfd20eb3d9331d8c0d92
+  data.tar.gz: ecbe4861303b94c04fa170d79ef7a9fae8da172e9ca6a4aa373ab778f983b85d6c3e7601682cc5e0fc4a4af32a3740f51c571c86324a68edb74f9e7446f08da7

data/CHANGELOG.md

@@ -17,6 +17,19 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 
 ### Security
 
+## [3.0.3] - 2022-12-28
+### Added
+
+- [#61](https://github.com/yamat47/japanese_address_parser/pull/61) Dependabotを使ってsubmodulesやnpmライブラリが自動で更新される仕組みを作った。([@yamat47](https://github.com/yamat47))
+- [#64](https://github.com/yamat47/japanese_address_parser/pull/64) Dependabotがライブラリを更新するときに、それに依存しているソースコードも自動で更新されるようにした。([@yamat47](https://github.com/yamat47))
+- [#65](https://github.com/yamat47/japanese_address_parser/pull/65) ソースコードの自動更新の仕組みを調整した。([@yamat47](https://github.com/yamat47))
+- [#70](https://github.com/yamat47/japanese_address_parser/pull/70) CSVや内部で利用するライブラリの自動更新の仕組みを調整した。([@yamat47](https://github.com/yamat47))
+
+### Changed
+
+- [#72](https://github.com/yamat47/japanese_address_parser/pull/72) Bump geolonia-japanese-addresses from fa4822f to ce956e6([@yamat47](https://github.com/yamat47))
+- [#73](https://github.com/yamat47/japanese_address_parser/pull/73) Bump @geolonia/normalize-japanese-addresses from 2.5.8 to 2.7.3 in /js([@yamat47](https://github.com/yamat47))
+
 ## [3.0.2] - 2022-11-19
 ### Changed
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    japanese_address_parser (3.0.2)
+    japanese_address_parser (3.0.3)
       schmooze
 
 GEM

data/js/node_modules/.package-lock.json

@@ -1,90 +1,5 @@
 {
-  "name": "japanese_address_parser",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
-  "packages": {
-    "node_modules/@geolonia/japanese-numeral": {
-      "version": "0.1.16",
-      "resolved": "https://registry.npmjs.org/@geolonia/japanese-numeral/-/japanese-numeral-0.1.16.tgz",
-      "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
-    },
-    "node_modules/@geolonia/normalize-japanese-addresses": {
-      "version": "2.5.8",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.5.8.tgz",
-      "integrity": "sha512-mv3+vHU2qXPjn2wbZH2p8kOKp7zTdcwCAWz8yryyyM5OGCRjHiqGBg+1t78Ut8b0wopyLJ7GjNanIoflEEKVeg==",
-      "dependencies": {
-        "@geolonia/japanese-numeral": "^0.1.16",
-        "isomorphic-unfetch": "^3.1.0",
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "node_modules/isomorphic-unfetch": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz",
-      "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==",
-      "dependencies": {
-        "node-fetch": "^2.6.1",
-        "unfetch": "^4.2.0"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/unfetch": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz",
-      "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA=="
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    }
-  }
+  "packages": {}
 }

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/config.d.ts

@@ -1,2 +1,3 @@
 import { Config } from './normalize';
+export declare const gh_pages_endpoint = "https://geolonia.github.io/japanese-addresses/api/ja";
 export declare const currentConfig: Config;

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/lib/cacheRegexes.d.ts

@@ -9,11 +9,25 @@ interface SingleTown {
     lng: string;
 }
 declare type TownList = SingleTown[];
+interface GaikuListItem {
+    gaiku: string;
+    lat: string;
+    lng: string;
+}
+interface SingleResidential {
+    gaiku: string;
+    jyukyo: string;
+    lat: string;
+    lng: string;
+}
+declare type ResidentialList = SingleResidential[];
 export declare const getPrefectures: () => Promise<PrefectureList>;
 export declare const cachePrefectures: (data: PrefectureList) => PrefectureList;
 export declare const getPrefectureRegexPatterns: (prefs: string[]) => [string, string][];
 export declare const getCityRegexPatterns: (pref: string, cities: string[]) => [string, string][];
 export declare const getTowns: (pref: string, city: string) => Promise<TownList>;
+export declare const getGaikuList: (pref: string, city: string, town: string) => Promise<GaikuListItem[]>;
+export declare const getResidentials: (pref: string, city: string, town: string) => Promise<ResidentialList>;
 export declare const getTownRegexPatterns: (pref: string, city: string) => Promise<[SingleTown, string][]>;
 export declare const getSameNamedPrefectureCityRegexPatterns: (prefs: string[], prefList: PrefectureList) => [string, string][];
 export {};

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-browser.js

@@ -346,8 +346,9 @@
     exports.findKanjiNumbers = findKanjiNumbers;
     });
 
+    var gh_pages_endpoint = 'https://geolonia.github.io/japanese-addresses/api/ja';
     var currentConfig = {
-        japaneseAddressesApi: 'https://geolonia.github.io/japanese-addresses/api/ja',
+        japaneseAddressesApi: gh_pages_endpoint,
         townCacheSize: 1000,
     };
 
@@ -1224,9 +1225,11 @@
     var cachedCityPatterns = {};
     var cachedPrefectures = undefined;
     var cachedTowns = {};
+    var cachedGaikuListItem = {};
+    var cachedResidentials = {};
     var cachedSameNamedPrefectureCityRegexPatterns = undefined;
     var getPrefectures = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var resp, data;
+        var prefsResp, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -1235,9 +1238,9 @@
                     }
                     return [4 /*yield*/, __internals.fetch('.json')]; // ja.json
                 case 1:
-                    resp = _a.sent() // ja.json
+                    prefsResp = _a.sent() // ja.json
                     ;
-                    return [4 /*yield*/, resp.json()];
+                    return [4 /*yield*/, prefsResp.json()];
                 case 2:
                     data = (_a.sent());
                     return [2 /*return*/, cachePrefectures(data)];
@@ -1278,7 +1281,7 @@
         return patterns;
     };
     var getTowns = function (pref, city) { return __awaiter(void 0, void 0, void 0, function () {
-        var cacheKey, cachedTown, responseTownsResp, towns;
+        var cacheKey, cachedTown, townsResp, towns;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -1289,14 +1292,81 @@
                     }
                     return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city) + '.json'].join('/'))];
                 case 1:
-                    responseTownsResp = _a.sent();
-                    return [4 /*yield*/, responseTownsResp.json()];
+                    townsResp = _a.sent();
+                    return [4 /*yield*/, townsResp.json()];
                 case 2:
                     towns = (_a.sent());
                     return [2 /*return*/, (cachedTowns[cacheKey] = towns)];
             }
         });
     }); };
+    var getGaikuList = function (pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+        var cacheKey, cache, gaikuResp, gaikuListItem;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    cacheKey = pref + "-" + city + "-" + town;
+                    cache = cachedGaikuListItem[cacheKey];
+                    if (typeof cache !== 'undefined') {
+                        return [2 /*return*/, cache];
+                    }
+                    return [4 /*yield*/, __internals.fetch(['', encodeURI(pref), encodeURI(city), encodeURI(town + '.json')].join('/'))];
+                case 1:
+                    gaikuResp = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, gaikuResp.json()];
+                case 3:
+                    gaikuListItem = (_b.sent());
+                    return [3 /*break*/, 5];
+                case 4:
+                    _b.sent();
+                    gaikuListItem = [];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/, (cachedGaikuListItem[cacheKey] = gaikuListItem)];
+            }
+        });
+    }); };
+    var getResidentials = function (pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+        var cacheKey, cache, residentialsResp, residentials;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    cacheKey = pref + "-" + city + "-" + town;
+                    cache = cachedResidentials[cacheKey];
+                    if (typeof cache !== 'undefined') {
+                        return [2 /*return*/, cache];
+                    }
+                    return [4 /*yield*/, __internals.fetch([
+                            '',
+                            encodeURI(pref),
+                            encodeURI(city),
+                            encodeURI(town),
+                            encodeURI('住居表示.json'),
+                        ].join('/'))];
+                case 1:
+                    residentialsResp = _b.sent();
+                    _b.label = 2;
+                case 2:
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, residentialsResp.json()];
+                case 3:
+                    residentials = (_b.sent());
+                    return [3 /*break*/, 5];
+                case 4:
+                    _b.sent();
+                    residentials = [];
+                    return [3 /*break*/, 5];
+                case 5:
+                    residentials.sort(function (res1, res2) {
+                        return (res2.gaiku + "-" + res2.jyukyo).length -
+                            (res1.gaiku + "-" + res1.jyukyo).length;
+                    });
+                    return [2 /*return*/, (cachedResidentials[cacheKey] = residentials)];
+            }
+        });
+    }); };
     // 十六町 のように漢数字と町が連結しているか
     var isKanjiNumberFollewedByCho = function (targetTownName) {
         var xCho = targetTownName.match(/.町/g);
@@ -1433,8 +1503,11 @@
     var __internals = {
         // default fetch
         fetch: function (input) {
-            var fileURL = new URL("" + config$1.japaneseAddressesApi + input);
-            return browser(fileURL.toString());
+            var url = new URL("" + config$1.japaneseAddressesApi + input).toString();
+            if (config$1.geoloniaApiKey) {
+                url += "?geolonia-api-key=" + config$1.geoloniaApiKey;
+            }
+            return browser(url);
         },
     };
     var normalizeTownName = function (addr, pref, city) { return __awaiter(void 0, void 0, void 0, function () {
@@ -1471,13 +1544,66 @@
             }
         });
     }); };
-    var normalize$1 = function (address, option) {
-        if (option === void 0) { option = defaultOption; }
+    var normalizeResidentialPart = function (addr, pref, city, town) { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, gaikuListItem, residentials, match, gaiku_1, jyukyo, jyukyohyoji_1, residential, addr2, gaikuItem, addr2;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, Promise.all([
+                        getGaikuList(pref, city, town),
+                        getResidentials(pref, city, town),
+                    ])
+                    // 住居表示未整備
+                ];
+                case 1:
+                    _a = _b.sent(), gaikuListItem = _a[0], residentials = _a[1];
+                    // 住居表示未整備
+                    if (gaikuListItem.length === 0) {
+                        return [2 /*return*/, null];
+                    }
+                    match = addr.match(/^([1-9][0-9]*)-([1-9][0-9]*)/);
+                    if (match) {
+                        gaiku_1 = match[1];
+                        jyukyo = match[2];
+                        jyukyohyoji_1 = gaiku_1 + "-" + jyukyo;
+                        residential = residentials.find(function (res) { return res.gaiku + "-" + res.jyukyo === jyukyohyoji_1; });
+                        if (residential) {
+                            addr2 = addr.replace(jyukyohyoji_1, '').trim();
+                            return [2 /*return*/, {
+                                    gaiku: gaiku_1,
+                                    jyukyo: jyukyo,
+                                    addr: addr2,
+                                    lat: residential.lat,
+                                    lng: residential.lng,
+                                }];
+                        }
+                        gaikuItem = gaikuListItem.find(function (item) { return item.gaiku === gaiku_1; });
+                        if (gaikuItem) {
+                            addr2 = addr.replace(gaikuItem.gaiku, '').trim();
+                            return [2 /*return*/, { gaiku: gaiku_1, addr: addr2, lat: gaikuItem.lat, lng: gaikuItem.lng }];
+                        }
+                    }
+                    return [2 /*return*/, null];
+            }
+        });
+    }); };
+    var normalize$1 = function (address, _option) {
+        if (_option === void 0) { _option = defaultOption; }
         return __awaiter(void 0, void 0, void 0, function () {
-            var addr, pref, city, town, lat, lng, level, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized, cities, cityPatterns, i, _d, _city, pattern, match, normalized;
+            var option, addr, pref, city, town, lat, lng, level, normalized, prefectures, prefs, prefPatterns, sameNamedPrefectureCityRegexPatterns, i, _a, prefectureCity, reg, match, i, _b, _pref, pattern, match, matched, _pref, cities, cityPatterns, i, _c, _city, pattern, match, i, normalized_1, cities, cityPatterns, i, _d, _city, pattern, match, result;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
+                        option = __assign(__assign({}, defaultOption), _option);
+                        if (option.geoloniaApiKey || config$1.geoloniaApiKey) {
+                            option.level = 8;
+                            option.geoloniaApiKey && (config$1.geoloniaApiKey = option.geoloniaApiKey);
+                            // API キーがある場合は、 Geolonia SaaS に切り替え。
+                            // ただし、config を書き換えて別のエンドポイントを使うようにカスタマイズしているケースがあるので、その場合は config に既に入っている値を優先
+                            if (config$1.japaneseAddressesApi === gh_pages_endpoint) {
+                                config$1.japaneseAddressesApi =
+                                    'https://japanese-addresses.geolonia.com/next/ja';
+                            }
+                        }
                         addr = address
                             .normalize('NFC')
                             .replace(/　/g, ' ')
@@ -1492,6 +1618,9 @@
                         })
                             .replace(/(.+)(丁目?|番(町|地|丁)|条|軒|線|(の|ノ)町|地割)/, function (match) {
                             return match.replace(/ /g, ''); // 町丁目名以前のスペースはすべて削除
+                        })
+                            .replace(/(.+)((郡.+(町|村))|((市|巿).+(区|區)))/, function (match) {
+                            return match.replace(/ /g, ''); // 区、郡以前のスペースはすべて削除
                         })
                             .replace(/.+?[0-9一二三四五六七八九〇十百千]-/, function (match) {
                             return match.replace(/ /g, ''); // 1番はじめに出てくるアラビア数字以前のスペースを削除
@@ -1502,6 +1631,7 @@
                         lat = null;
                         lng = null;
                         level = 0;
+                        normalized = null;
                         return [4 /*yield*/, getPrefectures()];
                     case 1:
                         prefectures = _e.sent();
@@ -1555,8 +1685,8 @@
                         if (!(i < matched.length)) return [3 /*break*/, 6];
                         return [4 /*yield*/, normalizeTownName(matched[i].addr, matched[i].pref, matched[i].city)];
                     case 4:
-                        normalized = _e.sent();
-                        if (normalized) {
+                        normalized_1 = _e.sent();
+                        if (normalized_1) {
                             pref = matched[i].pref;
                         }
                         _e.label = 5;
@@ -1592,58 +1722,85 @@
                                 lng = null;
                             }
                         }
-                        addr = addr
-                            .replace(/^-/, '')
-                            .replace(/([0-9]+)(丁目)/g, function (match) {
-                            return match.replace(/([0-9]+)/g, function (num) {
-                                return dist.number2kanji(Number(num));
-                            });
-                        })
-                            .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号?/, '$1-$3')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
-                            return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
-                        })
-                            .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g, function (match) {
-                            return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
-                        })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)-/, function (s) {
-                            // `1-` のようなケース
-                            return kan2num(s);
-                        })
-                            .replace(/-([0-9〇一二三四五六七八九十百千]+)/, function (s) {
-                            // `-1` のようなケース
-                            return kan2num(s);
-                        })
-                            .replace(/-[^0-9]+([0-9〇一二三四五六七八九十百千]+)/, function (s) {
-                            // `-あ1` のようなケース
-                            return kan2num(zen2han(s));
-                        })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)$/, function (s) {
-                            // `串本町串本１２３４` のようなケース
-                            return kan2num(s);
-                        })
-                            .trim();
+                        // townが取得できた場合にのみ、addrに対する各種の変換処理を行う。
+                        if (town) {
+                            addr = addr
+                                .replace(/^-/, '')
+                                .replace(/([0-9]+)(丁目)/g, function (match) {
+                                return match.replace(/([0-9]+)/g, function (num) {
+                                    return dist.number2kanji(Number(num));
+                                });
+                            })
+                                .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号?/, '$1-$3')
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
+                                return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
+                            })
+                                .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g, function (match) {
+                                return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
+                            })
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)-/, function (s) {
+                                // `1-` のようなケース
+                                return kan2num(s);
+                            })
+                                .replace(/-([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                                // `-1` のようなケース
+                                return kan2num(s);
+                            })
+                                .replace(/-[^0-9]+([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                                // `-あ1` のようなケース
+                                return kan2num(zen2han(s));
+                            })
+                                .replace(/([0-9〇一二三四五六七八九十百千]+)$/, function (s) {
+                                // `串本町串本１２３４` のようなケース
+                                return kan2num(s);
+                            })
+                                .trim();
+                        }
                         _e.label = 8;
                     case 8:
                         addr = patchAddr(pref, city, town, addr);
+                        if (!(option.level > 3 && normalized && town)) return [3 /*break*/, 10];
+                        return [4 /*yield*/, normalizeResidentialPart(addr, pref, city, town)];
+                    case 9:
+                        normalized = _e.sent();
+                        _e.label = 10;
+                    case 10:
+                        if (normalized) {
+                            lat = parseFloat(normalized.lat);
+                            lng = parseFloat(normalized.lng);
+                        }
+                        if (Number.isNaN(lat) || Number.isNaN(lng)) {
+                            lat = null;
+                            lng = null;
+                        }
                         if (pref)
                             level = level + 1;
                         if (city)
                             level = level + 1;
                         if (town)
                             level = level + 1;
-                        return [2 /*return*/, {
-                                pref: pref,
-                                city: city,
-                                town: town,
-                                addr: addr,
-                                lat: lat,
-                                lng: lng,
-                                level: level,
-                            }];
+                        result = {
+                            pref: pref,
+                            city: city,
+                            town: town,
+                            addr: addr,
+                            lat: lat,
+                            lng: lng,
+                            level: level,
+                        };
+                        if (normalized && 'gaiku' in normalized) {
+                            result.addr = normalized.addr;
+                            result.gaiku = normalized.gaiku;
+                            result.level = 7;
+                        }
+                        if (normalized && 'jyukyo' in normalized) {
+                            result.jyukyo = normalized.jyukyo;
+                            result.level = 8;
+                        }
+                        return [2 /*return*/, result];
                 }
             });
         });