assets/src/css/style.css

@@ -1625,10 +1625,6 @@ body:not(.sidebar-collapse) .sidebar .nav-treeview .nav-treeview .nav-link {
     padding: 0 5px;
 }
 
-.fullscreen-icon {
-	background-image: url('../img/leaflet/icon-fullscreen.svg');
-}
-
 @media screen and (max-width: 767px) {
     .navbar-left {
         display: inline-block;

gulpfile.js

@@ -123,7 +123,6 @@ const JS = gulp.parallel(() => {
         'bootstrap-maxlength/dist/bootstrap-maxlength.js',
         'leaflet/dist/leaflet.js',
         'leaflet-gesture-handling/dist/leaflet-gesture-handling.min.js',
-        'leaflet.fullscreen/Control.FullScreen.js',
         'ismobilejs/dist/isMobile.min.js',
         'ua-parser-js/dist/ua-parser.min.js',
     ];
@@ -185,7 +184,6 @@ const CSS = gulp.parallel(() => {
         'smartwizard/dist/css/smart_wizard_theme_arrows.min.css',
         'leaflet-gesture-handling/dist/leaflet-gesture-handling.min.css',
         'leaflet/dist/leaflet.css',
-        'leaflet.fullscreen/Control.FullScreen.css',
         '@ttskch/select2-bootstrap4-theme/dist/select2-bootstrap4.min.css'
     ];
 
@@ -254,10 +252,6 @@ function srcImages() {
 }
 
 function leaflet() {
-    gulp.src([
-        config.nodeDirectory + '/leaflet.fullscreen/icon-fullscreen.svg',
-    ]).pipe(gulp.dest(config.production + '/' + config.paths.images + '/leaflet'));
-
     return gulp.src([
         config.nodeDirectory + '/leaflet/dist/images/*.{jpg,png,jpeg}',
     ])

modules/anagrafiche/edit.php

@@ -387,7 +387,7 @@ echo '
                     L.tileLayer("'.setting('Tile server OpenStreetMap').'", {
                         maxZoom: 17,
                         attribution: "© OpenStreetMap"
-                    }).addTo(map);
+                    }).addTo(map); 
                 }
             
                 var icon = new L.Icon({
@@ -402,19 +402,8 @@ echo '
                 var marker = L.marker([lat, lng], {
                     icon: icon
                 }).addTo(map);
-
-                L.control
-                .fullscreen({
-                    position: "topright",
-                    title: "'.tr('Vai a schermo intero').'",
-                    titleCancel: "'.tr('Esci dalla modalità schermo intero').'",
-                    content: null,
-                    forceSeparateButton: true,
-                    forcePseudoFullscreen: true,
-                    fullscreenElement: false
-                }).addTo(map);
             
-                map.setView([lat, lng], 14);
+                map.setView([lat, lng], 10);
             }
 
             function risolviConto(tipo){

modules/anagrafiche/modals/posizione.php

@@ -159,18 +159,7 @@ function caricaMappa() {
         icon: icon
     }).addTo(map);
 
-    L.control
+	map.setView([lat, lng], 10);
-        .fullscreen({
-            position: "topright",
-            title: "'.tr('Vai a schermo intero').'",
-            titleCancel: "'.tr('Esci dalla modalità schermo intero').'",
-            content: null,
-            forceSeparateButton: true,
-            forcePseudoFullscreen: true,
-            fullscreenElement: false
-        }).addTo(map);
-
-	map.setView([lat, lng], 14);
 
     map.on("click", function(e) {
         marker.setLatLng(e.latlng);

modules/interventi/header.php

@@ -244,10 +244,9 @@ if (!empty($sede_cliente->gaddress) || (!empty($sede_cliente->lat) && !empty($se
                     <div class="col-md-6">';
     // Navigazione diretta verso l'indirizzo
     echo '
-                        <button class="btn btn-xs btn-default btn-block" onclick="caricaMappa();">
+                        <a class="btn btn-xs btn-default btn-block" onclick="$(\'#map-edit\').height(180); caricaMappa(); $(this).hide();">
-                            <div class="load"><i class="fa fa-compass"></i> '.tr('Carica mappa').'</div>
+                            <i class="fa fa-compass"></i> '.tr('Carica mappa').'
-                            <a class="go-to hidden" href="geo://'.$sede['lat'].','.$sede['lng'].'"><i class="fa fa-map"></i> '.tr('Apri mappa').'</a>
+                        </a>
-                        </button>
                     </div>
                     
                     <div class="col-md-6">';
@@ -346,16 +345,6 @@ echo '
 
     var map = null;
     function caricaMappa() {
-        const $map_container = $(".module-header:visible .card").eq(2);
-
-        // Ingrandimento area mappa
-        $map_container.css("height", "300px");
-        alignMaxHeight(".module-header .card");
-        $("#map-edit").css("height", "80%");
-
-        $map_container.find(".load").addClass("hidden");
-        $map_container.find(".go-to").removeClass("hidden");
-
         const lat = parseFloat("'.$sede_cliente->lat.'");
         const lng = parseFloat("'.$sede_cliente->lng.'");
     
@@ -370,18 +359,7 @@ echo '
             map = L.map("map-edit", {
                 gestureHandling: true
             });
-
+    
-            L.control
-                .fullscreen({
-                    position: "topright",
-                    title: "'.tr('Vai a schermo intero').'",
-                    titleCancel: "'.tr('Esci dalla modalità schermo intero').'",
-                    content: null,
-                    forceSeparateButton: true,
-                    forcePseudoFullscreen: true,
-                    fullscreenElement: false
-                }).addTo(map);
-
             L.tileLayer("'.setting('Tile server OpenStreetMap').'", {
                 maxZoom: 17,
                 attribution: "© OpenStreetMap"
@@ -404,15 +382,11 @@ echo '
         map.setView([lat, lng], 10);
     }
 
-    function alignMaxHeight(element){
+    max_height = 0;
-        max_height = 0;
+    $(".module-header .card").each( function(){
-        $(element).each( function(){
+        if($(this).height() > max_height){
-            if($(this).height() > max_height){
+            max_height = $(this).height();
-                max_height = $(this).height();
+        }
-            }
+    });
-        });
+    $(".module-header .card").height(max_height);
-        $(element).height(max_height);
-    }
-
-    alignMaxHeight(".module-header .card");
 </script>';

package.json

@@ -35,7 +35,6 @@
         "jquery.shorten": "^1.0.0",
         "leaflet": "^1.9.4",
         "leaflet-gesture-handling": "^1.2.2",
-        "leaflet.fullscreen": "^3.0.2",
         "moment": "^2.18.1",
         "numeral": "^2.0.6",
         "parsleyjs": "^2.7.2",