Merge pull request #129 from geolonia/issue_118_3

ローマ字データが欠けているレコードと修正されたレコードの両方がCSVファイルに出力されてしまっている問題の修正

api/ja/大阪府/南河内郡千早赤阪村.json

@@ -1 +1 @@
-[{"town":"大字中津原","koaza":"","lat":34.432692,"lng":135.625316},{"town":"大字中津原","koaza":"","lat":34.432692,"lng":135.625316},{"town":"大字二河原邊","koaza":"","lat":34.452332,"lng":135.634657},{"town":"大字二河原邊","koaza":"","lat":34.452332,"lng":135.634657},{"town":"大字千早","koaza":"","lat":34.412663,"lng":135.65735},{"town":"大字千早","koaza":"","lat":34.412663,"lng":135.65735},{"town":"大字吉年","koaza":"","lat":34.447272,"lng":135.615964},{"town":"大字吉年","koaza":"","lat":34.447272,"lng":135.615964},{"town":"大字小吹","koaza":"","lat":34.437739,"lng":135.611804},{"town":"大字小吹","koaza":"","lat":34.437739,"lng":135.611804},{"town":"大字川野邊","koaza":"","lat":34.466279,"lng":135.630678},{"town":"大字川野邊","koaza":"","lat":34.466279,"lng":135.630678},{"town":"大字東阪","koaza":"","lat":34.443337,"lng":135.628242},{"town":"大字東阪","koaza":"","lat":34.443337,"lng":135.628242},{"town":"大字桐山","koaza":"","lat":34.44679,"lng":135.634838},{"town":"大字桐山","koaza":"","lat":34.44679,"lng":135.634838},{"town":"大字森屋","koaza":"","lat":34.466335,"lng":135.619167},{"town":"大字森屋","koaza":"","lat":34.466335,"lng":135.619167},{"town":"大字水分","koaza":"","lat":34.447798,"lng":135.651934},{"town":"大字水分","koaza":"","lat":34.447798,"lng":135.651934}]
+[{"town":"大字中津原","koaza":"","lat":34.432692,"lng":135.625316},{"town":"大字二河原邊","koaza":"","lat":34.452332,"lng":135.634657},{"town":"大字千早","koaza":"","lat":34.412663,"lng":135.65735},{"town":"大字吉年","koaza":"","lat":34.447272,"lng":135.615964},{"town":"大字小吹","koaza":"","lat":34.437739,"lng":135.611804},{"town":"大字川野邊","koaza":"","lat":34.466279,"lng":135.630678},{"town":"大字東阪","koaza":"","lat":34.443337,"lng":135.628242},{"town":"大字桐山","koaza":"","lat":34.44679,"lng":135.634838},{"town":"大字森屋","koaza":"","lat":34.466335,"lng":135.619167},{"town":"大字水分","koaza":"","lat":34.447798,"lng":135.651934}]

api/ja/福島県/東白川郡矢祭町.json

@@ -1 +1 @@
-[{"town":"大字上関河内","koaza":"","lat":36.828769,"lng":140.457963},{"town":"大字上関河内","koaza":"","lat":36.828769,"lng":140.457963},{"town":"大字下石井","koaza":"","lat":36.894838,"lng":140.433633},{"town":"大字下石井","koaza":"","lat":36.894838,"lng":140.433633},{"town":"大字下関河内","koaza":"","lat":36.835132,"lng":140.437585},{"town":"大字下関河内","koaza":"","lat":36.835132,"lng":140.437585},{"town":"大字中石井","koaza":"","lat":36.917651,"lng":140.42656},{"town":"大字中石井","koaza":"","lat":36.917651,"lng":140.42656},{"town":"大字内川","koaza":"","lat":36.861094,"lng":140.379673},{"town":"大字内川","koaza":"","lat":36.861094,"lng":140.379673},{"town":"大字大垬","koaza":"","lat":36.807696,"lng":140.462428},{"town":"大字大垬","koaza":"","lat":36.807696,"lng":140.462428},{"town":"大字宝坂","koaza":"","lat":36.866906,"lng":140.445658},{"town":"大字宝坂","koaza":"","lat":36.866906,"lng":140.445658},{"town":"大字小田川","koaza":"","lat":36.857401,"lng":140.431198},{"town":"大字小田川","koaza":"","lat":36.857401,"lng":140.431198},{"town":"大字山下","koaza":"","lat":36.835655,"lng":140.414692},{"town":"大字山下","koaza":"","lat":36.835655,"lng":140.414692},{"town":"大字戸塚","koaza":"","lat":36.888901,"lng":140.421977},{"town":"大字戸塚","koaza":"","lat":36.888901,"lng":140.421977},{"town":"大字東舘","koaza":"","lat":36.875277,"lng":140.428002},{"town":"大字東舘","koaza":"","lat":36.875277,"lng":140.428002},{"town":"大字茗荷","koaza":"","lat":36.892314,"lng":140.35824},{"town":"大字茗荷","koaza":"","lat":36.892314,"lng":140.35824},{"town":"大字金沢","koaza":"","lat":36.881284,"lng":140.432816},{"town":"大字金沢","koaza":"","lat":36.881284,"lng":140.432816},{"town":"大字関岡","koaza":"","lat":36.871533,"lng":140.406127},{"town":"大字関岡","koaza":"","lat":36.871533,"lng":140.406127},{"town":"大字高野","koaza":"","lat":36.84955,"lng":140.419937},{"town":"大字高野","koaza":"","lat":36.84955,"lng":140.419937}]
+[{"town":"大字上関河内","koaza":"","lat":36.828769,"lng":140.457963},{"town":"大字下石井","koaza":"","lat":36.894838,"lng":140.433633},{"town":"大字下関河内","koaza":"","lat":36.835132,"lng":140.437585},{"town":"大字中石井","koaza":"","lat":36.917651,"lng":140.42656},{"town":"大字内川","koaza":"","lat":36.861094,"lng":140.379673},{"town":"大字大垬","koaza":"","lat":36.807696,"lng":140.462428},{"town":"大字宝坂","koaza":"","lat":36.866906,"lng":140.445658},{"town":"大字小田川","koaza":"","lat":36.857401,"lng":140.431198},{"town":"大字山下","koaza":"","lat":36.835655,"lng":140.414692},{"town":"大字戸塚","koaza":"","lat":36.888901,"lng":140.421977},{"town":"大字東舘","koaza":"","lat":36.875277,"lng":140.428002},{"town":"大字茗荷","koaza":"","lat":36.892314,"lng":140.35824},{"town":"大字金沢","koaza":"","lat":36.881284,"lng":140.432816},{"town":"大字関岡","koaza":"","lat":36.871533,"lng":140.406127},{"town":"大字高野","koaza":"","lat":36.84955,"lng":140.419937}]

bin/build.js

@@ -22,6 +22,7 @@ const exportToCsv = require('../lib/export-to-csv')
 const sortAddresses = require('../lib/sort-addresses')
 const getPostalKanaOrRomeItems = require('../lib/get-postal-kana-or-rome-items')
 const importPatches = require('../lib/import-patches')
+const createRecordKey = require('../lib/create-record-key')
 
 const sleep = promisify(setTimeout)
 
@@ -356,10 +357,7 @@ const getOazaAddressItems = async (prefCode, postalCodeKanaItems, postalCodeRome
       line['都道府県名'], cityName, townName, postalCodeRomeItems, '市区町村名ローマ字', 'rome',
     )
 
-    // 重複チェックに使用するためのキーには、「大字」または「字」を含めない。
-    const oazaKey = townName.replace(/^大?字/g, '')
-
-    const recordKey = line['都道府県名'] + cityName + oazaKey
+    const recordKey = createRecordKey(line['都道府県名'], cityName, townName)
 
     // to avoid duplication
     if (records[recordKey]) {
@@ -459,10 +457,8 @@ const getGaikuAddressItems = async (prefCode, postalCodeKanaItems, postalCodeRom
 
     // 重複チェックに使用するためのキーには、「大字」または「字」を含めない。
     const townName = removeUnnecessarySpace(line['大字・丁目名'])
-    const oazaKey = townName.replace(/^大?字/g, '')
-
     const koazaName = line['小字・通称名'] === 'NULL' ? '' : line['小字・通称名']
-    const recordKey = line['都道府県名'] + cityName + oazaKey + koazaName
+    const recordKey = createRecordKey(line['都道府県名'], cityName, townName, koazaName)
     const lng = Number(line['経度'])
     const lat = Number(line['緯度'])
     addToCoords(recordKey, lng, lat)
@@ -485,14 +481,9 @@ const getGaikuAddressItems = async (prefCode, postalCodeKanaItems, postalCodeRom
           (pref === line['都道府県名'] &&
             orig === line['市区町村名']))
     const cityName = renameEntry ? renameEntry.renamed : line['市区町村名']
-
     const townName = removeUnnecessarySpace(line['大字・丁目名'])
-
-    // 重複チェックに使用するためのキーには、「大字」または「字」を含めない。
-    const oazaKey = townName.replace(/^大?字/g, '')
-
     const koazaName = line['小字・通称名'] === 'NULL' ? '' : line['小字・通称名']
-    const recordKey = line['都道府県名'] + cityName + oazaKey + koazaName
+    const recordKey = createRecordKey(line['都道府県名'], cityName, townName, koazaName)
 
     // to avoid duplication
     if (records[recordKey]) {