Remove OL SimpleLayerSwitcher

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 7d8c2f33410532e395f55ad1ca1909f0e9228e2a..e5620b0a30dc6048b6009f26dd8657639266c573 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,42 +1,40 @@
 $(document).ready(function () {
-  var params = $("#map").data();
-  var map = createMap("map");
+  var map = createMap("map", {
+    zoomControl: true,
+    panZoomControl: false
+  });
 
-  setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+  if (OSM.home) {
+    map.setView([OSM.home.lat, OSM.home.lon], 12);
+  } else {
+    map.setView([0, 0], 0);
+  }
 
   if ($("#map").hasClass("set_location")) {
     var marker;
 
-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat));
+    if (OSM.home) {
+      marker = addMarkerToMap([OSM.home.lat, OSM.home.lon]);
     }
 
-    map.events.register("click", map, function (e) {
-      closeMapPopup();
-
+    map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
-        var lonlat = getEventPosition(e);
-
         $('#homerow').removeClass();
-        $('#home_lat').val(lonlat.lat);
-        $('#home_lon').val(lonlat.lon);
+        $('#home_lat').val(e.latlng.lat);
+        $('#home_lon').val(e.latlng.lng);
 
         if (marker) {
           removeMarkerFromMap(marker);
         }
 
-        marker = addMarkerToMap(lonlat);
+        marker = addMarkerToMap(e.latlng);
       }
     });
   } else {
-    addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat), null, params.marker.description);
-
     $("[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);
+        addMarkerToMap([user.lat, user.lon], L.icon({iconUrl: user.icon}), user.description);
       }
     });
   }