diff --git a/itaiji_dic/itaiji_src.json b/itaiji_dic/itaiji_src.json index 0e8fbb6..35e6c0b 100644 --- a/itaiji_dic/itaiji_src.json +++ b/itaiji_dic/itaiji_src.json @@ -37,6 +37,7 @@ "煙": "烟", "艶": "艷", "塩": "鹽", + "園": "薗", "奥": "奧", "往": "徃", "応": "應", @@ -264,7 +265,7 @@ "棲": "栖", "声": "聲", "静": "靜", - "斉": "斎齊", + "斉": "斎齋齊齊済齋齊斎斎薺濟斎斉薺齎濟齊齏霽", "跡": "迹蹟", "摂": "攝", "窃": "竊", diff --git a/jageocoder/__init__.py b/jageocoder/__init__.py index c822b6d..6ace4dd 100644 --- a/jageocoder/__init__.py +++ b/jageocoder/__init__.py @@ -19,8 +19,8 @@ >>> jageocoder.searchNode('') """ -__version__ = '1.0.0rc1' # The package version -__dictionary_version__ = '20211208' # Compatible dictionary version +__version__ = '1.0.0rc2' # The package version +__dictionary_version__ = '20211209' # Compatible dictionary version __author__ = 'Takeshi Sagara ' __all__ = [ diff --git a/jageocoder/itaiji.py b/jageocoder/itaiji.py index 20e2743..f311007 100644 --- a/jageocoder/itaiji.py +++ b/jageocoder/itaiji.py @@ -20,7 +20,7 @@ class Converter(object): AddressLevel.WARD: re.compile(r'(区)$'), AddressLevel.OAZA: re.compile(r'(町|条|線|丁|丁目|番|号|番丁|番町)$'), AddressLevel.AZA: re.compile(r'(町|条|線|丁|丁目|区|番|号)$'), - AddressLevel.BLOCK: re.compile(r'(番|番地)$'), + AddressLevel.BLOCK: re.compile(r'(番|番地|号|地)$'), AddressLevel.BLD: re.compile(r'(号|番地)$'), } diff --git a/jageocoder/itaiji_dic.json b/jageocoder/itaiji_dic.json index 4d73d4f..5cd8724 100644 --- a/jageocoder/itaiji_dic.json +++ b/jageocoder/itaiji_dic.json @@ -1 +1 @@ -{"\u30b1": "\u304c", "\u30f6": "\u304c", "\u30ac": "\u304c", "\u30c4": "\u3063", "\u30c3": "\u3063", "\u30ce": "\u306e", "\u4e43": "\u306e", "\u4e4b": "\u306e", "\u30f1": "\u30a8", "\u30a7": "\u30a8", "\u4e9e": "\u4e9c", "\u7a50": "\u79cb", "\u9f9d": "\u79cb", "\u60e1": "\u60aa", "\u8606": "\u82a6", "\u9c3a": "\u9bf5", "\u58d3": "\u5727", "\u83f4": "\u5eb5", "\u570d": "\u56f2", "\u7232": "\u70ba", "\u91ab": "\u533b", "\u6bd3": "\u80b2", "\u5f0c": "\u4e00", "\u58f9": "\u58f1", "\u7a3b": "\u7a32", "\u98ee": "\u98f2", "\u5a6c": "\u6deb", "\u96b1": "\u96a0", "\u97f5": "\u97fb", "\u5918": "\u536f", "\u9b31": "\u6b1d", "\u5ed0": "\u53a9", "\u5ecf": "\u53a9", "\u777f": "\u53e1", "\u71df": "\u55b6", "\u668e": "\u6620", "\u66f5": "\u66f3", "\u69ae": "\u6804", "\u9834": "\u7a4e", "\u885e": "\u885b", "\u548f": "\u8a60", "\u9a5b": "\u99c5", "\u5713": "\u5186", "\u70df": "\u7159", "\u8277": "\u8276", "\u9e7d": "\u5869", "\u5967": "\u5965", "\u5f83": "\u5f80", "\u61c9": "\u5fdc", "\u6b50": "\u6b27", "\u6bc6": "\u6bb4", "\u9d2c": "\u9daf", "\u583d": "\u5ca1", "\u5d17": "\u5ca1", "\u51b2": "\u6c96", "\u7a69": "\u7a4f", "\u5047": "\u4eee", "\u50f9": "\u4fa1", "\u8b41": "\u5629", "\u5ce9": "\u5ce8", "\u756b": "\u753b", "\u6703": "\u4f1a", "\u89e7": "\u89e3", "\u56d8": "\u56de", "\u58de": "\u58ca", "\u6060": "\u602a", "\u61f7": "\u61d0", "\u754d": "\u754c", "\u583a": "\u754c", "\u7e6a": "\u7d75", "\u880f": "\u87f9", "\u5d15": "\u5d16", "\u7919": "\u788d", "\u76d6": "\u84cb", "\u8462": "\u84cb", "\u8823": "\u86ce", "\u9264": "\u920e", "\u64f4": "\u62e1", "\u652a": "\u64b9", "\u6bbc": "\u6bbb", "\u89ba": "\u899a", "\u5b78": "\u5b66", "\u6588": "\u5b66", "\u5dbd": "\u5cb3", "\u6a02": "\u697d", "\u7ac8": "\u7ac3", "\u91e1": "\u91dc", "\u6822": "\u67cf", "\u9b3b": "\u7ca5", "\u82c5": "\u5208", "\u520b": "\u520a", "\u52f8": "\u52e7", "\u5377": "\u5dfb", "\u6b61": "\u6b53", "\u704c": "\u6f45", "\u7f50": "\u7f36", "\u89c0": "\u89b3", "\u8aeb": "\u8acc", "\u9452": "\u9451", "\u95dc": "\u95a2", "\u9677": "\u9665", "\u8218": "\u9928", "\u5dd6": "\u5dcc", "\u5d52": "\u5ca9", "\u9d08": "\u96c1", "\u9ceb": "\u96c1", "\u984f": "\u9854", "\u6199": "\u559c", "\u5650": "\u5668", "\u7ad2": "\u5947", "\u671e": "\u671f", "\u68ca": "\u68cb", "\u5f03": "\u68c4", "\u6b78": "\u5e30", "\u7688": "\u5e30", "\u6c23": "\u6c17", "\u6c14": "\u6c17", "\u9f9c": "\u4e80", "\u7912": "\u78ef", "\u50de": "\u507d", "\u6232": "\u622f", "\u72a7": "\u72a0", "\u78aa": "\u7827", "\u537b": "\u5374", "\u7cfa": "\u7cfe", "\u820a": "\u65e7", "\u64da": "\u62e0", "\u64e7": "\u6319", "\u8209": "\u6319", "\u4eb0": "\u4eac", "\u604a": "\u5354", "\u5cfd": "\u5ce1", "\u633e": "\u631f", "\u51b5": "\u6cc1", "\u72f9": "\u72ed", "\u582f": "\u5c2d", "\u66c9": "\u6681", "\u5340": "\u533a", "\u9a45": "\u99c6", "\u99c8": "\u99c6", "\u52f3": "\u52f2", "\u7fa3": "\u7fa4", "\u73ea": "\u572d", "\u5f91": "\u5f84", "\u9015": "\u5f84", "\u60e0": "\u6075", "\u6187": "\u61a9", "\u651c": "\u643a", "\u6eaa": "\u6e13", "\u8c3f": "\u6e13", "\u7d93": "\u7d4c", "\u7e7c": "\u7d99", "\u8396": "\u830e", "\u87a2": "\u86cd", "\u8f15": "\u8efd", "\u9838": "\u981a", "\u9dc4": "\u9d8f", "\u85dd": "\u82b8", "\u7f3a": "\u6b20", "\u51b3": "\u6c7a", "\u5109": "\u5039", "\u52b5": "\u5238", "\u528d": "\u5263", "\u5294": "\u5263", "\u5292": "\u5263", "\u5271": "\u5263", "\u91fc": "\u5263", "\u5708": "\u570f", "\u6aa2": "\u691c", "\u6b0a": "\u6a29", "\u737b": "\u732e", "\u7e23": "\u770c", "\u96aa": "\u967a", "\u986f": "\u9855", "\u9a57": "\u9a13", "\u56b4": "\u53b3", "\u4e55": "\u864e", "\u76b7": "\u9f13", "\u9ad9": "\u9ad8", "\u6548": "\u52b9", "\u5ee3": "\u5e83", "\u6046": "\u6052", "\u6644": "\u6643", "\u7a3e": "\u7a3f", "\u85c1": "\u7a3f", "\u754a": "\u8015", "\u783f": "\u9271", "\u7926": "\u9271", "\u945b": "\u9271", "\u5227": "\u52ab", "\u865f": "\u53f7", "\u8ee3": "\u8f5f", "\u570b": "\u56fd", "\u5700": "\u56fd", "\u5d73": "\u5d6f", "\u4f50": "\u5de6", "\u6fdf": "\u6e08", "\u788e": "\u7815", "\u9f4b": "\u658e", "\u5291": "\u5264", "\u962a": "\u5742", "\u5d5c": "\u5d0e", "\u57fc": "\u5d0e", "\u7895": "\u5d0e", "\ufa11": "\u5d0e", "\u505a": "\u4f5c", "\u6afb": "\u685c", "\u518c": "\u518a", "\u96dc": "\u96d1", "\u894d": "\u96d1", "\u768b": "\u7690", "\u53c3": "\u53c2", "\u6158": "\u60e8", "\u68e7": "\u685f", "\u8836": "\u8695", "\u8b9a": "\u8b83", "\u8d0a": "\u8cdb", "\u6b98": "\u6b8b", "\u7d72": "\u7cf8", "\u5e0b": "\u7d19", "\u9f52": "\u6b6f", "\u4e8a": "\u4e8b", "\u5152": "\u5150", "\u5c13": "\u723e", "\u8fad": "\u8f9e", "\u8089": "\u5b8d", "\u6fd5": "\u6e7f", "\u8cad": "\u8cea", "\u5be6": "\u5b9f", "\u7b71": "\u7be0", "\u8602": "\u854a", "\u854b": "\u854a", "\u820d": "\u820e", "\u51a9": "\u5199", "\u5beb": "\u5199", "\u91cb": "\u91c8", "\u5492": "\u546a", "\u58fd": "\u5bff", "\u6d32": "\u5dde", "\u6536": "\u53ce", "\u8b8e": "\u8b90", "\u5f9e": "\u5f93", "\u4ece": "\u5f93", "\u6f81": "\u6e0b", "\u6f80": "\u6e0b", "\u7378": "\u7363", "\u7e31": "\u7e26", "\u8085": "\u7c9b", "\u51d6": "\u6e96", "\u8655": "\u51e6", "\u85f7": "\u85af", "\u654d": "\u53d9", "\u6558": "\u53d9", "\u751e": "\u5617", "\u596c": "\u5968", "\u734e": "\u5968", "\u5c07": "\u5c06", "\u53b0": "\u5ee0", "\u67a9": "\u677e", "\u71d2": "\u713c", "\u7a31": "\u79f0", "\u8b49": "\u8a3c", "\u4e58": "\u4e57", "\u5269": "\u5270", "\u5872": "\u5834", "\u58e4": "\u58cc", "\u5b43": "\u5b22", "\u689d": "\u6761", "\u6de8": "\u6d44", "\u758a": "\u7573", "\u7589": "\u7573", "\u7582": "\u7573", "\u7a70": "\u7a63", "\u8b93": "\u8b72", "\u91c0": "\u91b8", "\u56d1": "\u5631", "\u991d": "\u98fe", "\u89f8": "\u89e6", "\u8123": "\u5507", "\u5be2": "\u5bdd", "\u613c": "\u614e", "\u6649": "\u664b", "\u771e": "\u771f", "\u5204": "\u5203", "\u76e1": "\u5c3d", "\u976b": "\u976d", "\u9771": "\u976d", "\u918b": "\u9162", "\u5716": "\u56f3", "\u5eda": "\u53a8", "\u57c0": "\u5782", "\u7cb9": "\u7c8b", "\u7fc6": "\u7fe0", "\u9189": "\u9154", "\u96a8": "\u968f", "\u81b8": "\u9ac4", "\u9ad3": "\u9ac4", "\u6578": "\u6570", "\u6a1e": "\u67a2", "\u6f82": "\u6f84", "\u4e17": "\u4e16", "\u7546": "\u755d", "\u6dd2": "\u51c4", "\u6816": "\u68f2", "\u8072": "\u58f0", "\u975c": "\u9759", "\u658e": "\u6589", "\u9f4a": "\u6589", "\u8ff9": "\u8de1", "\u8e5f": "\u8de1", "\u651d": "\u6442", "\u7aca": "\u7a83", "\u5c08": "\u5c02", "\u6230": "\u6226", "\u6dfa": "\u6d45", "\u6f5b": "\u6f5c", "\u6ff3": "\u6f5c", "\u7dab": "\u7dda", "\u7e96": "\u7e4a", "\u7e8e": "\u7e4a", "\u8229": "\u8239", "\u821f": "\u8239", "\u8ce4": "\u8cce", "\u8e10": "\u8df5", "\u9322": "\u92ad", "\u8b71": "\u5584", "\u79aa": "\u7985", "\u66fd": "\u66fe", "\u8e08": "\u758e", "\u8613": "\u8607", "\u6eaf": "\u9061", "\u6cdd": "\u9061", "\u9f21": "\u9f20", "\u7cdf": "\u7c95", "\u96d9": "\u53cc", "\u58ef": "\u58ee", "\u641c": "\u635c", "\u63d2": "\u633f", "\u722d": "\u4e89", "\u7a97": "\u7a93", "\u7e3d": "\u7dcf", "\u8070": "\u8061", "\u838a": "\u8358", "\u88dd": "\u88c5", "\u8d71": "\u8d70", "\u9a37": "\u9a12", "\u6852": "\u6851", "\u81df": "\u81d3", "\u85cf": "\u8535", "\u5c6c": "\u5c5e", "\u621d": "\u8cca", "\u7e8c": "\u7d9a", "\u5346": "\u5352", "\u90a8": "\u6751", "\u591b": "\u591a", "\u58ae": "\u5815", "\u8235": "\u67c1", "\u6a62": "\u6955", "\u8eb0": "\u4f53", "\u9ad4": "\u4f53", "\u8ec6": "\u4f53", "\u5c0d": "\u5bfe", "\u5e36": "\u5e2f", "\u6eef": "\u6ede", "\u81fa": "\u53f0", "\u7027": "\u6edd", "\u64c7": "\u629e", "\u6fa4": "\u6ca2", "\u922c": "\u9438", "\u9039": "\u9054", "\u8c4e": "\u7aea", "\u8c8d": "\u72f8", "\u55ae": "\u5358", "\u64d4": "\u62c5", "\u81bd": "\u80c6", "\u5718": "\u56e3", "\u5f48": "\u5f3e", "\u65b7": "\u65ad", "\u803b": "\u6065", "\u7661": "\u75f4", "\u7a49": "\u7a1a", "\u9072": "\u9045", "\u665d": "\u663c", "\u87f2": "\u866b", "\u9444": "\u92f3", "\u6f74": "\u7026", "\u8c6c": "\u732a", "\u5ef3": "\u5e81", "\u5ef0": "\u5e81", "\u753c": "\u753a", "\u807d": "\u8074", "\u8193": "\u8178", "\u6555": "\u52c5", "\u73ce": "\u73cd", "\u93ad": "\u93ae", "\u58fa": "\u58f7", "\u905e": "\u9013", "\u9295": "\u9244", "\u9435": "\u9244", "\u9421": "\u9244", "\u7e92": "\u7e8f", "\u8f49": "\u8ee2", "\u9ede": "\u70b9", "\u50b3": "\u4f1d", "\u83df": "\u514e", "\u5154": "\u514e", "\u83b5": "\u514e", "\u792a": "\u783a", "\u9ee8": "\u515a", "\u5d8b": "\u5cf6", "\u5d8c": "\u5cf6", "\u6aae": "\u68bc", "\u76dc": "\u76d7", "\u6fe4": "\u6d9b", "\u71c8": "\u706f", "\u7576": "\u5f53", "\u8373": "\u8c46", "\u8fef": "\u9003", "\u9b2a": "\u95d8", "\u4ec2": "\u50cd", "\u60b3": "\u5fb3", "\u7368": "\u72ec", "\u8b80": "\u8aad", "\u6764": "\u6803", "\u5c46": "\u5c4a", "\u7e69": "\u7e04", "\u5f0d": "\u4e8c", "\u5f10": "\u4e8c", "\u8cb3": "\u4e8c", "\u8cae": "\u4e8c", "\u9087": "\u8fe9", "\u97ed": "\u97ee", "\u59d9": "\u598a", "\u7962": "\u79b0", "\u9ecf": "\u7c98", "\u8ffa": "\u5efc", "\u60f1": "\u60a9", "\u8166": "\u8133", "\u9738": "\u8987", "\u6d6a": "\u6ce2", "\u5ee2": "\u5ec3", "\u62dc": "\u62dd", "\u76c3": "\u676f", "\u85ad": "\u7a17", "\u6973": "\u6885", "\u8ce3": "\u58f2", "\u8805": "\u877f", "\u9ea5": "\u9ea6", "\u51fe": "\u51fd", "\u767c": "\u767a", "\u9aee": "\u9aea", "\u7f78": "\u7f70", "\u62d4": "\u629c", "\u7b35": "\u7bc4", "\u883b": "\u86ee", "\u7955": "\u79d8", "\u6a9c": "\u6867", "\u51b0": "\u6c37", "\u6ff1": "\u6d5c", "\u6ff5": "\u6d5c", "\u51a8": "\u5bcc", "\u6e15": "\u6df5", "\u6e0a": "\u6df5", "\u62c2": "\u6255", "\u4f5b": "\u4ecf", "\u5e64": "\u5e63", "\u7add": "\u4e26", "\u9587": "\u9589", "\u7be6": "\u7b86", "\u8b8a": "\u5909", "\u908a": "\u8fba", "\u9089": "\u8fba", "\u8fa8": "\u5f01", "\u8fa7": "\u5f01", "\u74e3": "\u5f01", "\u8faf": "\u5f01", "\u8216": "\u8217", "\u92ea": "\u8217", "\u7a57": "\u7a42", "\u5bf6": "\u5b9d", "\u5bf3": "\u5b9d", "\u5cef": "\u5cf0", "\u8420": "\u840c", "\u8943": "\u8912", "\u8c50": "\u8c4a", "\u5190": "\u5192", "\u7683": "\u8c8c", "\u6c92": "\u6ca1", "\u5932": "\u672c", "\u98dc": "\u7ffb", "\u69c7": "\u69d9", "\u67a1": "\u685d", "\u5118": "\u4fad", "\u842c": "\u4e07", "\u6eff": "\u6e80", "\u7c11": "\u84d1", "\u7c14": "\u84d1", "\u8109": "\u8108", "\u68a6": "\u5922", "\u65e0": "\u7121", "\u58fb": "\u5a7f", "\u805f": "\u5a7f", "\u7ddc": "\u7dbf", "\u9eaa": "\u9eba", "\u9ed8": "\u9ed9", "\u9920": "\u9905", "\u91ce": "\u57dc", "\u5f4c": "\u5f25", "\u85e5": "\u85ac", "\u8b6f": "\u8a33", "\u7c54": "\u85ae", "\u85ea": "\u85ae", "\u7609": "\u7652", "\u6d8c": "\u6e67", "\u8c6b": "\u4e88", "\u9918": "\u4f59", "\u8207": "\u4e0e", "\u8b7d": "\u8a89", "\u6416": "\u63fa", "\u6a23": "\u69d8", "\u9394": "\u7194", "\u7ab0": "\u7aaf", "\u71ff": "\u8000", "\u8b20": "\u8b21", "\u8e34": "\u8e0a", "\u9059": "\u9065", "\u4f86": "\u6765", "\u5fa0": "\u6765", "\u4e82": "\u4e71", "\u89bd": "\u89a7", "\u88e1": "\u88cf", "\u7567": "\u7565", "\u6f91": "\u6e9c", "\u7544": "\u7559", "\u9f8d": "\u7adc", "\u6801": "\u67f3", "\u5169": "\u4e21", "\u51c9": "\u6dbc", "\u7375": "\u731f", "\u66b8": "\u77ad", "\u7cae": "\u7ce7", "\u9130": "\u96a3", "\u74a2": "\u7460", "\u58d8": "\u5841", "\u6cea": "\u6d99", "\u7e32": "\u7d2f", "\u52f5": "\u52b1", "\u79ae": "\u793c", "\u96b8": "\u96b7", "\u9748": "\u970a", "\u9f61": "\u9f62", "\u6200": "\u604b", "\u8068": "\u806f", "\u7210": "\u7089", "\u52de": "\u52b4", "\u6716": "\u6717", "\u6a13": "\u697c", "\u7c60": "\u7bed", "\u797f": "\u7984", "\u4e98": "\u4e99", "\u7063": "\u6e7e", "\u4eed": "\u4ede", "\u7ada": "\u4f47", "\u723c": "\u4fce", "\u4f1c": "\u5005", "\u50e3": "\u50ed", "\u5bc3": "\u51a4", "\u5bc7": "\u51a6", "\u7f83": "\u51aa", "\u6c8d": "\u51b1", "\u6d0c": "\u51bd", "\u5c05": "\u524b", "\u7b9a": "\u5273", "\u5969": "\u5333", "\u5df5": "\u536e", "\u5ec1": "\u53a0", "\u5ec8": "\u53a6", "\u5edd": "\u53ae", "\u5557": "\u5556", "\u54af": "\u5580", "\u8b5f": "\u566a", "\u568f": "\u5694", "\u9f67": "\u56d3", "\u962f": "\u5740", "\u9642": "\u5761", "\u57d3": "\u57d2", "\u7246": "\u58bb", "\u7f4e": "\u58dc", "\u5f09": "\u5958", "\u4fab": "\u4f5e", "\u5afb": "\u5afa", "\u5ad0": "\u5b32", "\u5d18": "\u5d19", "\u7bcf": "\u5d4c", "\u8fea": "\u5ef8", "\u5f5c": "\u5f5d", "\u5f2f": "\u5f4e", "\u9af4": "\u5f7f", "\u61fc": "\u60e7", "\u5ff0": "\u60b4", "\u615a": "\u6159", "\u61f4": "\u61fa", "\u621e": "\u621b", "\u634d": "\u625e", "\u6268": "\u6260", "\u62ff": "\u62cf", "\u67ec": "\u63c0", "\u62ac": "\u64e1", "\u65d9": "\u65db", "\u6698": "\u661c", "\u77b9": "\u66d6", "\u663f": "\u66e0", "\u69d3": "\u6760", "\u6ab3": "\u68b9", "\u69e8": "\u6901", "\u6936": "\u68d5", "\u6ac1": "\u6a12", "\u7c37": "\u6a90", "\u8617": "\u6a97", "\u7f4d": "\u6ad1", "\u6aaa": "\u6adf", "\u6bb1": "\u6bb2", "\u6fa3": "\u6d63", "\u6db8": "\u51c5", "\u70f1": "\u70af", "\u7188": "\u7155", "\u71fb": "\u718f", "\u9460": "\u720d", "\u7b8b": "\u724b", "\u7281": "\u7282", "\u8c7a": "\u72b2", "\u8c89": "\u72e2", "\u8c8e": "\u730a", "\u8c98": "\u734f", "\u746f": "\u7405", "\u78af": "\u7459", "\u7464": "\u7476", "\u73f1": "\u74d4", "\u78da": "\u750e", "\u7574": "\u7587", "\u80ac": "\u75a3", "\u75f3": "\u75f2", "\u9764": "\u76b0", "\u76b9": "\u76b8", "\u862f": "\u76ea", "\u7726": "\u7725", "\u89a9": "\u7779", "\u7980": "\u7a1f", "\u7b7a": "\u7b50", "\u7b0b": "\u7b4d", "\u7b9f": "\u7b98", "\u7b5d": "\u7b8f", "\u7c58": "\u7c50", "\u7c56": "\u7c64", "\u9fa0": "\u7c65", "\u7dd5": "\u7e83", "\u898a": "\u7f88", "\u7f87": "\u7f88", "\u7fae": "\u7fb9", "\u984b": "\u816e", "\u815f": "\u81a3", "\u9c60": "\u81be", "\u81c8": "\u81d8", "\u822e": "\u826b", "\u84ad": "\u82bb", "\u8393": "\u82fa", "\u855a": "\u843c", "\u8515": "\u8482", "\u860a": "\u8580", "\u8768": "\u8671", "\u87f7": "\u87b3", "\u87c6": "\u87c7", "\u87d2": "\u880e", "\u8827": "\u8839", "\u8842": "\u8844", "\u88b5": "\u887d", "\u891d": "\u894c", "\u8b4c": "\u8a1b", "\u8ae1": "\u8b1a", "\u8b5b": "\u8b56", "\u8c7c": "\u8c94", "\u8ccd": "\u8d13", "\u8e60": "\u8dd6", "\u8e2a": "\u8e64", "\u8eaa": "\u8e99", "\u8f19": "\u8f12", "\u8f0c": "\u8f1b", "\u8f63": "\u8f62", "\u9058": "\u9005", "\u900e": "\u9052", "\u9229": "\u946a", "\u945a": "\u947d", "\u9b27": "\u9599", "\u6ff6": "\u95ca", "\u97f2": "\u9f4f", "\u98c3": "\u98c4", "\u9c1b": "\u9c2e", "\u9f07": "\u9c32", "\u9cec": "\u9ce7", "\u9d44": "\u9d1f", "\u9d5e": "\u9d5d", "\u9dab": "\u9d87", "\u9dcf": "\u9dc6", "\u9eb8": "\u9ea9"} \ No newline at end of file +{"\u30b1": "\u304c", "\u30f6": "\u304c", "\u30ac": "\u304c", "\u30c4": "\u3063", "\u30c3": "\u3063", "\u30ce": "\u306e", "\u4e43": "\u306e", "\u4e4b": "\u306e", "\u30f1": "\u30a8", "\u30a7": "\u30a8", "\u4e9e": "\u4e9c", "\u7a50": "\u79cb", "\u9f9d": "\u79cb", "\u60e1": "\u60aa", "\u8606": "\u82a6", "\u9c3a": "\u9bf5", "\u58d3": "\u5727", "\u83f4": "\u5eb5", "\u570d": "\u56f2", "\u7232": "\u70ba", "\u91ab": "\u533b", "\u6bd3": "\u80b2", "\u5f0c": "\u4e00", "\u58f9": "\u58f1", "\u7a3b": "\u7a32", "\u98ee": "\u98f2", "\u5a6c": "\u6deb", "\u96b1": "\u96a0", "\u97f5": "\u97fb", "\u5918": "\u536f", "\u9b31": "\u6b1d", "\u5ed0": "\u53a9", "\u5ecf": "\u53a9", "\u777f": "\u53e1", "\u71df": "\u55b6", "\u668e": "\u6620", "\u66f5": "\u66f3", "\u69ae": "\u6804", "\u9834": "\u7a4e", "\u885e": "\u885b", "\u548f": "\u8a60", "\u9a5b": "\u99c5", "\u5713": "\u5186", "\u70df": "\u7159", "\u8277": "\u8276", "\u9e7d": "\u5869", "\u8597": "\u5712", "\u5967": "\u5965", "\u5f83": "\u5f80", "\u61c9": "\u5fdc", "\u6b50": "\u6b27", "\u6bc6": "\u6bb4", "\u9d2c": "\u9daf", "\u583d": "\u5ca1", "\u5d17": "\u5ca1", "\u51b2": "\u6c96", "\u7a69": "\u7a4f", "\u5047": "\u4eee", "\u50f9": "\u4fa1", "\u8b41": "\u5629", "\u5ce9": "\u5ce8", "\u756b": "\u753b", "\u6703": "\u4f1a", "\u89e7": "\u89e3", "\u56d8": "\u56de", "\u58de": "\u58ca", "\u6060": "\u602a", "\u61f7": "\u61d0", "\u754d": "\u754c", "\u583a": "\u754c", "\u7e6a": "\u7d75", "\u880f": "\u87f9", "\u5d15": "\u5d16", "\u7919": "\u788d", "\u76d6": "\u84cb", "\u8462": "\u84cb", "\u8823": "\u86ce", "\u9264": "\u920e", "\u64f4": "\u62e1", "\u652a": "\u64b9", "\u6bbc": "\u6bbb", "\u89ba": "\u899a", "\u5b78": "\u5b66", "\u6588": "\u5b66", "\u5dbd": "\u5cb3", "\u6a02": "\u697d", "\u7ac8": "\u7ac3", "\u91e1": "\u91dc", "\u6822": "\u67cf", "\u9b3b": "\u7ca5", "\u82c5": "\u5208", "\u520b": "\u520a", "\u52f8": "\u52e7", "\u5377": "\u5dfb", "\u6b61": "\u6b53", "\u704c": "\u6f45", "\u7f50": "\u7f36", "\u89c0": "\u89b3", "\u8aeb": "\u8acc", "\u9452": "\u9451", "\u95dc": "\u95a2", "\u9677": "\u9665", "\u8218": "\u9928", "\u5dd6": "\u5dcc", "\u5d52": "\u5ca9", "\u9d08": "\u96c1", "\u9ceb": "\u96c1", "\u984f": "\u9854", "\u6199": "\u559c", "\u5650": "\u5668", "\u7ad2": "\u5947", "\u671e": "\u671f", "\u68ca": "\u68cb", "\u5f03": "\u68c4", "\u6b78": "\u5e30", "\u7688": "\u5e30", "\u6c23": "\u6c17", "\u6c14": "\u6c17", "\u9f9c": "\u4e80", "\u7912": "\u78ef", "\u50de": "\u507d", "\u6232": "\u622f", "\u72a7": "\u72a0", "\u78aa": "\u7827", "\u537b": "\u5374", "\u7cfa": "\u7cfe", "\u820a": "\u65e7", "\u64da": "\u62e0", "\u64e7": "\u6319", "\u8209": "\u6319", "\u4eb0": "\u4eac", "\u604a": "\u5354", "\u5cfd": "\u5ce1", "\u633e": "\u631f", "\u51b5": "\u6cc1", "\u72f9": "\u72ed", "\u582f": "\u5c2d", "\u66c9": "\u6681", "\u5340": "\u533a", "\u9a45": "\u99c6", "\u99c8": "\u99c6", "\u52f3": "\u52f2", "\u7fa3": "\u7fa4", "\u73ea": "\u572d", "\u5f91": "\u5f84", "\u9015": "\u5f84", "\u60e0": "\u6075", "\u6187": "\u61a9", "\u651c": "\u643a", "\u6eaa": "\u6e13", "\u8c3f": "\u6e13", "\u7d93": "\u7d4c", "\u7e7c": "\u7d99", "\u8396": "\u830e", "\u87a2": "\u86cd", "\u8f15": "\u8efd", "\u9838": "\u981a", "\u9dc4": "\u9d8f", "\u85dd": "\u82b8", "\u7f3a": "\u6b20", "\u51b3": "\u6c7a", "\u5109": "\u5039", "\u52b5": "\u5238", "\u528d": "\u5263", "\u5294": "\u5263", "\u5292": "\u5263", "\u5271": "\u5263", "\u91fc": "\u5263", "\u5708": "\u570f", "\u6aa2": "\u691c", "\u6b0a": "\u6a29", "\u737b": "\u732e", "\u7e23": "\u770c", "\u96aa": "\u967a", "\u986f": "\u9855", "\u9a57": "\u9a13", "\u56b4": "\u53b3", "\u4e55": "\u864e", "\u76b7": "\u9f13", "\u9ad9": "\u9ad8", "\u6548": "\u52b9", "\u5ee3": "\u5e83", "\u6046": "\u6052", "\u6644": "\u6643", "\u7a3e": "\u7a3f", "\u85c1": "\u7a3f", "\u754a": "\u8015", "\u783f": "\u9271", "\u7926": "\u9271", "\u945b": "\u9271", "\u5227": "\u52ab", "\u865f": "\u53f7", "\u8ee3": "\u8f5f", "\u570b": "\u56fd", "\u5700": "\u56fd", "\u5d73": "\u5d6f", "\u4f50": "\u5de6", "\u6fdf": "\u6589", "\u788e": "\u7815", "\u9f4b": "\u6589", "\u5291": "\u5264", "\u962a": "\u5742", "\u5d5c": "\u5d0e", "\u57fc": "\u5d0e", "\u7895": "\u5d0e", "\ufa11": "\u5d0e", "\u505a": "\u4f5c", "\u6afb": "\u685c", "\u518c": "\u518a", "\u96dc": "\u96d1", "\u894d": "\u96d1", "\u768b": "\u7690", "\u53c3": "\u53c2", "\u6158": "\u60e8", "\u68e7": "\u685f", "\u8836": "\u8695", "\u8b9a": "\u8b83", "\u8d0a": "\u8cdb", "\u6b98": "\u6b8b", "\u7d72": "\u7cf8", "\u5e0b": "\u7d19", "\u9f52": "\u6b6f", "\u4e8a": "\u4e8b", "\u5152": "\u5150", "\u5c13": "\u723e", "\u8fad": "\u8f9e", "\u8089": "\u5b8d", "\u6fd5": "\u6e7f", "\u8cad": "\u8cea", "\u5be6": "\u5b9f", "\u7b71": "\u7be0", "\u8602": "\u854a", "\u854b": "\u854a", "\u820d": "\u820e", "\u51a9": "\u5199", "\u5beb": "\u5199", "\u91cb": "\u91c8", "\u5492": "\u546a", "\u58fd": "\u5bff", "\u6d32": "\u5dde", "\u6536": "\u53ce", "\u8b8e": "\u8b90", "\u5f9e": "\u5f93", "\u4ece": "\u5f93", "\u6f81": "\u6e0b", "\u6f80": "\u6e0b", "\u7378": "\u7363", "\u7e31": "\u7e26", "\u8085": "\u7c9b", "\u51d6": "\u6e96", "\u8655": "\u51e6", "\u85f7": "\u85af", "\u654d": "\u53d9", "\u6558": "\u53d9", "\u751e": "\u5617", "\u596c": "\u5968", "\u734e": "\u5968", "\u5c07": "\u5c06", "\u53b0": "\u5ee0", "\u67a9": "\u677e", "\u71d2": "\u713c", "\u7a31": "\u79f0", "\u8b49": "\u8a3c", "\u4e58": "\u4e57", "\u5269": "\u5270", "\u5872": "\u5834", "\u58e4": "\u58cc", "\u5b43": "\u5b22", "\u689d": "\u6761", "\u6de8": "\u6d44", "\u758a": "\u7573", "\u7589": "\u7573", "\u7582": "\u7573", "\u7a70": "\u7a63", "\u8b93": "\u8b72", "\u91c0": "\u91b8", "\u56d1": "\u5631", "\u991d": "\u98fe", "\u89f8": "\u89e6", "\u8123": "\u5507", "\u5be2": "\u5bdd", "\u613c": "\u614e", "\u6649": "\u664b", "\u771e": "\u771f", "\u5204": "\u5203", "\u76e1": "\u5c3d", "\u976b": "\u976d", "\u9771": "\u976d", "\u918b": "\u9162", "\u5716": "\u56f3", "\u5eda": "\u53a8", "\u57c0": "\u5782", "\u7cb9": "\u7c8b", "\u7fc6": "\u7fe0", "\u9189": "\u9154", "\u96a8": "\u968f", "\u81b8": "\u9ac4", "\u9ad3": "\u9ac4", "\u6578": "\u6570", "\u6a1e": "\u67a2", "\u6f82": "\u6f84", "\u4e17": "\u4e16", "\u7546": "\u755d", "\u6dd2": "\u51c4", "\u6816": "\u68f2", "\u8072": "\u58f0", "\u975c": "\u9759", "\u658e": "\u6589", "\u9f4a": "\u6589", "\u6e08": "\u6589", "\u85ba": "\u6589", "\u6589": "\u6589", "\u9f4e": "\u6589", "\u9f4f": "\u6589", "\u973d": "\u6589", "\u8ff9": "\u8de1", "\u8e5f": "\u8de1", "\u651d": "\u6442", "\u7aca": "\u7a83", "\u5c08": "\u5c02", "\u6230": "\u6226", "\u6dfa": "\u6d45", "\u6f5b": "\u6f5c", "\u6ff3": "\u6f5c", "\u7dab": "\u7dda", "\u7e96": "\u7e4a", "\u7e8e": "\u7e4a", "\u8229": "\u8239", "\u821f": "\u8239", "\u8ce4": "\u8cce", "\u8e10": "\u8df5", "\u9322": "\u92ad", "\u8b71": "\u5584", "\u79aa": "\u7985", "\u66fd": "\u66fe", "\u8e08": "\u758e", "\u8613": "\u8607", "\u6eaf": "\u9061", "\u6cdd": "\u9061", "\u9f21": "\u9f20", "\u7cdf": "\u7c95", "\u96d9": "\u53cc", "\u58ef": "\u58ee", "\u641c": "\u635c", "\u63d2": "\u633f", "\u722d": "\u4e89", "\u7a97": "\u7a93", "\u7e3d": "\u7dcf", "\u8070": "\u8061", "\u838a": "\u8358", "\u88dd": "\u88c5", "\u8d71": "\u8d70", "\u9a37": "\u9a12", "\u6852": "\u6851", "\u81df": "\u81d3", "\u85cf": "\u8535", "\u5c6c": "\u5c5e", "\u621d": "\u8cca", "\u7e8c": "\u7d9a", "\u5346": "\u5352", "\u90a8": "\u6751", "\u591b": "\u591a", "\u58ae": "\u5815", "\u8235": "\u67c1", "\u6a62": "\u6955", "\u8eb0": "\u4f53", "\u9ad4": "\u4f53", "\u8ec6": "\u4f53", "\u5c0d": "\u5bfe", "\u5e36": "\u5e2f", "\u6eef": "\u6ede", "\u81fa": "\u53f0", "\u7027": "\u6edd", "\u64c7": "\u629e", "\u6fa4": "\u6ca2", "\u922c": "\u9438", "\u9039": "\u9054", "\u8c4e": "\u7aea", "\u8c8d": "\u72f8", "\u55ae": "\u5358", "\u64d4": "\u62c5", "\u81bd": "\u80c6", "\u5718": "\u56e3", "\u5f48": "\u5f3e", "\u65b7": "\u65ad", "\u803b": "\u6065", "\u7661": "\u75f4", "\u7a49": "\u7a1a", "\u9072": "\u9045", "\u665d": "\u663c", "\u87f2": "\u866b", "\u9444": "\u92f3", "\u6f74": "\u7026", "\u8c6c": "\u732a", "\u5ef3": "\u5e81", "\u5ef0": "\u5e81", "\u753c": "\u753a", "\u807d": "\u8074", "\u8193": "\u8178", "\u6555": "\u52c5", "\u73ce": "\u73cd", "\u93ad": "\u93ae", "\u58fa": "\u58f7", "\u905e": "\u9013", "\u9295": "\u9244", "\u9435": "\u9244", "\u9421": "\u9244", "\u7e92": "\u7e8f", "\u8f49": "\u8ee2", "\u9ede": "\u70b9", "\u50b3": "\u4f1d", "\u83df": "\u514e", "\u5154": "\u514e", "\u83b5": "\u514e", "\u792a": "\u783a", "\u9ee8": "\u515a", "\u5d8b": "\u5cf6", "\u5d8c": "\u5cf6", "\u6aae": "\u68bc", "\u76dc": "\u76d7", "\u6fe4": "\u6d9b", "\u71c8": "\u706f", "\u7576": "\u5f53", "\u8373": "\u8c46", "\u8fef": "\u9003", "\u9b2a": "\u95d8", "\u4ec2": "\u50cd", "\u60b3": "\u5fb3", "\u7368": "\u72ec", "\u8b80": "\u8aad", "\u6764": "\u6803", "\u5c46": "\u5c4a", "\u7e69": "\u7e04", "\u5f0d": "\u4e8c", "\u5f10": "\u4e8c", "\u8cb3": "\u4e8c", "\u8cae": "\u4e8c", "\u9087": "\u8fe9", "\u97ed": "\u97ee", "\u59d9": "\u598a", "\u7962": "\u79b0", "\u9ecf": "\u7c98", "\u8ffa": "\u5efc", "\u60f1": "\u60a9", "\u8166": "\u8133", "\u9738": "\u8987", "\u6d6a": "\u6ce2", "\u5ee2": "\u5ec3", "\u62dc": "\u62dd", "\u76c3": "\u676f", "\u85ad": "\u7a17", "\u6973": "\u6885", "\u8ce3": "\u58f2", "\u8805": "\u877f", "\u9ea5": "\u9ea6", "\u51fe": "\u51fd", "\u767c": "\u767a", "\u9aee": "\u9aea", "\u7f78": "\u7f70", "\u62d4": "\u629c", "\u7b35": "\u7bc4", "\u883b": "\u86ee", "\u7955": "\u79d8", "\u6a9c": "\u6867", "\u51b0": "\u6c37", "\u6ff1": "\u6d5c", "\u6ff5": "\u6d5c", "\u51a8": "\u5bcc", "\u6e15": "\u6df5", "\u6e0a": "\u6df5", "\u62c2": "\u6255", "\u4f5b": "\u4ecf", "\u5e64": "\u5e63", "\u7add": "\u4e26", "\u9587": "\u9589", "\u7be6": "\u7b86", "\u8b8a": "\u5909", "\u908a": "\u8fba", "\u9089": "\u8fba", "\u8fa8": "\u5f01", "\u8fa7": "\u5f01", "\u74e3": "\u5f01", "\u8faf": "\u5f01", "\u8216": "\u8217", "\u92ea": "\u8217", "\u7a57": "\u7a42", "\u5bf6": "\u5b9d", "\u5bf3": "\u5b9d", "\u5cef": "\u5cf0", "\u8420": "\u840c", "\u8943": "\u8912", "\u8c50": "\u8c4a", "\u5190": "\u5192", "\u7683": "\u8c8c", "\u6c92": "\u6ca1", "\u5932": "\u672c", "\u98dc": "\u7ffb", "\u69c7": "\u69d9", "\u67a1": "\u685d", "\u5118": "\u4fad", "\u842c": "\u4e07", "\u6eff": "\u6e80", "\u7c11": "\u84d1", "\u7c14": "\u84d1", "\u8109": "\u8108", "\u68a6": "\u5922", "\u65e0": "\u7121", "\u58fb": "\u5a7f", "\u805f": "\u5a7f", "\u7ddc": "\u7dbf", "\u9eaa": "\u9eba", "\u9ed8": "\u9ed9", "\u9920": "\u9905", "\u91ce": "\u57dc", "\u5f4c": "\u5f25", "\u85e5": "\u85ac", "\u8b6f": "\u8a33", "\u7c54": "\u85ae", "\u85ea": "\u85ae", "\u7609": "\u7652", "\u6d8c": "\u6e67", "\u8c6b": "\u4e88", "\u9918": "\u4f59", "\u8207": "\u4e0e", "\u8b7d": "\u8a89", "\u6416": "\u63fa", "\u6a23": "\u69d8", "\u9394": "\u7194", "\u7ab0": "\u7aaf", "\u71ff": "\u8000", "\u8b20": "\u8b21", "\u8e34": "\u8e0a", "\u9059": "\u9065", "\u4f86": "\u6765", "\u5fa0": "\u6765", "\u4e82": "\u4e71", "\u89bd": "\u89a7", "\u88e1": "\u88cf", "\u7567": "\u7565", "\u6f91": "\u6e9c", "\u7544": "\u7559", "\u9f8d": "\u7adc", "\u6801": "\u67f3", "\u5169": "\u4e21", "\u51c9": "\u6dbc", "\u7375": "\u731f", "\u66b8": "\u77ad", "\u7cae": "\u7ce7", "\u9130": "\u96a3", "\u74a2": "\u7460", "\u58d8": "\u5841", "\u6cea": "\u6d99", "\u7e32": "\u7d2f", "\u52f5": "\u52b1", "\u79ae": "\u793c", "\u96b8": "\u96b7", "\u9748": "\u970a", "\u9f61": "\u9f62", "\u6200": "\u604b", "\u8068": "\u806f", "\u7210": "\u7089", "\u52de": "\u52b4", "\u6716": "\u6717", "\u6a13": "\u697c", "\u7c60": "\u7bed", "\u797f": "\u7984", "\u4e98": "\u4e99", "\u7063": "\u6e7e", "\u4eed": "\u4ede", "\u7ada": "\u4f47", "\u723c": "\u4fce", "\u4f1c": "\u5005", "\u50e3": "\u50ed", "\u5bc3": "\u51a4", "\u5bc7": "\u51a6", "\u7f83": "\u51aa", "\u6c8d": "\u51b1", "\u6d0c": "\u51bd", "\u5c05": "\u524b", "\u7b9a": "\u5273", "\u5969": "\u5333", "\u5df5": "\u536e", "\u5ec1": "\u53a0", "\u5ec8": "\u53a6", "\u5edd": "\u53ae", "\u5557": "\u5556", "\u54af": "\u5580", "\u8b5f": "\u566a", "\u568f": "\u5694", "\u9f67": "\u56d3", "\u962f": "\u5740", "\u9642": "\u5761", "\u57d3": "\u57d2", "\u7246": "\u58bb", "\u7f4e": "\u58dc", "\u5f09": "\u5958", "\u4fab": "\u4f5e", "\u5afb": "\u5afa", "\u5ad0": "\u5b32", "\u5d18": "\u5d19", "\u7bcf": "\u5d4c", "\u8fea": "\u5ef8", "\u5f5c": "\u5f5d", "\u5f2f": "\u5f4e", "\u9af4": "\u5f7f", "\u61fc": "\u60e7", "\u5ff0": "\u60b4", "\u615a": "\u6159", "\u61f4": "\u61fa", "\u621e": "\u621b", "\u634d": "\u625e", "\u6268": "\u6260", "\u62ff": "\u62cf", "\u67ec": "\u63c0", "\u62ac": "\u64e1", "\u65d9": "\u65db", "\u6698": "\u661c", "\u77b9": "\u66d6", "\u663f": "\u66e0", "\u69d3": "\u6760", "\u6ab3": "\u68b9", "\u69e8": "\u6901", "\u6936": "\u68d5", "\u6ac1": "\u6a12", "\u7c37": "\u6a90", "\u8617": "\u6a97", "\u7f4d": "\u6ad1", "\u6aaa": "\u6adf", "\u6bb1": "\u6bb2", "\u6fa3": "\u6d63", "\u6db8": "\u51c5", "\u70f1": "\u70af", "\u7188": "\u7155", "\u71fb": "\u718f", "\u9460": "\u720d", "\u7b8b": "\u724b", "\u7281": "\u7282", "\u8c7a": "\u72b2", "\u8c89": "\u72e2", "\u8c8e": "\u730a", "\u8c98": "\u734f", "\u746f": "\u7405", "\u78af": "\u7459", "\u7464": "\u7476", "\u73f1": "\u74d4", "\u78da": "\u750e", "\u7574": "\u7587", "\u80ac": "\u75a3", "\u75f3": "\u75f2", "\u9764": "\u76b0", "\u76b9": "\u76b8", "\u862f": "\u76ea", "\u7726": "\u7725", "\u89a9": "\u7779", "\u7980": "\u7a1f", "\u7b7a": "\u7b50", "\u7b0b": "\u7b4d", "\u7b9f": "\u7b98", "\u7b5d": "\u7b8f", "\u7c58": "\u7c50", "\u7c56": "\u7c64", "\u9fa0": "\u7c65", "\u7dd5": "\u7e83", "\u898a": "\u7f88", "\u7f87": "\u7f88", "\u7fae": "\u7fb9", "\u984b": "\u816e", "\u815f": "\u81a3", "\u9c60": "\u81be", "\u81c8": "\u81d8", "\u822e": "\u826b", "\u84ad": "\u82bb", "\u8393": "\u82fa", "\u855a": "\u843c", "\u8515": "\u8482", "\u860a": "\u8580", "\u8768": "\u8671", "\u87f7": "\u87b3", "\u87c6": "\u87c7", "\u87d2": "\u880e", "\u8827": "\u8839", "\u8842": "\u8844", "\u88b5": "\u887d", "\u891d": "\u894c", "\u8b4c": "\u8a1b", "\u8ae1": "\u8b1a", "\u8b5b": "\u8b56", "\u8c7c": "\u8c94", "\u8ccd": "\u8d13", "\u8e60": "\u8dd6", "\u8e2a": "\u8e64", "\u8eaa": "\u8e99", "\u8f19": "\u8f12", "\u8f0c": "\u8f1b", "\u8f63": "\u8f62", "\u9058": "\u9005", "\u900e": "\u9052", "\u9229": "\u946a", "\u945a": "\u947d", "\u9b27": "\u9599", "\u6ff6": "\u95ca", "\u97f2": "\u9f4f", "\u98c3": "\u98c4", "\u9c1b": "\u9c2e", "\u9f07": "\u9c32", "\u9cec": "\u9ce7", "\u9d44": "\u9d1f", "\u9d5e": "\u9d5d", "\u9dab": "\u9d87", "\u9dcf": "\u9dc6", "\u9eb8": "\u9ea9"} \ No newline at end of file diff --git a/jageocoder/node.py b/jageocoder/node.py index c3731ab..2f3327f 100644 --- a/jageocoder/node.py +++ b/jageocoder/node.py @@ -146,7 +146,8 @@ def search_child_with_criteria(self, session, pattern: str, AddressNode.id) return filtered_children - def search_recursive(self, index, session) -> List[Result]: + def search_recursive(self, index, session, + processed_nodes=None) -> List[Result]: """ Search nodes recursively that match the specified address notation. @@ -156,6 +157,8 @@ def search_recursive(self, index, session) -> List[Result]: The standardized address notation. session : sqlalchemy.orm.Session The database session for executing SQL queries. + processed_nodes: List of int, optional + List of IDs of nodes that have already been processed. Return ------ @@ -194,10 +197,12 @@ def search_recursive(self, index, session) -> List[Result]: if filtered_children.count() == 0 and index[0] in '-ノ': logger.debug("Beginning with an extra hyphen: {}".format( index)) - candidates = self.search_recursive(index[1:], session) + candidates = self.search_recursive( + index[1:], session, processed_nodes) if len(candidates) > 0: - return [Result(x[0], index[0] + x[1], len(x[1])) - for x in candidates] + return [Result( + x[0], index[0] + x[1], l_optional_prefix + len(x[1])) + for x in candidates] return [] @@ -208,6 +213,11 @@ def search_recursive(self, index, session) -> List[Result]: candidates = [] for child in filtered_children: + if processed_nodes is not None and child.id in processed_nodes: + logger.debug("-> skipped; {}({})".format( + child.name, child.id)) + continue + logger.debug("-> comparing; {}".format(child.name_index)) new_candidates = self._get_candidates_from_child( child, index, optional_prefix, session) @@ -227,11 +237,13 @@ def search_recursive(self, index, session) -> List[Result]: rest_index = index[offset:] logger.debug( "child:{} match {} chars".format(child, offset)) - for cand in child.search_recursive(rest_index, session): + for cand in child.search_recursive( + rest_index, session, processed_nodes): candidates.append( Result(cand[0], optional_prefix + index[0: offset] + cand[1], + l_optional_prefix + len(child.name_index) + len(cand[1]) )) @@ -243,13 +255,13 @@ def search_recursive(self, index, session) -> List[Result]: logger.debug('"{}" in index "{}" can be optional.'.format( index[:azalen], index)) sub_candidates = self.search_recursive( - index[azalen:], session) + index[azalen:], session, processed_nodes) if sub_candidates[0].matched != '': for cand in sub_candidates: candidates.append(Result( cand.node, optional_prefix + index[0:azalen] + cand.matched, - cand.nchars)) + l_optional_prefix + cand.nchars)) if len(candidates) == 0: candidates = [Result(self, '', 0)] @@ -316,12 +328,13 @@ def _get_candidates_from_child( candidates = [] offset = match_len rest_index = index[offset:] + l_optional_prefix = len(optional_prefix) logger.debug("child:{} match {} chars".format(child, offset)) for cand in child.search_recursive(rest_index, session): candidates.append(Result( cand.node, optional_prefix + index[0:match_len] + cand.matched, - match_len + cand.nchars)) + l_optional_prefix + match_len + cand.nchars)) return candidates diff --git a/jageocoder/tree.py b/jageocoder/tree.py index bef7485..45fa30f 100644 --- a/jageocoder/tree.py +++ b/jageocoder/tree.py @@ -972,7 +972,7 @@ def search_by_trie(self, query: str, logger.debug("Search '{}' under {}({})".format( rest_index, node.name, node.id)) results_by_node = node.search_recursive( - rest_index, self.session) + rest_index, self.session, processed_nodes) processed_nodes.append(node.id) logger.debug('{}({}) marked as processed'.format( node.name, node.id)) @@ -989,16 +989,21 @@ def search_by_trie(self, query: str, """ _len = offset + cand.nchars - _part = offset + len(cand[1]) + _part = offset + len(cand.matched) + msg = "candidate: {} ({})" + logger.debug(msg.format(key + cand.matched, _len)) if best_only: if _len > max_len: - results = {} + results = { + "cand.node.id": [cand.node, key + cand.matched] + } max_len = _len min_part = _part - if _len == max_len and cand.node.id not in results \ + elif _len == max_len and cand.node.id not in results \ and (min_part is None or _part <= min_part): - results[cand.node.id] = [cand.node, key + cand[1]] + results[cand.node.id] = [ + cand.node, key + cand.matched] min_part = _part else: diff --git a/tests/test_search.py b/tests/test_search.py index b4dc3eb..5d26e5b 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -67,6 +67,7 @@ def test_mie(self): """ self._check( query="三重県津市広明町13番地", + match="三重県津市広明町13番地", fullname=["三重県", "津市", "広明町", "13番地"]) def test_akita(self): @@ -90,7 +91,7 @@ def test_oaza(self): """ Test notations with and without "大字" """ - top = self._check( + self._check( query="東京都西多摩郡瑞穂町大字箱根ケ崎2335番地", match="東京都西多摩郡瑞穂町大字箱根ケ崎2335番地", fullname=[ @@ -431,6 +432,18 @@ def test_mura_ooaza_koaza(self): fullname=["徳島県", "美馬市", "脇町", "大字猪尻", "西上野", "61番地"]) + def test_select_best(self): + """ + Check that the best answer is returned for ambiguous queries. + """ + # "佐賀県鹿島市納富分字藤津甲２" can be parsed as + # - ["佐賀県", "鹿島市", "大字納富分", "藤津甲"] or + # - ["佐賀県", "鹿島市", "大字納富分", "甲", "2番地"] + self._check( + query="佐賀県鹿島市納富分字藤津甲２", + match="佐賀県鹿島市納富分字藤津甲", + fullname=["佐賀県", "鹿島市", "大字納富分", "藤津甲"]) + if __name__ == "__main__": unittest.main()