Merge remote-tracking branch 'openstreetmap/pull/1036'

[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 5a19cb4d63a2679be1c6d20e8f2ec9e42cbb8ac3..b513057c148d8908fc167b05b271034c7c8a7c54 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -9,7 +9,7 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
       map.removeLayer(marker);
     }
 

-    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+    marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)

       .bindPopup(I18n.t('diary_entry.edit.marker_text'));
   }
 
       .bindPopup(I18n.t('diary_entry.edit.marker_text'));
   }
 


@@ -34,7 +34,7 @@ $(document).ready(function () {
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {

-      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
+      marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)

         .bindPopup(I18n.t('diary_entry.edit.marker_text'));
     }
 
         .bindPopup(I18n.t('diary_entry.edit.marker_text'));
     }