japanese_address_parser 3.0.5 → 3.1.1

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

@@ -5,7 +5,7 @@ import { currentConfig } from '../config'
 import { __internals } from '../normalize'
 import { findKanjiNumbers } from '@geolonia/japanese-numeral'
 
-type PrefectureList = { [key: string]: string[] }
+export type PrefectureList = { [key: string]: string[] }
 interface SingleTown {
   town: string
   originalTown?: string
@@ -13,8 +13,13 @@ interface SingleTown {
   lat: string
   lng: string
 }
-type TownList = SingleTown[]
-
+export type TownList = SingleTown[]
+interface SingleAddr {
+  addr: string
+  lat: string | null
+  lng: string | null
+}
+export type AddrList = SingleAddr[]
 interface GaikuListItem {
   gaiku: string
   lat: string
@@ -40,16 +45,16 @@ let cachedPrefectures: PrefectureList | undefined = undefined
 const cachedTowns: { [key: string]: TownList } = {}
 const cachedGaikuListItem: { [key: string]: GaikuListItem[] } = {}
 const cachedResidentials: { [key: string]: ResidentialList } = {}
-let cachedSameNamedPrefectureCityRegexPatterns:
-  | [string, string][]
-  | undefined = undefined
+const cachedAddrs: { [key: string]: AddrList } = {} // TODO: use LRU
+let cachedSameNamedPrefectureCityRegexPatterns: [string, string][] | undefined =
+  undefined
 
 export const getPrefectures = async () => {
   if (typeof cachedPrefectures !== 'undefined') {
     return cachedPrefectures
   }
 
-  const prefsResp = await __internals.fetch('.json') // ja.json
+  const prefsResp = await __internals.fetch('.json', { level: 1 }) // ja.json
   const data = (await prefsResp.json()) as PrefectureList
   return cachePrefectures(data)
 }
@@ -104,6 +109,7 @@ export const getTowns = async (pref: string, city: string) => {
 
   const townsResp = await __internals.fetch(
     ['', encodeURI(pref), encodeURI(city) + '.json'].join('/'),
+    { level: 3, pref, city },
   )
   const towns = (await townsResp.json()) as TownList
   return (cachedTowns[cacheKey] = towns)
@@ -114,7 +120,13 @@ export const getGaikuList = async (
   city: string,
   town: string,
 ) => {
-  const cacheKey = `${pref}-${city}-${town}`
+  if (currentConfig.interfaceVersion > 1) {
+    throw new Error(
+      `Invalid config.interfaceVersion: ${currentConfig.interfaceVersion}'}. Please set config.interfaceVersion to 1.`,
+    )
+  }
+
+  const cacheKey = `${pref}-${city}-${town}-v${currentConfig.interfaceVersion}`
   const cache = cachedGaikuListItem[cacheKey]
   if (typeof cache !== 'undefined') {
     return cache
@@ -136,7 +148,13 @@ export const getResidentials = async (
   city: string,
   town: string,
 ) => {
-  const cacheKey = `${pref}-${city}-${town}`
+  if (currentConfig.interfaceVersion > 1) {
+    throw new Error(
+      `Invalid config.interfaceVersion: ${currentConfig.interfaceVersion}'}. Please set config.interfaceVersion to 1.`,
+    )
+  }
+
+  const cacheKey = `${pref}-${city}-${town}-v${currentConfig.interfaceVersion}`
   const cache = cachedResidentials[cacheKey]
   if (typeof cache !== 'undefined') {
     return cache
@@ -166,6 +184,34 @@ export const getResidentials = async (
   return (cachedResidentials[cacheKey] = residentials)
 }
 
+export const getAddrs = async (pref: string, city: string, town: string) => {
+  if (currentConfig.interfaceVersion < 2) {
+    throw new Error(
+      `Invalid config.interfaceVersion: ${currentConfig.interfaceVersion}'}. Please set config.interfaceVersion to 2 or higher`,
+    )
+  }
+
+  const cacheKey = `${pref}-${city}-${town}-v${currentConfig.interfaceVersion}`
+  const cache = cachedAddrs[cacheKey]
+  if (typeof cache !== 'undefined') {
+    return cache
+  }
+
+  const addrsResp = await __internals.fetch(
+    ['', encodeURI(pref), encodeURI(city), encodeURI(town) + '.json'].join('/'),
+    { level: 8, pref, city, town },
+  )
+  let addrs: AddrList
+  try {
+    addrs = (await addrsResp.json()) as AddrList
+  } catch {
+    addrs = []
+  }
+
+  addrs.sort((res1, res2) => res1.addr.length - res2.addr.length)
+  return (cachedAddrs[cacheKey] = addrs)
+}
+
 // 十六町 のように漢数字と町が連結しているか
 const isKanjiNumberFollewedByCho = (targetTownName: string) => {
   const xCho = targetTownName.match(/.町/g)
@@ -260,15 +306,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/lib/kan2num.ts

@@ -3,8 +3,12 @@ import { kanji2number, findKanjiNumbers } from '@geolonia/japanese-numeral'
 export const kan2num = (string: string) => {
   const kanjiNumbers = findKanjiNumbers(string)
   for (let i = 0; i < kanjiNumbers.length; i++) {
-    // @ts-ignore
-    string = string.replace(kanjiNumbers[i], kanji2number(kanjiNumbers[i]))
+    try {
+      // @ts-ignore
+      string = string.replace(kanjiNumbers[i], kanji2number(kanjiNumbers[i]));
+    } catch (error) {
+      // ignore
+    }
   }
 
   return string

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

@@ -1,26 +1,55 @@
 import * as Normalize from './normalize'
 import { promises as fs } from 'fs'
 import unfetch from 'isomorphic-unfetch'
+import { TransformRequestQuery } from './normalize'
 
-const fetchOrReadFile = async (
-  input: string,
-): Promise<Response | { json: () => Promise<unknown> }> => {
-  const fileURL = new URL(`${Normalize.config.japaneseAddressesApi}${input}`)
-  if (fileURL.protocol === 'http:' || fileURL.protocol === 'https:') {
-    if (Normalize.config.geoloniaApiKey) {
-      fileURL.search = `?geolonia-api-key=${Normalize.config.geoloniaApiKey}`
-    }
-    return unfetch(fileURL.toString())
-  } else if (fileURL.protocol === 'file:') {
-    const filePath = decodeURI(fileURL.pathname)
+export const requestHandlers = {
+  file: (fileURL: URL) => {
+    const filePath =
+      process.platform === 'win32'
+        ? decodeURI(fileURL.pathname).substr(1)
+        : decodeURI(fileURL.pathname)
     return {
       json: async () => {
         const contents = await fs.readFile(filePath)
         return JSON.parse(contents.toString('utf-8'))
       },
     }
+  },
+  http: (fileURL: URL) => {
+    if (Normalize.config.geoloniaApiKey) {
+      fileURL.search = `?geolonia-api-key=${Normalize.config.geoloniaApiKey}`
+    }
+    return unfetch(fileURL.toString())
+  },
+}
+
+/**
+ * 正規化のためのデータを取得する
+ * @param input - Path part like '東京都/文京区.json'
+ * @param requestOptions - input を構造化したデータ
+ */
+const fetchOrReadFile = async (
+  input: string,
+  requestOptions: TransformRequestQuery = { level: -1 },
+): Promise<Response | { json: () => Promise<unknown> }> => {
+  const fileURL = new URL(`${Normalize.config.japaneseAddressesApi}${input}`)
+  if (Normalize.config.transformRequest && requestOptions.level !== -1) {
+    const result = await Normalize.config.transformRequest(
+      fileURL,
+      requestOptions,
+    )
+    return {
+      json: async () => Promise.resolve(result),
+    }
   } else {
-    throw new Error(`Unknown URL schema: ${fileURL.protocol}`)
+    if (fileURL.protocol === 'http:' || fileURL.protocol === 'https:') {
+      return requestHandlers.http(fileURL)
+    } else if (fileURL.protocol === 'file:') {
+      return requestHandlers.file(fileURL)
+    } else {
+      throw new Error(`Unknown URL schema: ${fileURL.protocol}`)
+    }
   }
 }
 

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

@@ -9,21 +9,51 @@ import {
   getCityRegexPatterns,
   getTownRegexPatterns,
   getSameNamedPrefectureCityRegexPatterns,
+  // interface version 1
   getResidentials,
   getGaikuList,
+  // interface version 2
+  getAddrs,
+  PrefectureList,
+  TownList,
+  AddrList,
 } from './lib/cacheRegexes'
 import unfetch from 'isomorphic-unfetch'
 
+type TransformRequestResponse = null | PrefectureList | TownList | AddrList
+
+export type TransformRequestQuery = {
+  level: number //  level = -1 は旧 API。 transformRequestFunction を設定しても無視する
+  pref?: string
+  city?: string
+  town?: string
+}
+
+export type TransformRequestFunction = (
+  url: URL,
+  query: TransformRequestQuery,
+) => TransformRequestResponse | Promise<TransformRequestResponse>
+
 /**
  * normalize {@link Normalizer} の動作オプション。
  */
 export interface Config {
+  /**
+   * レスポンス型のバージョン。デフォルト 1
+   * 1 の場合は jyukyo: string, gaiku: string
+   * 2 の場合は addr: string,　other: string
+   */
+  interfaceVersion: number
+
   /** 住所データを URL 形式で指定。 file:// 形式で指定するとローカルファイルを参照できます。 */
   japaneseAddressesApi: string
 
   /** 町丁目のデータを何件までキャッシュするか。デフォルト 1,000 */
   townCacheSize: number
 
+  /** 住所データへのリクエストを変形するオプション。 interfaceVersion === 2 で有効 */
+  transformRequest?: TransformRequestFunction
+
   geoloniaApiKey?: string
 }
 export const config: Config = currentConfig
@@ -31,7 +61,7 @@ export const config: Config = currentConfig
 /**
  * 住所の正規化結果として戻されるオブジェクト
  */
-export interface NormalizeResult {
+interface NormalizeResult_v1 {
   /** 都道府県 */
   pref: string
   /** 市区町村 */
@@ -46,7 +76,7 @@ export interface NormalizeResult {
   addr: string
   /** 緯度。データが存在しない場合は null */
   lat: number | null
-  /** 軽度。データが存在しない場合は null */
+  /** 経度。データが存在しない場合は null */
   lng: number | null
   /**
    * 住所文字列をどこまで判別できたかを表す正規化レベル
@@ -60,6 +90,34 @@ export interface NormalizeResult {
   level: number
 }
 
+type NormalizeResult_v2 = {
+  /** 都道府県 */
+  pref: string
+  /** 市区町村 */
+  city: string
+  /** 町丁目 */
+  town: string
+  /** 住居表示または地番 */
+  addr: string
+  /** 正規化後の住所文字列 */
+  other?: string
+  /** 緯度。データが存在しない場合は null */
+  lat: number | null
+  /** 経度。データが存在しない場合は null */
+  lng: number | null
+  /**
+   * 住所文字列をどこまで判別できたかを表す正規化レベル
+   * - 0 - 都道府県も判別できなかった。
+   * - 1 - 都道府県まで判別できた。
+   * - 2 - 市区町村まで判別できた。
+   * - 3 - 町丁目まで判別できた。
+   * - 8 - 住居表示住所の街区符号・住居番号までの判別または地番住所の判別ができた。
+   */
+  level: number
+}
+
+export type NormalizeResult = NormalizeResult_v1 | NormalizeResult_v2
+
 /**
  * 正規化関数の {@link normalize} のオプション
  */
@@ -92,6 +150,7 @@ export type Normalizer = (
 
 export type FetchLike = (
   input: string,
+  requestQuery?: TransformRequestQuery,
 ) => Promise<Response | { json: () => Promise<unknown> }>
 
 const defaultOption = {
@@ -143,7 +202,13 @@ const normalizeResidentialPart = async (
   pref: string,
   city: string,
   town: string,
-) => {
+): Promise<{
+  gaiku: string
+  jyukyo?: string
+  addr: string
+  lat: string
+  lng: string
+} | null> => {
   const [gaikuListItem, residentials] = await Promise.all([
     getGaikuList(pref, city, town),
     getResidentials(pref, city, town),
@@ -183,6 +248,27 @@ const normalizeResidentialPart = async (
   return null
 }
 
+const normalizeAddrPart = async (
+  addr: string,
+  pref: string,
+  city: string,
+  town: string,
+) => {
+  const addrListItem = await getAddrs(pref, city, town)
+
+  // 住居表示住所、および地番住所が見つからなかった
+  if (addrListItem.length === 0) {
+    return null
+  }
+
+  const addrItem = addrListItem.find((item) => addr.startsWith(item.addr))
+  if (addrItem) {
+    const other = addr.replace(addrItem.addr, '').trim()
+    return { addr: addrItem.addr, other, lat: addrItem.lat, lng: addrItem.lng }
+  }
+  return null
+}
+
 export const normalize: Normalizer = async (
   address,
   _option = defaultOption,
@@ -353,7 +439,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')
@@ -378,7 +464,7 @@ export const normalize: Normalizer = async (
           // `-1` のようなケース
           return kan2num(s)
         })
-        .replace(/-[^0-9]+([0-9〇一二三四五六七八九十百千]+)/, (s) => {
+        .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, (s) => {
           // `-あ1` のようなケース
           return kan2num(zen2han(s))
         })
@@ -392,43 +478,85 @@ export const normalize: Normalizer = async (
 
   addr = patchAddr(pref, city, town, addr)
 
-  // 住居表示住所リストを使い番地号までの正規化を行う
-  if (option.level > 3 && normalized && town) {
-    normalized = await normalizeResidentialPart(addr, pref, city, town)
-  }
-  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
 
-  const result: NormalizeResult = {
-    pref,
-    city,
-    town,
-    addr,
-    lat,
-    lng,
-    level,
+  if (option.level <= 3 || level < 3) {
+    return { pref, city, town, addr, level, lat, lng }
   }
 
-  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
-  }
+  // ======================== Advanced section ========================
+  // これ以下は地番住所または住居表示住所までの正規化・ジオコーディングを行う処理
+  // 現状、インターフェース v1 と v2 が存在する
+  // japanese-addresses のフォーマット、および normalize 関数の戻り値が異なる
+  // 将来的に v2 に統一することを検討中
+  // ==================================================================
+
+  // v2 のインターフェース
+  if (currentConfig.interfaceVersion === 2) {
+    const normalizedAddrPart = await normalizeAddrPart(addr, pref, city, town)
+    let other = undefined
+    if (normalizedAddrPart) {
+      addr = normalizedAddrPart.addr
+      if (normalizedAddrPart.other) {
+        other = normalizedAddrPart.other
+      }
+      if (normalizedAddrPart.lat !== null)
+        lat = parseFloat(normalizedAddrPart.lat)
+      if (normalizedAddrPart.lng !== null)
+        lng = parseFloat(normalizedAddrPart.lng)
+      level = 8
+    }
+    const result: NormalizeResult_v2 = {
+      pref,
+      city,
+      town,
+      addr,
+      level,
+      lat,
+      lng,
+    }
+    if (other) {
+      result.other = other
+    }
+    return result
+  } else if (currentConfig.interfaceVersion === 1) {
+    // 住居表示住所リストを使い番地号までの正規化を行う
+    if (option.level > 3 && normalized && town) {
+      normalized = await normalizeResidentialPart(addr, pref, city, town)
+    }
+    if (normalized) {
+      lat = parseFloat(normalized.lat)
+      lng = parseFloat(normalized.lng)
+    }
+
+    if (Number.isNaN(lat) || Number.isNaN(lng)) {
+      lat = null
+      lng = null
+    }
+
+    const result: NormalizeResult_v1 = {
+      pref,
+      city,
+      town,
+      addr,
+      lat,
+      lng,
+      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 result
+    return result
+  } else {
+    throw new Error('invalid interfaceVersion')
+  }
 }

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.9.2"
       },
       "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.9.2",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
+      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
       "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.9.2",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
+      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
       "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.9.2"
   },
   "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