Merge pull request #265 from GIScience/release-v0.3.6

Release v0.3.6
GIScience · Nov 13, 2018 · 6121e53 · 6121e53
2 parents dd2a8a2 + 3ff054b
commit 6121e53
Show file tree

Hide file tree

Showing 27 changed files with 2,521 additions and 1,846 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v0.3.6] - 2018-11-13
+
+### Changed
+- Forum link to ask.openrouteservice.org (([#262](https://github.com/GIScience/openrouteservice-app/issues/262)))
+- GPX export file generation supports both old and new method (([#256](https://github.com/GIScience/openrouteservice-app/issues/256)))
+
+### Fixed
+- incorrect Wheelchair parameters ([#264](https://github.com/GIScience/openrouteservice-app/issues/264))
+- unchecking hgv settings leaves setting=false remnant in request' ([#263](https://github.com/GIScience/openrouteservice-app/issues/263))
+- broken Isochrone toggle ([#260](https://github.com/GIScience/openrouteservice-app/issues/260))
+
 ## [v0.3.5] - 2018-09-11
 
 ### Changed

diff --git a/Gruntfile.default.js b/Gruntfile.default.js
@@ -295,13 +295,13 @@ module.exports = function(grunt) {
                 constants: {
                     ENV: {
                         name: "production",
-                        geocode: "https://api.openrouteservice.org/geocoding",
+                        geocode: "https://api.openrouteservice.org/geocode",
                         directions:
                             "https://api.openrouteservice.org/directions",
                         isochrones:
                             "https://api.openrouteservice.org/isochrones",
                         matrix: "https://api.openrouteservice.org/matrix",
-                        pois: "https://api.openrouteservice.org/places",
+                        pois: "https://api.openrouteservice.org/pois",
                         shortenlink: "https://api-ssl.bitly.com/v3/shorten",
                         mapsurfer:
                             "https://api.openrouteservice.org/mapsurfer/{z}/{x}/{y}.png"

diff --git a/app/.jshintrc b/app/.jshintrc
@@ -1,3 +1,4 @@
 {
-    "esnext": true
+  "esversion": 6,
+  "asi": true
 }
diff --git a/app/components/ors-header/ors-header.html b/app/components/ors-header/ors-header.html
@@ -33,10 +33,10 @@
                     <span ng-bind-html="'Openrouteservice for disasters'">
                     </span>
                 </a>
-                <a class="item" href="https://groups.google.com/forum/#!forum/openrouteservice" target="_blank">
-                    <i class="fa fa-fw fa-google">
+                <a class="item" href="https://ask.openrouteservice.org" target="_blank">
+                    <i class="fa fa-fw fa-question-circle">
                     </i>
-                    <span ng-bind-html="'Google Groups'">
+                    <span ng-bind-html="'Ask Openrouteservice'">
                     </span>
                 </a>
             </div>

diff --git a/app/components/ors-header/ors-header.js b/app/components/ors-header/ors-header.js
@@ -84,12 +84,10 @@ angular.module("orsApp.ors-header", []).component("orsHeader", {
        */
       ctrl.setDefaultValues = value => {
         angular.forEach(Object.keys(ctrl.currentOptions.env), key => {
+          let pre = ctrl.currentOptions.env[key].split("/")
           ctrl.currentOptions.env[key] = [
             value,
-            ctrl.currentOptions.env[key]
-              .split("/")
-              .slice(3)
-              .join("/")
+            pre[pre.length - 1]
           ].join("/");
         });
       };
@@ -98,7 +96,7 @@ angular.module("orsApp.ors-header", []).component("orsHeader", {
        */
       ctrl.setENV = () => {
         ENV.directions = ctrl.currentOptions.env.directions;
-        ENV.analyse = ctrl.currentOptions.env.isochrones;
+        ENV.isochrones = ctrl.currentOptions.env.isochrones;
         ENV.geocode = ctrl.currentOptions.env.geocode;
         ENV.matrix = ctrl.currentOptions.env.matrix;
         ENV.pois = ctrl.currentOptions.env.pois;
@@ -110,7 +108,7 @@ angular.module("orsApp.ors-header", []).component("orsHeader", {
         alert(`Endpoints have been changed to
 geocode:     ${ENV.geocode}
 directions:   ${ENV.directions}
-isochrones:  ${ENV.analyse}
+isochrones:  ${ENV.isochrones}
 matrix:        ${ENV.matrix}
 pois:            ${ENV.pois}`);
       };

diff --git a/app/components/ors-navigation/ors-nav.js b/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.5";
+        ctrl.version = "0.3.6";
       }
     ],
     $routeConfig: [

diff --git a/app/components/ors-panel-accessibilityanalysis/ors-aa-queries/ors-aa-queries.js b/app/components/ors-panel-accessibilityanalysis/ors-aa-queries/ors-aa-queries.js
@@ -40,7 +40,9 @@ angular
         ctrl.toggle = obj => {
           orsAaService.toggle(obj.isoidx, obj.toggle, obj.zoom);
         };
-        ctrl.toggleInterval = obj => {};
+        ctrl.toggleInterval = obj => {
+          orsAaService.toggleInterval(obj.isoidx, obj.revIsoIidx, obj.toggle)
+        };
         ctrl.removeQuery = isoidx => {
           orsAaService.remove(isoidx);
         };

diff --git a/app/components/ors-panel-accessibilityanalysis/ors-aa-queries/ors-aa-query/ors-aa-query.js b/app/components/ors-panel-accessibilityanalysis/ors-aa-queries/ors-aa-query/ors-aa-query.js
@@ -139,14 +139,14 @@ angular.module("orsApp.ors-aa-query", []).component("orsAaQuery", {
           }
         });
         ctrl.showIntervals[intervalIdx] =
-          ctrl.showIntervals[intervalIdx] === true ? false : true;
-        if (ctrl.intervalsHidden.indexOf(intervalIdx) == -1) {
+          ctrl.showIntervals[intervalIdx] !== true;
+        if (ctrl.intervalsHidden.indexOf(intervalIdx) === -1) {
           ctrl.intervalsHidden.push(intervalIdx);
         } else {
           const index = ctrl.intervalsHidden.indexOf(intervalIdx);
           ctrl.intervalsHidden.splice(index, 1);
         }
-        if (ctrl.intervalsHidden.length == ctrl.intervalsLength) {
+        if (ctrl.intervalsHidden.length === ctrl.intervalsLength) {
           ctrl.showOnMap = false;
         } else {
           ctrl.showOnMap = true;

diff --git a/app/components/ors-panel-routing/ors-export-route/ors-export-route.html b/app/components/ors-panel-routing/ors-export-route/ors-export-route.html
@@ -30,10 +30,29 @@ <h1 ng-bind-html="('DOWNLOAD_ROUTE' | translate)">
     </div>
     <div ng-if="$ctrl.gpxOptShow">
         <br>
-        <div class="ui checkbox">
-            <input type="checkbox" id="instructions" data-ng-model="$ctrl.instructions"
-                   ng-click="$ctrl.instructions != $ctrl.instructions">
-            <label for="instructions" ng-bind-html="('INCLUDE_INSTRUCTIONS' | translate)"></label>
+        <div class="field ors-inline">
+            <div class="ui radio checkbox">
+                <input ng-model="$ctrl.toGpx"
+                       ng-value=true type="radio">
+                <label ng-click="$ctrl.toGpx = true">togpx
+                </label>
+            </div>
+        </div>
+        <div class="field ors-inline">
+            <div class="ui radio checkbox">
+                <input  ng-model="$ctrl.toGpx"
+                        ng-value=false type="radio">
+                <label ng-click="$ctrl.toGpx = false">Ors API
+                </label>
+            </div>
+        </div>
+        <div ng-if="!$ctrl.toGpx">
+            <br>
+            <div class="ui checkbox">
+                <input type="checkbox" id="instructions" data-ng-model="$ctrl.instructions"
+                       ng-click="$ctrl.instructions != $ctrl.instructions">
+                <label for="instructions" ng-bind-html="('INCLUDE_INSTRUCTIONS' | translate)"></label>
+            </div>
         </div>
     </div>
     <div class="ui divider">

diff --git a/app/components/ors-panel-routing/ors-export-route/ors-export-route.js b/app/components/ors-panel-routing/ors-export-route/ors-export-route.js
@@ -10,6 +10,7 @@ angular
         let ctrl = this;
         ctrl.elevation = true;
         ctrl.instructions = false;
+        ctrl.toGpx = true;
         ctrl.filename = "ors-export-linestring";
         ctrl.gpxOptShow = true;
         ctrl.tcxOptShow = false;
@@ -88,10 +89,11 @@ angular
         ctrl.exportRoute = () => {
           let options = {
             elevation: ctrl.elevation,
-            instructions: ctrl.instructions
+            instructions: ctrl.instructions,
+            toGpx: ctrl.toGpx
           };
           let currentRoute = null;
-          if (ctrl.currentFileFormat == "rawjson") {
+          if (ctrl.currentFileFormat === "rawjson") {
             currentRoute =
               orsRouteService.data.routes[orsRouteService.getCurrentRouteIdx()];
           } else {

diff --git a/app/includes/info.html b/app/includes/info.html
@@ -55,8 +55,10 @@ <h4 ng-bind-html="'Software & Libraries'">
     <p class="textjustify" ng-bind-html="('INFO_IV' | translate)">
     </p>
     <span>
-        <a href="https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!forum/openrouteservice" target="_blank">
-            <img height="auto" ng-src="img/googlegroups.png" width="120px"/>
+        <a style="color: #b5152b;text-decoration: none;" href="https://ask.openrouteservice.org" target="_blank">
+            <i class="fa fa-2x fa-question-circle"></i>
+            <span style="font-size: larger; padding: 0 0 5px 5px;position: relative;top: -3px;" ng-bind-html="'Ask Openrouteservice'">
+            </span>
         </a>
     </span>
     <p class="textjustify" ng-bind-html="('INFO_V' | translate)">