X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5fc7a47f6daf5c05da31794b6ba5a7c7dfd0c931..de5a225a95125db1a66d6dfbaa3a790db9719c18:/app/assets/javascripts/application.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index eb338aa93..0ee6dc880 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -5,6 +5,8 @@ //= require augment //= require leaflet //= require leaflet.osm +//= require leaflet.zoom +//= require leaflet.extend //= require leaflet.locationfilter //= require i18n/translations //= require oauth @@ -18,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)); @@ -34,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 @@ -54,18 +77,17 @@ function updatelinks(loc, zoom, layers, bounds, object) { } $(".geolink").each(setGeolink); - $("#shortlinkanchor").each(setShortlink); function setGeolink(index, link) { - var base = link.href.split('?')[0]; - var qs = link.href.split('?')[1]; - var args = querystring.parse(qs); + var base = link.href.split('?')[0], + qs = link.href.split('?')[1], + args = querystring.parse(qs); 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, { @@ -79,9 +101,7 @@ 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"); @@ -91,102 +111,81 @@ function updatelinks(loc, zoom, layers, bounds, object) { .addClass("disabled"); } } - link.href = base + '?' + querystring.stringify(args); } - - - function setShortlink() { - var base = link.href.split('?')[0], - qs = link.href.split('?')[1], - args = querystring.parse(qs), - code = makeShortCode(lat, lon, zoom), - prefix = shortlinkPrefix(); - - // Add ?{node,way,relation}=id to the arguments - if (object) { - args[object.type] = object.id; - } - - // This is a hack to omit the default mapnik layer from the shortlink. - if (layers && layers != "M") { - args.layers = layers; - } else { - delete args.layers; - } - - // Here we're assuming that all parameters but ?layers= and - // ?{node,way,relation}= can be safely omitted from the shortlink - // which encodes lat/lon/zoom. If new URL parameters are added to - // the main slippy map this needs to be changed. - if (args.layers || object) { - this.href = prefix + "/go/" + code + '?' + querystring.stringify(args); - } else { - this.href = prefix + "/go/" + code; - } - } } function minZoomAlert() { alert(I18n.t("javascripts.site." + name + "_zoom_alert")); return false; } -/* - * Get the URL prefix to use for a short link - */ -function shortlinkPrefix() { - if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) { - return "http://osm.org"; - } else { - return ""; - } +function getShortUrl(map) { + return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ? + 'http://osm.org/go/' : '/go/') + + makeShortCode(map); } -/* - * 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; - x = (x | (x << 2)) & 0x33333333; - x = (x | (x << 1)) & 0x55555555; - - y = (y | (y << 8)) & 0x00ff00ff; - y = (y | (y << 4)) & 0x0f0f0f0f; - y = (y | (y << 2)) & 0x33333333; - y = (y | (y << 1)) & 0x55555555; - - return (x << 1) | y; +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. - */ -function makeShortCode(lat, lon, zoom) { - char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~"; - var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0)); - var y = Math.round((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. - var str = ""; - var c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff); +// Called to create a short code for the short link. +function makeShortCode(map) { + var zoom = map.getZoom(), + str = '', + char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~", + 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. + c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff); + for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) { digit = (c1 >> (24 - 6 * i)) & 0x3f; str += char_array.charAt(digit); } - for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) { + for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) { digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f; str += char_array.charAt(digit); } - for (var i = 0; i < ((zoom + 8) % 3); ++i) { - str += "-"; + for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-"; + + // 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; + x = (x | (x << 2)) & 0x33333333; + x = (x | (x << 1)) & 0x55555555; + y = (y | (y << 8)) & 0x00ff00ff; + y = (y | (y << 4)) & 0x0f0f0f0f; + y = (y | (y << 2)) & 0x33333333; + y = (y | (y << 1)) & 0x55555555; + return (x << 1) | y; } + 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 he wrong + * Forms which have been cached by rails may have the wrong * authenticity token, so patch up any forms with the correct * token taken from the page header. */