Add/Integrate Map in Batch Manager single mode #45

Author: xbgmsharp

admin/admin_batchmanager.php

@@ -75,16 +75,11 @@ function osm_loc_end_element_set_global()
   <div class="osm-map1 map1"></div>
   <script>
     $(document).ready(function() {
-         console.log( "#permitAction pageshow!" );
          $("#permitAction").on("change", function (e) {
-           console.log( "#permitAction pageshow and change!" );
             var optionSelected = $("option:selected", this);
             if ("openstreetmap" == optionSelected.val()) {
-              console.log( "#permitAction pageshow and change and OSM!" );
-
               $(".osm-map1").qleaflet();
-
-            } /* End if */
+            }
          });
     });
   </script>
@@ -218,6 +213,16 @@ function osm_prefilter_batch_manager_unit($content)
 		    <label>{\'Longitude\'|@translate}
 		      <input type="text" size="9" name="osmlon-{$element.id}" value="{$element.longitude}">
 		    </label>
+
+<style type="text/css"> .map1 { height: 200px !important; width:100% !important; margin: 5px; } </style>
+<script src="plugins/piwigo-openstreetmap/leaflet/qleaflet.jquery.js"></script>
+<div class="osm-map-{$element.id} map1" data-markerpos="{$element.latitude},{$element.longitude}" data-markertext="{$element.name}" data-formid="{$element.id}"></div>
+<script>
+  $(document).ready(function() {
+        $(".osm-map-{$element.id}").qleaflet();
+  });
+</script>
+
 		  </td>
 		</tr>';
 		$content = substr_replace($content, $add, $pos, 0);

leaflet/qleaflet.jquery.js

@@ -26,7 +26,8 @@
               scrollWheelZoom : true,
               worldCopyJump: true,
               contextmenu: false
-            }
+            },
+          formid: false
         };
 
     // The actual plugin constructor
@@ -74,15 +75,22 @@
 	var popup = window.L.popup();
 
 	function onMapClick(e) {
-                console.log(e.latlng.toString());
-                console.log(document.forms);
+                //console.log(e.latlng.toString());
+                //console.log(document.forms);
+		//console.log(this.options);
   		popup
 			.setLatLng(e.latlng)
 			.setContent("You clicked the map at " + e.latlng.toString())
 			.openOn(this.map);
-		var form=document.forms[1]
-		form.osmlat.value = Math.ceil(e.latlng.lat * 100000) / 100000;
-		form.osmlon.value = Math.ceil(e.latlng.lng * 100000) / 100000;
+
+		if(this.options.formid != false) { // Batch manager single mode
+			$('[name=osmlat-'+this.options.formid+']').val(Math.ceil(e.latlng.lat * 100000) / 100000);
+			$('[name=osmlon-'+this.options.formid+']').val(Math.ceil(e.latlng.lng * 100000) / 100000);
+		} else { // Batch manager global mode
+			var form=document.forms[1];
+			form.osmlat.value = Math.ceil(e.latlng.lat * 100000) / 100000;
+			form.osmlon.value = Math.ceil(e.latlng.lng * 100000) / 100000;
+		}
 	}
 
         this.map.on('click', onMapClick, this);
@@ -119,33 +127,39 @@
 
       init : function() {
         this.id = this.element.attr('id');
-        //add id if necessart
+        //add id if necessary
         if(!this.id) {
           this.id = 'leafletmap' + Math.floor((Math.random()*100)+1);
           this.element.attr('id', this.id);
         }
         // get data from data attributes in html
         // set markers for each map
         // other options are shared
-        if(typeof this.element.data('markerpos') != 'undefined' && this.element.data('markerpos').length != 0) {
+        if(typeof this.element.data('markerpos') != 'undefined' && this.element.data('markerpos').length > 1) {
           this.element.markers = [];
           this.element.markers.push({
             pos : this.element.data('markerpos').split(','),
             text: this.element.data('markertext')
           });
+          this.options.mapOptions.zoom = 15; // If position is set then zoom into it
         } else {
           this.element.markers = this.options.markers;
         }
 
         // set center
         if(typeof this.element.data('center') != 'undefined' && this.element.data('center').length != 0) {
           this.element.center = this.element.data('center').split(',');
-        } else if (typeof this.element.data('markerpos') != 'undefined' && this.element.data('markerpos').length != 0) {
+        } else if (typeof this.element.data('markerpos') != 'undefined' && this.element.data('markerpos').length > 1) {
           this.element.center = this.element.data('markerpos').split(',');
         } else {
           this.element.center = this.options.mapOptions.center;
         }
 
+        // formid for batch manager single mode
+        if(typeof this.element.data('formid') != 'undefined' && this.element.data('formid').length != 0) {
+          this.options.formid = this.element.data('formid');
+        }
+
         //render
         this.loadStylesheet(this.options.leafletCssUri);
         $.getScript(this.options.leafletJsUri, this.bind(this.setMap, this));