X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/483854f411ce7106144883824adb7e49060424c2..286bffa3dba448f4364c6798f35003d8c6eefc4a:/app/assets/javascripts/application.js?ds=inline diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7e9584d09..83c17b6ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -2,224 +2,140 @@ //= require jquery_ujs //= require jquery.timers //= require jquery.cookie +//= require jquery.throttle-debounce +//= require bootstrap.tooltip +//= require bootstrap.dropdown //= require augment +//= require osm //= require leaflet //= require leaflet.osm +//= require leaflet.hash +//= require leaflet.zoom +//= require leaflet.extend //= require leaflet.locationfilter -//= require leaflet.locate -//= require leaflet.note //= require i18n/translations //= require oauth -//= require osm //= require piwik //= require map -//= require menu -//= require sidebar -//= require leaflet.share //= require richtext -//= require resize -//= require geocoder +//= require querystring + +var querystring = require('querystring-component'); function zoomPrecision(zoom) { - var decimals = Math.pow(10, Math.floor(zoom/3)); - return function(x) { - return Math.round(x * decimals) / decimals; - }; + return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); } -/* - * Called as the user scrolls/zooms around to aniplate hrefs of the - * view tab and various other links - */ -function updatelinks(loc, zoom, layers, minlon, minlat, maxlon, maxlat, object) { - var toPrecision = zoomPrecision(zoom); - var node; - - var lat = toPrecision(loc.lat), - lon = toPrecision(loc.lon || loc.lng); - - if (minlon) { - minlon = toPrecision(minlon); - minlat = toPrecision(minlat); - maxlon = toPrecision(maxlon); - maxlat = toPrecision(maxlat); - } - - $(".geolink").each(setGeolink); - $("#shortlinkanchor").each(setShortlink); - - function setGeolink(index, link) { - var args = getArgs(link.href); - - if ($(link).hasClass("llz")) { - args.lat = lat; - args.lon = lon; - args.zoom = zoom; - } else if (minlon && $(link).hasClass("bbox")) { - args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat; - } - - if (layers && $(link).hasClass("layers")) { - args.layers = layers; +function remoteEditHandler(bbox, select) { + var loaded = false, + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + if (select) query.select = select; + + var iframe = $('