X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/64f5b3f5113e5e2dcf4f44921c200c2335066779..de5a225a95125db1a66d6dfbaa3a790db9719c18:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c9eddfb9c..0ee6dc880 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 @@ -19,7 +20,7 @@ //= require geocoder //= require querystring -var querystring = require('querystring'); +var querystring = require('querystring-component'); function zoomPrecision(zoom) { var decimals = Math.pow(10, Math.floor(zoom/3)); @@ -35,6 +36,27 @@ function normalBounds(bounds) { new L.LatLng(bounds[1][0], bounds[1][1])); } +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; + $("#linkloader") + .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query)) + .load(function() { loaded = true; }); + + setTimeout(function () { + if (!loaded) alert(I18n.t('site.index.remote_failed')); + }, 1000); + + return false; +} + /* * Called as the user scrolls/zooms around to maniplate hrefs of the * view tab and various other links @@ -63,9 +85,9 @@ function updatelinks(loc, zoom, layers, bounds, object) { if ($(link).hasClass("llz")) { $.extend(args, { - lat: '' + lat, - lon: '' + lon, - zoom: '' + zoom + lat: lat, + lon: lon, + zoom: zoom }); } else if (minlon && $(link).hasClass("bbox")) { $.extend(args, { @@ -93,27 +115,38 @@ function updatelinks(loc, zoom, layers, bounds, object) { } } +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/') + makeShortCode(map); } -function minZoomAlert() { - alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; +function getUrl(map) { + var center = map.getCenter(), + zoom = map.getZoom(), + toZoom = zoomPrecision(zoom); + + return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ? + 'http://openstreetmap.org/?' : '/?') + + querystring.stringify({ + lat: toZoom(center.lat), + lon: toZoom(center.lng), + zoom: zoom, + layers: map.getLayersCode() + }); } -/* - * Called to create a short code for the short link. - */ +// Called to create a short code for the short link. function makeShortCode(map) { - var lon = map.getCenter().lng, - lat = map.getCenter().lat, - zoom = map.getZoom(), + var zoom = map.getZoom(), str = '', char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~", - x = Math.round((lon + 180.0) * ((1 << 30) / 90.0)), - y = Math.round((lat + 90.0) * ((1 << 30) / 45.0)), + x = Math.round((map.getCenter().lng + 180.0) * ((1 << 30) / 90.0)), + y = Math.round((map.getCenter().lat + 90.0) * ((1 << 30) / 45.0)), // JavaScript only has to keep 32 bits of bitwise operators, so this has to be // done in two parts. each of the parts c1/c2 has 30 bits of the total in it // and drops the last 4 bits of the full 64 bit Morton code. @@ -129,9 +162,7 @@ function makeShortCode(map) { } for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-"; - /* - * Called to interlace the bits in x and y, making a Morton code. - */ + // Called to interlace the bits in x and y, making a Morton code. function interlace(x, y) { x = (x | (x << 8)) & 0x00ff00ff; x = (x | (x << 4)) & 0x0f0f0f0f; @@ -147,6 +178,12 @@ function makeShortCode(map) { return str; } +// generate a cookie-safe string of map state +function cookieContent(map) { + var center = map.getCenter().wrap(); + return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|'); +} + /* * Forms which have been cached by rails may have the wrong * authenticity token, so patch up any forms with the correct