Skip to content

Commit 73cd2da

Browse files
mbasambasa
committed
closes #11; updated to abr's new data structure
1 parent c4c880f commit 73cd2da

File tree

3 files changed

+60
-60
lines changed

3 files changed

+60
-60
lines changed

‎scripts/import_abr.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ psql -U ${DBROLE} -d ${DBNAME} -f ./sql/abr/dropABRTables.sql
2727
# Create abr schema and tables
2828
psql -U ${DBROLE} -d ${DBNAME} -f ./sql/abr/createABRTables.sql
2929

30-
RSDT_TABLE="abr.rsdtdsp_dsp (lg_code ,town_id ,blk_id ,addr_id ,addr2_id ,city_name ,od_city_name ,oaza_town_name ,chome_name ,koaza_name ,blk_num ,rsdt_num ,rsdt_num2 ,basic_rsdt_div ,rsdt_addr_flg ,rsdt_addr_mtd_code ,oaza_frn_ltrs_flg ,koaza_frn_ltrs_flg ,status_flg ,efct_date ,ablt_date ,src_code ,remarks )"
31-
RSDT_POS_TABLE="abr.rsdtdsp_pos(lg_code ,town_id ,blk_id ,addr_id ,addr2_id ,disp_flag ,disp_method_flag ,basic_rsdt_div ,rep_pnt_lon ,rep_pnt_lat ,epsg ,scale ,source_url ,effective_date )"
32-
PREF_TABLE="abr.pref (lg_code ,pref_name ,pref_name_kana ,pref_name_roma ,efct_date ,ablt_date ,remarks )"
30+
RSDT_TABLE="abr.rsdtdsp_dsp (lg_code,machiaza_id,blk_id,rsdt_id,rsdt2_id,city,ward,oaza_cho,chome,koaza,machiaza_dist,blk_num,rsdt_num,rsdt_num2,basic_rsdt_div,rsdt_addr_flg,rsdt_addr_mtd_code,status_flg,efct_date,ablt_date,src_code,remarks)"
31+
RSDT_POS_TABLE="abr.rsdtdsp_pos(lg_code,machiaza_id,blk_id,rsdt_id,rsdt2_id,rsdt_addr_flg,rsdt_addr_mtd_code,rep_lon,rep_lat,rep_srid,rep_scale,rep_src_code,rsdt_addr_code_rdbl,rsdt_addr_data_mnt_date,basic_rsdt_div)"
32+
PREF_TABLE="abr.pref (lg_code,pref,pref_kana,pref_roma,efct_date,ablt_date,remarks)"
3333

3434

3535
echo -e "\nImporting rsdt csv files..."

‎sql/abr/convertABRTables.sql‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
create index abrpos1 on abr.rsdtdsp_pos (lg_code);
2-
create index abrpos2 on abr.rsdtdsp_pos (town_id);
2+
create index abrpos2 on abr.rsdtdsp_pos (machiaza_id);
33
create index abrpos3 on abr.rsdtdsp_pos (blk_id);
4-
create index abrpos4 on abr.rsdtdsp_pos (addr_id);
5-
create index abrpos5 on abr.rsdtdsp_pos (addr2_id);
4+
create index abrpos4 on abr.rsdtdsp_pos (rsdt_id);
5+
create index abrpos5 on abr.rsdtdsp_pos (rsdt2_id);
66

77
create index abr1 on abr.rsdtdsp_dsp (lg_code);
8-
create index abr2 on abr.rsdtdsp_dsp (town_id);
8+
create index abr2 on abr.rsdtdsp_dsp (machiaza_id);
99
create index abr3 on abr.rsdtdsp_dsp (blk_id);
10-
create index abr4 on abr.rsdtdsp_dsp (addr_id);
11-
create index abr5 on abr.rsdtdsp_dsp (addr2_id);
10+
create index abr4 on abr.rsdtdsp_dsp (rsdt_id);
11+
create index abr5 on abr.rsdtdsp_dsp (rsdt2_id);
1212

1313
vacuum ANALYZE abr.rsdtdsp_pos ;
1414
vacuum ANALYZE abr.rsdtdsp_dsp ;
@@ -17,18 +17,18 @@ delete from pggeocoder.address_g;
1717

1818
insert into pggeocoder.address_g (todofuken,shikuchoson,ooaza,chiban,go,lon,lat,geog)
1919
select
20-
pref_name as todofuken,
21-
city_name||COALESCE(od_city_name,'') as shikuchoson,
22-
COALESCE(oaza_town_name,'') || COALESCE(koaza_name,COALESCE(chome_name,'')) as ooza,
20+
pref as todofuken,
21+
city||COALESCE(ward,'') as shikuchoson,
22+
COALESCE(oaza_cho,'') || COALESCE(koaza,COALESCE(chome,'')) as ooza,
2323
blk_num as chiban,
2424
rsdt_num as go,
25-
b.rep_pnt_lon as lon,
26-
b.rep_pnt_lat as lat,
27-
st_point(b.rep_pnt_lon,b.rep_pnt_lat,4326) as geog
25+
b.rep_lon as lon,
26+
b.rep_lat as lat,
27+
st_point(b.rep_lon::float,b.rep_lat::float,4326) as geog
2828
from abr.rsdtdsp_dsp a,abr.rsdtdsp_pos b, abr.pref c
2929
where a.lg_code = b.lg_code and
30-
a.town_id = b.town_id and
30+
a.machiaza_id = b.machiaza_id and
3131
a.blk_id = b.blk_id and
32-
a.addr_id = b.addr_id and
33-
COALESCE(a.addr2_id,'') = COALESCE(b.addr2_id,'') and
32+
a.rsdt_id = b.rsdt_id and
33+
COALESCE(a.rsdt2_id,'') = COALESCE(b.rsdt2_id,'') and
3434
substr(a.lg_code,1,2) = substr(c.lg_code,1,2);

‎sql/abr/createABRTables.sql‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
create schema if not exists abr;
22

33
CREATE TABLE if not exists abr.rsdtdsp_dsp (
4-
"lg_code" TEXT DEFAULT '',
5-
"town_id" TEXT DEFAULT '',
6-
"blk_id" TEXT DEFAULT '',
7-
"addr_id" TEXT DEFAULT '',
8-
"addr2_id" TEXT DEFAULT '',
9-
"city_name" TEXT,
10-
"od_city_name" TEXT,
11-
"oaza_town_name" TEXT,
12-
"chome_name" TEXT,
13-
"koaza_name" TEXT,
14-
"blk_num" TEXT,
15-
"rsdt_num" TEXT,
16-
"rsdt_num2" TEXT,
17-
"basic_rsdt_div" TEXT,
18-
"rsdt_addr_flg" TEXT,
19-
"rsdt_addr_mtd_code" TEXT,
20-
"oaza_frn_ltrs_flg" TEXT,
21-
"koaza_frn_ltrs_flg" TEXT,
22-
"status_flg" TEXT,
23-
"efct_date" TEXT,
24-
"ablt_date" TEXT,
25-
"src_code" TEXT,
26-
"remarks" TEXT
4+
"lg_code" TEXT DEFAULT '',
5+
"machiaza_id" TEXT DEFAULT '',
6+
"blk_id" TEXT DEFAULT '',
7+
"rsdt_id" TEXT DEFAULT '',
8+
"rsdt2_id" TEXT DEFAULT '',
9+
"city" TEXT DEFAULT '',
10+
"ward" TEXT DEFAULT '',
11+
"oaza_cho" TEXT DEFAULT '',
12+
"chome" TEXT DEFAULT '',
13+
"koaza" TEXT DEFAULT '',
14+
"machiaza_dist" TEXT DEFAULT '',
15+
"blk_num" TEXT DEFAULT '',
16+
"rsdt_num" TEXT DEFAULT '',
17+
"rsdt_num2" TEXT DEFAULT '',
18+
"basic_rsdt_div" TEXT DEFAULT '',
19+
"rsdt_addr_flg" TEXT DEFAULT '',
20+
"rsdt_addr_mtd_code" TEXT DEFAULT '',
21+
"status_flg" TEXT DEFAULT '',
22+
"efct_date" TEXT DEFAULT '',
23+
"ablt_date" TEXT DEFAULT '',
24+
"src_code" TEXT DEFAULT '',
25+
"remarks" TEXT DEFAULT ''
2726
);
2827

2928
CREATE TABLE if not exists abr.rsdtdsp_pos (
30-
"lg_code" TEXT DEFAULT '',
31-
"town_id" TEXT DEFAULT '',
32-
"blk_id" TEXT DEFAULT '',
33-
"addr_id" TEXT DEFAULT '',
34-
"addr2_id" TEXT DEFAULT '',
35-
"disp_flag" TEXT,
36-
"disp_method_flag" TEXT,
37-
"basic_rsdt_div" TEXT,
38-
"rep_pnt_lon" REAL,
39-
"rep_pnt_lat" REAL,
40-
"epsg" TEXT,
41-
"scale" TEXT,
42-
"source_url" TEXT,
43-
"effective_date" TEXT
29+
"lg_code" TEXT DEFAULT '',
30+
"machiaza_id" TEXT DEFAULT '',
31+
"blk_id" TEXT DEFAULT '',
32+
"rsdt_id" TEXT DEFAULT '',
33+
"rsdt2_id" TEXT DEFAULT '',
34+
"rsdt_addr_flg" TEXT DEFAULT '',
35+
"rsdt_addr_mtd_code" TEXT DEFAULT '',
36+
"rep_lon" FLOAT,
37+
"rep_lat" FLOAT,
38+
"rep_srid" TEXT DEFAULT '',
39+
"rep_scale" TEXT DEFAULT '',
40+
"rep_src_code" TEXT DEFAULT '',
41+
"rsdt_addr_code_rdbl" TEXT DEFAULT '',
42+
"rsdt_addr_data_mnt_date" TEXT DEFAULT '',
43+
"basic_rsdt_div" TEXT DEFAULT ''
4444
);
4545

4646
CREATE TABLE IF NOT EXISTS abr.pref (
47-
"lg_code" TEXT,
48-
"pref_name" TEXT,
49-
"pref_name_kana" TEXT,
50-
"pref_name_roma" TEXT,
47+
"lg_code" TEXT,
48+
"pref" TEXT,
49+
"pref_kana" TEXT,
50+
"pref_roma" TEXT,
5151
"efct_date" TEXT,
5252
"ablt_date" TEXT,
53-
"remarks" TEXT
53+
"remarks" TEXT
5454
);
5555

5656

0 commit comments

Comments
 (0)