X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/99775524b35017256203903962990c9dd212dbb4..957d75295b2c379b17e61a2a22ee28fb5f701589:/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 a3022f9ae..6afebf8e5 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -8,6 +8,19 @@ OSM = { 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 %>, + + 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 %>, apiUrl: function (object) { var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; @@ -38,7 +51,7 @@ OSM = { }, mapParams: function (search) { - var params = OSM.params(search), mapParams = {}, bounds, loc, match; + var params = OSM.params(search), mapParams = {}, loc, match; if (params.mlon && params.mlat) { mapParams.marker = true; @@ -46,42 +59,13 @@ OSM = { mapParams.mlat = parseFloat(params.mlat); } - match = window.location.pathname.match(/\/browse\/(node|way|relation|changeset)\/(\d+)/); - if (match) { - mapParams.object_zoom = true; - mapParams.object = {type: match[1], id: parseInt(match[2])}; - } else if (params.node || params.way || params.relation || params.note) { - mapParams.object_zoom = true; - - 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)}; - } - } - - match = window.location.pathname.match(/\/browse\/note\/(\d+)/); - if (match) { - mapParams.note = parseInt(match[1]); - } else if (params.note) { - mapParams.note = parseInt(params.note); - } - - if (params.bbox) { - params.bbox = params.bbox.split(','); - bounds = L.latLngBounds( - [parseFloat(params.bbox[1]), - parseFloat(params.bbox[0])], - [parseFloat(params.bbox[3]), - parseFloat(params.bbox[2])]); - } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) { - bounds = L.latLngBounds( - [parseFloat(params.minlat), - parseFloat(params.minlon)], - [parseFloat(params.maxlat), - parseFloat(params.maxlon)]); + // 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)}; } var hash = OSM.parseHash(location.hash); @@ -91,22 +75,19 @@ OSM = { mapParams.lon = hash.center.lng; mapParams.lat = hash.center.lat; mapParams.zoom = hash.zoom; - mapParams.object_zoom = false; - } else if (bounds) { - mapParams.lon = bounds.getCenter().lng; // Not used by main map, but - mapParams.lat = bounds.getCenter().lat; // are used by iD/Potlatch. - mapParams.bounds = bounds; - mapParams.object_zoom = false; - } else if (params.lon && params.lat) { - mapParams.lon = parseFloat(params.lon); - mapParams.lat = parseFloat(params.lat); - mapParams.zoom = parseInt(params.zoom || 5); - mapParams.object_zoom = false; + } 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); - mapParams.object_zoom = false; } else if (loc = $.cookie('_osm_location')) { loc = loc.split("|"); mapParams.lon = parseFloat(loc[0]); @@ -139,12 +120,29 @@ OSM = { }, parseHash: function(hash) { - if (hash.indexOf('#') === 0) { - hash = hash.substr(1); + var args = {}; + + var i = hash.indexOf('#'); + if (i < 0) { + return args; } - hash = querystring.parse(hash); - var args = L.Hash.parseHash(hash.map || '') || {}; - if (hash.layers) args.layers = hash.layers; + + hash = querystring.parse(hash.substr(i + 1)); + + 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)) { + args.center = new L.LatLng(lat, lon); + args.zoom = zoom; + } + + if (hash.layers) { + args.layers = hash.layers; + } + return args; }, @@ -156,7 +154,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 || ''; } @@ -164,7 +162,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); @@ -174,5 +172,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) + )); } };