X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..16da03aacb264c1703d8bd4fab5c58c78745be00:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index b89d6c71d..9a05b62c2 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -6,6 +6,7 @@ //= require leaflet.note //= require leaflet.share //= require leaflet.polyline +//= require leaflet.query //= require index/search //= require index/browse //= require index/export @@ -15,6 +16,7 @@ //= require index/new_note //= require index/directions //= require index/changeset +//= require index/query //= require router $(document).ready(function () { @@ -32,9 +34,9 @@ $(document).ready(function () { // IE<10 doesn't respect Vary: X-Requested-With header, so // prevent caching the XHR response as a full-page URL. if (path.indexOf('?') >= 0) { - path += '&xhr=1' + path += '&xhr=1'; } else { - path += '?xhr=1' + path += '?xhr=1'; } $('#sidebar_content') @@ -126,16 +128,21 @@ $(document).ready(function () { sidebar: sidebar }).addTo(map); + L.OSM.query({ + position: position, + sidebar: sidebar + }).addTo(map); + L.control.scale() .addTo(map); - if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - initializeNotes(map); + if (OSM.STATUS !== 'api_offline' && OSM.STATUS !== 'database_offline') { + OSM.initializeNotes(map); if (params.layers.indexOf(map.noteLayer.options.code) >= 0) { map.addLayer(map.noteLayer); } - initializeBrowse(map); + OSM.initializeBrowse(map); if (params.layers.indexOf(map.dataLayer.options.code) >= 0) { map.addLayer(map.dataLayer); } @@ -157,16 +164,7 @@ $(document).ready(function () { $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); - if ($.cookie('_osm_sotm') == 'hide') { - $('#sotm').hide(); - } - - $('#sotm .close').on('click', function() { - $('#sotm').hide(); - $.cookie("_osm_sotm", 'hide', { expires: expiry }); - }); - - if ($.cookie('_osm_welcome') == 'hide') { + if ($.cookie('_osm_welcome') === 'hide') { $('.welcome').hide(); } @@ -193,7 +191,7 @@ $(document).ready(function () { map.setView([params.lat, params.lon], params.zoom); } - var marker = L.marker([0, 0], {icon: getUserIcon()}); + var marker = L.marker([0, 0], {icon: OSM.getUserIcon()}); if (params.marker) { marker.setLatLng([params.mlat, params.mlon]).addTo(map); @@ -209,6 +207,39 @@ $(document).ready(function () { marker.setLatLng(center).addTo(map); }); + function remoteEditHandler(bbox, object) { + var loaded = false, + url = document.location.protocol === "https:" ? + "https://127.0.0.1:8112/load_and_zoom?" : + "http://127.0.0.1:8111/load_and_zoom?", + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + if (object) query.select = object.type + object.id; + + var iframe = $('