From 9b42d951c3647affefaaeaccc0d289c9d953b622 Mon Sep 17 00:00:00 2001 From: Julian Zobel Date: Tue, 24 Nov 2020 17:34:45 +0100 Subject: [PATCH] JSONAttractionGenetor: NO Longer considers maximum radius --- .../attraction/JSONAttractionGenerator.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java index af8a67f4..ec89f33b 100644 --- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java +++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java @@ -137,15 +137,8 @@ public class JSONAttractionGenerator extends AbstractAttractionProvider { } // AP radius - if(allPOI.getJSONObject(i).getJSONObject("tags").has("radius")) { - double radius = allPOI.getJSONObject(i).getJSONObject("tags").getDouble("radius"); - - if(maximumRadius == -1) { - ap.setRadius(radius); - } - else { - ap.setRadius(Math.min(maximumRadius, radius)); - } + if(allPOI.getJSONObject(i).getJSONObject("tags").has("radius")) { + ap.setRadius(allPOI.getJSONObject(i).getJSONObject("tags").getDouble("radius")); } if(allPOI.getJSONObject(i).getJSONObject("tags").has("pauseTimeMin") && allPOI.getJSONObject(i).getJSONObject("tags").has("pauseTimeMax")) { -- GitLab