X-Git-Url: https://git.sur5r.net/?p=contagged;a=blobdiff_plain;f=scripts%2Fmaps.js;h=abdb79bd958ed384d8d200b4162a31b0aca19942;hp=d1ef0c08eb1caf80132e36280da60bfada3b9f21;hb=4bddd2bb3ff5fd3eec8886302a01dc8191ae1465;hpb=75245bbc807b67247234c9103b162008c5b5b326

diff --git a/scripts/maps.js b/scripts/maps.js
index d1ef0c0..abdb79b 100644
--- a/scripts/maps.js
+++ b/scripts/maps.js
@@ -1,46 +1,27 @@
+function drawMap(coords) {
+    var map = L.map('map');
+    if (coords.length == 1) {
+        map.setView([coords[0].lat, coords[0].lon], 14);
+    }
 
-var gmap_data = Array();
-var gmap_centered = false;
-
-function gmap_loader(){
-    if (!GBrowserIsCompatible()) {
-    	//return;
-    };
+    // create the tile layer with correct attribution
+    var osmUrl = "http://{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg";
+    var subDomains = ['otile1','otile2','otile3','otile4'];
 
-    var map = new GMap2(document.getElementById("google_map"));
-    var geocoder = new GClientGeocoder();
-    map.addControl(new GLargeMapControl());
-    map.addControl(new GMapTypeControl());
-    map.setCenter(new GLatLng(52.514863,13.381863),10);
-    for (var i=0; i<gmap_data.length; i++){
-        var t = 1;
-        if(i>10) t = 1000;
-        if(i>20) t = 2000;
-        gmap_add(map,geocoder,gmap_data[i].adr,gmap_data[i].info,t);
+    var osmAttrib = '&copy; <a href="http://open.mapquest.co.uk" target="_blank">MapQuest</a>, <a href="http://www.openstreetmap.org/" target="_blank">OpenStreetMap</a> and contributors.';
+    L.tileLayer(
+        osmUrl,
+        {attribution: osmAttrib, subdomains: subDomains}
+    ).addTo(map);
 
+    var markers = [];
+    $(coords).each(function(key, coord) {
+        var marker = L.marker([coord.lat, coord.lon]).addTo(map);
+        marker.bindPopup(coord.address);
+        markers.push(marker);
+    });
+    if (coords.length > 1) {
+        var group = new L.featureGroup(markers);
+        map.fitBounds(group.getBounds());
     }
-}
-
-function gmap_add(map,gc,adr,info,t){
-    setTimeout(function(){
-        gc.getLatLng(
-            adr,
-            function(point) {
-                if (!point) {
-                    //alert(address + " not found");
-                } else {
-                    if(!gmap_centered){
-                        map.setCenter(point, 5);
-                        gmap_centered = true;
-                    }
-                    var marker = new GMarker(point);
-                    map.addOverlay(marker);
-                    GEvent.addListener(marker, "click", function(){
-                        this.openInfoWindowHtml( info );
-                    });
-                }
-            }
-        );
-    },t);
-}
-
+}
\ No newline at end of file