Improve kyoto-street-name address

digital-go-jp · Oct 15, 2024 · 8a610d3 · 8a610d3 · maskatsum · Oct 15, 2024
1 parent ca4db5f
commit 8a610d3
Show file tree

Hide file tree

Showing 6 changed files with 1,709 additions and 225 deletions.
diff --git a/e2e/__tests__/geocode.test.ts b/e2e/__tests__/geocode.test.ts
@@ -104,49 +104,48 @@ const jsonTestRunner = async (testCaseName: string) => {
   expect(JSON.parse(stdout)).toMatchObject(expectedOutput);
 }
 
-// describe('debug', () => {
-
-//   test('中京区四条通室町西入ル鶏鉾町474', async () => {
-//     const input = '中京区四条通室町西入ル鶏鉾町474';
-//     const { stdout } = await runGeocoder(OutputFormat.NDJSON, {
-//       input,
-//     });
-//     expect(JSON.parse(stdout)).toMatchObject({
-//       "query": {
-//         "input": "中京区四条通室町西入ル鶏鉾町474"
-//       },
-//       "result": {
-//         "output": "京都府京都市中京区四条通室町西入ル鶏鉾町474",
-//         "others": [
-//           "四条通室町西入ル鶏鉾町474"
-//         ],
-//         "match_level": "machiaza_detail",
-//         "coordinate_level": "machiaza_detail",
-//         "lat": 35.016866,
-//         "lon": 135.764047,
-//         "lg_code": "261041",
-//         "machiaza_id": "9007108",
-//         "blk_id": null,
-//         "rsdt_id": null,
-//         "rsdt2_id": null,
-//         "prc_id": null,
-//         "pref": "京都府",
-//         "county": null,
-//         "city": "京都市",
-//         "ward": "中京区",
-//         "oaza_cho": "四丁目",
-//         "chome": null,
-//         "koaza": "柳馬場通丸太町",
-//         "blk_num": null,
-//         "rsdt_num": null,
-//         "rsdt_num2": null,
-//         "prc_num1": null,
-//         "prc_num2": null,
-//         "prc_num3": null
-//       }
-//     });
-//   });
-// });
+describe('debug', () => {
+
+  test('下京区四条通堺町東入ル立売中之町101-2', async () => {
+    const input = '下京区四条通堺町東入ル立売中之町101-2';
+    const { stdout } = await runGeocoder(OutputFormat.NDJSON, {
+      input,
+    });
+    expect(JSON.parse(stdout)).toMatchObject({
+      "query": {
+        "input": "下京区四条通堺町東入ル立売中之町101-2"
+      },
+      "result": {
+        "output": "京都府京都市下京区四条通堺町東入立売中之町101-2",
+        "others": [],
+        "match_level": "parcel",
+        "coordinate_level": "machiaza_detail",
+        "lat": 35.003524,
+        "lon": 135.763289,
+        "lg_code": "261068",
+        "machiaza_id": "0259105",
+        "rsdt_addr_flg": 0,
+        "blk_id": null,
+        "rsdt_id": null,
+        "rsdt2_id": null,
+        "prc_id": "001010000200000",
+        "pref": "京都府",
+        "county": null,
+        "city": "京都市",
+        "ward": "下京区",
+        "oaza_cho": "立売中之町",
+        "chome": null,
+        "koaza": "四条通堺町東入",
+        "blk_num": null,
+        "rsdt_num": null,
+        "rsdt_num2": null,
+        "prc_num1": "101",
+        "prc_num2": "2",
+        "prc_num3": null
+      }
+    });
+  });
+});
 
 describe('General cases', () => {
   test('基本的なケースのテスト', async () => {
@@ -158,7 +157,7 @@ describe('General cases', () => {
   });
 
   test('京都通り名のテスト(1)', async () => {
-    await jsonTestRunner('kyoto-street-name-cases');
+    await jsonTestRunner('kyoto-fire-departments');
   });
 
   test('京都通り名のテスト(2)', async () => {
File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	52.56	49.49	24.27	52.28
config	100	100	100	100
constant-values.ts	100	100	100	100
data-field.ts	100	100	100	100
db-table-name.ts	100	100	100	100
domain/models	34.57	3.7	1.92	36.93
city-dataset-file.ts	19.04	0	0	20	33–63
city-pos-dataset-file.ts	19.04	0	0	20	33–63
common-di-container.ts	66.66	100	0	66.66	30
dataset-file.ts	25.8	0	0	25.8	70–96, 114–134
env-provider.ts	58.33	25	25	58.33	34–45
parcel-dataset-file.ts	50	100	0	57.14	33–46
parcel-pos-dataset-file.ts	50	100	0	57.14	34–46
pref-dataset-file.ts	22.22	0	0	23.52	33–59
pref-pos-dataset-file.ts	22.22	0	0	23.52	33–64
rsdt-blk-file.ts	50	100	0	57.14	33–44
rsdt-blk-pos-file.ts	50	100	0	57.14	33–47
rsdt-dsp-file.ts	50	100	0	57.14	33–48
rsdt-dsp-pos-file.ts	50	100	0	57.14	33–48
town-dataset-file.ts	50	100	0	57.14	34–53
town-pos-dataset-file.ts	50	100	0	57.14	33–47
domain/services	58.97	33.33	22.72	57.27
counter-writable.ts	25	100	0	25	28–47
crc32-lib.ts	60	0	0	50	28–32, 36, 40
create-package-tree.ts	25	0	0	18.18	31–43
make-dir-if-not-exists.ts	50	0	0	40	29–33
parse-package-id.ts	72.72	0	0	71.42	61–78
reg-exp-ex.ts	100	66.66	100	100	35
table-key-provider.ts	67.74	66.66	37.5	67.74	45–46, 65, 80–85, 97–106, 114–122
upward-file-search.ts	27.27	0	0	30	31–44
domain/services/logger	20	0	0	20
debug-logger.ts	20	0	0	20	32–75
domain/services/package	75	0	50	71.42
get-package-info.ts	60	0	0	55.55	31–39
parse-package-json.ts	100	100	100	100
domain/services/thread	8.38	0	0	8.38
shared-memory.ts	30	100	0	30	27–31, 35–36
worker-thread-pool.ts	6.89	0	0	6.89	34–47, 52–154, 163–165, 170–173, 185–395
domain/types	86.76	44.44	50	87.69
pref-lg-code.ts	85.93	28.57	33.33	86.88	87–96
search-target.ts	100	100	100	100
domain/types/geocode	53.84	0	33.33	53.84
match-level.ts	53.84	0	33.33	53.84	34, 37–57
domain/types/messages	82.75	71.42	50	82.45
abrg-error.ts	63.63	100	50	63.63	44–47
abrg-message.ts	86.36	60	40	86.36	142, 151–158
get-system-locale.ts	100	100	100	100
interface	4.63	0	0	4.79
http-request-adapter.ts	4.63	0	0	4.79	31–48, 60–61, 69–73, 81–85, 94–98, 115–466
interface/database	25.71	0	0	25.71
geocode-db-controller.ts	25.71	0	0	25.71	44–158
interface/database/sqlite3	25.64	0	0	25.64
better-sqlite3-wrap.ts	21.73	0	0	21.73	30–67
sqlite3-util.ts	31.25	0	0	31.25	30–54
interface/database/sqlite3/geocode	13.69	0	0	13.77
common-db-geocode-sqlite3.ts	7.69	0	0	7.74	64–1035
parcel-db-geocode-sqlite3.ts	44.44	0	0	44.44	39–60
rsdt-blk-db-geocode-sqlite3.ts	50	100	0	50	38–58
rsdt-dsp-db-geocode-sqlite3.ts	50	100	0	50	37–69
interface/format	74.28	82.35	100	73.91
csv-transform.ts	74.28	82.35	100	73.91	55–61, 83, 140–143, 179–197
usecases/download	14.41	0	0	14.54
download-process.ts	14.41	0	0	14.54	68–326
usecases/geocode	31.39	0	27.77	31.39
abr-geocoder.ts	31.39	0	27.77	31.39	38–70, 96–105, 111, 135–136, 140–202
usecases/geocode/models	45.32	63.49	27.27	45.2
abr-geocoder-di-container.ts	33.33	0	0	33.33	41–54
city-and-ward-trie-finder.ts	32.35	0	0	32.35	16–29, 33–64
county-and-city-trie-finder.ts	32.35	0	0	32.35	16–29, 33–64
kyoto-street-trie-finder.ts	30.43	0	0	30.43	19–51, 55–97
oaza-cho-trie-finder.ts	25	0	0	25	19–80, 84–118
pref-trie-finder.ts	32.35	0	0	32.35	16–29, 33–61
query-set.ts	66.66	50	71.42	66.66	50, 60–68
query.ts	89.32	77.55	87.5	89.21	255–257, 331, 420–431
tokyo23-town-finder.ts	35.13	0	0	35.13	18–34, 38–69
tokyo23-ward-trie-finder.ts	35.13	0	0	35.13	18–34, 38–69
ward-and-oaza-trie-finder.ts	32.35	0	0	32.35	16–28, 32–63
ward-trie-finder.ts	33.33	0	0	33.33	16, 21–28, 32–68
usecases/geocode/models/trie	81.57	71.51	84.09	81.2
char-node.ts	82.49	72.79	90	82.11	52–91, 103, 144, 149, 205–206, 345, 376, 402, 420, 445–449, 473, 487–513, 548, 569–570, 614, 619, 649, 658
trie-finder.ts	77.21	66.66	71.42	76.92	79–83, 96–101, 173–174, 185, 212–220, 239, 248–249, 286
usecases/geocode/services	81.4	79.46	81.25	80.35
get-levenshtein-distance-ratio.ts	100	100	100	100
insert-space-before-room-or-facility.ts	94.02	87.17	100	93.84	31, 47–49
is-number.ts	85.71	100	50	80	29
jis-kanji.ts	76.92	71.42	100	76.19	465–471, 491–497, 511–517
kan2num.ts	74.81	65.71	100	74.24	154–155, 167, 200–224, 242, 248, 266–271, 275–276, 293–298, 309
load-geoder-trees.ts	58.62	0	0	55.55	42–52, 62–95
to-hankaku-alpha-num.ts	100	100	100	100
to-hiragana.ts	100	100	100	100
trim-dash-and-space.ts	100	100	100	100
usecases/geocode/steps	56.5	39.34	70.58	56.54
normalize-transform.ts	65.92	37.5	71.42	65.92	64, 117, 131, 189–193, 211–218, 228–318, 334–335, 364–365, 369, 372, 375–376, 378–379
parcel-transform.ts	44.82	33.87	62.5	44.76	62–63, 68–69, 81–82, 86–87, 91–92, 100–101, 115, 162–212, 232, 246, 258–263, 275–279, 284, 296, 309–387
pref-transform.ts	82.75	75	100	82.75	50–51, 66–67, 73