Merge pull request #5591 from AntonKhorev/api-element-resources--index-paths

[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 15c1682d5f0e14e925a8c5a4496da16ff577dc02..749cf5b7736767b6e52a59e70c02babac07d9022 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,17 +1,51 @@
-OSM = {
-<% if defined?(PIWIK) %>
-  PIWIK:                 <%= PIWIK.to_json %>,
-<% end %>
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= depend_on layers.yml
+//= depend_on key.yml

 
 

-  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 %>,
-  OVERPASS_URL:          <%= OVERPASS_URL.to_json %>,
+OSM = {
+  ...<%=
+    %i[
+      matomo
+      max_request_area
+      server_protocol
+      server_url
+      api_version
+      status
+      max_note_request_area
+      overpass_url
+      overpass_credentials
+      nominatim_url
+      graphhopper_url
+      fossgis_osrm_url
+      fossgis_valhalla_url
+      thunderforest_key
+      tracestrack_key
+    ]
+      .each_with_object({}) do |key, hash|
+        hash[key.to_s.upcase] = Settings.send(key) if Settings.respond_to?(key)
+      end.to_json
+  %>,
+
+  DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>,
+
+  LAYER_DEFINITIONS: <%= YAML.load_file(Rails.root.join("config/layers.yml")).to_json %>,
+  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_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 %>,
+
+  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";


@@ -22,24 +56,13 @@ OSM = {
     return url;
   },
 
     return url;
   },
 

-  params: function(search) {
-    var params = {};
-
-    search = (search || window.location.search).replace('?', '').split(/&|;/);
-
-    for (var i = 0; i < search.length; ++i) {
-      var pair = search[i],
-        j = pair.indexOf('='),
-        key = pair.slice(0, j),
-        val = pair.slice(++j);
-      params[key] = decodeURIComponent(val);
-    }
-
-    return params;
+  params: function (search) {
+    var query = search || window.location.search;
+    return Object.fromEntries(new URLSearchParams(query));

   },
 
   mapParams: function (search) {
   },
 
   mapParams: function (search) {

-    var params = OSM.params(search), mapParams = {}, loc, match;
+    var params = OSM.params(search), mapParams = {};

 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;
 
     if (params.mlon && params.mlat) {
       mapParams.marker = true;


@@ -49,22 +72,26 @@ OSM = {
 
     // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
     if (params.node) {
 
     // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
     if (params.node) {

-      mapParams.object = {type: 'node', id: parseInt(params.node)};
+      mapParams.object = { type: "node", id: parseInt(params.node, 10) };

     } else if (params.way) {
     } else if (params.way) {

-      mapParams.object = {type: 'way', id: parseInt(params.way)};
+      mapParams.object = { type: "way", id: parseInt(params.way, 10) };

     } else if (params.relation) {
     } else if (params.relation) {

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

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

+    const loc = Cookies.get("_osm_location")?.split("|");
+

     // Decide on a map starting position. Various ways of doing this.
     if (hash.center) {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
     } else if (params.bbox) {
     // Decide on a map starting position. Various ways of doing this.
     if (hash.center) {
       mapParams.lon = hash.center.lng;
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
     } else if (params.bbox) {

-      var bbox = params.bbox.split(',');
+      var bbox = params.bbox.split(",");

       mapParams.bounds = L.latLngBounds(
         [parseFloat(bbox[1]), parseFloat(bbox[0])],
         [parseFloat(bbox[3]), parseFloat(bbox[2])]);
       mapParams.bounds = L.latLngBounds(
         [parseFloat(bbox[1]), parseFloat(bbox[0])],
         [parseFloat(bbox[3]), parseFloat(bbox[2])]);


@@ -75,29 +102,27 @@ OSM = {
     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
     } else if (params.mlon && params.mlat) {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);

-      mapParams.zoom = parseInt(params.zoom || 12);
-    } else if (loc = $.cookie('_osm_location')) {
-      loc = loc.split("|");
+      mapParams.zoom = parseInt(params.zoom || 12, 10);
+    } else if (loc) {

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

-      mapParams.zoom = parseInt(loc[2]);
+      mapParams.zoom = parseInt(loc[2], 10);

     } else if (OSM.home) {
       mapParams.lon = OSM.home.lon;
       mapParams.lat = OSM.home.lat;
       mapParams.zoom = 10;
     } else if (OSM.location) {
       mapParams.bounds = L.latLngBounds(
     } else if (OSM.home) {
       mapParams.lon = OSM.home.lon;
       mapParams.lat = OSM.home.lat;
       mapParams.zoom = 10;
     } else if (OSM.location) {
       mapParams.bounds = L.latLngBounds(

-        [OSM.location.minlat,
-         OSM.location.minlon],
-        [OSM.location.maxlat,
-         OSM.location.maxlon]);
+        [OSM.location.minlat, OSM.location.minlon],
+        [OSM.location.maxlat, OSM.location.maxlon]
+      );

     } else {
       mapParams.lon = -0.1;
       mapParams.lat = 51.5;
     } else {
       mapParams.lon = -0.1;
       mapParams.lat = 51.5;

-      mapParams.zoom = parseInt(params.zoom || 5);
+      mapParams.zoom = parseInt(params.zoom || 5, 10);

     }
 
     }
 

-    mapParams.layers = hash.layers || (loc && loc[3]) || '';
+    mapParams.layers = hash.layers || (loc && loc[3]) || "";

 
     var scale = parseFloat(params.scale);
     if (scale > 0) {
 
     var scale = parseFloat(params.scale);
     if (scale > 0) {


@@ -107,34 +132,34 @@ OSM = {
     return mapParams;
   },
 
     return mapParams;
   },
 

-  parseHash: function(hash) {
+  parseHash: function (hash) {

     var args = {};
 
     var args = {};
 

-    var i = hash.indexOf('#');
+    var i = hash.indexOf("#");

     if (i < 0) {
       return args;
     }
 
     if (i < 0) {
       return args;
     }
 

-    hash = querystring.parse(hash.substr(i + 1));
+    const hashParams = new URLSearchParams(hash.slice(i + 1));

 
 

-    var map = (hash.map || '').split('/'),
-      zoom = parseInt(map[0], 10),
-      lat = parseFloat(map[1]),
-      lon = parseFloat(map[2]);
+    var map = (hashParams.get("map") || "").split("/"),
+        zoom = parseInt(map[0], 10),
+        lat = parseFloat(map[1]),
+        lon = parseFloat(map[2]);

 
     if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
       args.center = new L.LatLng(lat, lon);
       args.zoom = zoom;
     }
 
 
     if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) {
       args.center = new L.LatLng(lat, lon);
       args.zoom = zoom;
     }
 

-    if (hash.layers) {
-      args.layers = hash.layers;
+    if (hashParams.has("layers")) {
+      args.layers = hashParams.get("layers");

     }
 
     return args;
   },
 
     }
 
     return args;
   },
 

-  formatHash: function(args) {
+  formatHash: function (args) {

     var center, zoom, layers;
 
     if (args instanceof L.Map) {
     var center, zoom, layers;
 
     if (args instanceof L.Map) {


@@ -144,47 +169,50 @@ OSM = {
     } else {
       center = args.center || L.latLng(args.lat, args.lon);
       zoom = args.zoom;
     } else {
       center = args.center || L.latLng(args.lat, args.lon);
       zoom = args.zoom;

-      layers = args.layers || '';
+      layers = args.layers || "";

     }
 
     }
 

-    center = center.wrap();
-    layers = layers.replace('M', '');
+    layers = layers.replace("M", "");

 
 

-    var precision = OSM.zoomPrecision(zoom),
-      hash = '#map=' + zoom +
-        '/' + center.lat.toFixed(precision) +
-        '/' + center.lng.toFixed(precision);
+    let hash = "#map=" + [zoom, ...OSM.cropLocation(center, zoom)].join("/");

 
     if (layers) {
 
     if (layers) {

-      hash += '&layers=' + layers;
+      hash += "&layers=" + layers;

     }
 
     return hash;
   },
 
     }
 
     return hash;
   },
 

-  zoomPrecision: function(zoom) {
-    return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+  zoomPrecision: function (zoom) {
+    var pixels = Math.pow(2, 8 + zoom);
+    var degrees = 180;
+    return Math.ceil(Math.log10(pixels / degrees));
+  },
+
+  cropLocation: function (latLng, zoom) {
+    const precision = OSM.zoomPrecision(zoom),
+          wrapped = latLng.wrap();
+    return [wrapped.lat, wrapped.lng].map(c => c.toFixed(precision));

   },
 
   },
 

-  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('|');
+  locationCookie: function (map) {
+    const zoom = map.getZoom(),
+          center = OSM.cropLocation(map.getCenter(), zoom).reverse();
+    return [...center, zoom, map.getLayersCode()].join("|");

   },
 
   },
 

-  distance: function(latlng1, latlng2) {
+  distance: function (latlng1, latlng2) {

     var lat1 = latlng1.lat * Math.PI / 180,
     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;
+        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(
 
     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)
+        Math.pow(Math.sin(latdiff / 2), 2) +
+        (Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2))

       ));
   }
 };
       ));
   }
 };