diff --git a/src/ImportGML_FUEL_update.sh b/src/ImportGML_FUEL_update.sh index 86647cd..4d46ce9 100644 --- a/src/ImportGML_FUEL_update.sh +++ b/src/ImportGML_FUEL_update.sh @@ -4,6 +4,7 @@ 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 hsqldb_2.2.9.jar org.hsqldb.util.DatabaseManager # db_driver=org.hsqldb.jdbcDriver diff --git a/src/fuel.activity.violet.html b/src/fuel.activity.violet.html index 1fcc293..afcb3bb 100644 --- a/src/fuel.activity.violet.html +++ b/src/fuel.activity.violet.html @@ -313,7 +313,7 @@ - + 1 @@ -384,90 +384,83 @@ 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 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 1 - - - - - - - - - - - + - + 1 @@ -477,12 +470,12 @@ - - + + - + - + 1 @@ -492,12 +485,12 @@ - - - - + + + + - + 1 @@ -506,31 +499,28 @@ - - - + + + - + - + 1 - - - - - - + + + + + + + + + + + + - - 1 - - - - - - - - + 1 @@ -539,13 +529,28 @@ + + + + + + + + 1 + + + + + + + - - + + - + - + 1 @@ -554,46 +559,46 @@ - - - - - + + + + + - + + 1 + + + + + + + + + + + + + + 1 - - - - - - - - 1 - - - - - - - - - - - + + + + - + 1 - - - - + + + + - + 1 @@ -603,12 +608,12 @@ - - - - + + + + - + 1 @@ -617,13 +622,22 @@ - - - - - + + + + + - + + 1 + + + + + + + + 1 @@ -632,43 +646,22 @@ - - - - - - - - 1 - - - - - - - - - - - - + + + + + - + 1 - - - - - - - + - - - - + + + + - + 1 @@ -678,29 +671,12 @@ - - - - - - - - - 1 - - - - - - - - - - - - - - + + + + + + 1 @@ -709,37 +685,28 @@ - - - - - - - - 1 - - - - - - - - + + + + + + + 1 - + - - + + - - - - + + + + 1 @@ -748,15 +715,45 @@ - - - - - - - + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + - + 1 @@ -765,13 +762,52 @@ - - + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + 1 + + + + + + + + + - - - - + + + + 1 @@ -780,11 +816,88 @@ + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + 1 + + + + + + + ]]>

- embedded diagram image +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 +Tni3EQAAAABJRU5ErkJg" /> \ No newline at end of file diff --git a/src/osm/jp/api/HttpPOST.java b/src/osm/jp/api/HttpPOST.java index 8ca75b8..da4f204 100644 --- a/src/osm/jp/api/HttpPOST.java +++ b/src/osm/jp/api/HttpPOST.java @@ -12,15 +12,15 @@ * @author 68user http://X68000.q-e-d.net/~68user/ */ public class HttpPOST { - //public static String host = "http://api06.dev.openstreetmap.org"; - //public static String host = "http://api.openstreetmap.org"; - public static String host = "http://overpass-api.de"; - - public static void main(String[] args) throws MalformedURLException, ProtocolException, IOException { - double minlat = 35.13d; - double maxlat = 35.66d; + //public static String host = "http://api06.dev.openstreetmap.org"; + //public static String host = "http://api.openstreetmap.org"; + public static String host = "http://overpass-api.de"; + + public static void main(String[] args) throws MalformedURLException, ProtocolException, IOException { + double minlat = 35.13d; + double maxlat = 35.66d; double minlon = 138.99d; - double maxlon = 139.79d; + double maxlon = 139.79d; getCapabilities(new File("output.xml"), "highway", "bus_stop", minlat, maxlat, minlon, maxlon); getCapabilities(new File("output.xml"), "highway", "disused:bus_stop", minlat, maxlat, minlon, maxlon); getCapabilities(new File("output.xml"), "amenity", "bus_station", minlat, maxlat, minlon, maxlon); @@ -28,18 +28,18 @@ getCapabilities(new File("output.xml"), "public_transport", "stop_position", minlat, maxlat, minlon, maxlon); } - public static void getCapabilities(File oFile, String key, String value, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException { - if (oFile.isFile()) { - oFile.delete(); - } + public static void getCapabilities(File oFile, String key, String value, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException { + if (oFile.isFile()) { + oFile.delete(); + } - BufferedWriter hw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(oFile), "UTF-8")); - getCapabilities(hw, key, value, minLat, maxLat, minLon, maxLon); + BufferedWriter hw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(oFile), "UTF-8")); + getCapabilities(hw, key, value, minLat, maxLat, minLon, maxLon); hw.close(); - } + } - public static void getCapabilities(BufferedWriter hw, String key, String value, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException { - System.out.println(host + "/api/interpreter"); + public static void getCapabilities(BufferedWriter hw, String key, String value, double minLat, double maxLat, double minLon, double maxLon) throws MalformedURLException, ProtocolException, IOException { + System.out.println(host + "/api/interpreter"); URL url = new URL(host + "/api/interpreter"); int responsecode = 0; @@ -64,17 +64,17 @@ outputWriter(pw, " "); outputWriter(pw, ""); pw.close(); // closeで送信完了 - + try { - TimeUnit.SECONDS.sleep(1); - } catch (InterruptedException e) {} + TimeUnit.SECONDS.sleep(1); + } catch (InterruptedException e) {} responsecode = urlconn.getResponseCode(); System.out.println("レスポンスコード[" + responsecode + "] " + "レスポンスメッセージ[" + urlconn.getResponseMessage() + "]"); Map> headers = urlconn.getHeaderFields(); for (Map.Entry> bar : headers.entrySet()) { - System.out.print("\t" + bar.getKey() +"\t: "); // キーを取得 + System.out.print("\t" + bar.getKey() +"\t: "); // キーを取得 List vals = bar.getValue(); // 値を取得 for(String str : vals) { System.out.print("["+ str +"],"); @@ -86,34 +86,34 @@ // レスポンスコード[500] レスポンスメッセージ[Internal server error] // レスポンスコード[504] レスポンスメッセージ[Gateway Timeout] try { - TimeUnit.MINUTES.sleep(5); - } catch (InterruptedException e) {} + TimeUnit.MINUTES.sleep(5); + } catch (InterruptedException e) {} } else { System.out.println("\n---- ボディ ----"); - + BufferedReader reader = new BufferedReader(new InputStreamReader(urlconn.getInputStream(), "UTF-8")); while (true) { String line = reader.readLine(); if (line == null) { break; } - hw.write(line); - hw.newLine(); + hw.write(line); + hw.newLine(); } reader.close(); } urlconn.disconnect(); try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e) {} + TimeUnit.SECONDS.sleep(5); + } catch (InterruptedException e) {} } while ((responsecode == 429) || (responsecode == 504)); - } + } - public static void outputWriter(PrintWriter pw, String text) { - System.out.println("\t" + text); - pw.print(text); - } + public static void outputWriter(PrintWriter pw, String text) { + System.out.println("\t" + text); + pw.print(text); + } } diff --git a/src/osm/jp/coverage/fuel/ToCartoCSV.java b/src/osm/jp/coverage/fuel/ToCartoCSV.java new file mode 100644 index 0000000..e474855 --- /dev/null +++ b/src/osm/jp/coverage/fuel/ToCartoCSV.java @@ -0,0 +1,60 @@ +package osm.jp.coverage.fuel; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import jp.co.areaweb.tools.database.DatabaseTool; + +/** + * PostGISデータをCarto用のCSVファイルに出力する。 + * 出力ファイル名： "fuel.csv" + * テーブル名： t_fuel + * インデックス： ix_fuel_geom + * gid PostGISの識別ID + * fixed OSMのバス停が周辺に存在するかどうか、存在しない場合は0,存在する場合は1。ブランド有りは５０。 + * geom PostGIS形式の位置情報(4612:) + * @author yuu + * + */ +public class ToCartoCSV { + public static final String CSV_FILE_NAME = "t_fuel"; + + public static void main (String[] argv) throws Exception { + outputDb(DatabaseTool.openDb("postgis")); + } + + public static void outputDb(Connection con) throws Exception { + File csvFile = new File(CSV_FILE_NAME+".csv"); + try (BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(csvFile), "UTF-8"))) { + System.out.println("idref,score,lon,lat"); + ow.write("idref,score,lon,lat"); + ow.newLine(); + + PreparedStatement ps8 = con.prepareStatement("SELECT idref,ST_X(ST_TRANSFORM(geom,4612)) as lon, ST_Y(ST_TRANSFORM(geom,4612)) as lat,fixed FROM t_fuel"); + try (ResultSet rset8 = ps8.executeQuery()) { + while (rset8.next()) { + String idref = rset8.getString("idref"); + Double lat = rset8.getDouble("lat"); + Double lon = rset8.getDouble("lon"); + int score = rset8.getInt("fixed"); + + String osm_node; + osm_node = "\""+ idref +"\",\""+ score +"\",\""+ Double.toString(lon) +"\",\""+ Double.toString(lat) +"\""; + System.out.println(osm_node); + ow.write(osm_node); + ow.newLine(); + } + } + ow.flush(); + } + } +}