diff --git a/.gitignore b/.gitignore index b951f67..b701cc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ *~ *.class *.zip +*.jar bin/ build/ dist/ classes/ sample/ +database/ **/ConvBusstop.jar **/osmCoverage.jar test/database/ @@ -21,6 +23,9 @@ .settings .project .classpath +build.xml +manifest.mf +nbbuild.xml # ============ # # OS generated # @@ -32,5 +37,4 @@ Icon? ehthumbs.db [Tt]humbs.db -**/nbproject/private/ - +nbproject/ diff --git a/doc/osmCoverage.md b/doc/osmCoverage.md index 181fd68..0fb9f9c 100644 --- a/doc/osmCoverage.md +++ b/doc/osmCoverage.md @@ -36,7 +36,7 @@ ### database PostGIS -#### PostGIS データベースを立ち上げる +#### PostGIS(osmdb) データベースを立ち上げる "PostGIS"を起動する @@ -44,34 +44,48 @@ 1) `docker pull kartoza/postgis:9.6-2.4` -2) `mkdir $HOME/pg_data` +2) `WORKAREA=$pwd` -3) `docker run --name=postgis -d -e POSTGRES_USER=alex -e POSTGRES_PASS=password -e POSTGRES_DBNAME=gis -e ALLOW_IP_RANGE=0.0.0.0/0 -p 5432:5432 -v $HOME/pg_data:/var/lib/postgresql --restart=always kartoza/postgis:9.6-2.4` +3) `mkdir $HOME/pg_data` - * --name=postgis +4) `docker run --name=osmdb -m 2g -d -e POSTGRES_USER=alex -e POSTGRES_PASS=password -e POSTGRES_DBNAME=osmdb -e ALLOW_IP_RANGE=0.0.0.0/0 -p 5432:5432 -v $HOME/pg_data:/var/lib/postgresql --restart=always kartoza/postgis:9.6-2.4` + + * `--name=osmdb` + * `-m 2g` momory 2GB * `-e POSTGRES_USER=alex` * `-e POSTGRES_PASS=password` - * `-e POSTGRES_DBNAME=gis` + * `-e POSTGRES_DBNAME=osmdb` * `-e ALLOW_IP_RANGE=0.0.0.0/0` すべてのIPからの接続を許可する * `-p 5432:5432` * `-v $HOME/pg_data:/var/lib/postgresql` PostgreSQL databade data folder * `--restart=always` +``` +$ docker pull kartoza/postgis:9.6-2.4 +$ mkdir +$ mkdir $HOME/pg_data +$ docker run -m 2g --name=osmdb -d -e POSTGRES_USER=alex -e POSTGRES_PASS=password -e POSTGRES_DBNAME=osmdb -e ALLOW_IP_RANGE=0.0.0.0/0 -p 5432:5432 -v $HOME/pg_data:/var/lib/postgresql --restart=always kartoza/postgis:9.6-2.4 +$ +``` + + "pgAdmin4"で接続を確認する -1) `docker run --name=pgadmin4 -p 80:80 -e "PGADMIN_DEFAULT_EMAIL=gisuser@domain.com" -e "PGADMIN_DEFAULT_PASSWORD=gisuser" -d dpage/pgadmin4` +1) `docker pull dpage/pgadmin4` + +2) `docker run --name=pgadmin4 -p 80:80 -e "PGADMIN_DEFAULT_EMAIL=gisuser@domain.com" -e "PGADMIN_DEFAULT_PASSWORD=gisuser" -d dpage/pgadmin4` * --name=pgadmin4 * -e "PGADMIN_DEFAULT_EMAIL=gisuser@domain.com" * -e "PGADMIN_DEFAULT_PASSWORD=gisuser" -2) pgAdmin4 : Login +3) pgAdmin4 : Login * `http://localhost/` * userid: `gisuser@domain.com` * password: `gisuser` -3) pgAdmin4 : 接続 / Connection +4) pgAdmin4 : 接続 / Connection * host name: `localhost` * port: `5432` @@ -86,7 +100,7 @@ ``` db_driver=org.postgresql.Driver -db_url=jdbc:postgresql://localhost:5432/gis +db_url=jdbc:postgresql://172.17.0.1:5432/osmdb db_user=alex db_passwd=password ``` diff --git a/lib/hayashi_0225.jar b/lib/hayashi_0225.jar deleted file mode 100644 index 00ad366..0000000 --- a/lib/hayashi_0225.jar +++ /dev/null Binary files differ diff --git a/src/coverage_BUSSTOP.sh b/src/coverage_BUSSTOP.sh index 99a5632..2019645 100755 --- a/src/coverage_BUSSTOP.sh +++ b/src/coverage_BUSSTOP.sh @@ -7,6 +7,7 @@ # pwd cp share/pbfDate.json GML_BUSSTOP/pbfDate.json +curl -o share/GML_BUSSTOP/P11-10.removed.json.txt https://raw.githubusercontent.com/yuuhayashi/coverageWeb/master/GML_BUSSTOP/P11-10.removed.json.txt cp share/P11-10.removed.json.txt GML_BUSSTOP/P11-10.removed.json.txt cp share/gisdb.properties gisdb.properties cp share/osmdb.properties osmdb.properties @@ -31,7 +32,6 @@ java -cp $CLASSPATH osm.jp.coverage.busstop.ToPostgis osmdb java -cp $CLASSPATH osm.jp.coverage.busstop.ToPostgis gisdb - ## create 't_busstop.carto.csv' java -cp $CLASSPATH osm.jp.coverage.busstop.ToCartoCSV java -cp $CLASSPATH osm.jp.coverage.busstop.ToGeoJSON @@ -51,4 +51,4 @@ tar czf share/coverage.busstopJSON.tgz GML_BUSSTOP/coverage.*.json GML_BUSSTOP/*.csv GML_BUSSTOP/pbfDate.json GML_BUSSTOP/*.txt -chmod -R 777 share \ No newline at end of file +chmod -R 777 share diff --git a/src/coverage_FUEL.sh b/src/coverage_FUEL.sh index f4d4f89..739d587 100755 --- a/src/coverage_FUEL.sh +++ b/src/coverage_FUEL.sh @@ -3,10 +3,10 @@ # # cd ~/docker/osm_get # docker run --rm -it -v $(pwd)/share:/root/osmCoverage/share haya4/osmget bash -# docker run --rm -t -v $(pwd)/share:/root/osmCoverage/share haya4/osmget bash coverage_FUEL_.sh # pwd cp share/pbfDate.json GML_FUEL/pbfDate.json +curl -o share/GML_FUEL/P07-15.removed.json.txt https://raw.githubusercontent.com/yuuhayashi/coverageWeb/master/GML_FUEL/P07-15.removed.json.txt cp share/P07-15.removed.json.txt GML_FUEL/P07-15.removed.json.txt cp share/gisdb.properties gisdb.properties cp share/osmdb.properties osmdb.properties diff --git a/src/coverage_POLICE.sh b/src/coverage_POLICE.sh index 632cd15..f56dc14 100755 --- a/src/coverage_POLICE.sh +++ b/src/coverage_POLICE.sh @@ -15,6 +15,7 @@ CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar export CLASSPATH +# make to PostGIS java -cp $CLASSPATH osm.jp.coverage.police.DbPolice java -cp $CLASSPATH osm.jp.coverage.police.DbExistPolice java -cp $CLASSPATH osm.jp.coverage.police.Police diff --git a/src/coverage_POSTOFFICE.sh b/src/coverage_POSTOFFICE.sh index 78f4cb5..183aedf 100644 --- a/src/coverage_POSTOFFICE.sh +++ b/src/coverage_POSTOFFICE.sh @@ -16,6 +16,7 @@ CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar export CLASSPATH +# make to PostGIS java -cp $CLASSPATH osm.jp.coverage.postoffice.DbPostoffice -DROP java -cp $CLASSPATH osm.jp.coverage.postoffice.DbExistPostoffice java -cp $CLASSPATH osm.jp.coverage.postoffice.Postoffice diff --git a/src/osm/jp/coverage/fuel/DbExistFuel.java b/src/osm/jp/coverage/fuel/DbExistFuel.java index b259563..04f4c0a 100644 --- a/src/osm/jp/coverage/fuel/DbExistFuel.java +++ b/src/osm/jp/coverage/fuel/DbExistFuel.java @@ -140,8 +140,6 @@ readExistingSub("disused:amenity", "fuel", POINT_NO); readExistingSub("abandoned:amenity", "fuel", POINT_NO); readExistingSub("demolished:amenity", "fuel", POINT_NO); - readExistingSub("historic:amenity", "fuel", POINT_NO); - readExistingSub("was:amenity", "fuel", POINT_NO); readExistingSub("removed:amenity", "fuel", POINT_NO); readExistingSub("no:amenity", "fuel", POINT_NO); } diff --git a/src/osm/jp/coverage/police/DbExistPolice.java b/src/osm/jp/coverage/police/DbExistPolice.java index 262431a..2eb88ef 100644 --- a/src/osm/jp/coverage/police/DbExistPolice.java +++ b/src/osm/jp/coverage/police/DbExistPolice.java @@ -90,8 +90,6 @@ readExistingSub("disused:amenity", "police", POINT_NO); readExistingSub("abandoned:amenity", "police", POINT_NO); readExistingSub("demolished:amenity", "police", POINT_NO); - readExistingSub("historic:amenity", "police", POINT_NO); - readExistingSub("was:amenity", "police", POINT_NO); readExistingSub("removed:amenity", "police", POINT_NO); readExistingSub("no:amenity", "police", POINT_NO); } diff --git a/src/osm/jp/coverage/postoffice/DbExistPostoffice.java b/src/osm/jp/coverage/postoffice/DbExistPostoffice.java index d3f4463..6c11426 100644 --- a/src/osm/jp/coverage/postoffice/DbExistPostoffice.java +++ b/src/osm/jp/coverage/postoffice/DbExistPostoffice.java @@ -72,8 +72,6 @@ readExistingSub("disused:amenity", "post_office", POINT_NO); readExistingSub("abandoned:amenity", "post_office", POINT_NO); readExistingSub("demolished:amenity", "post_office", POINT_NO); - readExistingSub("historic:amenity", "post_office", POINT_NO); - readExistingSub("was:amenity", "post_office", POINT_NO); readExistingSub("removed:amenity", "post_office", POINT_NO); readExistingSub("no:amenity", "post_office", POINT_NO); } diff --git a/src/osm/jp/postgis/ToPostgis.java b/src/osm/jp/postgis/ToPostgis.java index a625eac..5f5ecf1 100644 --- a/src/osm/jp/postgis/ToPostgis.java +++ b/src/osm/jp/postgis/ToPostgis.java @@ -179,11 +179,13 @@ public static int outCnt = 0; public static void printMark() { - System.out.print("."); outCnt++; - if (outCnt >= 100) { - outCnt = 0; - System.out.println(); + if ((outCnt % 10) == 1) { + System.out.print("."); + if (outCnt >= 800) { + outCnt = 0; + System.out.println(); + } } } }