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-09 14:48:09 +02:00
parent 79aa07ae84
commit 30f548096b
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,9 +15,10 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
@ -34,7 +35,6 @@ public class DatabasePseudoTagProvider {
FrozenLongMap<Map<String, String>> dbData; FrozenLongMap<Map<String, String>> dbData;
public static void main(String[] args) { public static void main(String[] args) {
String jdbcurl = args[0]; String jdbcurl = args[0];
String filename = args[1]; String filename = args[1];
@ -108,14 +108,14 @@ public class DatabasePseudoTagProvider {
if (line == null) { if (line == null) {
break; break;
} }
StringTokenizer tk = new StringTokenizer(line, ";"); List<String> tokens = tokenize(line);
long osm_id = Long.parseLong(tk.nextToken()); long osm_id = Long.parseLong(tokens.get(0));
Map<String, String> row = new HashMap<>(5); Map<String, String> row = new HashMap<>(5);
addTag(row, tk, "estimated_noise_class"); addTag(row, tokens.get(1), "estimated_noise_class");
addTag(row, tk, "estimated_river_class"); addTag(row, tokens.get(2), "estimated_river_class");
addTag(row, tk, "estimated_forest_class"); addTag(row, tokens.get(3), "estimated_forest_class");
addTag(row, tk, "estimated_town_class"); addTag(row, tokens.get(4), "estimated_town_class");
addTag(row, tk, "estimated_traffic_class"); addTag(row, tokens.get(5), "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);
@ -140,13 +140,28 @@ public class DatabasePseudoTagProvider {
} }
} }
private static void addTag(Map<String, String> row, StringTokenizer tk, String name) { // use own tokenizer as String.split, StringTokenizer
if (tk.hasMoreTokens()) { // etc. have issues with empty elements
String v = tk.nextToken(); private List<String> tokenize(String s) {
if (v != null && !v.isEmpty()) { List<String> l = new ArrayList<>();
row.put(name, v); StringBuilder sb = new StringBuilder();
for(int i=0; i<s.length(); i++) {
char c = s.charAt(i);
if (c == ';') {
l.add(sb.toString());
sb.setLength(0);
} else {
sb.append(c);
} }
} }
l.add(sb.toString());
return l;
}
private static void addTag(Map<String, String> row, String s, String name) {
if (!s.isEmpty()) {
row.put(name, s);
}
} }
public void addTags(long osm_id, Map<String, String> map) { public void addTags(long osm_id, Map<String, String> map) {
@ -179,4 +194,6 @@ public class DatabasePseudoTagProvider {
pseudoTagsFound.put(key, cnt + 1L); pseudoTagsFound.put(key, cnt + 1L);
} }
} }
} }