Disable map key on non-default layers

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 77cb86a8d210b670e9a9c2ba1a350f678001d936..d31f5bb82679f2ae6415631876820fab9401141c 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,41 +1,46 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  var map = createMap("map");
+  var map = L.map("map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  L.OSM.zoom()
+    .addTo(map);

 
   if (OSM.home) {
 
   if (OSM.home) {

-    setMapCenter(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat), 12);
+    map.setView([OSM.home.lat, OSM.home.lon], 12);

   } else {
   } else {

-    setMapCenter(new OpenLayers.LonLat(0, 0), 0);
+    map.setView([0, 0], 0);

   }
 
   if ($("#map").hasClass("set_location")) {
   }
 
   if ($("#map").hasClass("set_location")) {

-    var marker;
+    var marker = L.marker([0, 0], {icon: getUserIcon()});

 
     if (OSM.home) {
 
     if (OSM.home) {

-      marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);

     }
 
     }
 

-    map.events.register("click", map, function (e) {
+    map.on("click", function (e) {

       if ($('#updatehome').is(':checked')) {
       if ($('#updatehome').is(':checked')) {

-        var lonlat = getEventPosition(e);
+        var zoom = map.getZoom(),
+            precision = zoomPrecision(zoom),
+            location = e.latlng.wrap();

 
         $('#homerow').removeClass();
 
         $('#homerow').removeClass();

-        $('#home_lat').val(lonlat.lat);
-        $('#home_lon').val(lonlat.lon);
-
-        if (marker) {
-          removeMarkerFromMap(marker);
-        }
+        $('#home_lat').val(location.lat.toFixed(precision));
+        $('#home_lon').val(location.lng.toFixed(precision));

 
 

-        marker = addMarkerToMap(lonlat);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);

       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {

-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+          .bindPopup(user.description);

       }
     });
   }
       }
     });
   }