japanese_address_parser 3.0.4 → 3.1.0

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

@@ -132,8 +132,8 @@ var patchAddr = function (pref, city, town, addr) {
 };
 
 // JIS 第2水準 => 第1水準 及び 旧字体 => 新字体
-var JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌'.split(/,/);
-var JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥'.split(/,/);
+var JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌,麩'.split(/,/);
+var JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥,麸'.split(/,/);
 var JIS_KANJI_REGEX_PATTERNS = JIS_OLD_KANJI.map(function (old, i) {
     var pattern = old + "|" + JIS_NEW_KANJI[i];
     return [pattern, old, JIS_NEW_KANJI[i]];
@@ -152,6 +152,7 @@ var toRegexPattern = function (string) {
     _str = _str
         .replace(/三栄町|四谷三栄町/g, '(三栄町|四谷三栄町)')
         .replace(/鬮野川|くじ野川|くじの川/g, '(鬮野川|くじ野川|くじの川)')
+        .replace(/柿碕町|柿さき町/g, '(柿碕町|柿さき町)')
         .replace(/通り|とおり/g, '(通り|とおり)')
         .replace(/埠頭|ふ頭/g, '(埠頭|ふ頭)')
         .replace(/番町|番丁/g, '(番町|番丁)')
@@ -339,9 +340,9 @@ var isKanjiNumberFollewedByCho = function (targetTownName) {
     return kanjiNumbers.length > 0;
 };
 var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void 0, void 0, function () {
-    var cachedResult, pre_towns, townSet, towns, isKyoto, _i, pre_towns_1, town, originalTown, townAbbr, patterns;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var cachedResult, pre_towns, townSet, towns, isKyoto, _i, pre_towns_1, town, originalTown, townAbbr, patterns, _a, towns_1, town, chomeMatch, chomeNamePart, chomeNum, pattern;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 cachedResult = cachedTownRegexes.get(pref + "-" + city);
                 if (typeof cachedResult !== 'undefined') {
@@ -349,7 +350,7 @@ var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void
                 }
                 return [4 /*yield*/, getTowns(pref, city)];
             case 1:
-                pre_towns = _a.sent();
+                pre_towns = _b.sent();
                 townSet = new Set(pre_towns.map(function (town) { return town.town; }));
                 towns = [];
                 isKyoto = city.match(/^京都市/);
@@ -415,6 +416,18 @@ var getTownRegexPatterns = function (pref, city) { return __awaiter(void 0, void
                     }));
                     return [town, pattern];
                 });
+                // X丁目の丁目なしの数字だけ許容するため、最後に数字だけ追加していく
+                for (_a = 0, towns_1 = towns; _a < towns_1.length; _a++) {
+                    town = towns_1[_a];
+                    chomeMatch = town.town.match(/([^一二三四五六七八九十]+)([一二三四五六七八九十]+)(丁目?)/);
+                    if (!chomeMatch) {
+                        continue;
+                    }
+                    chomeNamePart = chomeMatch[1];
+                    chomeNum = chomeMatch[2];
+                    pattern = toRegexPattern("^" + chomeNamePart + "(" + chomeNum + "|" + kan2num(chomeNum) + ")");
+                    patterns.push([town, pattern]);
+                }
                 cachedTownRegexes.set(pref + "-" + city, patterns);
                 return [2 /*return*/, patterns];
         }
@@ -684,7 +697,7 @@ var normalize$1 = function (address, _option) {
                             });
                         })
                             .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号?/, '$1-$3')
+                            .replace(/([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
                             .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
@@ -769,7 +782,7 @@ var fetchOrReadFile = function (input) { return __awaiter(void 0, void 0, void 0
             return [2 /*return*/, unfetch__default['default'](fileURL.toString())];
         }
         else if (fileURL.protocol === 'file:') {
-            filePath_1 = decodeURI(fileURL.pathname);
+            filePath_1 = process.platform === 'win32' ? decodeURI(fileURL.pathname).substr(1) : decodeURI(fileURL.pathname);
             return [2 /*return*/, {
                     json: function () { return __awaiter(void 0, void 0, void 0, function () {
                         var contents;

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

@@ -27,7 +27,7 @@ export interface NormalizeResult {
     addr: string;
     /** 緯度。データが存在しない場合は null */
     lat: number | null;
-    /** 軽度。データが存在しない場合は null */
+    /** 経度。データが存在しない場合は null */
     lng: number | null;
     /**
      * 住所文字列をどこまで判別できたかを表す正規化レベル

data/js/node_modules/@geolonia/normalize-japanese-addresses/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@geolonia/normalize-japanese-addresses",
-  "version": "2.7.3",
+  "version": "2.8.0",
   "description": "",
   "browser": "./dist/main-browser.js",
   "main": "./dist/main-node.js",
   "types": "./dist/normalize.d.ts",
   "scripts": {
-    "test": "npm run test:main && npm run test:addresses && npm run test:node && npm run test:residential",
+    "test": "npm run test:main && npm run test:addresses && npm run test:node:platform && npm run test:residential",
+    "test:node:platform": "npm run test:node-win || npm run test:node",
     "test:main": "jest test/main.test.ts",
     "test:addresses": "jest test/addresses.test.ts",
     "test:residential": "jest test/residential.test.ts --runInBand",
-    "test:node": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz | tar xvfz - -C ./test > /dev/null 2>&1 && jest test/fs.test.ts",
+    "test:node": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz | tar xvfz - -C ./test > nul 2>&1 && jest test/fs.test.ts",
+    "test:node-win": "curl -sL https://github.com/geolonia/japanese-addresses/archive/refs/heads/master.tar.gz -o master.tar.gz && 7z x master.tar.gz -y -o./ && 7z x ./master.tar -y -o./test && del master.tar.gz master.tar && jest test/fs.test.ts",
     "test:generate-test-data": "npx ts-node -O '{\"module\":\"commonjs\"}' test/build-test-data.ts > test/addresses.csv",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.test.ts\" --fix",
-    "build": "rm -rf ./dist && rollup -c ./rollup.config.ts"
+    "build": "npm run clean && rollup -c rollup.config.ts",
+    "clean": "node -e \"const fs = require('fs'); try { fs.rmSync('dist', { recursive: true, force: true }) } catch (err) { console.error(err) }\""
   },
   "author": "",
   "license": "MIT",

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

@@ -25,4 +25,13 @@ export default [
     output: { file: pkg.main, format: 'cjs' },
     plugins: [typescript()],
   },
+  {
+    input: 'src/main-es.ts',
+    output: {
+      dir: 'dist',
+      name: 'normalize',
+      format: 'esm',
+    },
+    plugins: [typescript(), resolve({ browser: true }), commonjs()],
+  },
 ]

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

@@ -260,15 +260,29 @@ export const getTownRegexPatterns = async (pref: string, city: string) => {
             const _pattern = `(${patterns.join(
               '|',
             )})((丁|町)目?|番(町|丁)|条|軒|線|の町?|地割|号|[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━])`
-
             return _pattern // デバッグのときにめんどくさいので変数に入れる。
           },
         ),
     )
-
     return [town, pattern]
   }) as [SingleTown, string][]
 
+  // X丁目の丁目なしの数字だけ許容するため、最後に数字だけ追加していく
+  for (const town of towns) {
+    const chomeMatch = town.town.match(
+      /([^一二三四五六七八九十]+)([一二三四五六七八九十]+)(丁目?)/,
+    )
+    if (!chomeMatch) {
+      continue
+    }
+    const chomeNamePart = chomeMatch[1]
+    const chomeNum = chomeMatch[2]
+    const pattern = toRegexPattern(
+      `^${chomeNamePart}(${chomeNum}|${kan2num(chomeNum)})`,
+    )
+    patterns.push([town, pattern])
+  }
+
   cachedTownRegexes.set(`${pref}-${city}`, patterns)
   return patterns
 }

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/lib/dict.ts

@@ -1,8 +1,8 @@
 // JIS 第2水準 => 第1水準 及び 旧字体 => 新字体
-const JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌'.split(
+const JIS_OLD_KANJI = '亞,圍,壹,榮,驛,應,櫻,假,會,懷,覺,樂,陷,歡,氣,戲,據,挾,區,徑,溪,輕,藝,儉,圈,權,嚴,恆,國,齋,雜,蠶,殘,兒,實,釋,從,縱,敍,燒,條,剩,壤,釀,眞,盡,醉,髓,聲,竊,淺,錢,禪,爭,插,騷,屬,對,滯,擇,單,斷,癡,鑄,敕,鐵,傳,黨,鬪,屆,腦,廢,發,蠻,拂,邊,瓣,寶,沒,滿,藥,餘,樣,亂,兩,禮,靈,爐,灣,惡,醫,飮,營,圓,歐,奧,價,繪,擴,學,罐,勸,觀,歸,犧,擧,狹,驅,莖,經,繼,缺,劍,檢,顯,廣,鑛,碎,劑,參,慘,絲,辭,舍,壽,澁,肅,將,證,乘,疊,孃,觸,寢,圖,穗,樞,齊,攝,戰,潛,雙,莊,裝,藏,續,體,臺,澤,膽,彈,蟲,廳,鎭,點,燈,盜,獨,貳,霸,賣,髮,祕,佛,變,辯,豐,飜,默,與,譽,謠,覽,獵,勵,齡,勞,壓,爲,隱,衞,鹽,毆,穩,畫,壞,殼,嶽,卷,關,顏,僞,舊,峽,曉,勳,惠,螢,鷄,縣,險,獻,驗,效,號,濟,册,棧,贊,齒,濕,寫,收,獸,處,稱,奬,淨,繩,讓,囑,愼,粹,隨,數,靜,專,踐,纖,壯,搜,總,臟,墮,帶,瀧,擔,團,遲,晝,聽,遞,轉,當,稻,讀,惱,拜,麥,拔,濱,竝,辨,舖,襃,萬,譯,豫,搖,來,龍,壘,隸,戀,樓,鰺,鶯,蠣,攪,竈,灌,諫,頸,礦,蘂,靱,賤,壺,礪,檮,濤,邇,蠅,檜,儘,藪,籠,彌,麩'.split(
   /,/,
 )
-const JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥'.split(
+const JIS_NEW_KANJI = '亜,囲,壱,栄,駅,応,桜,仮,会,懐,覚,楽,陥,歓,気,戯,拠,挟,区,径,渓,軽,芸,倹,圏,権,厳,恒,国,斎,雑,蚕,残,児,実,釈,従,縦,叙,焼,条,剰,壌,醸,真,尽,酔,髄,声,窃,浅,銭,禅,争,挿,騒,属,対,滞,択,単,断,痴,鋳,勅,鉄,伝,党,闘,届,脳,廃,発,蛮,払,辺,弁,宝,没,満,薬,余,様,乱,両,礼,霊,炉,湾,悪,医,飲,営,円,欧,奥,価,絵,拡,学,缶,勧,観,帰,犠,挙,狭,駆,茎,経,継,欠,剣,検,顕,広,鉱,砕,剤,参,惨,糸,辞,舎,寿,渋,粛,将,証,乗,畳,嬢,触,寝,図,穂,枢,斉,摂,戦,潜,双,荘,装,蔵,続,体,台,沢,胆,弾,虫,庁,鎮,点,灯,盗,独,弐,覇,売,髪,秘,仏,変,弁,豊,翻,黙,与,誉,謡,覧,猟,励,齢,労,圧,為,隠,衛,塩,殴,穏,画,壊,殻,岳,巻,関,顔,偽,旧,峡,暁,勲,恵,蛍,鶏,県,険,献,験,効,号,済,冊,桟,賛,歯,湿,写,収,獣,処,称,奨,浄,縄,譲,嘱,慎,粋,随,数,静,専,践,繊,壮,捜,総,臓,堕,帯,滝,担,団,遅,昼,聴,逓,転,当,稲,読,悩,拝,麦,抜,浜,並,弁,舗,褒,万,訳,予,揺,来,竜,塁,隷,恋,楼,鯵,鴬,蛎,撹,竃,潅,諌,頚,砿,蕊,靭,賎,壷,砺,梼,涛,迩,蝿,桧,侭,薮,篭,弥,麸'.split(
   /,/,
 )
 
@@ -29,6 +29,7 @@ export const toRegexPattern = (string: string) => {
   _str = _str
     .replace(/三栄町|四谷三栄町/g, '(三栄町|四谷三栄町)')
     .replace(/鬮野川|くじ野川|くじの川/g, '(鬮野川|くじ野川|くじの川)')
+    .replace(/柿碕町|柿さき町/g, '(柿碕町|柿さき町)')
     .replace(/通り|とおり/g, '(通り|とおり)')
     .replace(/埠頭|ふ頭/g, '(埠頭|ふ頭)')
     .replace(/番町|番丁/g, '(番町|番丁)')

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/main-es.ts

@@ -0,0 +1,4 @@
+import * as Normalize from './normalize'
+
+export const config = Normalize.config
+export const normalize = Normalize.normalize

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/main-node.ts

@@ -12,7 +12,7 @@ const fetchOrReadFile = async (
     }
     return unfetch(fileURL.toString())
   } else if (fileURL.protocol === 'file:') {
-    const filePath = decodeURI(fileURL.pathname)
+    const filePath = process.platform === 'win32' ? decodeURI(fileURL.pathname).substr(1) : decodeURI(fileURL.pathname);
     return {
       json: async () => {
         const contents = await fs.readFile(filePath)

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/normalize.ts

@@ -46,7 +46,7 @@ export interface NormalizeResult {
   addr: string
   /** 緯度。データが存在しない場合は null */
   lat: number | null
-  /** 軽度。データが存在しない場合は null */
+  /** 経度。データが存在しない場合は null */
   lng: number | null
   /**
    * 住所文字列をどこまで判別できたかを表す正規化レベル
@@ -353,7 +353,7 @@ export const normalize: Normalizer = async (
           '$1 $5',
         )
         .replace(
-          /([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号?/,
+          /([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/,
           '$1-$3',
         )
         .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')

data/js/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "japanese_address_parser",
       "dependencies": {
-        "@geolonia/normalize-japanese-addresses": "^2.7.3"
+        "@geolonia/normalize-japanese-addresses": "^2.8.0"
       },
       "devDependencies": {}
     },
@@ -16,9 +16,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "node_modules/@geolonia/normalize-japanese-addresses": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.7.3.tgz",
-      "integrity": "sha512-Gc1FI2oS8SjpL6l5Avkj+qcdBMbOIhUpZoETXgydxXMtvM2b9bVVQ7+YtlnBo4NDVIwFPSxaqeRqsXasig/mtg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.8.0.tgz",
+      "integrity": "sha512-BNKTl+38nq+ZKABa9nmwixLyDTXDPYDWSG3DluTjvhog3LEVWcTOHy0taIWXpumlvoz67ingq2qxdjtvW8ktzQ==",
       "dependencies": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",
@@ -101,9 +101,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "@geolonia/normalize-japanese-addresses": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.7.3.tgz",
-      "integrity": "sha512-Gc1FI2oS8SjpL6l5Avkj+qcdBMbOIhUpZoETXgydxXMtvM2b9bVVQ7+YtlnBo4NDVIwFPSxaqeRqsXasig/mtg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.8.0.tgz",
+      "integrity": "sha512-BNKTl+38nq+ZKABa9nmwixLyDTXDPYDWSG3DluTjvhog3LEVWcTOHy0taIWXpumlvoz67ingq2qxdjtvW8ktzQ==",
       "requires": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",

data/js/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "description": "JapaneseAddressParserは日本の住所をパースすることができるRuby gemです。",
   "dependencies": {
-    "@geolonia/normalize-japanese-addresses": "^2.7.3"
+    "@geolonia/normalize-japanese-addresses": "^2.8.0"
   },
   "devDependencies": {}
 }

data/lib/japanese_address_parser/data/03-03206.csv

@@ -353,6 +353,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 下鬼柳,シモオニヤナギ,SHIMONIYANAGI,十六地割,39.266345,141.096501
 下鬼柳,シモオニヤナギ,SHIMONIYANAGI,十四地割,39.266478,141.102455
 下鬼柳,シモオニヤナギ,SHIMONIYANAGI,四地割,39.282827,141.091036
+しらゆり,シラユリ,SHIRAYURI,,,
 新穀町一丁目,シンコクチョウ 1,SHINKOKUCHO 1,,39.289124,141.112788
 新穀町二丁目,シンコクチョウ 2,SHINKOKUCHO 2,,39.289984,141.110576
 諏訪町一丁目,スワチョウ 1,SUWACHO 1,,39.286243,141.11941

data/lib/japanese_address_parser/data/04-04421.csv

@@ -1,12 +1,4 @@
 name,name_kana,name_romaji,nickname,latitude,longitude
-落合桧和田,,,,38.430514,140.947568
-落合桧和田,,,中道,38.430873,140.92928
-落合桧和田,,,八幡堂,38.427406,140.938836
-落合桧和田,,,千刈田,38.430733,140.932626
-落合桧和田,,,新高原,38.432263,140.930077
-落合桧和田,,,糯田,38.429822,140.932751
-落合桧和田,,,遠浦,38.431684,140.925735
-落合桧和田,,,高原,38.430335,140.93046
 落合相川,オチアイアイカワ,OCHIAI AIKAWA,,38.442109,140.921086
 落合相川,オチアイアイカワ,OCHIAI AIKAWA,塚越,38.438884,140.930493
 落合相川,オチアイアイカワ,OCHIAI AIKAWA,塚越三番,38.439941,140.935737
@@ -31,6 +23,14 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 落合蒜袋,オチアイヒルブクロ,OCHIAI HIRUBUKURO,菱柄,38.447649,140.911786
 落合蒜袋,オチアイヒルブクロ,OCHIAI HIRUBUKURO,行屋下,38.449988,140.909907
 落合蒜袋,オチアイヒルブクロ,OCHIAI HIRUBUKURO,長町,38.449781,140.908786
+落合桧和田,オチアイヒワダ,,,38.430514,140.947568
+落合桧和田,オチアイヒワダ,,中道,38.430873,140.92928
+落合桧和田,オチアイヒワダ,,八幡堂,38.427406,140.938836
+落合桧和田,オチアイヒワダ,,千刈田,38.430733,140.932626
+落合桧和田,オチアイヒワダ,,新高原,38.432263,140.930077
+落合桧和田,オチアイヒワダ,,糯田,38.429822,140.932751
+落合桧和田,オチアイヒワダ,,遠浦,38.431684,140.925735
+落合桧和田,オチアイヒワダ,,高原,38.430335,140.93046
 落合報恩寺,オチアイホウオンジ,OCHIAI HOONJI,,38.443497,140.953906
 落合報恩寺,オチアイホウオンジ,OCHIAI HOONJI,大久保,38.44271,140.944656
 落合報恩寺,オチアイホウオンジ,OCHIAI HOONJI,竹沢下,38.438117,140.944617

data/lib/japanese_address_parser/data/05-05203.csv

@@ -43,9 +43,13 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 猪岡,イノオカ,INOKA,水上,39.31756,140.521665
 猪岡,イノオカ,INOKA,長瀞,39.315335,140.519002
 梅の木町,ウメノキマチ,UMENOKIMACHI,,39.315702,140.557751
+駅西一丁目,エキニシ 1,EKINISHI 1,,,
+駅西二丁目,エキニシ 2,EKINISHI 2,,,
+駅西三丁目,エキニシ 3,EKINISHI 3,,,
 駅前町,エキマエチョウ,EKIMAECHO,,39.308784,140.561408
 駅南一丁目,エキミナミ 1,EKIMINAMI 1,,39.302415,140.56071
 駅南二丁目,エキミナミ 2,EKIMINAMI 2,,39.302577,140.558314
+駅南三丁目,エキミナミ 3,EKIMINAMI 3,,,
 追廻一丁目,オイマワシ 1,OIMAWASHI 1,,39.332247,140.568572
 追廻二丁目,オイマワシ 2,OIMAWASHI 2,,39.331959,140.570628
 追廻三丁目,オイマワシ 3,OIMAWASHI 3,,39.334844,140.572056
@@ -408,6 +412,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 三本柳,サンボンヤナギ,SAMBONYANAGI,街道下,39.321213,140.538111
 三本柳,サンボンヤナギ,SAMBONYANAGI,馬場尻,39.324461,140.53328
 三枚橋一丁目,サンマイバシ 1,SAMMAIBASHI 1,,39.313272,140.558151
+三枚橋二丁目,サンマイバシ 2,SANMAIBASHI 2,,,
 静町,シズカマチ,SHIZUKAMACHI,,39.332264,140.545279
 静町,シズカマチ,SHIZUKAMACHI,北小屋,39.336115,140.543985
 静町,シズカマチ,SHIZUKAMACHI,払小屋,39.334205,140.543283

data/lib/japanese_address_parser/data/08-08222.csv

@@ -76,6 +76,10 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 鉢形台一丁目,ハチガタダイ 1,HACHIGATADAI 1,,35.96364,140.647669
 鉢形台二丁目,ハチガタダイ 2,HACHIGATADAI 2,,35.961016,140.648239
 鉢形台三丁目,ハチガタダイ 3,HACHIGATADAI 3,,35.95818,140.649236
+平井東一丁目,ヒライヒガシ 1,HIRAIHIGASHI 1,,,
+平井東二丁目,ヒライヒガシ 2,HIRAIHIGASHI 2,,,
+平井東三丁目,ヒライヒガシ 3,HIRAIHIGASHI 3,,,
+平井東四丁目,ヒライヒガシ 4,HIRAIHIGASHI 4,,,
 緑ヶ丘一丁目,ミドリガオカ 1,MIDORIGAOKA 1,,35.973731,140.623658
 緑ヶ丘二丁目,ミドリガオカ 2,MIDORIGAOKA 2,,35.972016,140.622091
 緑ヶ丘三丁目,ミドリガオカ 3,MIDORIGAOKA 3,,35.971853,140.618483

data/lib/japanese_address_parser/data/11-11442.csv

@@ -56,3 +56,5 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 和戸三丁目,ワド 3,WADO 3,,36.043459,139.700748
 和戸四丁目,ワド 4,WADO 4,,36.04095,139.704036
 和戸五丁目,ワド 5,WADO 5,,36.039436,139.706174
+和戸横町一丁目,ワドヨコマチ 1,WADOYOKOMACHI 1,,,
+和戸横町二丁目,ワドヨコマチ 2,WADOYOKOMACHI 2,,,

data/lib/japanese_address_parser/data/13-13225.csv

@@ -8,6 +8,9 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 向陽台五丁目,コウヨウダイ 5,KOYODAI 5,,35.639543,139.486042
 向陽台六丁目,コウヨウダイ 6,KOYODAI 6,,35.643117,139.491824
 坂浜,サカハマ,SAKAHAMA,,35.624406,139.487984
+坂浜三丁目,サカハマ 3,SAKAHAMA 3,,,
+坂浜四丁目,サカハマ 4,SAKAHAMA 4,,,
+坂浜五丁目,サカハマ 5,SAKAHAMA 5,,,
 長峰一丁目,ナガミネ 1,NAGAMINE 1,,35.631883,139.487495
 長峰二丁目,ナガミネ 2,NAGAMINE 2,,35.629705,139.482086
 長峰三丁目,ナガミネ 3,NAGAMINE 3,,35.631393,139.479182

data/lib/japanese_address_parser/data/14-14134.csv

@@ -11,6 +11,9 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 梶ケ谷六丁目,カジガヤ 6,KAJIGAYA 6,,35.583404,139.610187
 蟹ケ谷,カニガヤ,KANIGAYA,,35.565095,139.631473
 上作延,カミサクノベ,KAMISAKUNOBE,,35.600721,139.593909
+上作延一丁目,カミサクノベ 1,KAMISAKUNOBE 1,,,
+上作延二丁目,カミサクノベ 2,KAMISAKUNOBE 2,,,
+上作延三丁目,カミサクノベ 3,KAMISAKUNOBE 3,,,
 北野川,キタノガワ,KITANOGAWA,,35.579726,139.620171
 北見方一丁目,キタミガタ 1,KITAMIGATA 1,,35.598177,139.627756
 北見方二丁目,キタミガタ 2,KITAMIGATA 2,,35.601393,139.631721

data/lib/japanese_address_parser/data/15-15104.csv

@@ -1,5 +1,4 @@
 name,name_kana,name_romaji,nickname,latitude,longitude
-丸山ノ内善之丞組,,,,37.88125,139.125034
 亀田ノ内高山,,,,37.879682,139.100705
 茜ケ丘,アカネガオカ,AKANEGAOKA,,37.857526,139.139964
 阿賀野一丁目,アガノ 1,AGANO 1,,37.831463,139.167735
@@ -238,6 +237,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 丸潟一丁目,マルガタ 1,MARUGATA 1,,37.86123,139.07009
 丸潟新田,マルガタシンデン,MARUGATASHINDEN,,37.859149,139.058087
 丸山,マルヤマ,MARUYAMA,,37.882188,139.118102
+丸山ノ内善之丞組,マルヤマノウチゼンノジョウグミ,,,37.88125,139.125034
 茗荷谷,ミョウガダニ,MYOGADANI,,37.88451,139.128127
 元町一丁目,モトマチ 1,MOTOMACHI 1,,37.864471,139.109545
 元町二丁目,モトマチ 2,MOTOMACHI 2,,37.864516,139.107774

data/lib/japanese_address_parser/data/15-15222.csv

@@ -1,5 +1,4 @@
 name,name_kana,name_romaji,nickname,latitude,longitude
-吉川区大滝,,,,37.219953,138.378852
 大字七ケ所新田,,,,37.084741,138.259014
 大字三ツ屋,,,,37.172462,138.267622
 大字三ツ橋,,,,37.164171,138.271632
@@ -826,6 +825,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 吉川区入河沢,ヨシカワクイリコウゾウ,YOSHIKAWAKU IRIKOZO,,37.199831,138.436597
 吉川区岩沢,ヨシカワクイワサワ,YOSHIKAWAKU IWASAWA,,37.193286,138.45174
 吉川区大賀,ヨシカワクオオガ,YOSHIKAWAKU OGA,,37.183752,138.471892
+吉川区大滝,ヨシカワクオオタキ,,,37.219953,138.378852
 吉川区尾神,ヨシカワクオカミ,YOSHIKAWAKU OKAMI,,37.207202,138.495855
 吉川区小苗代,ヨシカワクオナワシロ,YOSHIKAWAKU ONAWASHIRO,,37.228209,138.416737
 吉川区伯母ケ沢,ヨシカワクオバガサワ,YOSHIKAWAKU OBAGASAWA,,37.22418,138.464613

data/lib/japanese_address_parser/data/15-15225.csv

@@ -1,5 +1,4 @@
 name,name_kana,name_romaji,nickname,latitude,longitude
-中ノ島,,,,37.233532,138.95672
 青島,アオシマ,AOSHIMA,,37.219496,138.951683
 赤土,アカツチ,AKATSUCHI,,37.291054,139.010522
 穴沢,アナザワ,ANAZAWA,,37.355824,139.090915
@@ -69,6 +68,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 徳田,トクダ,TOKUDA,,37.268482,138.924905
 中島,ナカジマ,NAKAJIMA,,37.245415,138.965366
 中島新田,ナカジマシンデン,NAKAJIMASHINDEN,,37.251499,138.969477
+中ノ島,ナカノシマ,,,37.233532,138.95672
 中原,ナカハラ,NAKAHARA,,37.218062,138.969493
 中原,ナカハラ,NAKAHARA,土井下,37.218376,138.968179
 長鳥,ナガトリ,NAGATORI,,37.341905,139.039373

data/lib/japanese_address_parser/data/18-18202.csv

@@ -42,7 +42,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 河原町,カワハラチョウ,KAWAHARACHO,,35.649662,136.087101
 観音町,カンノンチョウ,KANNONCHO,,35.631812,136.077836
 木崎,キザキ,KIZAKI,,35.641552,136.043202
-衣掛町,キヌカケチョウ,KINUKAKECHO,,35.629368,136.073971
+衣掛町,キヌカケチョウ,KINUKAKECHO,,,
 木ノ芽町,キノメチョウ,KINOMECHO,,35.641793,136.074802
 清水町一丁目,キヨミズチョウ 1,KIYOMIZUCHO 1,,35.651667,136.076761
 清水町二丁目,キヨミズチョウ 2,KIYOMIZUCHO 2,,35.648214,136.075964

data/lib/japanese_address_parser/data/22-22102.csv

@@ -159,6 +159,12 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 宮竹二丁目,ミヤタケ 2,MIYATAKE 2,,34.951407,138.418046
 宮本町,ミヤモトチョウ,MIYAMOTOCHO,,34.965236,138.383087
 向敷地,ムコウシキジ,MUKOSHIKIJI,,34.961845,138.355956
+向敷地一丁目,ムコウシキジ 1,MUKOSHIKIJI 1,,,
+向敷地二丁目,ムコウシキジ 2,MUKOSHIKIJI 2,,,
+向敷地三丁目,ムコウシキジ 3,MUKOSHIKIJI 3,,,
+向敷地四丁目,ムコウシキジ 4,MUKOSHIKIJI 4,,,
+向敷地五丁目,ムコウシキジ 5,MUKOSHIKIJI 5,,,
+向敷地六丁目,ムコウシキジ 6,MUKOSHIKIJI 6,,,
 向手越一丁目,ムコウテゴシ 1,MUKOTEGOSHI 1,,34.951815,138.360714
 向手越二丁目,ムコウテゴシ 2,MUKOTEGOSHI 2,,34.950862,138.358764
 用宗,モチムネ,MOCHIMUNE,,34.9321,138.362474

data/lib/japanese_address_parser/data/23-23202.csv

@@ -2075,6 +2075,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 八幡町,ハチマンチョウ,HACHIMANCHO,三丁目,34.960552,137.166799
 八幡町,ハチマンチョウ,HACHIMANCHO,二丁目,34.960548,137.16573
 八帖北町,ハッチョウキタマチ,HATCHO KITAMACHI,,34.962294,137.153551
+八丁町,ハッチョウチョウ,HACCHOCHO,,,
 八帖町,ハッチョウチョウ,HATCHOCHO,,34.957608,137.150914
 八帖町,ハッチョウチョウ,HATCHOCHO,大通,34.958504,137.151777
 八帖町,ハッチョウチョウ,HATCHOCHO,往還通,34.956755,137.150946

data/lib/japanese_address_parser/data/23-23207.csv

@@ -245,6 +245,11 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 江島町,エジマチョウ,EJIMACHO,西脇,34.860345,137.446177
 江島町,エジマチョウ,EJIMACHO,金山,34.865962,137.448072
 江島町,エジマチョウ,EJIMACHO,高畑,34.862125,137.448812
+大木新町通一丁目,オオギシンマチドオリ 1,OGISHINMACHIDORI 1,,,
+大木新町通二丁目,オオギシンマチドオリ 2,OGISHINMACHIDORI 2,,,
+大木新町通三丁目,オオギシンマチドオリ 3,OGISHINMACHIDORI 3,,,
+大木新町通四丁目,オオギシンマチドオリ 4,OGISHINMACHIDORI 4,,,
+大木新町通五丁目,オオギシンマチドオリ 5,OGISHINMACHIDORI 5,,,
 大木町,オオギチョウ,OGICHO,,34.862294,137.389923
 大木町,オオギチョウ,OGICHO,下縄手,34.854017,137.412134
 大木町,オオギチョウ,OGICHO,中曽根,34.851028,137.399423

data/lib/japanese_address_parser/data/23-23213.csv

@@ -1549,6 +1549,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 田貫二丁目,タヌキ 2,TANUKI 2,,34.868131,137.026531
 田貫三丁目,タヌキ 3,TANUKI 3,,34.867233,137.024577
 田貫四丁目,タヌキ 4,TANUKI 4,,34.865981,137.02578
+田貫五丁目,タヌキ 5,TANUKI 5,,,
 田貫町,タヌキチョウ,TANUKICHO,,34.87174,137.023732
 田貫町,タヌキチョウ,TANUKICHO,下野川,34.874507,137.020828
 田貫町,タヌキチョウ,TANUKICHO,南山,34.866069,137.023789

data/lib/japanese_address_parser/data/23-23236.csv

@@ -168,6 +168,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 黒笹町,クロザサチョウ,KUROZASACHO,樋越,35.123603,137.092139
 黒笹町,クロザサチョウ,KUROZASACHO,清水,35.124963,137.089158
 黒笹町,クロザサチョウ,KUROZASACHO,野田兼,35.122747,137.090997
+黒笹山手,クロザサヤマテ,KUROZASAYAMATE,,,
 潮見,シオミ,SHIOMI,,35.099207,137.112355
 新前田一丁目,シンマエダ 1,SHINMAEDA 1,,,
 新前田二丁目,シンマエダ 2,SHINMAEDA 2,,,

data/lib/japanese_address_parser/data/25-25206.csv

@@ -131,6 +131,10 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 南草津三丁目,ミナミクサツ 3,MINAMIKUSATSU 3,,35.004849,135.941335
 南草津四丁目,ミナミクサツ 4,MINAMIKUSATSU 4,,35.002608,135.942183
 南草津五丁目,ミナミクサツ 5,MINAMIKUSATSU 5,,35.004992,135.939439
+南草津プリムタウン一丁目,ミナミクサツプリムタウン 1,MINAMIKUSATSUPURIMUTAUN 1,,,
+南草津プリムタウン二丁目,ミナミクサツプリムタウン 2,MINAMIKUSATSUPURIMUTAUN 2,,,
+南草津プリムタウン三丁目,ミナミクサツプリムタウン 3,MINAMIKUSATSUPURIMUTAUN 3,,,
+南草津プリムタウン四丁目,ミナミクサツプリムタウン 4,MINAMIKUSATSUPURIMUTAUN 4,,,
 南山田町,ミナミヤマダチョウ,MINAMIYAMADACHO,,35.019309,135.927256
 矢倉一丁目,ヤグラ 1,YAGURA 1,,35.010307,135.955368
 矢倉二丁目,ヤグラ 2,YAGURA 2,,35.006839,135.952183

data/lib/japanese_address_parser/data/27-27212.csv

@@ -552,6 +552,10 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 都塚二丁目,ミヤコヅカ 2,MIYAKOZUKA 2,,34.606238,135.623484
 都塚三丁目,ミヤコヅカ 3,MIYAKOZUKA 3,,34.604877,135.623758
 都塚四丁目,ミヤコヅカ 4,MIYAKOZUKA 4,,34.60413,135.622238
+都塚北一丁目,ミヤコヅカキタ 1,MIYAKOZUKAKITA 1,,,
+都塚北二丁目,ミヤコヅカキタ 2,MIYAKOZUKAKITA 2,,,
+都塚南一丁目,ミヤコヅカミナミ 1,MIYAKOZUKAMINAMI 1,,,
+都塚南二丁目,ミヤコヅカミナミ 2,MIYAKOZUKAMINAMI 2,,,
 宮町一丁目,ミヤマチ 1,MIYAMACHI 1,,34.632927,135.596825
 宮町二丁目,ミヤマチ 2,MIYAMACHI 2,,34.633973,135.595104
 宮町三丁目,ミヤマチ 3,MIYAMACHI 3,,34.636355,135.597492

data/lib/japanese_address_parser/data/28-28108.csv

@@ -255,6 +255,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 学が丘六丁目,マナビガオカ 6,MANABIGAOKA 6,,34.661331,135.060639
 学が丘七丁目,マナビガオカ 7,MANABIGAOKA 7,,34.662979,135.061727
 瑞ケ丘,ミズガオカ,MIZUGAOKA,,34.633811,135.056087
+みずき台,ミズキダイ,MIZUKIDAI,,,
 瑞穂通,ミズホドオリ,MIZUHODORI,,34.634415,135.059456
 南多聞台一丁目,ミナミタモンダイ 1,MINAMITAMONDAI 1,,34.657208,135.032472
 南多聞台二丁目,ミナミタモンダイ 2,MINAMITAMONDAI 2,,34.65505,135.034099

data/lib/japanese_address_parser/data/28-28204.csv

@@ -292,11 +292,11 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 名塩南台四丁目,ナジオミナミダイ 4,NAJIO MINAMIDAI 4,,34.82347,135.302858
 名塩美山,ナジオミヤマ,NAJIO MIYAMA,,34.846545,135.270286
 名次町,ナツギチョウ,NATSUGICHO,,34.74999,135.331786
-生瀬武庫川町,ナマセムコガワチョウ,NAMASEMUKOGAWACHO,,34.817319,135.331442
 生瀬高台,ナマゼタカダイ,NAMAZE TAKADAI,,34.814744,135.32403
 生瀬町一丁目,ナマゼチョウ 1,NAMAZECHO 1,,34.820172,135.327347
 生瀬町二丁目,ナマゼチョウ 2,NAMAZECHO 2,,34.818779,135.327374
 生瀬東町,ナマゼヒガシマチ,NAMAZE HIGASHIMACHI,,34.815688,135.335677
+生瀬武庫川町,ナマゼムコガワチョウ,NAMASEMUKOGAWACHO,,34.817319,135.331442
 鳴尾町一丁目,ナルオチョウ 1,NARUOCHO 1,,34.717337,135.372427
 鳴尾町二丁目,ナルオチョウ 2,NARUOCHO 2,,34.714834,135.371214
 鳴尾町三丁目,ナルオチョウ 3,NARUOCHO 3,,34.718288,135.369794

data/lib/japanese_address_parser/data/28-28226.csv

@@ -52,6 +52,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 塩田新島,シオタニイジマ,SHIOTANIIJIMA,,34.418291,134.898525
 志筑,シヅキ,SHIZUKI,,34.434187,134.899988
 志筑新島,シヅキニイジマ,SHIZUKINIIJIMA,,34.426239,134.903893
+志筑新浜,シヅキニイハマ,SHIZUKINIHAMA,,,
 下河合,シモガワイ,SHIMOGAWAI,,34.45967,134.863156
 下田,シモダ,SHIMODA,,34.509856,134.981559
 白山,シラヤマ,SHIRAYAMA,,34.537388,134.975818

data/lib/japanese_address_parser/data/29-29201.csv

@@ -1,6 +1,7 @@
 name,name_kana,name_romaji,nickname,latitude,longitude
 六条東町,,,,34.666801,135.787085
 南法蓮町,,,,34.688222,135.827221
+横領町,,YOKORYOCHO,,34.686123,135.783108
 百万ヶ辻子町,,,,34.6826,135.824532
 青垣台一丁目,アオガキダイ 1,AOGAKIDAI 1,,34.671769,135.759327
 青垣台二丁目,アオガキダイ 2,AOGAKIDAI 2,,34.6693,135.760914
@@ -621,7 +622,6 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 横井七丁目,ヨコイ 7,YOKOI 7,,34.647563,135.835248
 横井町,ヨコイチョウ,YOKOICHO,,34.657692,135.858839
 横田町,ヨコタチョウ,YOKOTACHO,,34.659821,135.910328
-横領町,ヨコリョウチョウ,YOKORYOCHO,,34.686123,135.783108
 来迎寺町,ライコウジチョウ,RAIKOJICHO,,34.592816,135.947645
 六条一丁目,ロクジョウ 1,ROKUJO 1,,34.669273,135.77997
 六条二丁目,ロクジョウ 2,ROKUJO 2,,34.669969,135.773664

data/lib/japanese_address_parser/data/34-34207.csv

@@ -363,6 +363,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 船町,フナマチ,FUNAMACHI,,34.486919,133.367973
 古野上町,フルノガミチョウ,FURUNOGAMICHO,,34.482399,133.357124
 平成台,ヘイセイダイ,HEISEIDAI,,34.488444,133.42574
+北匠町,ホクショウチョウ,HOKUSHOCHO,,,
 本郷町,ホンゴウチョウ,HONGOCHO,,34.484203,133.241607
 本庄町中一丁目,ホンジョウチョウナカ 1,HONJOCHONAKA 1,,34.490937,133.350514
 本庄町中二丁目,ホンジョウチョウナカ 2,HONJOCHONAKA 2,,34.489541,133.349128
@@ -422,6 +423,8 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 箕島町,ミノシマチョウ,MINOSHIMACHO,,34.446871,133.406734
 水呑町,ミノミチョウ,MINOMICHO,,34.449414,133.382535
 水呑町,ミノミチョウ,MINOMICHO,大谷,34.436851,133.386013
+水呑町三新田一丁目,ミノミチョウサンシンデン 1,MINOMICHOSANSHINDEN 1,,,
+水呑町三新田二丁目,ミノミチョウサンシンデン 2,MINOMICHOSANSHINDEN 2,,,
 水呑向丘,ミノミムカイガオカ,MINOMIMUKAIGAOKA,,34.43957,133.382766
 御船町一丁目,ミフネチョウ 1,MIFUNECHO 1,,34.488156,133.370002
 御船町二丁目,ミフネチョウ 2,MIFUNECHO 2,,34.488206,133.371869

data/lib/japanese_address_parser/data/35-35215.csv

@@ -222,6 +222,8 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 徳山港町,トクヤマミナトマチ,TOKUYAMAMINATOMACHI,,34.052237,131.796011
 富田一丁目,トンダ 1,TONDA 1,,34.074263,131.7508
 富田二丁目,トンダ 2,TONDA 2,,34.074246,131.754711
+富田新町一丁目,トンダシンマチ 1,TONDASHINMACHI 1,,,
+富田新町二丁目,トンダシンマチ 2,TONDASHINMACHI 2,,,
 土井一丁目,ドイ 1,DOI 1,,34.079254,131.770808
 土井二丁目,ドイ 2,DOI 2,,34.077118,131.773499
 道源町,ドウゲンチョウ,DOGENCHO,,34.065584,131.784826
@@ -257,6 +259,7 @@ name,name_kana,name_romaji,nickname,latitude,longitude
 花園町,ハナゾノチョウ,HANAZONOCHO,,34.066983,131.7755
 花畠町,ハナバタケチョウ,HANABATAKECHO,,34.05978,131.810996
 浜田一丁目,ハマダ 1,HAMADA 1,,34.069147,131.755553
+浜田二丁目,ハマダ 2,HAMADA 2,,,
 速玉町,ハヤタマチョウ,HAYATAMACHO,,34.046024,131.809746
 原宿町,ハラジュクチョウ,HARAJUKUCHO,,34.062296,131.804365
 晴海町,ハルミチョウ,HARUMICHO,,34.036451,131.791869