Merge pull request #280 from GIScience/hotfix-v0.3.9

Hotfix v0.3.9

CHANGELOG.md

@@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Deprecated
 ### Removed-->
 
+## [v0.3.9] - 2019-03-02
+
+### Changed
+- fuel options initialization
+    - hide fuel options if it is not possible to retrieve car brands
+    - retry fuel option initialization on option change (after changing endpoint)
+
+### Fixed
+- missing fuel endpoint in Gruntfile.default.js ([#279](https://github.com/GIScience/openrouteservice-app/issues/279))
 
 ## [v0.3.8] - 2019-02-28
 

Gruntfile.default.js

@@ -287,7 +287,8 @@ module.exports = function(grunt) {
                         shortenlink: "https://api-ssl.bitly.com/v3/shorten",
                         mapsurfer:
                             "https://api.openrouteservice.org/mapsurfer/{z}/{x}/{y}.png",
-                        landmarks: 'https://landmarks-api.openrouteservice.org/'
+                        landmarks: 'https://landmarks-api.openrouteservice.org/',
+                        fuel: "https://api.openrouteservice.org/fuel"
                     }
                 }
             },
@@ -308,7 +309,8 @@ module.exports = function(grunt) {
                         shortenlink: "https://api-ssl.bitly.com/v3/shorten",
                         mapsurfer:
                             "https://api.openrouteservice.org/mapsurfer/{z}/{x}/{y}.png",
-                        landmarks: 'https://landmarks-api.openrouteservice.org/'
+                        landmarks: 'https://landmarks-api.openrouteservice.org/',
+                        fuel: "https://api.openrouteservice.org/fuel"
                     }
                 }
             }

app/components/ors-navigation/ors-nav.js

@@ -13,7 +13,7 @@ angular
         if ($location.path() == "/") {
           ctrl.activeMenu = "/directions";
         } else ctrl.activeMenu = $location.path();
-        ctrl.version = "0.3.8";
+        ctrl.version = "0.3.9";
       }
     ],
     $routeConfig: [

app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.html

@@ -178,7 +178,7 @@
         </ul>
     </div>
 </div>
-<div class="options-box" ng-if="$ctrl.routing" ng-show="$ctrl.activeSubgroup == 'Car'">
+<div class="options-box" ng-if="$ctrl.routing && $ctrl.carBrands" ng-show="$ctrl.activeSubgroup == 'Car'">
     <div class="pointer" ng-click="fuelSettings = !fuelSettings">
         <i ng-class="$ctrl.getClass(fuelSettings)">
         </i>

app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js

@@ -39,15 +39,9 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
         /** This is a reference of the settings object, if we change here, it is updated in settings */
         ctrl.currentOptions = orsSettingsFactory.getActiveOptions();
 
-        let brandsRequest = orsFuelService.getBrands();
-        brandsRequest.promise.then(
-          brandsResponse => {
-            ctrl.carBrands = brandsResponse.brands;
-          },
-          brandsError => {
-            console.log(brandsError);
-          }
-        );
+        if (!ctrl.carBrands) {
+          ctrl.initOFS();
+        }
 
         // preference/weight is only considered for routing panel
         if (ctrl.routing)
@@ -481,6 +475,9 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
         ctrl.routing = route == "directions" ? true : false;
       });
       ctrl.changeOptions = () => {
+        if (!ctrl.carBrands) {
+          ctrl.initOFS();
+        }
         // call setoptions
         if (ctrl.currentOptions.difficulty)
           ctrl.difficultySliders.Fitness.options.disabled =
@@ -581,6 +578,21 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
       };
 
       // OFS options
+      ctrl.initOFS = () => {
+        try {
+          let brandsRequest = orsFuelService.getBrands();
+          brandsRequest.promise.then(
+            brandsResponse => {
+              ctrl.carBrands = brandsResponse.brands;
+            },
+            brandsError => {
+              console.log(brandsError);
+            }
+          );
+        } catch (e) {
+          ctrl.carBrands = null;
+        }
+      };
       ctrl.carCategories = carCategories;
       ctrl.categoryCheck = true;
       ctrl.carModels = ctrl.carYears = ctrl.carTypes = [];

app/infrastructure/ors-settings-service.js

@@ -240,7 +240,8 @@ angular.module("orsApp.settings-service", []).factory("orsSettingsFactory", [
               orsSettingsFactory.focusIdx,
               settings.profile.options.landmarks
             );
-            let ofsSettings = profile === "Car" ? settings.profile.options.ofs : undefined;
+            let ofsSettings =
+              profile === "Car" ? settings.profile.options.ofs : undefined;
             if (ofsSettings) {
               orsFuelService.getConsumption(ofsSettings);
             }

app/js/app.js

@@ -10,7 +10,7 @@
  *|------------------------------------------------------------------------------------*/
 /**
  * @author: Amandus Butzer, [email protected], Timothy Ellersiek, [email protected]
- * @version: 0.3.8
+ * @version: 0.3.9
  */
 (function(searchString, position) {
   fetchData().then(bootstrapApplication);

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "openrouteservice.org",
   "description": "angular version of openrouteservice.org",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "homepage": "http://www.uni-heidelberg.de",
   "license": "MIT",
   "private": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maps.openrouteservice.org",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/GIScience/openrouteservice-app.git"