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

update import of way point names

Browse source
This commit is contained in:
afischerdev 2023-04-22 12:46:35 +02:00
parent 8190aaa92d
commit d43edb311d
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
View file

@ -101,6 +101,19 @@ public class BRouterWorker {
if (waypoints == null) return "no pts "; if (waypoints == null) return "no pts ";
if (params.containsKey("straight")) {
try {
String straight = params.getString("straight");
String[] sa = straight.split(",");
for (int i = 0; i < sa.length; i++) {
int v = Integer.valueOf(sa[i]);
if (waypoints.size() > v) waypoints.get(v).direct = true;
}
} catch (NumberFormatException e) {
}
}
if (params.containsKey("extraParams")) { // add user params if (params.containsKey("extraParams")) { // add user params
String extraParams = params.getString("extraParams"); String extraParams = params.getString("extraParams");
if (rc.keyValues == null) rc.keyValues = new HashMap<String, String>(); if (rc.keyValues == null) rc.keyValues = new HashMap<String, String>();
@ -112,23 +125,11 @@ public class BRouterWorker {
String key = tk2.nextToken(); String key = tk2.nextToken();
if (tk2.hasMoreTokens()) { if (tk2.hasMoreTokens()) {
String value = tk2.nextToken(); String value = tk2.nextToken();
if (key.equals("straight")) {
try {
String[] sa = value.split(",");
for (int i = 0; i < sa.length; i++) {
int v = Integer.valueOf(sa[i]);
if (waypoints.size() > v) waypoints.get(v).direct = true;
}
} catch (Exception e) {
System.err.println("error " + e.getStackTrace()[0].getLineNumber() + " " + e.getStackTrace()[0] + "\n" + e);
}
} else {
rc.keyValues.put(key, value); rc.keyValues.put(key, value);
} }
} }
} }
} }
}
try { try {
@ -217,8 +218,8 @@ public class BRouterWorker {
n.ilat = (int) ((lats[i] + 90.) * 1000000. + 0.5); n.ilat = (int) ((lats[i] + 90.) * 1000000. + 0.5);
wplist.add(n); wplist.add(n);
} }
wplist.get(0).name = "from"; if (wplist.get(0).name.startsWith("via")) wplist.get(0).name = "from";
wplist.get(wplist.size() - 1).name = "to"; if (wplist.get(wplist.size() - 1).name.startsWith("via")) wplist.get(wplist.size() - 1).name = "to";
return wplist; return wplist;
} }
@ -247,8 +248,8 @@ public class BRouterWorker {
} }
} }
wplist.get(0).name = "from"; if (wplist.get(0).name.startsWith("via")) wplist.get(0).name = "from";
wplist.get(wplist.size() - 1).name = "to"; if (wplist.get(wplist.size() - 1).name.startsWith("via")) wplist.get(wplist.size() - 1).name = "to";
return wplist; return wplist;
} }

4
brouter-server/src/main/java/btools/server/request/ServerHandler.java
View file

@ -109,8 +109,8 @@ public class ServerHandler extends RequestHandler {
} }
} }
wplist.get(0).name = "from"; if (wplist.get(0).name.startsWith("via")) wplist.get(0).name = "from";
wplist.get(wplist.size() - 1).name = "to"; if (wplist.get(wplist.size() - 1).name.startsWith("via")) wplist.get(wplist.size() - 1).name = "to";
return wplist; return wplist;
} }