Merge pull request #947 from GIScience/bugfix/#946-convert-parameter-weights

remove String.format for converting parameter

Author: takb

openrouteservice/src/main/java/org/heigit/ors/api/requests/common/GenericHandler.java

@@ -41,6 +41,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class GenericHandler {
@@ -313,25 +314,25 @@ private ProfileParameters applyWeightings(RequestProfileParamsWeightings weighti
         try {
             if (weightings.hasGreenIndex()) {
                 ProfileWeighting pw = new ProfileWeighting("green");
-                float greenFactor = weightings.getGreenIndex();
-                if (greenFactor > 1)
-                    throw new ParameterOutOfRangeException(GenericErrorCodes.INVALID_PARAMETER_VALUE, String.format("%.2f", greenFactor), "green factor", "1.0");
-                pw.addParameter("factor", String.format("%.2f", greenFactor));
+                Float greenFactor = weightings.getGreenIndex();
+                if (greenFactor.floatValue() > 1)
+                    throw new ParameterOutOfRangeException(GenericErrorCodes.INVALID_PARAMETER_VALUE, String.format(Locale.UK, "%.2f", greenFactor), "green factor", "1.0");
+                pw.addParameter("factor", greenFactor);
                 params.add(pw);
             }
 
             if (weightings.hasQuietIndex()) {
                 ProfileWeighting pw = new ProfileWeighting("quiet");
-                float quietFactor = weightings.getQuietIndex();
-                if (quietFactor > 1)
-                    throw new ParameterOutOfRangeException(GenericErrorCodes.INVALID_PARAMETER_VALUE, String.format("%.2f", quietFactor), "quiet factor", "1.0");
-                pw.addParameter("factor", String.format("%.2f", quietFactor));
+                Float quietFactor = weightings.getQuietIndex();
+                if (quietFactor.floatValue() > 1)
+                    throw new ParameterOutOfRangeException(GenericErrorCodes.INVALID_PARAMETER_VALUE, String.format(Locale.UK, "%.2f", quietFactor), "quiet factor", "1.0");
+                pw.addParameter("factor", quietFactor);
                 params.add(pw);
             }
 
             if (weightings.hasSteepnessDifficulty()) {
                 ProfileWeighting pw = new ProfileWeighting("steepness_difficulty");
-                pw.addParameter("level", String.format("%d", weightings.getSteepnessDifficulty()));
+                pw.addParameter("level", weightings.getSteepnessDifficulty());
                 params.add(pw);
             }
         } catch (InternalServerException e) {

openrouteservice/src/main/java/org/heigit/ors/routing/ProfileWeighting.java

@@ -34,14 +34,14 @@ public String getName()
 		return name;
 	}
 
-	public void addParameter(String name, String value) {
-		if (params == null)
-			params = new PMap();
-		params.put(name, value);
+	public void addParameter(String name, Object value) {
+		getParameters().put(name, value);
 	}
 
 	public PMap getParameters()
 	{
+		if (params == null)
+			params = new PMap();
 		return params;
 	}