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

pseudo-tags from DB, here: preload and use in-memory matching

Browse source
This commit is contained in:
Arndt Brenschede 2023-05-28 19:53:35 +02:00
parent bfe1f4a6a4
commit f7bce89b7c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,10 @@ public class DatabasePseudoTagProvider {
public void addTags(long osm_id, Map<String, String> map) { public void addTags(long osm_id, Map<String, String> map) {
if (map == null || !map.containsKey("highway")) {
return;
}
cntOsmWays++; cntOsmWays++;
if ((cntOsmWays % 1000000L) == 0) { if ((cntOsmWays % 1000000L) == 0) {
String out = "Osm Ways processed=" + cntOsmWays + " way modifs=" + cntWayModified; String out = "Osm Ways processed=" + cntOsmWays + " way modifs=" + cntWayModified;

12
brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
View file

@ -171,6 +171,12 @@ public class OsmCutter extends MapCreatorBase {
// encode tags // encode tags
if (w.getTagsOrNull() == null) return; if (w.getTagsOrNull() == null) return;
if (dbPseudoTagProvider != null) {
dbPseudoTagProvider.addTags(w.wid, w.getTagsOrNull());
}
generatePseudoTags(w.getTagsOrNull());
int[] lookupData = _expctxWay.createNewLookupData(); int[] lookupData = _expctxWay.createNewLookupData();
for (String key : w.getTagsOrNull().keySet()) { for (String key : w.getTagsOrNull().keySet()) {
String value = w.getTag(key); String value = w.getTag(key);
@ -187,12 +193,6 @@ public class OsmCutter extends MapCreatorBase {
ok |= _expctxWay.getCostfactor() < 10000.; ok |= _expctxWay.getCostfactor() < 10000.;
if (!ok) return; if (!ok) return;
if (dbPseudoTagProvider != null) {
dbPseudoTagProvider.addTags(w.wid, w.getTagsOrNull());
}
generatePseudoTags(w.getTagsOrNull());
if (wayDos != null) { if (wayDos != null) {
w.writeTo(wayDos); w.writeTo(wayDos);
} }