X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7af04f8691b2be446af91ae8c51dc0e196bd22fb..83b3db99747b9630dff3ad3292a68daa6599d0e5:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a475aad4d..7072b7c6b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,220 +1,140 @@ //= require jquery //= require jquery_ujs -//= require jquery.autogrowtextarea //= require jquery.timers +//= require jquery.cookie +//= require jquery.throttle-debounce +//= require bootstrap.tooltip +//= require bootstrap.dropdown //= require augment -//= require openlayers +//= require osm +//= require leaflet +//= require leaflet.osm +//= require leaflet.map +//= require leaflet.zoom +//= require leaflet.locationfilter //= require i18n/translations -//= require globals +//= require oauth //= require piwik -//= require browse -//= require export -//= require map -//= require key -//= require menu -//= require sidebar //= require richtext +//= 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(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) { - var toPrecision = zoomPrecision(zoom); - var node; - - lat = toPrecision(lat); - lon = toPrecision(lon); - - if (minlon) { - minlon = toPrecision(minlon); - minlat = toPrecision(minlat); - maxlon = toPrecision(maxlon); - maxlat = toPrecision(maxlat); - } - - $(".geolink").each(function (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; - } - - if (objtype && $(link).hasClass("object")) { - args[objtype] = objid; +function remoteEditHandler(bbox, object) { + 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 (object) query.select = object.type + object.id; + + var iframe = $('