fixed bedug

Fork: 0

coverage / osmCoverage

Browse code fixed bedug master
1 parent 4281959 commit 0e9ccb6448e0011023c4ce7e8541de38bd115981 hayashi authored on 1 May 2018

Patch

Unified Split

Showing 10 changed files

                Ignore Space
               Show notes
              View
            
          
          61 ■■■■■
          src/coverage_POLICE.sh
        
        
        
          0 → 100755
               # dummy
cd /home/yuu/workspace/osmCoverageBin
pwd
 
git config --global user.name "hayashi"
git config --global user.email hayashi.yuu@gmail.com
git fetch
git pull gitbucket master
 
#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
 
#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
 
 
 
#
#
# 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
rm -rf vtile
mkdir -m +w vtile
cp ./GML_POLICE/police?.json vtile
tar czvf policeJSON.tgz vtile/*.json
 
java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToGeoJSON -slim
 
tar czvf coverage.postofficeJSON.tgz ./GML_POLICE/*.json ./GML_POLICE/*.csv
 
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
 
 
#
#
# osmCoverage_PostofficeTile
#
+# dummy
+cd /home/yuu/workspace/osmCoverageBin
+pwd
+git config --global user.name "hayashi"
+git config --global user.email hayashi.yuu@gmail.com
+git fetch
+git pull gitbucket master
+#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
+#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
+#
+#
+# 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
+rm -rf vtile
+mkdir -m +w vtile
+cp ./GML_POLICE/police?.json vtile
+tar czvf policeJSON.tgz vtile/*.json
+java -cp .:osmCoverage.jar:hayashi.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.police.ToGeoJSON -slim
+tar czvf coverage.postofficeJSON.tgz ./GML_POLICE/*.json ./GML_POLICE/*.csv
+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
+#
+#
+# osmCoverage_PostofficeTile
+#

                Ignore Space
               Show notes
              View
            
          
          93 ■■■■■
          src/coverage_POLICE_after.sh
        
        
        
          0 → 100644
               # make Vector Tile
export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
export MANPATH="/home/linuxbrew/.linuxbrew/share/man:$MANPATH"
export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:$INFOPATH"
export CXX=g++-5
#brew install tippecanoe
 
rm -rf vtile
mkdir vtile
 
curl --user yuu:yuu8844 -O http://localhost:8080/job/osmCoverage_PoliceJson/lastSuccessfulBuild/artifact/policeJSON.tgz
 
tar zxvf policeJSON.tgz
 
#-----------
# ~/vtile
#
cd vtile
ls -l
 
tippecanoe -l police_map0 -rg -z16 -Z6 -o police0.mbtiles police0.json
tippecanoe -l police_map1 -rg -z16 -Z6 -o police1.mbtiles police1.json
tippecanoe -l police_map2 -rg -z16 -Z6 -o police2.mbtiles policw2.json
 
git clone git://github.com/mapbox/mbutil.git
 
#-----------
# ~/vtile/mbutil
#
cd mbutil
./mb-util --image_format=pbf ../police0.mbtiles tilePolice0
./mb-util --image_format=pbf ../police1.mbtiles tilePolice1
./mb-util --image_format=pbf ../police2.mbtiles tilePolice2
 
pwd
ls -l
 
#-----------
# ~/vtile/mbutil/tilePolice0
#
cd tilePolice0
pwd
ls -l
gzip -d -v -r -S .pbf *
find . -type f -exec mv -v '{}' '{}'.pbf \;
 
#-----------
# ~/vtile/mbutil
#
cd ..
pwd
ls -l
tar czvf ../../tilePolice0.tgz tilePolice0
pwd
ls -l
 
#-----------
# ~/vtile/mbutil/tilePolice1
#
cd tilePolice1
pwd
ls -l
gzip -d -v -r -S .pbf *
find . -type f -exec mv -v '{}' '{}'.pbf \;
 
#-----------
# ~/vtile/mbutil
#
cd ..
pwd
ls -l
tar czvf ../../tilePolice1.tgz tilePolice1
pwd
 
#-----------
# ~/vtile/mbutil/tilePolice2
#
cd tilePolice2
pwd
ls -l
gzip -d -v -r -S .pbf *
find . -type f -exec mv -v '{}' '{}'.pbf \;
 
#-----------
# ~/vtile/mbutil
#
cd ..
pwd
ls -l
tar czvf ../../tilePolice2.tgz tilePolice2
 
#-----------
+# make Vector Tile
+export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
+export MANPATH="/home/linuxbrew/.linuxbrew/share/man:$MANPATH"
+export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:$INFOPATH"
+export CXX=g++-5
+#brew install tippecanoe
+rm -rf vtile
+mkdir vtile
+curl --user yuu:yuu8844 -O http://localhost:8080/job/osmCoverage_PoliceJson/lastSuccessfulBuild/artifact/policeJSON.tgz
+tar zxvf policeJSON.tgz
+#-----------
+# ~/vtile
+#
+cd vtile
+ls -l
+tippecanoe -l police_map0 -rg -z16 -Z6 -o police0.mbtiles police0.json
+tippecanoe -l police_map1 -rg -z16 -Z6 -o police1.mbtiles police1.json
+tippecanoe -l police_map2 -rg -z16 -Z6 -o police2.mbtiles policw2.json
+git clone git://github.com/mapbox/mbutil.git
+#-----------
+# ~/vtile/mbutil
+#
+cd mbutil
+./mb-util --image_format=pbf ../police0.mbtiles tilePolice0
+./mb-util --image_format=pbf ../police1.mbtiles tilePolice1
+./mb-util --image_format=pbf ../police2.mbtiles tilePolice2
+pwd
+ls -l
+#-----------
+# ~/vtile/mbutil/tilePolice0
+#
+cd tilePolice0
+pwd
+ls -l
+gzip -d -v -r -S .pbf *
+find . -type f -exec mv -v '{}' '{}'.pbf \;
+#-----------
+# ~/vtile/mbutil
+#
+cd ..
+pwd
+ls -l
+tar czvf ../../tilePolice0.tgz tilePolice0
+pwd
+ls -l
+#-----------
+# ~/vtile/mbutil/tilePolice1
+#
+cd tilePolice1
+pwd
+ls -l
+gzip -d -v -r -S .pbf *
+find . -type f -exec mv -v '{}' '{}'.pbf \;
+#-----------
+# ~/vtile/mbutil
+#
+cd ..
+pwd
+ls -l
+tar czvf ../../tilePolice1.tgz tilePolice1
+pwd
+#-----------
+# ~/vtile/mbutil/tilePolice2
+#
+cd tilePolice2
+pwd
+ls -l
+gzip -d -v -r -S .pbf *
+find . -type f -exec mv -v '{}' '{}'.pbf \;
+#-----------
+# ~/vtile/mbutil
+#
+cd ..
+pwd
+ls -l
+tar czvf ../../tilePolice2.tgz tilePolice2
+#-----------

Ignore Space Show notes View src/coverage_POSTOFFICE.sh

Ignore Space Show notes View src/db.police.class.violet.html 0 → 100644

Ignore Space Show notes View src/osm/jp/api/Osmdb.java

Ignore Space Show notes View src/osm/jp/coverage/police/DbPolice.java

Ignore Space Show notes View src/osm/jp/coverage/police/Police.java

Ignore Space Show notes View test/osm/jp/coverage/police/DbExistTest.java

Ignore Space Show notes View test/osm/jp/coverage/police/DbPoliceTest.java

Ignore Space Show notes View test/osm/jp/coverage/police/PoliceTest.java

Show line notes below