X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3cdd4b5d732ae6ea7a65490ed6797190f3f4330..606e66beb32d2b683651cf9ac7ae575d90df7ad6:/app/assets/javascripts/application.js?ds=sidebyside diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fc426e883..cb670da34 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -5,6 +5,7 @@ //= require augment //= require leaflet //= require leaflet.osm +//= require leaflet.zoom //= require leaflet.extend //= require leaflet.locationfilter //= require i18n/translations @@ -15,7 +16,6 @@ //= require menu //= require sidebar //= require richtext -//= require resize //= require geocoder //= require querystring @@ -99,40 +99,42 @@ function updatelinks(loc, zoom, layers, bounds, object) { 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")) - .removeClass("disabled"); - } else { - $(link).on("click.minzoom", minZoomAlert) - .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip")) - .addClass("disabled"); - } + var name = link.id.replace(/anchor$/, ""); + $(link).off("click.minzoom"); + if (zoom >= minzoom) { + $(link) + .attr("title", I18n.t("javascripts.site." + name + "_tooltip")) + .removeClass("disabled"); + } else { + $(link) + .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip")) + .addClass("disabled") + .on("click.minzoom", function () { + alert(I18n.t("javascripts.site." + name + "_zoom_alert")); + return false; + }); + } } link.href = base + '?' + querystring.stringify(args); } } -function minZoomAlert() { - alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; -} - function getShortUrl(map) { return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ? - 'http://osm.org/go/' : '/go/') + + 'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/') + makeShortCode(map); } function getUrl(map) { var center = map.getCenter(), - zoom = map.getZoom(); + zoom = map.getZoom(), + toZoom = zoomPrecision(zoom); return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ? - 'http://openstreetmap.org/?' : '/?') + + 'http://openstreetmap.org/?' : 'http://' + window.location.hostname + '/?') + querystring.stringify({ - lat: center.lat, - lon: center.lng, + lat: toZoom(center.lat), + lon: toZoom(center.lng), zoom: zoom, layers: map.getLayersCode() });