X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a805e0b545a37b19a4162e71850bef9aba9d6628..b0d3ecb3c31e87f294d57d92a404220094e7bbd5:/app/assets/javascripts/osm.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index cb3737351..e429f4479 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,16 +1,51 @@ +//= depend_on settings.yml +//= depend_on settings.local.yml +//= depend_on key.yml +//= require qs/dist/qs + 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 %>, + 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 %> - 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 %>, +<% 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_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 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"; @@ -31,7 +66,12 @@ OSM = { j = pair.indexOf('='), key = pair.slice(0, j), val = pair.slice(++j); - params[key] = decodeURIComponent(val); + + try { + params[key] = decodeURIComponent(val); + } catch (e) { + // Ignore parse exceptions + } } return params; @@ -46,12 +86,15 @@ OSM = { mapParams.mlat = parseFloat(params.mlat); } + // 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)}; + } else if (params.note) { + mapParams.object = {type: 'note', id: parseInt(params.note)}; } var hash = OSM.parseHash(location.hash); @@ -61,15 +104,20 @@ OSM = { mapParams.lon = hash.center.lng; mapParams.lat = hash.center.lat; mapParams.zoom = hash.zoom; - } else if (params.lon && params.lat) { - mapParams.lon = parseFloat(params.lon); - mapParams.lat = parseFloat(params.lat); - mapParams.zoom = parseInt(params.zoom || 5); + } 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])]); + } 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)]); } 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')) { + } else if (loc = Cookies.get('_osm_location')) { loc = loc.split("|"); mapParams.lon = parseFloat(loc[0]); mapParams.lat = parseFloat(loc[1]); @@ -101,37 +149,25 @@ OSM = { }, parseHash: function(hash) { + var args = {}; + var i = hash.indexOf('#'); if (i < 0) { - return false; + return args; } - hash = hash.substr(i + 1); + hash = Qs.parse(hash.slice(i + 1)); - if (hash === '') { - return false; - } - - hash = querystring.parse(hash); - - var args = hash.map.split("/"); - if (args.length !== 3) { - return false; - } - - var zoom = parseInt(args[0], 10), - lat = parseFloat(args[1]), - lon = parseFloat(args[2]); + var map = (hash.map || '').split('/'), + zoom = parseInt(map[0], 10), + lat = parseFloat(map[1]), + lon = parseFloat(map[2]); - if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) { - return false; + if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) { + args.center = new L.LatLng(lat, lon); + args.zoom = zoom; } - args = { - center: new L.LatLng(lat, lon), - zoom: zoom - }; - if (hash.layers) { args.layers = hash.layers; } @@ -147,7 +183,7 @@ OSM = { zoom = args.getZoom(); layers = args.getLayersCode(); } else { - center = L.latLng(args.lat, args.lon); + center = args.center || L.latLng(args.lat, args.lon); zoom = args.zoom; layers = args.layers || ''; } @@ -155,7 +191,7 @@ OSM = { center = center.wrap(); layers = layers.replace('M', ''); - var precision = zoomPrecision(zoom), + var precision = OSM.zoomPrecision(zoom), hash = '#map=' + zoom + '/' + center.lat.toFixed(precision) + '/' + center.lng.toFixed(precision); @@ -165,5 +201,31 @@ OSM = { } return hash; + }, + + zoomPrecision: function(zoom) { + return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); + }, + + 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('|'); + }, + + 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; + + 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) + )); } };