Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

changed db-tag-processing to csv-file

Browse source
This commit is contained in:
Arndt Brenschede 2023-07-02 10:19:23 +02:00
parent 21b0431a1a
commit c109caac2a
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
brouter-map-creator/src/main/java/btools/mapcreator/DatabasePseudoTagProvider.java
View file

@ -54,18 +54,18 @@ public class DatabasePseudoTagProvider {
psAllTags.setFetchSize(100); psAllTags.setFetchSize(100);
// process the results // process the results
ResultSet rsBrouter = psAllTags.executeQuery(); ResultSet rs = psAllTags.executeQuery();
long dbRows = 0L; long dbRows = 0L;
while (rsBrouter.next()) { while (rs.next()) {
StringBuilder line = new StringBuilder(); StringBuilder line = new StringBuilder();
line.append(rsBrouter.getLong("losmid")) line.append(rs.getLong("losmid"));
.append(';').append(rsBrouter.getString("noise_class")) appendDBTag(line, rs, "noise_class");
.append(';').append(rsBrouter.getString("river_class")) appendDBTag(line, rs, "river_class");
.append(';').append(rsBrouter.getString("forest_class")) appendDBTag(line, rs, "forest_class");
.append(';').append(rsBrouter.getString("town_class")) appendDBTag(line, rs, "town_class");
.append(';').append(rsBrouter.getString("traffic_class")) appendDBTag(line, rs, "traffic_class");
.append('\n'); line.append('\n');
bw.write(line.toString()); bw.write(line.toString());
dbRows++; dbRows++;
if (dbRows % 1000000L == 0L) { if (dbRows % 1000000L == 0L) {
@ -82,6 +82,14 @@ public class DatabasePseudoTagProvider {
} }
} }
private static void appendDBTag(StringBuilder sb, ResultSet rs, String name) throws SQLException {
sb.append(';');
String v = rs.getString(name);
if (v != null) {
sb.append(v);
}
}
public DatabasePseudoTagProvider(String filename) { public DatabasePseudoTagProvider(String filename) {
try (BufferedReader br = new BufferedReader(new InputStreamReader( try (BufferedReader br = new BufferedReader(new InputStreamReader(
@ -103,11 +111,11 @@ public class DatabasePseudoTagProvider {
StringTokenizer tk = new StringTokenizer(line, ";"); StringTokenizer tk = new StringTokenizer(line, ";");
long osm_id = Long.parseLong(tk.nextToken()); long osm_id = Long.parseLong(tk.nextToken());
Map<String, String> row = new HashMap<>(5); Map<String, String> row = new HashMap<>(5);
row.put("estimated_noise_class", tk.nextToken()); addTag(row, tk, "estimated_noise_class");
row.put("estimated_river_class", tk.nextToken()); addTag(row, tk, "estimated_river_class");
row.put("estimated_forest_class", tk.nextToken()); addTag(row, tk, "estimated_forest_class");
row.put("estimated_town_class", tk.nextToken()); addTag(row, tk, "estimated_town_class");
row.put("estimated_traffic_class", tk.nextToken()); addTag(row, tk, "estimated_traffic_class");
// apply the instance-unifier for the row-map // apply the instance-unifier for the row-map
Map<String, String> knownRow = mapUnifier.get(row); Map<String, String> knownRow = mapUnifier.get(row);
@ -132,6 +140,14 @@ public class DatabasePseudoTagProvider {
} }
} }
private static void addTag(Map<String, String> row, StringTokenizer tk, String name) {
if (tk.hasMoreTokens()) {
String v = tk.nextToken();
if (v != null && !v.isEmpty()) {
row.put(name, v);
}
}
}
public void addTags(long osm_id, Map<String, String> map) { public void addTags(long osm_id, Map<String, String> map) {
@ -153,7 +169,7 @@ public class DatabasePseudoTagProvider {
return; return;
} }
cntWayModified = cntWayModified + 1; cntWayModified++;
for (String key : dbTags.keySet()) { for (String key : dbTags.keySet()) {
map.put(key, dbTags.get(key)); map.put(key, dbTags.get(key));
Long cnt = pseudoTagsFound.get(key); Long cnt = pseudoTagsFound.get(key);