Move base layer UI above overlay layer UI

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

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index c16930480e5ff75f7d3f0ba041d302c8ffa4d44d..7c420b671b679901230be1b041a336e0bec676b4 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,19 +1,16 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  var marker;
+  var marker, map;

 
   function setLocation(e) {
 
   function setLocation(e) {

-    closeMapPopup();
-
-    var lonlat = getEventPosition(e);
-
-    $("#latitude").val(lonlat.lat);
-    $("#longitude").val(lonlat.lon);
+    $("#latitude").val(e.latlng.lat);
+    $("#longitude").val(e.latlng.lng);

 
     if (marker) {
 
     if (marker) {

-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);

     }
 
     }
 

-    marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));
+    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+      .bindPopup(I18n.t('diary_entry.edit.marker_text'));

   }
 
   $("#usemap").click(function (e) {
   }
 
   $("#usemap").click(function (e) {


@@ -23,15 +20,27 @@ $(document).ready(function () {
     $("#usemap").hide();
 
     var params = $("#map").data();
     $("#usemap").hide();
 
     var params = $("#map").data();

-    var centre = new OpenLayers.LonLat(params.lon, params.lat);
-    var map = createMap("map");
+    var centre = [params.lat, params.lon];
+
+    map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
+
+    L.OSM.zoom()
+      .addTo(map);
+
+    $("#map").on("resized", function () {
+      map.invalidateSize();
+    });

 
 

-    setMapCenter(centre, params.zoom);
+    map.setView(centre, params.zoom);

 
     if ($("#latitude").val() && $("#longitude").val()) {
 
     if ($("#latitude").val() && $("#longitude").val()) {

-      marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
+      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
+        .bindPopup(I18n.t('diary_entry.edit.marker_text'));

     }
 
     }
 

-    map.events.register("click", map, setLocation);
+    map.on("click", setLocation);

   });
 });
   });
 });