Merge pull request #364 from GIScience/release/v0.7.2

Release/v0.7.2
GIScience · Jun 14, 2021 · fbfbc7d · fbfbc7d
2 parents d443642 + 65673ab
commit fbfbc7d
Show file tree

Hide file tree

Showing 9 changed files with 721 additions and 675 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,7 +35,16 @@ RELEASING:
 8. Add version to docker-compose.yml (grunt version always adds 1 on top the current version ...)
  -->
 
-## [unreleased]
+## [0.7.2] - 2021-06-14
+
+### Fixed
+- CHANGELOG release 0.7.1 info
+- poi service error for features without osm tags ([#363](https://github.com/GIScience/openrouteservice-app/issues/363))
+
+### Security
+- updates for some packages through `npm audit fix`
+
+## [0.7.1] - 2021-06-11
 
 ### Added
 - Hungarian translations update (PR [#355](https://github.com/GIScience/openrouteservice-app/pull/355))
@@ -414,7 +423,9 @@ RELEASING:
 ### Fixed
 - hiding wrong Isochrones ([#160](https://github.com/GIScience/openrouteservice-app/issues/160))
 
-[unreleased]: https://github.com/GIScience/openrouteservice-app/compare/v0.7.0...HEAD
+[unreleased]: https://github.com/GIScience/openrouteservice-app/compare/v0.7.2...HEAD
+[0.7.2]: https://github.com/GIScience/openrouteservice-app/compare/v0.7.1...v0.7.2
+[0.7.1]: https://github.com/GIScience/openrouteservice-app/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.4...v0.6.0
 [0.5.4]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.3...v0.5.4

diff --git a/app/components/ors-map/ors-map.js b/app/components/ors-map/ors-map.js
@@ -992,7 +992,7 @@ angular.module("orsApp").directive("orsMap", () => {
             let popupContent = "";
             let cIds = feature.properties["category_ids"];
             let osmTags = feature.properties.osm_tags;
-            if (osmTags.name)
+            if (osmTags && osmTags.name)
               popupContent += "<strong>" + osmTags.name + "</strong><br>";
             // use category_name with space instead of underscore if no name tag available
             else {
@@ -1002,42 +1002,46 @@ angular.module("orsApp").directive("orsMap", () => {
               popupContent += "<strong>" + noUnderscoreName + "</strong>";
               feature.properties["noUnderscoreName"] = noUnderscoreName;
             }
+            if (osmTags) {
+              if (osmTags.address) {
+                popupContent += lists.locations_icons.address + " ";
+                let part_added = false;
+                for (let address_part of [
+                  "street",
+                  "house_number",
+                  "postal_code",
+                  "locality",
+                  "region",
+                  "country"
+                ]) {
+                  if (osmTags.address[address_part]) {
+                    part_added = true;
+                    popupContent += osmTags.address[address_part] + ", ";
+                  }
+                }
+                if (part_added) popupContent = popupContent.slice(0, -2);
+              }
+              if (osmTags.phone)
+                popupContent +=
+                  "<br>" + lists.locations_icons.phone + " " + osmTags.phone;
+              if (osmTags.website)
+                popupContent +=
+                  "<br>" +
+                  lists.locations_icons.website +
+                  " " +
+                  '<a href="' +
+                  osmTags.website +
+                  '" target=_blank>' +
+                  osmTags.website +
+                  "</a>";
+              if (osmTags.wheelchair)
+                popupContent += "<br>" + lists.locations_icons.wheelchair;
+            }
             feature.properties[
               "categoryGroupId"
             ] = orsLocationsService.getSubcategoriesLookup()[
               parseInt(Object.keys(cIds)[0])
             ];
-            if (osmTags.address) {
-              popupContent += lists.locations_icons.address + " ";
-              if (osmTags.address.street)
-                popupContent += osmTags.address.street + ", ";
-              if (osmTags.address.house_number)
-                popupContent += osmTags.address.house_number + ", ";
-              if (osmTags.address.postal_code)
-                popupContent += osmTags.address.postal_code + ", ";
-              if (osmTags.address.locality)
-                popupContent += osmTags.address.locality + ", ";
-              if (osmTags.address.region)
-                popupContent += osmTags.address.region + ", ";
-              if (osmTags.address.country)
-                popupContent += osmTags.address.country + ", ";
-              popupContent = popupContent.slice(0, -2);
-            }
-            if (osmTags.phone)
-              popupContent +=
-                "<br>" + lists.locations_icons.phone + " " + osmTags.phone;
-            if (osmTags.website)
-              popupContent +=
-                "<br>" +
-                lists.locations_icons.website +
-                " " +
-                '<a href="' +
-                osmTags.website +
-                '" target=_blank>' +
-                osmTags.website +
-                "</a>";
-            if (osmTags.wheelchair)
-              popupContent += "<br>" + lists.locations_icons.wheelchair;
             if (feature.properties.osm_type === 1) {
               popupContent +=
                 '<br><br><a href="http://www.openstreetmap.org/node/' +

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.7.1";
+        ctrl.version = "0.7.2";
       }
     ],
     $routeConfig: [

diff --git a/app/infrastructure/ors-importexport-service.js b/app/infrastructure/ors-importexport-service.js
@@ -81,7 +81,7 @@ angular
       // create a simple Course TCX file (MARQ24)
       // see https://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd
       let toTcx = (name, speedInKmPerH) => {
-        let version = "0.7.1";
+        let version = "0.7.2";
         let pointInformation =
           orsRouteService.data.features[orsRouteService.getCurrentRouteIdx()]
             .point_information;

diff --git a/app/js/app.js b/app/js/app.js
@@ -10,7 +10,7 @@
  *|------------------------------------------------------------------------------------*/
 /**
  * @author: Amandus Butzer, amandus@openrouteservice.org, Timothy Ellersiek, timothy@openrouteservice.org
- * @version: 0.7.1
+ * @version: 0.7.2
  */
 (function(searchString, position) {
   fetchData().then(bootstrapApplication);

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "openrouteservice.org",
   "description": "angular version of openrouteservice.org",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "homepage": "http://www.heigit.org",
   "license": "ISC",
   "private": true,

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   ors-classic-maps:
     container_name: ors-maps
-    image: ors-classic-maps:v0.7.1
+    image: ors-classic-maps:v0.7.2
     ports:
       - 8035:3035
       - 3005:3005