Merge branch 'master' into notes

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 28659a931538c6d810b6fb5825ad1982641b3757..c90d96c3997d93219c95293c8fd192f1bb27a7cc 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,8 @@
+//= require_self
 //= require index/browse
 //= require index/export
 //= require index/key
+//= require index/notes
 
 $(document).ready(function () {
   var permalinks = $("#permalink").html();
@@ -34,7 +36,7 @@ $(document).ready(function () {
   }
 
   if (params.marker) {
-    marker = L.marker([params.mlat, params.mlon]).addTo(map);
+    marker = L.marker([params.mlat, params.mlon], {icon: getUserIcon()}).addTo(map);
   }
 
   if (params.object) {
@@ -60,7 +62,7 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(centre, {icon: getArrowIcon()}).addTo(map);
+    marker = L.marker(centre, {icon: getUserIcon()}).addTo(map);
   });
 
   function updateLocation() {
@@ -115,10 +117,10 @@ $(document).ready(function () {
     $("#sidebar_title").html(I18n.t('site.sidebar.search_results'));
     $("#sidebar_content").load($(this).attr("action"), {
       query: $("#query").val(),
-      minlon: bounds.getSouthWest().lng,
-      minlat: bounds.getSouthWest().lat,
-      maxlon: bounds.getNorthEast().lng,
-      maxlat: bounds.getNorthEast().lat
+      minlon: bounds.getWestLng(),
+      minlat: bounds.getSouthLat(),
+      maxlon: bounds.getEastLng(),
+      maxlat: bounds.getNorthLat()
     }, openSidebar);
 
     return false;