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

rework nogo and vetos

Browse source
This commit is contained in:
afischerdev 2023-03-19 13:59:38 +01:00
parent 0b3e6b19b0
commit 63912941f0
2 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java
View file

@ -20,6 +20,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
import btools.router.OsmNodeNamed; import btools.router.OsmNodeNamed;
@ -71,12 +72,15 @@ public class BRouterService extends Service {
worker.profileName = profile; worker.profileName = profile;
worker.profilePath = baseDir + "/brouter/profiles2/" + profile + ".brf"; worker.profilePath = baseDir + "/brouter/profiles2/" + profile + ".brf";
worker.rawTrackPath = baseDir + "/brouter/modes/" + profile + "_rawtrack.dat"; worker.rawTrackPath = baseDir + "/brouter/modes/" + profile + "_rawtrack.dat";
if (!new File(worker.profilePath).exists()) if (!new File(worker.profilePath).exists()) {
errMsg = "Profile " + profile + " does not exists"; errMsg = "Profile " + profile + " does not exists";
try { } else {
readNogos(worker, baseDir); try {
} catch (Exception e) { readNogos(worker, baseDir);
errMsg = e.getLocalizedMessage(); errMsg = getConfigFromModeForProfile(worker, baseDir, profile);
} catch (Exception e) {
errMsg = e.getLocalizedMessage();
}
} }
} else { } else {
errMsg = getConfigFromMode(worker, baseDir, params.getString("v"), params.getString("fast")); errMsg = getConfigFromMode(worker, baseDir, params.getString("v"), params.getString("fast"));
@ -111,9 +115,20 @@ public class BRouterService extends Service {
} }
} }
private String getConfigFromModeForProfile(BRouterWorker worker, String baseDir, String profile) {
return getConfigFromMode(worker, baseDir, profile, null);
}
private String getConfigFromMode(BRouterWorker worker, String baseDir, String mode, String fast) { private String getConfigFromMode(BRouterWorker worker, String baseDir, String mode, String fast) {
boolean isFast = "1".equals(fast) || "true".equals(fast) || "yes".equals(fast); boolean isFast = false;
String mode_key = mode + "_" + (isFast ? "fast" : "short"); String profile = null;
String mode_key = null;
if (fast != null) {
isFast = "1".equals(fast) || "true".equals(fast) || "yes".equals(fast);
mode_key = mode + "_" + (isFast ? "fast" : "short");
} else {
profile = mode;
}
BufferedReader br = null; BufferedReader br = null;
try { try {
@ -124,7 +139,9 @@ public class BRouterService extends Service {
if (line == null) if (line == null)
break; break;
ServiceModeConfig smc = new ServiceModeConfig(line); ServiceModeConfig smc = new ServiceModeConfig(line);
if (!smc.mode.equals(mode_key)) if (profile!=null && !smc.profile.equals(profile))
continue;
else if (profile==null && !smc.mode.equals(mode_key))
continue; continue;
worker.profileName = smc.profile; worker.profileName = smc.profile;
worker.profilePath = baseDir + "/brouter/profiles2/" + smc.profile + ".brf"; worker.profilePath = baseDir + "/brouter/profiles2/" + smc.profile + ".brf";
@ -132,6 +149,22 @@ public class BRouterService extends Service {
readNogos(worker, baseDir); readNogos(worker, baseDir);
// veto nogos by profiles veto list
List<OsmNodeNamed> nogoList = new ArrayList<>(worker.nogoList);
worker.nogoList.clear();
for (OsmNodeNamed nogo : nogoList) {
if (!smc.nogoVetos.contains(nogo.ilon + "," + nogo.ilat)) {
worker.nogoList.add(nogo);
}
}
List<OsmNodeNamed> nogoPolygonsList = new ArrayList<>(worker.nogoPolygonsList);
worker.nogoPolygonsList.clear();
for (OsmNodeNamed nogo : nogoPolygonsList) {
if (!smc.nogoVetos.contains(nogo.ilon + "," + nogo.ilat)) {
worker.nogoPolygonsList.add(nogo);
}
}
return null; return null;
} }
} catch (Exception e) { } catch (Exception e) {
@ -143,7 +176,7 @@ public class BRouterService extends Service {
} catch (Exception ee) { } catch (Exception ee) {
} }
} }
return "no brouter service config found for mode " + mode_key; return "no brouter service config found for mode " + (mode_key!=null?mode_key:profile);
} }
private String getConfigForRemoteProfile(BRouterWorker worker, String baseDir, String remoteProfile) { private String getConfigForRemoteProfile(BRouterWorker worker, String baseDir, String remoteProfile) {

4
brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java
View file

@ -67,9 +67,7 @@ public class CoordinateReader {
* (with hardcoded name for now) * (with hardcoded name for now)
*/ */
public void readPointmap() throws IOException { public void readPointmap() throws IOException {
if (!_readPointmap(internalDir + "/favourites_bak.gpx")) { _readPointmap(internalDir + "/favourites.gpx");
_readPointmap(internalDir + "/favourites.gpx");
}
_readNogoLines(basedir + tracksdir); _readNogoLines(basedir + tracksdir);
} }