diff --git a/src/osm/jp/api/Coverage.java b/src/osm/jp/api/Coverage.java index 8071b9b..b1ce5ce 100644 --- a/src/osm/jp/api/Coverage.java +++ b/src/osm/jp/api/Coverage.java @@ -7,14 +7,15 @@ import osm.jp.postgis.CoverageAll; public abstract class Coverage { - public static final String DB_PORP_GISDB = "gisdb"; + + //public static String DB_PORP_GISDB = "gisdb"; public static final String DB_PORP_LOCALDB = "database"; - public static void output(File dir, String tableName, String comment) throws Exception { - output(dir, tableName, tableName.toLowerCase(), comment, null); + public static void output(File dir, String tableName, String comment, String gisdb) throws Exception { + output(dir, tableName, tableName.toLowerCase(), comment, null, gisdb); } - public static void output(File dir, String tableName, String name, String comment, String where) throws Exception { + public static void output(File dir, String tableName, String name, String comment, String where, String gisdb) throws Exception { File outputFileCsv = new File(dir, "coverage."+ name +".csv"); File outputFileJson = new File(dir, "coverage."+ name +".json"); @@ -22,7 +23,7 @@ obj.setTablename(tableName); obj.setData(new ArrayList<>()); - Connection conPost = DatabaseTool.openDb(DB_PORP_GISDB); + Connection conPost = DatabaseTool.openDb(gisdb); Connection conHsql = DatabaseTool.openDb(DB_PORP_LOCALDB); try { obj.load(conPost, conHsql, tableName, where); diff --git a/src/osm/jp/coverage/busstop/CoverageBusstop.java b/src/osm/jp/coverage/busstop/CoverageBusstop.java index 33e5670..689676a 100644 --- a/src/osm/jp/coverage/busstop/CoverageBusstop.java +++ b/src/osm/jp/coverage/busstop/CoverageBusstop.java @@ -6,12 +6,21 @@ public class CoverageBusstop extends Coverage { + /** + * GML_BUSSTOP/coverage.busstop.csv と GML_BUSSTOP/coverage.busstop.json を出力する + * + * java -cp $CLASSPATH osm.jp.coverage.busstop.CoverageBusstop osmdb + * + * @param args [0] 'osmdb.properties' + * @throws Exception + */ public static void main(String[] args) throws Exception { output( new File("GML_BUSSTOP"), DbBusstop.TABLE_NAME, - "国土数値情報　バス停留所データ 平成２２年" + "国土数値情報　バス停留所データ 平成２２年", + args[0] ); } } diff --git a/src/osm/jp/coverage/busstop/ExportCSV.java b/src/osm/jp/coverage/busstop/ExportCSV.java index 170d53d..ee28399 100644 --- a/src/osm/jp/coverage/busstop/ExportCSV.java +++ b/src/osm/jp/coverage/busstop/ExportCSV.java @@ -25,6 +25,6 @@ ToPostgis model = new ToPostgis(); model.items = items; - model.toCsv(new File(CSV_FILE_NAME)); + model.toCsv(new File(CSV_FILE_NAME), argv[0]); } } diff --git a/src/osm/jp/coverage/busstop/NagoyaBusstop.java b/src/osm/jp/coverage/busstop/NagoyaBusstop.java index 7a0786d..f03d6b2 100644 --- a/src/osm/jp/coverage/busstop/NagoyaBusstop.java +++ b/src/osm/jp/coverage/busstop/NagoyaBusstop.java @@ -45,12 +45,13 @@ /** * メイン * - * java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop [option] + * java -cp .:ConvBusstop.jar:hayashi_0225.jar:hsqldb_2.2.9.jar osm.jp.ConvBusstop [gisdb] [option] * OPTION: -check OSMデータ上に既存のバス停が存在するかどうかをチェックする * @param args * @throws Exception */ public static void main(String[] args) throws Exception { + String gisdbPropertiy = args[0]; File outFile = new File("update.sql"); if (outFile.isFile()) { outFile.delete(); @@ -81,7 +82,7 @@ Connection conPost = null; try { - conPost = DatabaseTool.openDb(CoverageBusstop.DB_PORP_GISDB); + conPost = DatabaseTool.openDb(gisdbPropertiy); DoSQL.sqlExecute(conPost, "DROP TABLE nagoya_busstop;"); DoSQL.sqlExecute(conPost, "CREATE TABLE nagoya_busstop (gid SERIAL PRIMARY KEY, name text, kana text, fixed integer, area integer, geom GEOMETRY(POINT, 4612));"); DoSQL.sqlExecute(conPost, "CREATE INDEX ix_nagoya_busstop_geom ON nagoya_busstop USING GiST (geom);"); diff --git a/src/osm/jp/coverage/busstop/ToCartoCSV.java b/src/osm/jp/coverage/busstop/ToCartoCSV.java index cfc62b6..3a9eb2e 100644 --- a/src/osm/jp/coverage/busstop/ToCartoCSV.java +++ b/src/osm/jp/coverage/busstop/ToCartoCSV.java @@ -28,16 +28,16 @@ @SuppressWarnings("CallToPrintStackTrace") public static void main (String[] argv) { try { - outputDb(); + outputDb(argv[0]); } catch (Exception e) { e.printStackTrace(); } } - public static void outputDb() throws Exception { + public static void outputDb(String gisdb) throws Exception { File csvFile = new File(CSV_FILE_NAME); try (BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(csvFile), "UTF-8"))) { - Connection con = DatabaseTool.openDb(CoverageBusstop.DB_PORP_GISDB); + Connection con = DatabaseTool.openDb(gisdb); // CSV header System.out.println("gid,geom,score"); ow.write("gid,geom,score"); diff --git a/src/osm/jp/coverage/busstop/ToGeoJSON.java b/src/osm/jp/coverage/busstop/ToGeoJSON.java index 43a60fa..e1f60ac 100644 --- a/src/osm/jp/coverage/busstop/ToGeoJSON.java +++ b/src/osm/jp/coverage/busstop/ToGeoJSON.java @@ -20,10 +20,14 @@ public class ToGeoJSON { public static void main (String[] argv) throws Exception { boolean slim = false; + String gisdb = "gisdb"; for (String arg : argv) { if (arg.equals("-slim")) { slim = true; } + else { + gisdb = arg; + } } osm.jp.postgis.ToGeoJSON obj = new osm.jp.postgis.ToGeoJSON("busstop"); obj.sqlForm1 = "SELECT row_to_json(feature) FROM (" @@ -32,7 +36,7 @@ + "row_to_json((" + "SELECT p FROM (SELECT t_%s.gmlid, t_%s.fixed) AS p" + ")) AS properties From t_%s %s order by area,gmlid) As feature"; - Connection con = DatabaseTool.openDb(CoverageBusstop.DB_PORP_GISDB); + Connection con = DatabaseTool.openDb(gisdb); obj.outputDb(con, "", new File("GML_BUSSTOP", "busstop.json"), false); obj.outputDb(con, "WHERE fixed=0", new File("GML_BUSSTOP", "busstop0.json"), false); obj.outputDb(con, "WHERE fixed=1", new File("GML_BUSSTOP", "busstop1.json"), false); diff --git a/src/osm/jp/coverage/busstop/ToPostgis.java b/src/osm/jp/coverage/busstop/ToPostgis.java index 145b144..b8f332f 100644 --- a/src/osm/jp/coverage/busstop/ToPostgis.java +++ b/src/osm/jp/coverage/busstop/ToPostgis.java @@ -25,7 +25,7 @@ public static void main(String[] argv) throws Exception { ToPostgis model = new ToPostgis(); if (argv.length < 1) { - model.transport(); + throw new Exception("args[0] <--- 'gisdb'"); } else { model.transport(argv[0]); diff --git a/src/osm/jp/coverage/fuel/CoverageFuel.java b/src/osm/jp/coverage/fuel/CoverageFuel.java index 61a9980..b18d92a 100644 --- a/src/osm/jp/coverage/fuel/CoverageFuel.java +++ b/src/osm/jp/coverage/fuel/CoverageFuel.java @@ -9,7 +9,8 @@ output( new File("GML_FUEL"), DbFuel.TABLE_NAME, - "国土数値情報　燃料給油所データ 平成２８年(2016)" + "国土数値情報　燃料給油所データ 平成２８年(2016)", + args[0] ); } } diff --git a/src/osm/jp/coverage/fuel/ExportCSV.java b/src/osm/jp/coverage/fuel/ExportCSV.java index f48e24d..a729bda 100644 --- a/src/osm/jp/coverage/fuel/ExportCSV.java +++ b/src/osm/jp/coverage/fuel/ExportCSV.java @@ -13,7 +13,10 @@ public static String tableName; public static String CSV_FILE_NAME = "t_fuel.csv"; - public static void main (String[] argv) throws ClassNotFoundException, SQLException, IOException, FileNotFoundException, ParserConfigurationException, SAXException { + public static void main (String[] argv) throws Exception { + if (argv.length < 1) { + throw new Exception("args[0] <--- 'gisdb'"); + } PostgisItems items = new PostgisItems(); items.add(new PostgisItem("gmlid", "gmlid")); @@ -25,6 +28,6 @@ ToPostgis model = new ToPostgis(); model.items = items; - model.toCsv(new File(CSV_FILE_NAME)); + model.toCsv(new File(CSV_FILE_NAME), argv[0]); } } diff --git a/src/osm/jp/coverage/fuel/ToCartoCSV.java b/src/osm/jp/coverage/fuel/ToCartoCSV.java index d11c741..664f1d5 100644 --- a/src/osm/jp/coverage/fuel/ToCartoCSV.java +++ b/src/osm/jp/coverage/fuel/ToCartoCSV.java @@ -26,7 +26,7 @@ public static final String CSV_FILE_NAME = "t_fuel.carto.csv"; public static void main (String[] argv) throws Exception { - outputDb(DatabaseTool.openDb(Coverage.DB_PORP_GISDB)); + outputDb(DatabaseTool.openDb(argv[0])); } public static void outputDb(Connection con) throws Exception { diff --git a/src/osm/jp/coverage/fuel/ToGeoJSON.java b/src/osm/jp/coverage/fuel/ToGeoJSON.java index 55d1c14..e31bc46 100644 --- a/src/osm/jp/coverage/fuel/ToGeoJSON.java +++ b/src/osm/jp/coverage/fuel/ToGeoJSON.java @@ -21,14 +21,18 @@ public class ToGeoJSON { public static void main (String[] argv) throws Exception { boolean slim = false; + String gisdb = "gisdb"; for (String arg : argv) { if (arg.equals("-slim")) { slim = true; } + else { + gisdb = arg; + } } osm.jp.postgis.ToGeoJSON obj = new osm.jp.postgis.ToGeoJSON(DbFuel.TABLE_NAME); - Connection con = DatabaseTool.openDb(Coverage.DB_PORP_GISDB); + Connection con = DatabaseTool.openDb(gisdb); try { obj.outputDb(con, "", new File("fuel.json"), false); obj.outputDb(con, "WHERE fixed=0", new File("fuel0.json"), slim); diff --git a/src/osm/jp/coverage/fuel/ToPostgis.java b/src/osm/jp/coverage/fuel/ToPostgis.java index 72c96db..be159b8 100644 --- a/src/osm/jp/coverage/fuel/ToPostgis.java +++ b/src/osm/jp/coverage/fuel/ToPostgis.java @@ -26,7 +26,7 @@ public static void main(String[] argv) throws Exception { ToPostgis model = new ToPostgis(); if (argv.length < 1) { - model.transport(); + throw new Exception("args[0] <--- 'gisdb'"); } else { model.transport(argv[0]); diff --git a/src/osm/jp/coverage/police/CoveragePolice2.java b/src/osm/jp/coverage/police/CoveragePolice2.java index d360a97..30e519d 100644 --- a/src/osm/jp/coverage/police/CoveragePolice2.java +++ b/src/osm/jp/coverage/police/CoveragePolice2.java @@ -18,7 +18,8 @@ DbPolice.TABLE_NAME, "police2", "国土数値情報 警察署データ（平成24年:2012）2:警察署", - "code=2" + "code=2", + args[0] ); } } diff --git a/src/osm/jp/coverage/police/CoveragePolice4.java b/src/osm/jp/coverage/police/CoveragePolice4.java index dc91f73..102747c 100644 --- a/src/osm/jp/coverage/police/CoveragePolice4.java +++ b/src/osm/jp/coverage/police/CoveragePolice4.java @@ -17,7 +17,8 @@ DbPolice.TABLE_NAME, "police4", "国土数値情報 警察署データ（平成24年:2012）4:交番", - "code=4" + "code=4", + args[0] ); } } diff --git a/src/osm/jp/coverage/police/CoveragePolice5.java b/src/osm/jp/coverage/police/CoveragePolice5.java index 0ca65d2..0b65924 100644 --- a/src/osm/jp/coverage/police/CoveragePolice5.java +++ b/src/osm/jp/coverage/police/CoveragePolice5.java @@ -16,7 +16,8 @@ DbPolice.TABLE_NAME, "police5", "国土数値情報 警察署データ（平成24年:2012）5:駐在所", - "code=5" + "code=5", + args[0] ); } } diff --git a/src/osm/jp/coverage/police/CoveragePolice6.java b/src/osm/jp/coverage/police/CoveragePolice6.java index 5208702..93b3dd6 100644 --- a/src/osm/jp/coverage/police/CoveragePolice6.java +++ b/src/osm/jp/coverage/police/CoveragePolice6.java @@ -17,7 +17,8 @@ DbPolice.TABLE_NAME, "police6", "国土数値情報 警察署データ（平成24年:2012）6:派出所", - "code=6" + "code=6", + args[0] ); } } diff --git a/src/osm/jp/coverage/police/ExportCSV.java b/src/osm/jp/coverage/police/ExportCSV.java index 402ce55..406dce5 100644 --- a/src/osm/jp/coverage/police/ExportCSV.java +++ b/src/osm/jp/coverage/police/ExportCSV.java @@ -1,11 +1,6 @@ package osm.jp.coverage.police; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.sql.SQLException; -import javax.xml.parsers.ParserConfigurationException; -import org.xml.sax.SAXException; import osm.jp.postgis.PostgisItem; import osm.jp.postgis.PostgisItems; @@ -13,7 +8,10 @@ public static String tableName; public static String CSV_FILE_NAME = "t_police.csv"; - public static void main (String[] argv) throws ClassNotFoundException, SQLException, IOException, FileNotFoundException, ParserConfigurationException, SAXException { + public static void main (String[] argv) throws Exception { + if (argv.length < 1) { + throw new Exception("args[0] <--- 'gisdb'"); + } PostgisItems items = new PostgisItems(); items.add(new PostgisItem("gmlid", "idref")); @@ -25,6 +23,6 @@ ToPostgis model = new ToPostgis(); model.items = items; - model.toCsv(new File(CSV_FILE_NAME)); + model.toCsv(new File(CSV_FILE_NAME), argv[0]); } } diff --git a/src/osm/jp/coverage/police/ToGeoJSON.java b/src/osm/jp/coverage/police/ToGeoJSON.java index 24384b6..0518ceb 100644 --- a/src/osm/jp/coverage/police/ToGeoJSON.java +++ b/src/osm/jp/coverage/police/ToGeoJSON.java @@ -22,15 +22,19 @@ public class ToGeoJSON { public static void main (String[] argv) throws Exception { boolean slim = false; + String gisdb = "gisdb"; for (String arg : argv) { if (arg.equals("-slim")) { slim = true; } + else { + gisdb = arg; + } } File dir = new File("GML_POLICE"); osm.jp.postgis.ToGeoJSON obj = new osm.jp.postgis.ToGeoJSON(DbPolice.TABLE_NAME); - Connection con = DatabaseTool.openDb(Coverage.DB_PORP_GISDB); + Connection con = DatabaseTool.openDb(gisdb); try { obj.outputDb(con, "", new File(dir, "police.json"), false); obj.outputDb(con, "WHERE fixed=0 and code=2", new File(dir, "police2z.json"), slim); diff --git a/src/osm/jp/coverage/police/ToPostgis.java b/src/osm/jp/coverage/police/ToPostgis.java index 52d68b8..8e6e267 100644 --- a/src/osm/jp/coverage/police/ToPostgis.java +++ b/src/osm/jp/coverage/police/ToPostgis.java @@ -26,7 +26,7 @@ public static void main(String[] argv) throws Exception { ToPostgis model = new ToPostgis(); if (argv.length < 1) { - model.transport(); + throw new Exception("args[0] <--- 'gisdb'"); } else { model.transport(argv[0]); diff --git a/src/osm/jp/coverage/postoffice/CoveragePostoffice.java b/src/osm/jp/coverage/postoffice/CoveragePostoffice.java index 967de53..955ba0d 100644 --- a/src/osm/jp/coverage/postoffice/CoveragePostoffice.java +++ b/src/osm/jp/coverage/postoffice/CoveragePostoffice.java @@ -6,10 +6,15 @@ public class CoveragePostoffice extends Coverage { public static void main(String[] args) throws Exception { + if (args.length < 1) { + throw new Exception("args[0] <--- 'gisdb'"); + } + output( new File("GML_POSTOFFICE"), DbPostoffice.TABLE_NAME, - "国土数値情報 郵便局データ（平成25年）" + "国土数値情報 郵便局データ（平成25年）", + args[0] ); } } diff --git a/src/osm/jp/coverage/postoffice/ExportCSV.java b/src/osm/jp/coverage/postoffice/ExportCSV.java index 0d78bd1..a00f8eb 100644 --- a/src/osm/jp/coverage/postoffice/ExportCSV.java +++ b/src/osm/jp/coverage/postoffice/ExportCSV.java @@ -1,11 +1,6 @@ package osm.jp.coverage.postoffice; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.sql.SQLException; -import javax.xml.parsers.ParserConfigurationException; -import org.xml.sax.SAXException; import osm.jp.postgis.PostgisItem; import osm.jp.postgis.PostgisItems; @@ -13,8 +8,11 @@ public static String tableName; public static String CSV_FILE_NAME = "t_postoffice.csv"; - public static void main (String[] argv) throws ClassNotFoundException, SQLException, IOException, FileNotFoundException, ParserConfigurationException, SAXException { - + public static void main (String[] argv) throws Exception { + if (argv.length < 1) { + throw new Exception("args[0] <--- 'gisdb'"); + } + PostgisItems items = new PostgisItems(); items.add(new PostgisItem("gmlid", "idref")); items.add(new PostgisItem("area", "area")); @@ -24,6 +22,6 @@ ToPostgis model = new ToPostgis(); model.items = items; - model.toCsv(new File(CSV_FILE_NAME)); + model.toCsv(new File(CSV_FILE_NAME), argv[0]); } } diff --git a/src/osm/jp/coverage/postoffice/Postoffice.java b/src/osm/jp/coverage/postoffice/Postoffice.java index 87e7d29..52e6160 100644 --- a/src/osm/jp/coverage/postoffice/Postoffice.java +++ b/src/osm/jp/coverage/postoffice/Postoffice.java @@ -43,17 +43,20 @@ * @throws SAXException * @throws ParserConfigurationException */ - public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException + @SuppressWarnings("ResultOfObjectAllocationIgnored") + public static void main(String[] args) throws Exception { - Connection con = DatabaseTool.openDb(Coverage.DB_PORP_LOCALDB); - try { - new Postoffice(con); + // HSQLディレクトリがなければ作る + File dbdir = new File(Coverage.DB_PORP_LOCALDB); + if (!dbdir.isDirectory()) { + dbdir.mkdir(); } - finally { - DatabaseTool.closeDb(con); + + try (Connection hsql = DatabaseTool.openDb(Coverage.DB_PORP_LOCALDB)) { + new Postoffice(hsql); } } - + /** * HSQL_DB.OSM_EXITのscoreを集計して、HSQL_DB.POSTOFFICEのfixedに反映させる * @@ -66,7 +69,7 @@ * @throws SAXException * @throws TransformerException */ - public Postoffice(Connection con) throws SQLException, FileNotFoundException, ClassNotFoundException, IOException, ParserConfigurationException, SAXException, TransformerException { + public Postoffice(Connection con) throws Exception { String sql4 = "UPDATE "+ DbPostoffice.TABLE_NAME +" SET fixed1=0"; String sql1 = "SELECT idref,lat,lon,score FROM "+ DbExistPostoffice.EXIST_TABLE_NAME; String sql2 = "SELECT idref,lat,lon,fixed, area FROM "+ DbPostoffice.TABLE_NAME +" WHERE (lat > ?) and (lat < ?) and (lon > ?) and (lon < ?) and (fixed1=0)"; @@ -126,4 +129,5 @@ ps5.executeUpdate(); } } + } \ No newline at end of file diff --git a/src/osm/jp/coverage/postoffice/ToGeoJSON.java b/src/osm/jp/coverage/postoffice/ToGeoJSON.java index c376e41..c4da8ae 100644 --- a/src/osm/jp/coverage/postoffice/ToGeoJSON.java +++ b/src/osm/jp/coverage/postoffice/ToGeoJSON.java @@ -4,7 +4,6 @@ import java.sql.Connection; import jp.co.areaweb.tools.database.DatabaseTool; -import osm.jp.api.Coverage; /** * PostGISデータをGeoJSONファイルに出力する。 @@ -22,14 +21,18 @@ public class ToGeoJSON { public static void main (String[] argv) throws Exception { boolean slim = false; + String gisdb = null; for (String arg : argv) { if (arg.equals("-slim")) { slim = true; } + else { + gisdb = argv[0]; + } } osm.jp.postgis.ToGeoJSON obj = new osm.jp.postgis.ToGeoJSON(DbPostoffice.TABLE_NAME); - Connection con = DatabaseTool.openDb(Coverage.DB_PORP_GISDB); + Connection con = DatabaseTool.openDb(gisdb); try { obj.outputDb(con, "", new File("GML_POSTOFFICE", "postoffice.json"), false); obj.outputDb(con, "WHERE fixed=0", new File("GML_POSTOFFICE", "postoffice0.json"), slim); diff --git a/src/osm/jp/coverage/postoffice/ToPostgis.java b/src/osm/jp/coverage/postoffice/ToPostgis.java index dc6908a..1ce9f10 100644 --- a/src/osm/jp/coverage/postoffice/ToPostgis.java +++ b/src/osm/jp/coverage/postoffice/ToPostgis.java @@ -26,7 +26,7 @@ public static void main(String[] argv) throws Exception { ToPostgis model = new ToPostgis(); if (argv.length < 1) { - model.transport(); + throw new Exception("args[0] <--- 'gisdb'"); } else { model.transport(argv[0]); diff --git a/src/osm/jp/postgis/Kml.java b/src/osm/jp/postgis/Kml.java index 2b2eacc..e657075 100644 --- a/src/osm/jp/postgis/Kml.java +++ b/src/osm/jp/postgis/Kml.java @@ -17,7 +17,6 @@ import javax.json.JsonReader; import javax.json.JsonValue; import jp.co.areaweb.tools.database.DatabaseTool; -import osm.jp.api.Coverage; import osm.jp.api.Japan; import osm.jp.api.RectArea; @@ -29,6 +28,7 @@ private final double km; PipedWriter pipeOut; + String gisdb = null; public static final int MAX_DATA_COUNT = 1000; @@ -40,13 +40,15 @@ * @param lat * @param lon * @param km + * @param gisdb * @throws java.io.IOException */ - public Kml(PipedWriter pipeOut, String dbname, String name, double lat, double lon, double km) throws IOException { + public Kml(PipedWriter pipeOut, String dbname, String name, double lat, double lon, double km, String gisdb) throws IOException { this.name = name; this.lat = lat; this.lon = lon; this.km = km; + this.gisdb = gisdb; this.type = null; if (dbname.equals(osm.jp.coverage.busstop.DbBusstop.TABLE_NAME)) { @@ -83,7 +85,7 @@ } int count = 0; - try (Connection conPost = DatabaseTool.openDb(Coverage.DB_PORP_GISDB)) + try (Connection conPost = DatabaseTool.openDb(this.gisdb)) { ow.println(getStringStyle()); diff --git a/src/osm/jp/postgis/ToPostgis.java b/src/osm/jp/postgis/ToPostgis.java index 5f5ecf1..4c51228 100644 --- a/src/osm/jp/postgis/ToPostgis.java +++ b/src/osm/jp/postgis/ToPostgis.java @@ -55,11 +55,9 @@ /** * HSQLDBからPOSTGISへ * + * @param toPropertiy * @throws Exception */ - public void transport() throws Exception { - transport(Coverage.DB_PORP_GISDB); - } public void transport(String toPropertiy) throws Exception { try (Connection conHsql = DatabaseTool.openDb(Coverage.DB_PORP_LOCALDB); Connection conPost = DatabaseTool.openDb(toPropertiy)) @@ -152,10 +150,21 @@ } } - public void toCsv (File csvFile) + /** + * + * @param csvFile + * @param gisdb + * @throws FileNotFoundException + * @throws ClassNotFoundException + * @throws SQLException + * @throws IOException + * @throws ParserConfigurationException + * @throws SAXException + */ + public void toCsv (File csvFile, String gisdb) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException { - try (Connection conPost = DatabaseTool.openDb(Coverage.DB_PORP_GISDB); + try (Connection conPost = DatabaseTool.openDb(gisdb); BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(csvFile), "UTF-8"))) { String header = items.getCsvHeader(); diff --git a/src/osm/jp/postgis/UnMapped.java b/src/osm/jp/postgis/UnMapped.java index 3f5a796..495c595 100644 --- a/src/osm/jp/postgis/UnMapped.java +++ b/src/osm/jp/postgis/UnMapped.java @@ -15,11 +15,16 @@ public class UnMapped { ToPostgis type; String dbname; + String gisdb; @SuppressWarnings({"UseSpecificCatch", "CallToPrintStackTrace"}) public static void main(String[] args) throws IOException { String dbname = "busstop"; - ByteArrayOutputStream outKmz = (new UnMapped(dbname)).createKmz(35.4341254D,139.408969D, 3.0D); + if (args.length < 1) { + throw new IOException("args[0] <--- 'gisdb'"); + } + + ByteArrayOutputStream outKmz = (new UnMapped(dbname, args[0])).createKmz(35.4341254D,139.408969D, 3.0D); try (ByteArrayInputStream in = new ByteArrayInputStream(outKmz.toByteArray())) { File kmzFile = new File("kmz.kmz"); FileOutputStream o = new FileOutputStream(kmzFile); @@ -27,8 +32,9 @@ } } - public UnMapped(String dbname) { + public UnMapped(String dbname, String gisdb) { this.dbname = dbname; + this.gisdb = gisdb; } @SuppressWarnings({"CallToPrintStackTrace", "UseSpecificCatch"}) @@ -39,7 +45,7 @@ final ByteArrayOutputStream outKml = new ByteArrayOutputStream(); String title = "'"+ dbname +"' - UnMapped OpenSteetMap"; - Thread kml = new Thread(new Kml(write, dbname, title, lat,lon, km)); + Thread kml = new Thread(new Kml(write, dbname, title, lat,lon, km, this.gisdb)); Thread converter = new Thread(new PipeConverter(read, outKml)); kml.start(); diff --git a/test/osm/jp/coverage/ToPostgis.java b/test/osm/jp/coverage/ToPostgis.java index 3ce1f78..4311431 100644 --- a/test/osm/jp/coverage/ToPostgis.java +++ b/test/osm/jp/coverage/ToPostgis.java @@ -31,7 +31,7 @@ try { // DB.tableを作成 conHsql = DatabaseTool.openDb(Coverage.DB_PORP_LOCALDB); - conPost = DatabaseTool.openDb(Coverage.DB_PORP_GISDB); + conPost = DatabaseTool.openDb(argv[0]); transportNew(conHsql, conPost); } diff --git a/test/osm/jp/postgis/UnMappedTest.java b/test/osm/jp/postgis/UnMappedTest.java index da4bf8b..3281ce3 100644 --- a/test/osm/jp/postgis/UnMappedTest.java +++ b/test/osm/jp/postgis/UnMappedTest.java @@ -18,7 +18,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.xml.sax.Attributes; -import osm.jp.api.Coverage; import osm.jp.coverage.busstop.DbBusstop; /** @@ -49,11 +48,6 @@ } @Test - public void testDbPropertiesName() { - assertThat(Coverage.DB_PORP_GISDB, is("gisdb")); - } - - @Test public void getBusstopTable() { String tableName = DbBusstop.TABLE_NAME; assertThat(tableName, is("busstop")); @@ -100,7 +94,7 @@ void check(String dbname) { File kmz = null; try { - (new UnMapped(dbname)).createKmz(35.4341254D,139.408969D, 5.0D); + (new UnMapped(dbname, "osmdb")).createKmz(35.4341254D,139.408969D, 5.0D); } catch(Exception e) { fail(e.toString());