X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c75d725893c78175f27af02804e69e181df47ad7..ad368d189f4842f18e81fd272c677e5d820a2da4:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a9c76d17f..2b8bc5d26 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -2,215 +2,141 @@ //= 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 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(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) { - 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(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; - } - - if (object && $(link).hasClass("object")) { - args[object.type] = object.id; - } - - var minzoom = $(link).data("minzoom"); - if (minzoom) { - var name = link.id.replace(/anchor$/, ""); - - $(link).off("click.minzoom"); - - if (zoom >= minzoom) { - $(link).attr("title", I18n.t("javascripts.site." + name + "_tooltip")); - $(link).removeClass("disabled"); - } else { - $(link).on("click.minzoom", function () { alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; }); - $(link).attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip")); - $(link).addClass("disabled"); - } - } - - link.href = setArgs(link.href, args); - } - - function setShortlink() { - var args = getArgs(this.href); - var code = makeShortCode(lat, lon, zoom); - var prefix = shortlinkPrefix(); - - // Add ?{node,way,relation}=id to the arguments - if (object) { - args[object.type] = object.id; - } +function normalBounds(bounds) { + if (bounds instanceof L.LatLngBounds) return bounds; + return new L.LatLngBounds( + new L.LatLng(bounds[0][0], bounds[0][1]), + new L.LatLng(bounds[1][0], bounds[1][1])); +} - // This is a hack to omit the default mapnik layer from the shortlink. - if (layers && layers != "M") { - args.layers = layers; - } - else { - delete args.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 = $('