diff --git a/src/coverage_BUSSTOP.sh b/src/coverage_BUSSTOP.sh index 873490b..99a5632 100755 --- a/src/coverage_BUSSTOP.sh +++ b/src/coverage_BUSSTOP.sh @@ -2,33 +2,39 @@ # HOST ~/docker/osm_get # # cd ~/docker/osm_get -# docker run --rm -it -v $(pwd)/share:/root/osmCoverageBin/share haya4/osmget bash -# docker run --rm -t -v $(pwd)/share:/root/osmCoverageBin/share haya4/osmget bash coverage_BUSSTOP_.sh +# 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_BUSSTOP_.sh # pwd cp share/pbfDate.json GML_BUSSTOP/pbfDate.json -curl -o 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 +cp share/database.properties database.properties # make to PostGIS mkdir database -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.DbBusstop -INIT -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.DbBusstop -IMPORT GML_BUSSTOP -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.DbBusstop -REMOVED GML_BUSSTOP/P11-10.removed.json.txt +CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar +export CLASSPATH -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.DbExistBusstop -INIT -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.DbExistBusstop -IMPORT +java -cp $CLASSPATH osm.jp.coverage.busstop.DbBusstop -INIT +java -cp $CLASSPATH osm.jp.coverage.busstop.DbBusstop -IMPORT GML_BUSSTOP +java -cp $CLASSPATH osm.jp.coverage.busstop.DbBusstop -REMOVED GML_BUSSTOP/P11-10.removed.json.txt -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.Busstop -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.DbBusstop -OUTPUT GML_BUSSTOP/P11-10.removed.txt -mv GML_BUSSTOP/P11-10.removed.txt GML_BUSSTOP/P11-10.removed.json.txt +java -cp $CLASSPATH osm.jp.coverage.busstop.DbExistBusstop -INIT +java -cp $CLASSPATH osm.jp.coverage.busstop.DbExistBusstop -IMPORT -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.ToPostgis osmdb -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.busstop.ToPostgis gisdb +java -cp $CLASSPATH osm.jp.coverage.busstop.Busstop +java -cp $CLASSPATH osm.jp.coverage.busstop.DbBusstop -OUTPUT P11-10.removed.txt +mv P11-10.removed.txt GML_BUSSTOP/P11-10.removed.json.txt + +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 .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.ToCartoCSV -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.ToGeoJSON +java -cp $CLASSPATH osm.jp.coverage.busstop.ToCartoCSV +java -cp $CLASSPATH osm.jp.coverage.busstop.ToGeoJSON ls -l rm -rf vtile @@ -37,12 +43,12 @@ mv GML_BUSSTOP/busstop?.json vtile tar czf share/busstopJSON.tgz vtile/*.json -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.ToGeoJSON -slim -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.Coverage GML_BUSSTOP/coverage.busstop.csv -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.Coverage GML_BUSSTOP/coverage.busstop.json -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.busstop.ExportCSV +java -cp $CLASSPATH osm.jp.coverage.busstop.ToGeoJSON -slim +java -cp $CLASSPATH osm.jp.coverage.busstop.CoverageBusstop GML_BUSSTOP/coverage.busstop.csv +java -cp $CLASSPATH osm.jp.coverage.busstop.CoverageBusstop GML_BUSSTOP/coverage.busstop.json +java -cp $CLASSPATH osm.jp.coverage.busstop.ExportCSV mv t_*.csv GML_BUSSTOP tar czf share/coverage.busstopJSON.tgz GML_BUSSTOP/coverage.*.json GML_BUSSTOP/*.csv GML_BUSSTOP/pbfDate.json GML_BUSSTOP/*.txt -chmod -R 777 share +chmod -R 777 share \ No newline at end of file diff --git a/src/coverage_FUEL.sh b/src/coverage_FUEL.sh index b256d37..f4d4f89 100755 --- a/src/coverage_FUEL.sh +++ b/src/coverage_FUEL.sh @@ -2,34 +2,40 @@ # HOST ~/docker/osm_get # # cd ~/docker/osm_get -# docker run --rm -it -v $(pwd)/share:/root/osmCoverageBin/share haya4/osmget bash -# docker run --rm -t -v $(pwd)/share:/root/osmCoverageBin/share haya4/osmget bash coverage_FUEL_.sh +# 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 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 +cp share/database.properties database.properties mkdir database -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbFuel -INIT -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbFuel -IMPORT GML_FUEL -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbFuel -REMOVED GML_FUEL/P07-15.removed.json.txt +CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar +export CLASSPATH -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbExistFuel -INIT -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbExistFuel -IMPORT +java -cp $CLASSPATH osm.jp.coverage.fuel.DbFuel -INIT +java -cp $CLASSPATH osm.jp.coverage.fuel.DbFuel -IMPORT GML_FUEL +java -cp $CLASSPATH osm.jp.coverage.fuel.DbFuel -REMOVED GML_FUEL/P07-15.removed.json.txt -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.Fuel -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.DbFuel -OUTPUT GML_FUEL/P07-15.removed.txt +java -cp $CLASSPATH osm.jp.coverage.fuel.DbExistFuel -INIT +java -cp $CLASSPATH osm.jp.coverage.fuel.DbExistFuel -IMPORT + +java -cp $CLASSPATH osm.jp.coverage.fuel.Fuel +java -cp $CLASSPATH osm.jp.coverage.fuel.DbFuel -OUTPUT GML_FUEL/P07-15.removed.txt mv GML_FUEL/P07-15.removed.txt GML_FUEL/P07-15.removed.json.txt -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.fuel.ToPostgis osmdb -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.fuel.ToPostgis gisdb +java -cp $CLASSPATH osm.jp.coverage.fuel.ToPostgis osmdb +java -cp $CLASSPATH osm.jp.coverage.fuel.ToPostgis gisdb ## create 't_fuel.carto.csv' -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.ToCartoCSV +java osm.jp.coverage.fuel.ToCartoCSV ## export from PostGIS to 'fuel.json fuel0.json fuel1.json fuel2.json' ## create 'fuelJSON.tgz' from 'fuel.json fuel0.json fuel1.json fuel2.json' -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.ToGeoJSON +java osm.jp.coverage.fuel.ToGeoJSON rm -rf vtile mkdir -m +w vtile cp GML_FUEL/pbfDate.json vtile @@ -37,10 +43,10 @@ tar czf share/fuelJSON.tgz vtile/*.json ## create 'coverage.fuelJSON.tgz' -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.ToGeoJSON -slim -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.Coverage coverage.fuel.csv -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.Coverage coverage.fuel.json -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar osm.jp.coverage.fuel.ExportCSV +java -cp $CLASSPATH osm.jp.coverage.fuel.ToGeoJSON -slim +java -cp $CLASSPATH osm.jp.coverage.fuel.CoverageFuel coverage.fuel.csv +java -cp $CLASSPATH osm.jp.coverage.fuel.CoverageFuel coverage.fuel.json +java -cp $CLASSPATH osm.jp.coverage.fuel.ExportCSV mv t_*.csv GML_FUEL ls -l diff --git a/src/coverage_POLICE.sh b/src/coverage_POLICE.sh index 9c1ce5e..632cd15 100755 --- a/src/coverage_POLICE.sh +++ b/src/coverage_POLICE.sh @@ -1,61 +1,57 @@ -# dummy -cd /home/yuu/workspace/osmCoverageBin +# +# HOST ~/docker/osm_get +# +# 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_POLICE_.sh +# pwd +cp share/pbfDate.json GML_POLICE/pbfDate.json +cp share/gisdb.properties gisdb.properties +cp share/osmdb.properties osmdb.properties +cp share/database.properties database.properties -git config --global user.name "hayashi" -git config --global user.email hayashi.yuu@gmail.com -git fetch -git pull gitbucket master +mkdir database +CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar +export CLASSPATH -#rm -rf GML_POSTOFFICE -#mkdir GML_POSTOFFICE -#cd GML_POSTOFFICE -#curl --user yuu:yuu8844 -O http://surveyor.mydns.jp/coverage/GML_POLICE/P18-12-??.xml +java -cp $CLASSPATH osm.jp.coverage.police.DbPolice +java -cp $CLASSPATH osm.jp.coverage.police.DbExistPolice +java -cp $CLASSPATH osm.jp.coverage.police.Police +java -cp $CLASSPATH osm.jp.coverage.police.ToPostgis osmdb +java -cp $CLASSPATH osm.jp.coverage.police.ToPostgis gisdb +java -cp $CLASSPATH osm.jp.coverage.police.ToGeoJSON -#cd .. -pwd -curl --user yuu:yuu8844 -O http://localhost:8080/job/osmCoverage/lastSuccessfulBuild/artifact/osmCoverage.jar -cp ../hayashi/dist/hayashi.jar . - - -# make to PostGIS -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.DbPolice -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.DbExist -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.Police -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToPostgis osmdb -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToPostgis gisdb - - - -# -# -# osmCoverage_PoliceJson -# - -## export from PostGIS to JSON -### export from PostGIS -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.Coverage2 -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.Coverage4 -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.Coverage5 -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToGeoJSON - -ls -l +ls -l GML_POLICE/*.json rm -rf vtile mkdir -m +w vtile -cp ./GML_POLICE/police?.json vtile -tar czvf policeJSON.tgz vtile/*.json +cp GML_POLICE/pbfDate.json vtile +cp GML_POLICE/police*.json vtile +tar czf policeJSON.tgz vtile/*.json +mv policeJSON.tgz share -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToGeoJSON -slim +### export from PostGIS +# output file "coverage.police2.csv" and "coverage.police2.json" +java -cp $CLASSPATH osm.jp.coverage.police.CoveragePolice2 -tar czvf coverage.postofficeJSON.tgz ./GML_POLICE/*.json ./GML_POLICE/*.csv +# output file "coverage.police4.csv" and "coverage.police4.json" +java -cp $CLASSPATH osm.jp.coverage.police.CoveragePolice4 -git add GML_POLICE/*.json -git commit --allow-empty -m "coverage police update $(date +%Y-%m-%d_%H:%M)" -git remote -v -git push gitbucket master +# output file "coverage.police5.csv" and "coverage.police5.json" +java -cp $CLASSPATH osm.jp.coverage.police.CoveragePolice5 +# output file "coverage.police5.csv" and "coverage.police6.json" +java -cp $CLASSPATH osm.jp.coverage.police.CoveragePolice6 -# -# -# osmCoverage_PostofficeTile -# +#java -cp .:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar osm.jp.coverage.police.ToGeoJSON -slim +java -cp $CLASSPATH osm.jp.coverage.police.ToGeoJSON -slim + +java -cp $CLASSPATH osm.jp.coverage.police.ExportCSV +mv t_*.csv GML_POLICE + +ls -l GML_POLICE/*.csv +ls -l GML_POLICE/*.json +tar czf coverage.policeJSON.tgz GML_POLICE/coverage.*.json GML_POLICE/*.csv GML_POLICE/pbfDate.json GML_POLICE/police*.json +mv coverage.policeJSON.tgz share + +chmod -R 777 share diff --git a/src/coverage_POSTOFFICE.sh b/src/coverage_POSTOFFICE.sh index 1b99898..78f4cb5 100644 --- a/src/coverage_POSTOFFICE.sh +++ b/src/coverage_POSTOFFICE.sh @@ -1,58 +1,46 @@ -# dummy -cd /home/yuu/workspace/osmCoverageBin +# +# HOST ~/docker/osm_get +# +# 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_POSTOFFICE_.sh +# pwd +cp share/pbfDate.json GML_POSTOFFICE/pbfDate.json +cp share/gisdb.properties gisdb.properties +cp share/osmdb.properties osmdb.properties +cp share/database.properties database.properties -git config --global user.name "hayashi" -git config --global user.email hayashi.yuu@gmail.com -git fetch -git pull gitbucket master +rm -rf database +mkdir database +CLASSPATH=.:osmCoverage.jar:hayashi.jar:hsqldb.jar:postgresql.jar:javax.json.jar +export CLASSPATH -rm -rf GML_POSTOFFICE -mkdir GML_POSTOFFICE -cd GML_POSTOFFICE -curl --user yuu:yuu8844 -O http://surveyor.mydns.jp/coverage/GML_POSTOFFICE/P30-13.xml +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 +java -cp $CLASSPATH osm.jp.coverage.postoffice.ToPostgis osmdb +java -cp $CLASSPATH osm.jp.coverage.postoffice.ToPostgis gisdb -cd .. -pwd -curl --user yuu:yuu8844 -O http://localhost:8080/job/osmCoverage/lastSuccessfulBuild/artifact/osmCoverage.jar -cp ../hayashi/dist/hayashi.jar . +## export from PostGIS to 'postoffice.json postoffice0.json postoffice1.json postoffice2.json' +## create 'postofficeJSON.tgz' from 'postoffice.json postoffice0.json postoffice1.json postoffice2.json' +java -cp $CLASSPATH osm.jp.coverage.postoffice.ToGeoJSON - -# make to PostGIS -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.DbPostoffice -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.DbExist -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.Postoffice -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.ToPostgis - - - -# -# -# osmCoverage_PostofficeJson -# - -## export from PostGIS to JSON -### export from PostGIS -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.CoverageAll -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.ToGeoJSON - -ls -l rm -rf vtile mkdir -m +w vtile -cp ./GML_POSTOFFICE/postoffice?.json vtile -tar czvf postofficeJSON.tgz vtile/*.json +cp GML_POSTOFFICE/pbfDate.json vtile +mv GML_POSTOFFICE/postoffice?.json vtile +tar czf postofficeJSON.tgz vtile/*.json +mv postofficeJSON.tgz share -java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.postoffice.ToGeoJSON -slim +## create 'coverage.postofficeJSON.tgz' +java -cp $CLASSPATH osm.jp.coverage.postoffice.ToGeoJSON -slim +java -cp $CLASSPATH osm.jp.coverage.postoffice.CoveragePostoffice coverage.postoffice.csv +java -cp $CLASSPATH osm.jp.coverage.postoffice.CoveragePostoffice coverage.postoffice.json +java -cp $CLASSPATH osm.jp.coverage.postoffice.ExportCSV +mv t_*.csv GML_POSTOFFICE -tar czvf coverage.postofficeJSON.tgz ./GML_POSTOFFICE/*.json ./GML_POSTOFFICE/*.csv - -git add GML_POSTOFFICE/*.json -git commit --allow-empty -m "coverage postoffice update $(date +%Y-%m-%d_%H:%M)" -git remote -v -git push gitbucket master - - -# -# -# osmCoverage_PostofficeTile -# +ls -l +tar czf coverage.postofficeJSON.tgz GML_POSTOFFICE/coverage.*.json GML_POSTOFFICE/*.csv GML_POSTOFFICE/pbfDate.json +mv coverage.postofficeJSON.tgz share +chmod -R 777 share