X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e96a64ca9c2ea068dd9167e074ee26c8d28744b4..286bffa3dba448f4364c6798f35003d8c6eefc4a:/app/assets/javascripts/application.js?ds=inline diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e91a9036f..83c17b6ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -2,37 +2,28 @@ //= 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 i18n/translations //= require oauth -//= require osm //= require piwik //= require map -//= require menu -//= require sidebar //= 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; - }; -} - -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])); + return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); } function remoteEditHandler(bbox, select) { @@ -45,12 +36,21 @@ function remoteEditHandler(bbox, select) { }; if (select) query.select = select; - $("#linkloader") + + var iframe = $('