Merge tag '2.29.2' into geotrek_UX_dev_mid_2018

2.29.2
GeotrekCE · Oct 28, 2020 · 31d0c28 · 31d0c28
2 parents dd113e7 + a2ddd3e
commit 31d0c28
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,21 +1,29 @@
-2.29.1-ux3 / 2020-10-20
-===================
+2.29.2-ux / 2020-10-28
+======================
+
+**Bug fixes**
+
+* Do not show empty square without properties on extra layers
+
+
+2.29.1-ux3 / 2020-10-27
+=======================
 
 **Enhancements**
 
 * No pictogram trek's label, add default pictogram
 
 
 2.29.1-ux2 / 2020-10-20
-===================
+=======================
 
 **Bug fixes**
 
 * No pictogram trek's label no filter
 
 
 2.29.1-ux / 2020-10-20
-===================
+======================
 
 **Bug fixes**
 

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.29.1-ux3",
+  "version": "2.29.2-ux",
   "description": "Geotrek rando public portal of Geotrek",
   "author": "Makina Corpus",
   "main": "src/app/app.js",

diff --git a/src/app/map/services.js b/src/app/map/services.js
@@ -1752,7 +1752,7 @@ function layersService ($http, globalSettings, settingsFactory, translationServi
                         },
                         onEachFeature: function (feature, layer) {
                             var markup = [], prop;
-                            if (layer && layer.feature && layer.feature.properties) {
+                            if (layer && layer.feature && layer.feature.properties && (layer.feature.properties.name || layer.feature.properties.photo_url || layer.feature.properties.type || layer.feature.properties.website)) {
 
                                 prop = layer.feature.properties;