From 90cc045404ddbb7b296025e1fba815ed6e57a64c Mon Sep 17 00:00:00 2001 From: afischerdev Date: Thu, 5 Oct 2023 12:48:06 +0200 Subject: [PATCH] moved string control to app worker --- .../src/main/java/btools/router/RoutingParamCollector.java | 5 +---- .../src/main/java/btools/routingapp/BRouterWorker.java | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java index fde32c6..99f5b3b 100644 --- a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java +++ b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java @@ -133,7 +133,7 @@ public class RoutingParamCollector { if (params.containsKey("profile")) { rctx.localFunction = params.get("profile"); } - if (params.containsKey("nogoLats")) { + if (params.containsKey("nogoLats") && params.get("nogoLats").length() > 0) { List nogoList = readNogos(params.get("nogoLons"), params.get("nogoLats"), params.get("nogoRadi")); if (nogoList != null) { RoutingContext.prepareNogoPoints(nogoList); @@ -324,9 +324,6 @@ public class RoutingParamCollector { public List readNogos(String nogoLons, String nogoLats, String nogoRadi) { if (nogoLons == null || nogoLats == null || nogoRadi == null) return null; List nogoList = new ArrayList<>(); - nogoLons = nogoLons.replace("[", "").replace("]", ""); - nogoLats = nogoLats.replace("[", "").replace("]", ""); - nogoRadi = nogoRadi.replace("[", "").replace("]", ""); String[] lons = nogoLons.split(","); String[] lats = nogoLats.split(","); diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java index 01423cc..5823db5 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java @@ -86,7 +86,9 @@ public class BRouterWorker { for (String key : params.keySet()) { Object value = params.get(key); if (value instanceof double[]) { - theParams.put(key, Arrays.toString(params.getDoubleArray(key))); + String s = Arrays.toString(params.getDoubleArray(key)); + s = s.replace("[", "").replace("]", ""); + theParams.put(key, s); } else { theParams.put(key, value.toString()); }