X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ce53e510adb1baed6cc8f27e48d810a586853e55..1b2bfb6e9242d5ec8ff5ab65d44b5761d95d1942:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 4bfc5cad1..15c1682d5 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,7 +1,6 @@ OSM = { -<% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) %> - PIWIK_LOCATION: <%= PIWIK_LOCATION.to_json %>, - PIWIK_SITE: <%= PIWIK_SITE.to_json %>, +<% if defined?(PIWIK) %> + PIWIK: <%= PIWIK.to_json %>, <% end %> MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, @@ -9,11 +8,12 @@ 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 %>, apiUrl: function (object) { var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; - if (object.type != "node") { + if (object.type === "way" || object.type === "relation") { url += "/full"; } else if (object.version) { url += "/" + object.version; @@ -22,8 +22,8 @@ OSM = { return url; }, - mapParams: function (search) { - var params = {}, mapParams = {}, bounds, loc; + params: function(search) { + var params = {}; search = (search || window.location.search).replace('?', '').split(/&|;/); @@ -35,73 +35,52 @@ OSM = { params[key] = decodeURIComponent(val); } + return params; + }, + + mapParams: function (search) { + var params = OSM.params(search), mapParams = {}, loc, match; + if (params.mlon && params.mlat) { mapParams.marker = true; mapParams.mlon = parseFloat(params.mlon); mapParams.mlat = parseFloat(params.mlat); } - if (params.layers) { - mapParams.layers = params.layers; - } - - if (params.node || params.way || params.relation) { - 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)}; - } - } - - 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)}; } - if (params.box === 'yes') { - mapParams.box = bounds; - } + var hash = OSM.parseHash(location.hash); // Decide on a map starting position. Various ways of doing this. - var hash = L.Hash.parseHash(location.hash); - if (hash) { + if (hash.center) { mapParams.lon = hash.center.lng; mapParams.lat = hash.center.lat; mapParams.zoom = hash.zoom; - mapParams.object_zoom = false; - } else if (bounds) { - 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]); mapParams.lat = parseFloat(loc[1]); mapParams.zoom = parseInt(loc[2]); - mapParams.layers = loc[3]; } else if (OSM.home) { mapParams.lon = OSM.home.lon; mapParams.lat = OSM.home.lat; @@ -118,11 +97,7 @@ OSM = { mapParams.zoom = parseInt(params.zoom || 5); } - mapParams.notes = params.notes == "yes"; - - if (params.note) { - mapParams.note = parseInt(params.note); - } + mapParams.layers = hash.layers || (loc && loc[3]) || ''; var scale = parseFloat(params.scale); if (scale > 0) { @@ -130,5 +105,86 @@ OSM = { } return mapParams; + }, + + parseHash: function(hash) { + var args = {}; + + var i = hash.indexOf('#'); + if (i < 0) { + return args; + } + + 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; + }, + + formatHash: function(args) { + var center, zoom, layers; + + if (args instanceof L.Map) { + center = args.getCenter(); + zoom = args.getZoom(); + layers = args.getLayersCode(); + } else { + center = args.center || L.latLng(args.lat, args.lon); + zoom = args.zoom; + 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); + + if (layers) { + hash += '&layers=' + layers; + } + + 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) + )); } };