Reuse styles for map-ui panel

[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 33f190412622334f895c3d40f683629acf899c82..81c1e315217711a2c5d23631c4b8b0802dc2fb1d 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,12 +1,14 @@
 OSM = {
 <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>
 OSM = {
 <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %>

-  PIWIK_LOCATION:   <%= PIWIK_LOCATION.to_json %>,
-  PIWIK_SITE:       <%= PIWIK_SITE.to_json %>,
+  PIWIK_LOCATION:        <%= PIWIK_LOCATION.to_json %>,
+  PIWIK_SITE:            <%= PIWIK_SITE.to_json %>,

 <% end %>
 
 <% end %>
 

-  MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>,
-  SERVER_URL:       <%= SERVER_URL.to_json %>,
-  API_VERSION:      <%= API_VERSION.to_json %>,
+  MAX_REQUEST_AREA:      <%= MAX_REQUEST_AREA.to_json %>,
+  SERVER_URL:            <%= SERVER_URL.to_json %>,
+  API_VERSION:           <%= API_VERSION.to_json %>,
+  STATUS:                <%= STATUS.to_json %>,
+  MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,

 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;


@@ -23,7 +25,7 @@ OSM = {
   mapParams: function (search) {
     var params = {}, mapParams = {}, loc;
 
   mapParams: function (search) {
     var params = {}, mapParams = {}, loc;
 

-    search = (search || window.location.search).replace('?', '').split('&');
+    search = (search || window.location.search).replace('?', '').split(/&|;/);

 
     for (var i = 0; i < search.length; ++i) {
       var pair = search[i],
 
     for (var i = 0; i < search.length; ++i) {
       var pair = search[i],


@@ -111,6 +113,10 @@ OSM = {
 
     mapParams.notes = params.notes == "yes";
 
 
     mapParams.notes = params.notes == "yes";
 

+    if (params.note) {
+      mapParams.note = parseInt(params.note);
+    }
+

     var scale = parseFloat(params.scale);
     if (scale > 0) {
       mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);
     var scale = parseFloat(params.scale);
     if (scale > 0) {
       mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0);