Subscribe users when they interact with notes

[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 31bb23c4b7458dff99af3aaf48bb200f92f6a4dd..e08528f845da2b2cee72780d3197720fbc42ab02 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,41 +1,51 @@
-//= depend_on application.yml
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= depend_on key.yml
+//= require qs/dist/qs

 
 OSM = {
 
 OSM = {

-<% if defined?(PIWIK) %>
-  PIWIK:                   <%= PIWIK.to_json %>,
+<% if defined?(Settings.matomo) %>
+  MATOMO:                  <%= Settings.matomo.to_json %>,

 <% end %>
 
   MAX_REQUEST_AREA:        <%= Settings.max_request_area.to_json %>,
   SERVER_PROTOCOL:         <%= Settings.server_protocol.to_json %>,
   SERVER_URL:              <%= Settings.server_url.to_json %>,
   API_VERSION:             <%= Settings.api_version.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:        <%= Settings.max_request_area.to_json %>,
   SERVER_PROTOCOL:         <%= Settings.server_protocol.to_json %>,
   SERVER_URL:              <%= Settings.server_url.to_json %>,
   API_VERSION:             <%= Settings.api_version.to_json %>,

-  STATUS:                  <%= STATUS.to_json %>,
+  STATUS:                  <%= Settings.status.to_json %>,

   MAX_NOTE_REQUEST_AREA:   <%= Settings.max_note_request_area.to_json %>,
   OVERPASS_URL:            <%= Settings.overpass_url.to_json %>,
   MAX_NOTE_REQUEST_AREA:   <%= Settings.max_note_request_area.to_json %>,
   OVERPASS_URL:            <%= Settings.overpass_url.to_json %>,

+  OVERPASS_CREDENTIALS:    <%= Settings.overpass_credentials.to_json %>,

   NOMINATIM_URL:           <%= Settings.nominatim_url.to_json %>,
   GRAPHHOPPER_URL:         <%= Settings.graphhopper_url.to_json %>,
   FOSSGIS_OSRM_URL:        <%= Settings.fossgis_osrm_url.to_json %>,
   NOMINATIM_URL:           <%= Settings.nominatim_url.to_json %>,
   GRAPHHOPPER_URL:         <%= Settings.graphhopper_url.to_json %>,
   FOSSGIS_OSRM_URL:        <%= Settings.fossgis_osrm_url.to_json %>,

+  FOSSGIS_VALHALLA_URL:    <%= Settings.fossgis_valhalla_url.to_json %>,

   DEFAULT_LOCALE:          <%= I18n.default_locale.to_json %>,
 
 <% if Settings.key?(:thunderforest_key) %>
   THUNDERFOREST_KEY:       <%= Settings.thunderforest_key.to_json %>,
 <% end %>
 
   DEFAULT_LOCALE:          <%= I18n.default_locale.to_json %>,
 
 <% if Settings.key?(:thunderforest_key) %>
   THUNDERFOREST_KEY:       <%= Settings.thunderforest_key.to_json %>,
 <% end %>
 

+<% if Settings.key?(:tracestrack_key) %>
+  TRACESTRACK_KEY:         <%= Settings.tracestrack_key.to_json %>,
+<% end %>
+
+  LAYERS_WITH_MAP_KEY:     <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>,
+

   MARKER_GREEN:            <%= image_path("marker-green.png").to_json %>,
   MARKER_RED:              <%= image_path("marker-red.png").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 %>,
+  MARKER_ICON:             <%= image_path("leaflet/dist/images/marker-icon.png").to_json %>,
+  MARKER_ICON_2X:          <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>,
+  MARKER_SHADOW:           <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>,

 
 

-  SEARCHING:               <%= image_path("searching.gif").to_json %>,
+  NEW_NOTE_MARKER:         <%= image_path("new_note_marker.svg").to_json %>,
+  OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.svg").to_json %>,
+  CLOSED_NOTE_MARKER:      <%= image_path("closed_note_marker.svg").to_json %>,

 
   apiUrl: function (object) {
 
   apiUrl: function (object) {

-    var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
+    var apiType = object.type === "note" ? "notes" : object.type;
+    var url = "/api/" + OSM.API_VERSION + "/" + apiType + "/" + object.id;

 
     if (object.type === "way" || object.type === "relation") {
       url += "/full";
 
     if (object.type === "way" || object.type === "relation") {
       url += "/full";


@@ -83,6 +93,8 @@ OSM = {
       mapParams.object = {type: 'way', id: parseInt(params.way)};
     } else if (params.relation) {
       mapParams.object = {type: 'relation', id: parseInt(params.relation)};
       mapParams.object = {type: 'way', id: parseInt(params.way)};
     } else if (params.relation) {
       mapParams.object = {type: 'relation', id: parseInt(params.relation)};

+    } else if (params.note) {
+      mapParams.object = {type: 'note', id: parseInt(params.note)};

     }
 
     var hash = OSM.parseHash(location.hash);
     }
 
     var hash = OSM.parseHash(location.hash);


@@ -105,7 +117,7 @@ OSM = {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);

-    } else if (loc = $.cookie('_osm_location')) {
+    } else if (loc = Cookies.get('_osm_location')) {

       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
       mapParams.lat = parseFloat(loc[1]);
       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
       mapParams.lat = parseFloat(loc[1]);


@@ -144,7 +156,7 @@ OSM = {
       return args;
     }
 
       return args;
     }
 

-    hash = querystring.parse(hash.substr(i + 1));
+    hash = Qs.parse(hash.slice(i + 1));

 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),
 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),


@@ -192,7 +204,9 @@ OSM = {
   },
 
   zoomPrecision: function(zoom) {
   },
 
   zoomPrecision: function(zoom) {

-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+    var pixels = Math.pow(2, 8 + zoom);
+    var degrees = 180;
+    return Math.ceil(Math.log10(pixels / degrees));

   },
 
   locationCookie: function(map) {
   },
 
   locationCookie: function(map) {