Compare commits

..

2 Commits

Author SHA1 Message Date
1fbb3486cf clean && documentation 2020-05-30 16:21:59 +02:00
2c5c71c587 clean && add Timeout for load correctly map on Add Marker Metabox 2020-05-30 16:21:35 +02:00
5 changed files with 36 additions and 58 deletions

10
README.md Normal file
View File

@ -0,0 +1,10 @@
# Wordpress Plugin - Soundmap
Es una versión revisada del viejo plugin de Soinumapa desarrollado por Xavier Balderas.
## Configuración
* Descarga el plugin en la carpeta **wp-content/plugins**
* Activa el plugin en la sección **Plugins** de tu instancia de Wordpress
* Configura el area del mapa visualizada en **Ajustes > SoundMap**
* Crear los puntos necesarios en la sección **Markers**

View File

@ -1,6 +1,7 @@
#map_canvas {
height: 400px;
min-height: 400px;
width: 100%;
background:#ccc;
}
#soundmap-attachments-list {
margin-top: 10px;

View File

@ -21,22 +21,15 @@
initMap: function(){
//this.layers.push(new L.Google());
//this.layers.push(new L.Google('TERRAIN'));
//this.map.addLayer(this.layers[0]);
/* L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w}', {
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
maxZoom: 18,
id: 'mapbox.streets',
accessToken: 'your.mapbox.access.token'
}).addTo(this.map);*/
mapboxUrl = 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
var grayscale = L.tileLayer(mapboxUrl, {id: 'mapbox.light'}),
streets = L.tileLayer(mapboxUrl, {id: 'mapbox.streets'});
this.map = L.map('map_canvas',{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, layers: [grayscale,streets]});
mapboxUrl = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
var grayscale = L.tileLayer(mapboxUrl, {id: 'mapbox/light-v10'}),
streets = L.tileLayer(mapboxUrl, {id: 'mapbox/streets-v11'}),
osm = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png');
this.map = L.map('map_canvas',{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, layers: [osm,grayscale,streets]});
this.map.addControl(
new L.Control.Layers(
{
'OSM': osm,
'Grayscale':grayscale,
'Streets': streets
}, {}
@ -44,14 +37,15 @@
);
this.map.addEventListener('click', this.mapClick, this);
//this.map.invalidateSize();
if( $('#soundmap-marker-lat').val() ){
if( $('#soundmap-marker-lat').val() ){
var _latlng = [parseFloat($('#soundmap-marker-lat').val()), parseFloat($('#soundmap-marker-lng').val())];
this.marker = L.marker(_latlng,{draggable: true}).addTo(this.map);
this.map.panTo(_latlng);
this.marker.addEventListener('dragend', this.markerDrag, this);
}
//_.bindAll(this);
//init elements
this.file_frame = wp.media({
multiple: false,
@ -59,11 +53,9 @@
type: 'audio'
}
});
console.log(this.file_frame)
console.log('iniciando file_frame')
this.initEvents();
;
},
@ -72,6 +64,7 @@
$('#add_files').bind('click', this.openMediaManager);
wp.media.frames.file_frame.on('select',this.mediaSelected, this);
$('.delete-att-item').live('click', this.removeMedia);
setTimeout(() => { this.map.invalidateSize(); }, 0);
},
removeMedia: function(event){
@ -120,10 +113,9 @@
});
$(document).ready(function(){
console.log($('#map_canvas').width());
soundmap.initMap();
});

View File

@ -8,26 +8,10 @@
layers:{},
initMap: function(){
/*
this.map = L.map('map_canvas_options',{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom});
this.layers.SATELLITE = new L.Google();
this.layers.TERRAIN = new L.Google('TERRAIN');
this.layers.HYBRID = new L.Google('HYBRID');
this.layers.ROADMAP = new L.Google('ROADMAP');
this.map.addLayer(this.layers[this.mapType]);
this.map.addControl(
new L.Control.Layers(
{
'Google':this.layers.SATELLITE,
'Google Terrain': this.layers.TERRAIN,
'Google Hybrid': this.layers.HYBRID,
'Google Roadmap': this.layers.ROADMAP
}, {}
)
);*/
mapboxUrl = 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
var grayscale = L.tileLayer(mapboxUrl, {id: 'mapbox.light'}),
streets = L.tileLayer(mapboxUrl, {id: 'mapbox.streets'});
mapboxUrl = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibHJ1bGxvIiwiYSI6ImNpaDUydjdoNTAwd3BzdGx5bGlhOTh6bXYifQ.tE8QgNbVSgwP8V5LnJWA3w';
var grayscale = L.tileLayer(mapboxUrl, {id: 'mapbox/light-v10'}),
streets = L.tileLayer(mapboxUrl, {id: 'mapbox/streets-v11'});
this.map = L.map('map_canvas_options',{center: [this.origin.lat, this.origin.lng], zoom: this.origin.zoom, layers: [grayscale,streets]});
this.map.addControl(
new L.Control.Layers(
@ -43,7 +27,6 @@
this.map.addEventListener('zoomend', this.mapZoom, this);
this.map.addEventListener('baselayerchange', this.layerChange, this);
_.bindAll(this);
this.initEvents();
},
@ -61,7 +44,7 @@
$('#soundmap_op_origin_zoom').val(this.map.getZoom());
},
initEvents: function(){
setTimeout( () => { this.map.invalidateSize(); }, 0);
}

View File

@ -135,7 +135,8 @@ if (!class_exists('Soundmap')){
echo '<label for="soundmap-marker-lat">' . __('Latitud', 'soundmap') . '</label>';
echo '<input type="text" name="soundmap_marker_lat" id="soundmap-marker-lat" value = "' . $soundmap_lat . '">';
echo '<label for="soundmap-marker-lng">' . __('Longitud', 'soundmap') . '</label>';
echo '<input type="text" name="soundmap_marker_lng" id="soundmap-marker-lng" value = "'. $soundmap_lng . '">';
echo '<input type="text" name="soundmap_marker_lng" id="soundmap-marker-lng" value = "'. $soundmap_lng . '">';
echo '<script></script>';
}
function load_options(){
@ -167,18 +168,8 @@ if (!class_exists('Soundmap')){
}// admin_menu
function enqueue_map_scripts(){
/* Register the basic scripts needed for presenting the maps.
- Google Maps
- LeafletJS
- Leaflet Google Plugin
- LeafletCSS
*/
//wp_enqueue_script( 'google-maps', 'http://maps.google.com/maps/api/js?v=3.7&amp;sensor=false' ); // Google Maps
//wp_enqueue_script('mapboxjs','https://api.mapbox.com/mapbox.js/v2.2.4/mapbox.js',array(),'2.2.4',TRUE); // add Leaflet.js
wp_enqueue_script('leafletjs','https://unpkg.com/leaflet@1.3.4/dist/leaflet.js',array(),'1.3.4',TRUE); // add Leaflet.js
//wp_enqueue_style('mapboxcss','https://api.mapbox.com/mapbox.js/v2.2.4/mapbox.css',array(),'2.2.4','all'); // add CSS Leaflet
wp_enqueue_style('leafletcss',"https://unpkg.com/leaflet@1.3.4/dist/leaflet.css",array(),'1.3.4','all'); // add CSS Leaflet
//wp_enqueue_script('leaflet-plugin-google', plugins_url('js/leaflet/plugins/Google.js', __FILE__), array('leafletjs', 'google-maps'), '0.7.2', TRUE);
wp_enqueue_script('leafletjs','https://unpkg.com/leaflet@1.6.0/dist/leaflet.js',array(),'1.6.0',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
}
function wp_enqueue_scripts(){
@ -205,8 +196,9 @@ if (!class_exists('Soundmap')){
if (($hook == 'post-new.php' || $hook == 'post.php') && $current_screen->post_type == "marker"){
$this->enqueue_map_scripts();
wp_enqueue_script('soundmap-add', plugins_url('js/soundmap.add.js', __FILE__), array(), '0.1', TRUE);
wp_enqueue_script('underscore');
wp_enqueue_style('soundmap-add-css', plugins_url('css/soundmap.add.css', __FILE__), array(), '0.1', 'all');
wp_enqueue_script('soundmap-add', plugins_url('js/soundmap.add.js', __FILE__), array(), '0.1', TRUE);
$params = array();
$params['origin'] = $this->config['origin'];