Update: LeafletJS library to 1.9.3

css/soundmap.front.css

@@ -0,0 +1 @@
+div.soinumapa-map{ width:100%;height:50vh;}

js/soundmap.front.js

@@ -14,27 +14,20 @@
         },
 
         init: function (selector, query){
-			console.log(selector+'.... '+query); 
+            mapboxUrl = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
-            //this.map = L.map(selector,{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, scrollWheelZoom: false});
+            var grayscale = L.tileLayer(mapboxUrl, {id: 'mapbox/light-v10'}),
-			L.mapbox.accessToken = 'pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
+            streets   = L.tileLayer(mapboxUrl, {id: 'mapbox/streets-v11'}),
-            this.map = L.mapbox.map(selector,'lrullo.cih52v78z00v4krkrzge97rgg',{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, scrollWheelZoom: false});
+            osm 			= L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png');
-			/*this.layers.SATELLITE = new L.Google();
+            this.map = L.map(selector,{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, layers: [osm,grayscale,streets]});
-            this.layers.TERRAIN = new L.Google('TERRAIN');
+            this.map.addControl(
-            this.layers.HYBRID = new L.Google('HYBRID');
+            new L.Control.Layers(
-            this.layers.ROADMAP = new L.Google('ROADMAP');*/
+                {
-			//this.layers.MAPBOX
+                    'OSM': osm,
-            //this.map.addLayer(this.layers[this.mapType]);
+                    'Grayscale':grayscale,
-            /*this.map.addControl(
+                    'Streets': streets
-                new L.Control.Layers(
+                }, {}
-                    {
+            )
-                        'Google':this.layers.SATELLITE,
+            );
-                        'Google Terrain': this.layers.TERRAIN,
-                        'Google Hybrid': this.layers.HYBRID,
-                        'Google Roadmap': this.layers.ROADMAP
-                    }, {}
-                )
-            );*/
-            //_.bindAll(this);
 
             options = {
                 type:    'POST',
@@ -46,10 +39,8 @@
                 }
             };
 
-			console.log(options); 
             // Use with PHP's wp_send_json_success() and wp_send_json_error()
             $.ajax( options ).done(this.ajaxDone).fail(this.ajaxFail);
-			console.log(this.infos); 
         },
 
         addMapCallback: function (event, callback){
@@ -57,7 +48,7 @@
         },
 
         onMarkerClick: function(event){
-			self = window.Soundmap;
+			       self = window.Soundmap;
             var id = event.target.feature.properties.id;
             self.ajaxMarker = event.target;
             if(self.infos[id]){
@@ -100,13 +91,14 @@
         },
 
         ajaxDone: function(response){
-			console.log('done'+response); 
             var self = this;
             this.markers = L.geoJson(response.data,{
                 onEachFeature: function(feature, layer){
                     layer.on('click', self.onMarkerClick);
                 }
             }).addTo(this.map);
+            this.map.fitBounds(this.markers.getBounds());
+
         },
         ajaxFail: function(){
             console.log(this);
@@ -116,8 +108,9 @@
 
     $(document).ready(function(){
        //soundmap.initMap();
-		soundmap.init('map-content','');
+       if ($('#map_canvas').length) {
-		console.log('document.ready'); 
+        soundmap.init('map_canvas','');
+       }
     });
 
 

soundmap.php

@@ -31,6 +31,15 @@ if (!class_exists('Soundmap')){
             //Register hooks and filters
             $this->register_hooks();
             $this->register_filters();
+            $this->register_shortcode();
+        }
+
+        function register_shortcode() {
+          add_shortcode('soinumapa-map',array($this,'shortcode_map'));
+        }
+
+        function shortcode_map($atts) {
+          return '<div id="map_canvas" class="soinumapa-map"></div>';
         }
 
         function register_content_type(){
@@ -171,8 +180,8 @@ if (!class_exists('Soundmap')){
         }// admin_menu
 
         function enqueue_map_scripts(){
-            wp_enqueue_script('leafletjs','https://unpkg.com/leaflet@1.6.0/dist/leaflet.js',array(),'1.6.0',TRUE); // add Leaflet.js
+            wp_enqueue_script('leafletjs','https://unpkg.com/leaflet@1.9.3/dist/leaflet.js',array(),'1.9.3',TRUE); // add Leaflet.js
-            wp_enqueue_style('leafletcss',"https://unpkg.com/leaflet@1.6.0/dist/leaflet.css",array(),'1.6.0','all'); // add CSS Leaflet
+            wp_enqueue_style('leafletcss',"https://unpkg.com/leaflet@1.9.3/dist/leaflet.css",array(),'1.9.3','all'); // add CSS Leaflet
         }
 
         function wp_enqueue_scripts(){

theme/theme_window.php

@@ -10,7 +10,7 @@
         <?php if(isset($mark->autor) && $mark->autor){ ?> <p class="marker-info"><?php echo __('Author', 'soundmap') . ': ' . $mark->autor; ?></br><?php } ?>
         <hr class="clear">
         <!--audio class="soundmap-audio-player not-processed" src="<?php echo $mark->files[0]['url'] ?>"></audio-->
-        <audio class="" src="<?php echo $mark->files[0]['url'] ?>" controls=controls style="max-width:100%;"></audio>
+        <audio class="" src="<?php echo $mark->files[0]['url'] ?>" controls=controls style="max-width:100%;" autoplay></audio>
         <div class="marker-info">
         <?php the_tags(__('Tags','soundmap') . ': ', ' | ', '</br>'); ?>
         <?php echo __('Categories','soundmap') . ': '; the_category(' | '); ?>