Merge 2.21.2 not-ux

GeotrekCE · Sep 16, 2019 · 970dae4 · 970dae4
2 parents 40e605a + bd39eff
commit 970dae4
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 18 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,10 @@
-2.21.2-ux.dev0
+2.21.2-ux / 2019-09-16
 ===================
 
 **Bug fixes**
 
-*
+* Show POIs on dive detail page
+* Fix POIs and Steps not displayed on sidebar detail page
 
 2.21.1-ux / 2019-09-11
 ===================

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geotrekrando",
-  "version": "2.21.2-ux.dev0",
+  "version": "2.21.2-ux",
   "description": "Geotrek rando public portal of Geotrek",
   "author": "Makina Corpus",
   "main": "src/app/app.js",

diff --git a/src/app/config/factories.js b/src/app/config/factories.js
@@ -15,6 +15,7 @@ function settingsFactory(globalSettings) {
         servicesUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.SERVICES_FILE,
         eventsUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.TOURISTIC_EVENTS_FILE,
         touristicUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.TOURISTIC_CONTENTS_FILE,
+        diveUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.DIVES_DIR + '/',
         divesUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.DIVES_FILE,
         flatUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.FLAT_FILE,
         warningCategoriesUrl =  globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.WARNING_CAT_DIR + '/' + globalSettings.WARNING_CAT_FILE,
@@ -48,6 +49,7 @@ function settingsFactory(globalSettings) {
         servicesUrl: servicesUrl,
         eventsUrl: eventsUrl,
         touristicUrl: touristicUrl,
+        diveUrl: diveUrl,
         divesUrl: divesUrl,
         flatUrl: flatUrl,
         warningCategoriesUrl: warningCategoriesUrl,

diff --git a/src/app/config/settings.default.json b/src/app/config/settings.default.json
@@ -125,6 +125,7 @@
     "DEPARTURE_ARRIVAL_ICON": "",
     "API_DIR": "api",
     "TREKS_DIR": "treks",
+    "DIVES_DIR": "dives",
     "TREKS_FILE": "treks.geojson",
     "POI_FILE": "pois.geojson",
     "SERVICES_FILE": "services.geojson",

diff --git a/src/app/detail/controllers.js b/src/app/detail/controllers.js
@@ -253,7 +253,7 @@ function DetailController($scope, $rootScope, $state, $q, $modal, $timeout, $sta
     function getPoisOfResult(result, forceRefresh) {
         var deferred = $q.defer();
 
-        poisService.getPoisFromElement(result.id, forceRefresh)
+        poisService.getPoisFromElement(result, forceRefresh)
             .then(
                 function (elementPois) {
                     $scope.pois = elementPois.features;
@@ -268,8 +268,7 @@ function DetailController($scope, $rootScope, $state, $q, $modal, $timeout, $sta
     function getInterests(result, forceRefresh) {
         var promises = [],
             activeDefaultType = null;
-
-        if (result.properties.contentType === 'trek') {
+        if (result.properties.contentType === 'trek' || result.properties.contentType === 'dive') {
             promises.push(
                 getPoisOfResult(result, forceRefresh)
                     .then(

diff --git a/src/app/detail/templates/detail-aside.html b/src/app/detail/templates/detail-aside.html
@@ -47,7 +47,7 @@
         </div>
 
     </div>
-    <div class="detail-aside-group pois" ng-if="pois.length && result.properties.contentType === 'trek'" ng-class="{active: currentInterest === 'pois'}">
+    <div class="detail-aside-group pois" ng-if="pois.length && (result.properties.contentType === 'trek' || result.properties.contentType === 'dive')" ng-class="{active: currentInterest === 'pois'}">
         <div class="detail-aside-group-title" ng-click="toggleInterest('pois')">
             <span>{{ 'POI' | translate }}</span>
             <span class="detail-aside-group-counter" ng-if="displayAsidesCounter" ng-bind="pois.length"></span>

diff --git a/src/app/detail/templates/detail-content-elevation.html b/src/app/detail/templates/detail-content-elevation.html
@@ -1,4 +1,4 @@
-<div class="detail-content-elevation" ng-if="result.properties.contentType === 'trek'" id="elevation">
+<div class="detail-content-elevation" ng-if="result.properties.contentType === 'trek' || result.properties.contentType === 'dive'" id="elevation">
     <h3>{{'PROFILE_ALTI' | translate}}</h3>
 
     <div class="elevation-y elevation-legend">

diff --git a/src/app/dives/services.js b/src/app/dives/services.js
@@ -14,7 +14,7 @@ function divesService(globalSettings, settingsFactory, translationService, $q, $
             /**
              * Dives Type
              */
-            dive.properties.diveType = 'dive';
+            dive.properties.contentType = 'dive';
 
             /**
              * Dives IDs

diff --git a/src/app/items-list/templates/items-list.html b/src/app/items-list/templates/items-list.html
@@ -36,8 +36,8 @@ <h1 class="result-title title">
             <span class="depth"      ng-if="::result.properties.depth">{{::'DEPTH_S' | translate}} {{result.properties.depth}}&nbsp;m</span>
             <span class="difficulty" ng-if="::result.properties.difficulty">{{::result.properties.difficulty.label}}</span>
             <span class="levels"     ng-if="::result.properties.levels" ng-repeat="level in ::result.properties.levels">{{::level.label}}</span>
-            <span class="type1"      ng-if="::result.properties.type1[0] && result.properties.contentType !== 'trek'">{{::result.properties.type1[0].name}}</span>
-            <span class="type2"      ng-if="::result.properties.type2[0] && result.properties.contentType !== 'trek'">{{::result.properties.type2[0].name}}</span>
+            <span class="type1"      ng-if="::result.properties.type1[0] && (result.properties.contentType !== 'trek' || result.properties.contentType !== 'dive')">{{::result.properties.type1[0].name}}</span>
+            <span class="type2"      ng-if="::result.properties.type2[0] && (result.properties.contentType !== 'trek' || result.properties.contentType !== 'dive')">{{::result.properties.type2[0].name}}</span>
             <span class="target"     ng-if="::result.properties.target_audience">{{::result.properties.target_audience}}</span>
         </div>
 

diff --git a/src/app/map/services.js b/src/app/map/services.js
@@ -32,7 +32,7 @@ function mapService($rootScope, $q, $state, $resource, $translate, $filter, util
         controlServices.addTo(this.map);
         var classServices = controlServices.getContainer().classList;
 
-        if (element.properties.contentType === 'trek') {
+        if (element.properties.contentType === 'trek' || element.properties.contentType === 'dive') {
             servicesService.getServicesFromElement(element.id)
                 .then(
                     function (services) {
@@ -162,7 +162,7 @@ function mapService($rootScope, $q, $state, $resource, $translate, $filter, util
             }
 
             promises.push(
-                poisService.getPoisFromElement(element.id, true)
+                poisService.getPoisFromElement(element, true)
                     .then(
                         function (pois) {
                             var counter = 0;

diff --git a/src/app/pois/services.js b/src/app/pois/services.js
@@ -68,11 +68,15 @@ function poisService($resource, $q, globalSettings, settingsFactory, translation
 
     };
 
-    this.getPoisFromElement = function getPoisFromElement (elementId) {
-
+    this.getPoisFromElement = function getPoisFromElement (element) {
         var deferred = $q.defer();
         var currentLang = translationService.getCurrentLang();
-        var url = settingsFactory.trekUrl.replace(/\$lang/, currentLang) + elementId + '/' + globalSettings.POI_FILE;
+        if (element.properties.contentType === 'trek') {
+            var url = settingsFactory.trekUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.POI_FILE;
+        }
+        if (element.properties.contentType === 'dive') {
+            var url = settingsFactory.diveUrl.replace(/\$lang/, currentLang) + element.id + '/' + globalSettings.POI_FILE;
+        }
 
         var requests = $resource(url, {}, {
             query: {

diff --git a/src/app/warning/services.js b/src/app/warning/services.js
@@ -277,7 +277,7 @@ function WarningMapService(globalSettings, utilsFactory, iconsService, layersSer
             type = 'geojson';
             elementLocation = [];
         } else {
-            currentLayer = (result.properties.contentType === 'trek' ? self._treksMarkersLayer : self._touristicsMarkersLayer);
+            currentLayer = (result.properties.contentType === 'trek' || result.properties.contentType === 'dive' ? self._treksMarkersLayer : self._touristicsMarkersLayer);
             type = 'category';
             elementLocation = utilsFactory.getStartPoint(result);
         }