diff --git a/src/Demo.java b/src/Demo.java deleted file mode 100644 index 688d674..0000000 --- a/src/Demo.java +++ /dev/null @@ -1,37 +0,0 @@ -import java.io.*; -import java.sql.Connection; -import java.sql.SQLException; -import jp.co.areaweb.tools.database.*; - -public class Demo { - /** - * メイン - * - * java -cp .:SelectBusstop.jar:hayashi_0225.jar:postgresql-9.4.1212.jar osm.jp.SelectBusstop - * - * @throws IOException - * @throws SQLException - * @throws ClassNotFoundException - * @throws FileNotFoundException - * @throws TransformerException - * @throws SAXException - * @throws ParserConfigurationException */ - public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException - { - File dbdir = new File("database"); - if (!dbdir.isDirectory()) { - dbdir.mkdir(); - } - - Connection con = DatabaseTool.openDb("database"); - //Demo.initDb(con); - - try { - System.out.println("Connection OK!"); - } - finally { - DatabaseTool.closeDb(con); - } - } - -} \ No newline at end of file diff --git a/src/Demo.sh b/src/Demo.sh deleted file mode 100755 index 6de0fba..0000000 --- a/src/Demo.sh +++ /dev/null @@ -1,2 +0,0 @@ -#java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar Demo -java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar:hsqldb_2.2.9.jar osm.jp.coverage.busstop.Busstop diff --git a/src/ImportGML_FUEL.bat b/src/ImportGML_FUEL.bat deleted file mode 100644 index 2f1f6e9..0000000 --- a/src/ImportGML_FUEL.bat +++ /dev/null @@ -1,3 +0,0 @@ -RD /s database -java -cp .;osmCoverage.jar;hayashi_0225.jar;hsqldb_2.2.9.jar;postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel - diff --git a/src/ImportGML_FUEL.sh b/src/ImportGML_FUEL.sh deleted file mode 100755 index d246691..0000000 --- a/src/ImportGML_FUEL.sh +++ /dev/null @@ -1,15 +0,0 @@ -cp ../osmCoverage/dist/osmCoverage.jar . -rm -r database -mkdir database -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToCartoCSV -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.csv -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.json -git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" -cp coverage.fuel.json ../www-root/coverage -cd ../www-root -git add . -git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" diff --git a/src/ImportGML_FUEL_update.sh b/src/ImportGML_FUEL_update.sh deleted file mode 100644 index 2fc12f6..0000000 --- a/src/ImportGML_FUEL_update.sh +++ /dev/null @@ -1,22 +0,0 @@ -cp ../osmCoverage/dist/osmCoverage.jar . -rm -r database -mkdir database -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel -update -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis -update -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToCartoCSV -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.csv -java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.json -git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" -cp coverage.fuel.json ../www-root/coverage -cd ../www-root -git add . -git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" - -# java -cp hsqldb_2.2.9.jar org.hsqldb.util.DatabaseManager -# db_driver=org.hsqldb.jdbcDriver -# db_url=jdbc:hsqldb:file:./database/db -# db_user=sa -# db_passwd= -# \ No newline at end of file diff --git a/src/busstop.activity.violet.html b/src/busstop.activity.violet.html index c9be366..8786175 100644 --- a/src/busstop.activity.violet.html +++ b/src/busstop.activity.violet.html @@ -20,7 +20,7 @@ - + 1 @@ -320,10 +320,10 @@ - + - - + + 1 255 @@ -338,185 +338,140 @@ 255 - - DbFuel.main(-update) -PostGIS.t_busstopを読み取って -HSQLDB.BUS_STOPテーブルに格納する - - - - - - - 1 - - - - - - - - - 1 - - - - - - - + + + + 1 - + 255 255 255 255 - + 0 0 0 255 - - - Create & insert - - - - - - - 1 - - 255 - 255 - 255 - 255 - - - 0 - 0 - 0 - 255 - - + - - - - + + + + 1 - - - - + + + + ToCartoCSV.main() - - - - + + + + 1 - - - + + + - - - - + + + + 1 - - - - + + + + t_fuel.csv - + 255 228 181 255 - - - - + + + + 1 - - - + + + - - - - + + + + 1 - + 255 255 255 255 - + 0 0 0 255 - - + + Coverage (JSON) Coverage (CSV) - - - - + + + + 1 - + 255 255 255 255 - + 0 0 0 255 - + - - - - + + + + 1 - - - + + + - - - - + + + + 1 - - - - + + + + Coverage.json Coverage.csv - + 255 228 181 @@ -524,14 +479,14 @@ - - + + - - - - + + + + 1 @@ -540,13 +495,13 @@ - + - - - - + + + + 1 @@ -555,13 +510,13 @@ - + - - - - + + + + 1 @@ -570,13 +525,13 @@ - + - - - - + + + + 1 @@ -585,13 +540,13 @@ - + - - - - + + + + 1 @@ -600,13 +555,13 @@ - + - - - - + + + + 1 @@ -615,13 +570,13 @@ - + - - - - + + + + 1 @@ -630,13 +585,13 @@ - + - - - - + + + + 1 @@ -645,22 +600,22 @@ - + - - - - + + + + 1 - + - - - - + + + + 1 @@ -669,13 +624,13 @@ - + - - - - + + + + 1 @@ -684,22 +639,22 @@ - + - - - - + + + + 1 - + - - - - + + + + 1 @@ -708,22 +663,22 @@ - + - - - - + + + + 1 - + - - - - + + + + 1 @@ -732,13 +687,13 @@ - + - - - - + + + + 1 @@ -747,13 +702,13 @@ - + - - - - + + + + 1 @@ -762,13 +717,13 @@ - + - - - - + + + + 1 @@ -777,13 +732,13 @@ - + - - - - + + + + 1 @@ -792,13 +747,13 @@ - + - - - - + + + + 1 @@ -807,69 +762,13 @@ - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - 1 - - - - - - - - + - - - - + + + + 1 @@ -878,45 +777,13 @@ - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - + + + + + + + 1 @@ -925,13 +792,13 @@ - - - - - - - + + + + + + + 1 @@ -940,13 +807,13 @@ - - - - - - - + + + + + + + 1 @@ -955,22 +822,22 @@ - + - - - - - + + + + + 1 - - - - - - - + + + + + + + 1 @@ -979,13 +846,13 @@ - - - - - - - + + + + + + + 1 @@ -994,13 +861,13 @@ - - - - - - - + + + + + + + 1 @@ -1009,1153 +876,956 @@ - + - - - - - + + + + + 1 - + - - - - + + + + 1 ]]>

- embedded diagram image + embedded diagram image \ No newline at end of file diff --git a/src/busstop_update.sh b/src/busstop_update.sh deleted file mode 100755 index cb94df9..0000000 --- a/src/busstop_update.sh +++ /dev/null @@ -1,7 +0,0 @@ -cp ../osmCoverage/dist/osmCoverage.jar . - -rm */update.sql -java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar:hsqldb_2.2.9.jar osm.jp.coverage.busstop.Busstop -update -java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar osm.jp.postgis.Do_sqlfiles -update -java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar:hsqldb_2.2.9.jar osm.jp.coverage.busstop.Coverage coverage.csv -git commit -a -m "coverage update $(date +%Y-%m-%d_%H:%M)" diff --git a/src/coverageGML_FUEL.sh b/src/coverageGML_FUEL.sh new file mode 100755 index 0000000..d246691 --- /dev/null +++ b/src/coverageGML_FUEL.sh @@ -0,0 +1,15 @@ +cp ../osmCoverage/dist/osmCoverage.jar . +rm -r database +mkdir database +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToCartoCSV +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.csv +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.json +git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" +cp coverage.fuel.json ../www-root/coverage +cd ../www-root +git add . +git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" diff --git a/src/coverage_FUEL.bat b/src/coverage_FUEL.bat new file mode 100644 index 0000000..2f1f6e9 --- /dev/null +++ b/src/coverage_FUEL.bat @@ -0,0 +1,3 @@ +RD /s database +java -cp .;osmCoverage.jar;hayashi_0225.jar;hsqldb_2.2.9.jar;postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel + diff --git a/src/coverage_FUEL_update.sh b/src/coverage_FUEL_update.sh new file mode 100644 index 0000000..2fc12f6 --- /dev/null +++ b/src/coverage_FUEL_update.sh @@ -0,0 +1,22 @@ +cp ../osmCoverage/dist/osmCoverage.jar . +rm -r database +mkdir database +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel -update +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbExist +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Fuel +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToPostgis -update +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.ToCartoCSV +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.csv +java -cp .:osmCoverage.jar:hayashi_0225.jar:hsqldb_2.2.9.jar:postgresql-9.4.1212.jar osm.jp.coverage.fuel.Coverage coverage.fuel.json +git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" +cp coverage.fuel.json ../www-root/coverage +cd ../www-root +git add . +git commit -a -m "coverage fuel update $(date +%Y-%m-%d_%H:%M)" + +# java -cp hsqldb_2.2.9.jar org.hsqldb.util.DatabaseManager +# db_driver=org.hsqldb.jdbcDriver +# db_url=jdbc:hsqldb:file:./database/db +# db_user=sa +# db_passwd= +# \ No newline at end of file diff --git a/src/coverage_busstop_update.sh b/src/coverage_busstop_update.sh new file mode 100755 index 0000000..7398441 --- /dev/null +++ b/src/coverage_busstop_update.sh @@ -0,0 +1,9 @@ +cp ../osmCoverage/dist/osmCoverage.jar . +rm -r database +mkdir database + +rm */update.sql +java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar:hsqldb_2.2.9.jar osm.jp.coverage.busstop.Busstop -update +java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar osm.jp.postgis.Do_sqlfiles -update +java -cp .:osmCoverage.jar:hayashi_0225.jar:postgresql-9.4.1212.jar:hsqldb_2.2.9.jar osm.jp.coverage.busstop.Coverage coverage.csv +git commit -a -m "coverage update $(date +%Y-%m-%d_%H:%M)" diff --git a/src/osm/jp/coverage/busstop/DbBusstop.java b/src/osm/jp/coverage/busstop/DbBusstop.java index a87a435..9425190 100644 --- a/src/osm/jp/coverage/busstop/DbBusstop.java +++ b/src/osm/jp/coverage/busstop/DbBusstop.java @@ -14,7 +14,6 @@ public class DbBusstop { public static final String TABLE_NAME = "bus_stop"; - public static boolean UPDATE = false; public static boolean DROP = false; File inputFile; @@ -34,9 +33,6 @@ public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, IOException, SQLException, ParserConfigurationException, SAXException { for (String arg : args) { - if (arg.toUpperCase().equals("-UPDATE")) { - UPDATE = true; - } if (arg.toUpperCase().equals("-DROP")) { DROP = true; } @@ -49,16 +45,10 @@ } Connection conHsql = null; - Connection conPost = null; try { conHsql = DatabaseTool.openDb("database"); if (DROP) { dropTable(conHsql); - if (UPDATE) { - create(conHsql); - } - } - if (!UPDATE) { create(conHsql); } @@ -66,18 +56,12 @@ ps.executeUpdate(); } - if (UPDATE) { - conPost = DatabaseTool.openDb("postgis"); - transport(con, conPost); - } - else { - File gmlDir = new File("GML_FUEL"); - for (File gmlFile : gmlDir.listFiles()) { - if (checkGMLfile(gmlFile)) { - int index = "P07-15_".length(); - int areacode = Integer.parseInt(gmlFile.getName().substring(index, index+2)); - inputFile(con, gmlFile, areacode); - } + File gmlDir = new File("GML_FUEL"); + for (File gmlFile : gmlDir.listFiles()) { + if (checkGMLfile(gmlFile)) { + int index = "P07-15_".length(); + int areacode = Integer.parseInt(gmlFile.getName().substring(index, index+2)); + inputFile(con, gmlFile, areacode); } } diff --git a/src/sql.txt b/src/sql.txt deleted file mode 100644 index 102f920..0000000 --- a/src/sql.txt +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE t_busstop ( - gid SERIAL PRIMARY KEY, - osm_id bigint, - name text, - geom GEOMETRY(POINT, 4612) -); -CREATE INDEX ix_busstop_geom ON t_busstop USING GiST (geom); - -insert into t_busstop(osm_id,name,geom) select osm_id, st_transform(way,4612) FROM planet_osm_point WHERE (highway='bus_stop'); -insert into t_busstop(osm_id,name,geom) VALUES(884, 'なまえ', ST_GeomFromText('POINT(139.4110836 35.4341053)', 4612)); - ----- -CREATE TABLE t_test ( - gid SERIAL PRIMARY KEY, - osm_id bigint, - name text, - geom GEOMETRY(POINT, 4612) -); - -CREATE INDEX ix_test_geom ON t_test USING GiST (geom); - -insert into t_test(osm_id,name,geom) VALUES(884, 'なまえ', ST_GeomFromText('POINT(139.4110836 35.4341053)', 4612)); - ----- \ No newline at end of file