Remove fastest weighting option

default is now recommended which is fastest for car closes #315
GIScience · Aug 10, 2020 · 230b380 · 230b380
1 parent 100c4ec
commit 230b380
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - leaflet.heightgraph version & style
+- default weigthing option to recommended ([#315](https://github.com/GIScience/openrouteservice-app/issues/315))
+
+### Removed
+- fastest weighting option ([#315](https://github.com/GIScience/openrouteservice-app/issues/315))
 
 ## [v0.5.4] - 2020-07-23
 

diff --git a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js
@@ -48,19 +48,16 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
           ctrl.currentOptions.weight =
             ctrl.currentOptions.weight !== undefined
               ? ctrl.currentOptions.weight
-              : ctrl.optionList.weight.Fastest.value;
+              : ctrl.optionList.weight.Recommended.value;
         ctrl.weightSlider = {
           value: ctrl.currentOptions.weight,
           options: {
             stepsArray: [
               {
-                value: ctrl.optionList.weight.Fastest.value
+                value: ctrl.optionList.weight.Recommended.value
               },
               {
                 value: ctrl.optionList.weight.Shortest.value
-              },
-              {
-                value: ctrl.optionList.weight.Recommended.value
               }
             ],
             showTicks: true,

diff --git a/app/constants/lists.js b/app/constants/lists.js
@@ -219,17 +219,13 @@ angular.module("orsApp").constant("lists", {
   },
   optionList: {
     weight: {
-      Fastest: {
-        value: "Fastest",
+      Recommended: {
+        value: "Recommended",
         shortValue: "0"
       },
       Shortest: {
         value: "Shortest",
         shortValue: "1"
-      },
-      Recommended: {
-        value: "Recommended",
-        shortValue: "2"
       }
     },
     roundTrip: {

diff --git a/app/infrastructure/ors-params-service.js b/app/infrastructure/ors-params-service.js
@@ -91,6 +91,10 @@ angular.module("orsApp.params-service", []).factory("orsParamsService", [
           }
         }
         if (key === "weight") {
+          // switches to Recommended (0) for old Recommended values (2), old Fastest (0) go automatically to Recommended
+          if (value === "2") {
+            value = "0"
+          }
           for (let weightType in lists.optionList.weight) {
             if (lists.optionList.weight[weightType].shortValue === value) {
               settings.profile.options.weight =

diff --git a/app/languages/de-DE.json b/app/languages/de-DE.json
@@ -67,7 +67,7 @@
     "CHOOSELANG": "Wählen Sie eine Sprache",
     "LANGROUTING": "Sprache der Routing-Anweisungen",
     "Fastest": "Schnellste",
-    "Recommended": "Bevorzugt",
+    "Recommended": "Empfohlen",
     "Shortest": "Kürzeste",
     "BICYCLENORMAL": "Normal",
     "BICYCLESAFEST": "Sichere Route",