diff --git a/src/osm/jp/coverage/busstop/Coverage.java b/src/osm/jp/coverage/busstop/Coverage.java index 5c9f2c8..bd42fcd 100644 --- a/src/osm/jp/coverage/busstop/Coverage.java +++ b/src/osm/jp/coverage/busstop/Coverage.java @@ -21,7 +21,7 @@ File outputFileCsv = new File(dir, "coverage.busstop.csv"); File outputFileJson = new File(dir, "coverage.busstop.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbBusstop.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/fuel/Coverage.java b/src/osm/jp/coverage/fuel/Coverage.java index 58f9b0f..80418db 100644 --- a/src/osm/jp/coverage/fuel/Coverage.java +++ b/src/osm/jp/coverage/fuel/Coverage.java @@ -20,7 +20,7 @@ File outputFileCsv = new File(dir, "coverage.fuel.csv"); File outputFileJson = new File(dir, "coverage.fuel.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbFuel.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/police/Coverage2.java b/src/osm/jp/coverage/police/Coverage2.java index 3fe8b52..6549121 100644 --- a/src/osm/jp/coverage/police/Coverage2.java +++ b/src/osm/jp/coverage/police/Coverage2.java @@ -25,7 +25,7 @@ File outputFileCsv = new File(dir, "coverage.police2.csv"); File outputFileJson = new File(dir, "coverage.police2.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbPolice.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/police/Coverage4.java b/src/osm/jp/coverage/police/Coverage4.java index f7e01f6..5b489cb 100644 --- a/src/osm/jp/coverage/police/Coverage4.java +++ b/src/osm/jp/coverage/police/Coverage4.java @@ -25,7 +25,7 @@ File outputFileCsv = new File(dir, "coverage.police4.csv"); File outputFileJson = new File(dir, "coverage.police4.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbPolice.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/police/Coverage5.java b/src/osm/jp/coverage/police/Coverage5.java index 08977f2..5b927ae 100644 --- a/src/osm/jp/coverage/police/Coverage5.java +++ b/src/osm/jp/coverage/police/Coverage5.java @@ -25,7 +25,7 @@ File outputFileCsv = new File(dir, "coverage.police5.csv"); File outputFileJson = new File(dir, "coverage.police5.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbPolice.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/police/Coverage6.java b/src/osm/jp/coverage/police/Coverage6.java index c9bef35..bcc5115 100644 --- a/src/osm/jp/coverage/police/Coverage6.java +++ b/src/osm/jp/coverage/police/Coverage6.java @@ -25,7 +25,7 @@ File outputFileCsv = new File(dir, "coverage.police6.csv"); File outputFileJson = new File(dir, "coverage.police6.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbPolice.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/coverage/postoffice/Coverage.java b/src/osm/jp/coverage/postoffice/Coverage.java index 45acd08..2c80498 100644 --- a/src/osm/jp/coverage/postoffice/Coverage.java +++ b/src/osm/jp/coverage/postoffice/Coverage.java @@ -20,7 +20,7 @@ File outputFileCsv = new File(dir, "coverage.postoffice.csv"); File outputFileJson = new File(dir, "coverage.postoffice.json"); - CoverageAll obj = new CoverageAll(); + CoverageAll obj = new CoverageAll(new File(dir, "pbfDate.json")); obj.setTablename(DbPostoffice.TABLE_NAME); obj.setData(new ArrayList<>()); diff --git a/src/osm/jp/postgis/CoverageAll.java b/src/osm/jp/postgis/CoverageAll.java index e485db5..2491854 100644 --- a/src/osm/jp/postgis/CoverageAll.java +++ b/src/osm/jp/postgis/CoverageAll.java @@ -1,9 +1,11 @@ package osm.jp.postgis; +import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; @@ -15,6 +17,9 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import javax.json.Json; +import javax.json.JsonObject; +import javax.json.JsonValue; import jp.co.areaweb.tools.csv.CsvFile; import jp.co.areaweb.tools.csv.CsvRecord; import osm.jp.api.Japan; @@ -52,6 +57,34 @@ public String tableName; public File outputFile; public ArrayList data; + public String dateStr; + + /** + * + * @param pbfDate {"date":"2017-09-22"} + * @throws java.io.FileNotFoundException + */ + public CoverageAll(File pbfDate) throws FileNotFoundException, IOException { + if (pbfDate == null) { + dateStr = LocalDate.now().format(DateTimeFormatter.ISO_DATE); + } + else { + String tmp; + try (FileReader fr = new FileReader(pbfDate); + BufferedReader br = new BufferedReader(fr)) + { + while((tmp=br.readLine()) != null){ + System.out.println(tmp); + JsonValue v = Json.createValue(tmp); + if (v != null) { + JsonObject obj = (JsonObject)v; + dateStr = obj.getString("date"); + return; + } + } + } + } + } public void setTablename(String tableName) { this.tableName = tableName; @@ -190,7 +223,7 @@ int level = 0; hw.write(space(level++) + "{"); hw.newLine(); - hw.write(space(level) + "\"timestamp\": \""+ LocalDate.now().format(DateTimeFormatter.ISO_DATE) +"\","); + hw.write(space(level) + "\"timestamp\": \""+ dateStr +"\","); hw.newLine(); hw.write(space(level) + "\"sourcedata\": \""+ sourcedata +"\","); hw.newLine();