X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b06be5e5d3b43fcd0707dd6ad3ab823d8acfe06..7cf9bf0e553a141acab2afea53842f97eddd0a40:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 602d3af10..749cf5b77 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -2,48 +2,46 @@ //= depend_on settings.local.yml //= depend_on layers.yml //= depend_on key.yml -//= require qs/dist/qs OSM = { -<% 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 %>, - STATUS: <%= Settings.status.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 %>, - 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 %> - -<% if Settings.key?(:tracestrack_key) %> - TRACESTRACK_KEY: <%= Settings.tracestrack_key.to_json %>, -<% end %> - - 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 %>, + ...<%= + %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) { var apiType = object.type === "note" ? "notes" : object.type; @@ -59,28 +57,12 @@ OSM = { }, 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); - - try { - params[key] = decodeURIComponent(val); - } catch (e) { - // Ignore parse exceptions - } - } - - return params; + var query = search || window.location.search; + return Object.fromEntries(new URLSearchParams(query)); }, mapParams: function (search) { - var params = OSM.params(search), mapParams = {}, match; + var params = OSM.params(search), mapParams = {}; if (params.mlon && params.mlat) { mapParams.marker = true; @@ -158,9 +140,9 @@ OSM = { return args; } - hash = Qs.parse(hash.slice(i + 1)); + const hashParams = new URLSearchParams(hash.slice(i + 1)); - var map = (hash.map || "").split("/"), + var map = (hashParams.get("map") || "").split("/"), zoom = parseInt(map[0], 10), lat = parseFloat(map[1]), lon = parseFloat(map[2]); @@ -170,8 +152,8 @@ OSM = { args.zoom = zoom; } - if (hash.layers) { - args.layers = hash.layers; + if (hashParams.has("layers")) { + args.layers = hashParams.get("layers"); } return args; @@ -190,13 +172,9 @@ OSM = { layers = args.layers || ""; } - center = center.wrap(); 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) { hash += "&layers=" + layers; @@ -211,11 +189,16 @@ OSM = { 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("|"); + const zoom = map.getZoom(), + center = OSM.cropLocation(map.getCenter(), zoom).reverse(); + return [...center, zoom, map.getLayersCode()].join("|"); }, distance: function (latlng1, latlng2) { @@ -229,7 +212,7 @@ OSM = { 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.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2)) )); } };