Associate search input with route destination instead of departure

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

 
 

-  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 %>,
+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;
+    const apiType = object.type === "note" ? "notes" : object.type;
+    let 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";


@@ -34,24 +56,14 @@ 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) {
+    const 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;
+    const params = OSM.params(search),
+          mapParams = {};

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


@@ -60,15 +72,19 @@ OSM = {
     }
 
     // Old-style object parameters; still in use for edit links e.g. /edit?way=1234
     }
 
     // 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)};
-    } else if (params.way) {
-      mapParams.object = {type: 'way', id: parseInt(params.way)};
-    } else if (params.relation) {
-      mapParams.object = {type: 'relation', id: parseInt(params.relation)};
+    for (const type of ["node", "way", "relation", "note"]) {
+      if (params[type]) {
+        mapParams.object = { type, id: parseInt(params[type], 10) };
+      }

     }
 
     }
 

-    var hash = OSM.parseHash(location.hash);
+    const hash = OSM.parseHash(location.hash);
+
+    const loc = Cookies.get("_osm_location")?.split("|");
+
+    function bboxToLatLngBounds({ minlon, minlat, maxlon, maxlat }) {
+      return L.latLngBounds([minlat, minlon], [maxlat, maxlon]);
+    }

 
     // Decide on a map starting position. Various ways of doing this.
     if (hash.center) {
 
     // Decide on a map starting position. Various ways of doing this.
     if (hash.center) {


@@ -76,42 +92,35 @@ OSM = {
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
     } else if (params.bbox) {
       mapParams.lat = hash.center.lat;
       mapParams.zoom = hash.zoom;
     } else if (params.bbox) {

-      var bbox = params.bbox.split(',');
-      mapParams.bounds = L.latLngBounds(
-        [parseFloat(bbox[1]), parseFloat(bbox[0])],
-        [parseFloat(bbox[3]), parseFloat(bbox[2])]);
+      const [minlon, minlat, maxlon, maxlat] = params.bbox.split(",");
+      mapParams.bounds = bboxToLatLngBounds({ minlon, minlat, maxlon, maxlat });

     } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {
     } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) {

-      mapParams.bounds = L.latLngBounds(
-        [parseFloat(params.minlat), parseFloat(params.minlon)],
-        [parseFloat(params.maxlat), parseFloat(params.maxlon)]);
+      mapParams.bounds = bboxToLatLngBounds(params);

     } else if (params.mlon && 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.lon = parseFloat(loc[0]);
-      mapParams.lat = parseFloat(loc[1]);
-      mapParams.zoom = parseInt(loc[2]);
+      mapParams.lon = params.mlon;
+      mapParams.lat = params.mlat;
+      mapParams.zoom = params.zoom || 12;
+    } else if (loc) {
+      [mapParams.lon, mapParams.lat, mapParams.zoom] = loc;

     } else if (OSM.home) {
       mapParams.lon = OSM.home.lon;
       mapParams.lat = OSM.home.lat;
       mapParams.zoom = 10;
     } else if (OSM.location) {
     } 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]);
+      mapParams.bounds = bboxToLatLngBounds(OSM.location);

     } 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 = params.zoom || 5;

     }
 
     }
 

-    mapParams.layers = hash.layers || (loc && loc[3]) || '';
+    if (typeof mapParams.lat === "string") mapParams.lat = parseFloat(mapParams.lat);
+    if (typeof mapParams.lon === "string") mapParams.lon = parseFloat(mapParams.lon);
+    if (typeof mapParams.zoom === "string") mapParams.zoom = parseInt(mapParams.zoom, 10);

 
 

-    var scale = parseFloat(params.scale);
+    mapParams.layers = hash.layers || (loc && loc[3]) || "";
+
+    const scale = parseFloat(params.scale);

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


@@ -119,35 +128,35 @@ OSM = {
     return mapParams;
   },
 
     return mapParams;
   },
 

-  parseHash: function(hash) {
-    var args = {};
+  parseHash: function (hash) {
+    const args = {};

 
 

-    var i = hash.indexOf('#');
+    const 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]);
+    const 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) {
-    var center, zoom, layers;
+  formatHash: function (args) {
+    let center, zoom, layers;

 
     if (args instanceof L.Map) {
       center = args.getCenter();
 
     if (args instanceof L.Map) {
       center = args.getCenter();


@@ -156,47 +165,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) {
+    const pixels = Math.pow(2, 8 + zoom);
+    const 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) {
-    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;
+  distance: function (latlng1, latlng2) {
+    const 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(
 
     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))

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