Fix warnings from rubocop update

[rails.git] / app / assets / javascripts / osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 382e32bdfde5d2285b065a685378bb796514eeb5..6afebf8e5dc0db61730a2feaa253a7fe7fcd3e0b 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -8,6 +8,19 @@ OSM = {
   API_VERSION:           <%= API_VERSION.to_json %>,
   STATUS:                <%= STATUS.to_json %>,
   MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
+  OVERPASS_URL:          <%= OVERPASS_URL.to_json %>,
+  NOMINATIM_URL:         <%= NOMINATIM_URL.to_json %>,
+
+  MARKER_GREEN:          <%= image_path("marker-green.png").to_json %>,
+  MARKER_RED:            <%= image_path("marker-red.png").to_json %>,
+
+  MARKER_ICON:           <%= image_path("images/marker-icon.png").to_json %>,
+  MARKER_ICON_2X:        <%= image_path("images/marker-icon-2x.png").to_json %>,
+  MARKER_SHADOW:         <%= image_path("images/marker-shadow.png").to_json %>,
+
+  NEW_NOTE_MARKER:       <%= image_path("new_note_marker.png").to_json %>,
+  OPEN_NOTE_MARKER:      <%= image_path("open_note_marker.png").to_json %>,
+  CLOSED_NOTE_MARKER:    <%= image_path("closed_note_marker.png").to_json %>,
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
@@ -71,10 +84,6 @@ OSM = {
       mapParams.bounds = L.latLngBounds(
         [parseFloat(params.minlat), parseFloat(params.minlon)],
         [parseFloat(params.maxlat), parseFloat(params.maxlon)]);
-    } else if (params.lon && params.lat) {
-      mapParams.lon = parseFloat(params.lon);
-      mapParams.lat = parseFloat(params.lat);
-      mapParams.zoom = parseInt(params.zoom || 5);
     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
@@ -165,7 +174,29 @@ OSM = {
     return hash;
   },
 
-  zoomPrecision: function (zoom) {
+  zoomPrecision: function(zoom) {
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+  },
+
+  locationCookie: function(map) {
+    var center = map.getCenter().wrap(),
+      zoom = map.getZoom(),
+      precision = OSM.zoomPrecision(zoom);
+    return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|');
+  },
+
+  distance: function(latlng1, latlng2) {
+    var lat1 = latlng1.lat * Math.PI / 180,
+      lng1 = latlng1.lng * Math.PI / 180,
+      lat2 = latlng2.lat * Math.PI / 180,
+      lng2 = latlng2.lng * Math.PI / 180,
+      latdiff = lat2 - lat1,
+      lngdiff = lng2 - lng1;
+
+    return 6372795 * 2 * Math.asin(
+      Math.sqrt(
+        Math.pow(Math.sin(latdiff / 2), 2) + 
+        Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2)
+      ));
   }
 };