Merge tag '2.22.1' into geotrek_UX_dev_mid_2018

Author: Gaël UTARD

CHANGES.md

@@ -1,3 +1,10 @@
+2.22.1-ux / 2020-02-07
+======================
+
+**Bug fixes**
+
+* Fix some bugs after upgrade to Leaflet 1.x
+
 2.22.0-ux / 2020-02-06
 ======================
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "geotrekrando",
-  "version": "2.22.0-ux",
+  "version": "2.22.1-ux",
   "description": "Geotrek rando public portal of Geotrek",
   "author": "Makina Corpus",
   "main": "src/app/app.js",
@@ -60,7 +60,7 @@
     "leaflet-geometryutil": "^0.9.2",
     "leaflet-minimap": "^3.6.1",
     "leaflet-pip": "^1.1.0",
-    "leaflet-textpath": "^1.2.0",
+    "leaflet-textpath": "^1.2.3",
     "leaflet.markercluster": "^1.4.1",
     "lodash": "^4.17.4",
     "merge-stream": "^1.0.1",

package.json

@@ -251,8 +251,8 @@ function mapService($rootScope, $q, $state, $resource, $translate, $filter, util
         });
     };
 
-    this.createLayerFromElement = function createLayerFromElement (element, type, elementLocation, forceRefresh, clickable) {
-        clickable = clickable !== undefined ? clickable : true;
+    this.createLayerFromElement = function createLayerFromElement (element, type, elementLocation, forceRefresh, interactive) {
+        interactive = interactive !== undefined ? interactive : true;
         var deferred = $q.defer();
         var popupSources = {};
         if (type === "geojson" && element.geometry.type !== 'MultiPoint') {
@@ -264,7 +264,7 @@ function mapService($rootScope, $q, $state, $resource, $translate, $filter, util
             }
             var geoStyle = {
                 className: className,
-                clickable: clickable
+                interactive: interactive
             };
 
             if (element.geometry.type === 'Polygon') {

src/app/map/services.js

@@ -1,5 +1,4 @@
 @import 'leaflet/_leaflet';
-@import 'leaflet/_leaflet.label';
 @import 'leaflet/_fullscreen';
 @import 'leaflet/_switch';
 @import 'leaflet/_minimap';

src/app/vendors/images/leaflet-fullscreen/fullscreen.png

@@ -1,2 +1,40 @@
-.leaflet-control-fullscreen-button { background-image: url(#{$vendors-images-path}leaflet-fullscreen/icon-fullscreen.png); }
-.leaflet-retina .leaflet-control-fullscreen-button { background-image: url(#{$vendors-images-path}leaflet-fullscreen/icon-fullscreen-2x.png); background-size: 26px 26px; }
+.leaflet-control-fullscreen a {
+  background:#fff url(#{$vendors-images-path}leaflet-fullscreen/fullscreen.png) no-repeat 0 0;
+  background-size:26px 52px;
+  }
+  .leaflet-touch .leaflet-control-fullscreen a {
+    background-position: 2px 2px;
+    }
+  .leaflet-fullscreen-on .leaflet-control-fullscreen a {
+    background-position:0 -26px;
+    }
+  .leaflet-touch.leaflet-fullscreen-on .leaflet-control-fullscreen a {
+    background-position: 2px -24px;
+    }
+
+/* Do not combine these two rules; IE will break. */
+.leaflet-container:-webkit-full-screen {
+  width:100%!important;
+  height:100%!important;
+  }
+.leaflet-container.leaflet-fullscreen-on {
+  width:100%!important;
+  height:100%!important;
+  }
+
+.leaflet-pseudo-fullscreen {
+  position:fixed!important;
+  width:100%!important;
+  height:100%!important;
+  top:0!important;
+  left:0!important;
+  z-index:99999;
+  }
+
+@media
+  (-webkit-min-device-pixel-ratio:2),
+  (min-resolution:192dpi) {
+    .leaflet-control-fullscreen a {
+      background-image:url(#{$vendors-images-path}leaflet-fullscreen/fullscreen@2x.png);
+    }
+  }