X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7d200c4a6d0904ab1e027518eca7200b0ca9a08..42c1dec8f0f53b457e9512bcc24f26cad9df9916:/app/assets/javascripts/index/history.js diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index d27a06943..8103f047e 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -1,3 +1,5 @@ +//= require jquery.simulate + OSM.History = function(map) { var page = {}; @@ -9,8 +11,10 @@ OSM.History = function(map) { .on("mouseout", "[data-changeset]", function () { unHighlightChangeset($(this).data("changeset").id); }) - .on("click", "[data-changeset]", function () { - clickChangeset($(this).data("changeset").id); + .on("click", "[data-changeset]", function (e) { + if (!$(e.target).is('a')) { + clickChangeset($(this).data("changeset").id, e); + } }); var group = L.featureGroup() @@ -21,7 +25,7 @@ OSM.History = function(map) { unHighlightChangeset(e.layer.id); }) .on("click", function (e) { - clickChangeset(e.layer.id); + clickChangeset(e.layer.id, e); }); group.getLayerId = function(layer) { @@ -38,20 +42,31 @@ OSM.History = function(map) { $("#changeset_" + id).removeClass("selected"); } - function clickChangeset(id) { - OSM.route($("#changeset_" + id).find(".changeset_id").attr("href")); + function clickChangeset(id, e) { + $("#changeset_" + id).find("a.changeset_id").simulate("click", e); } - function loadData() { + function update() { + var data = {list: '1'}; + + if (window.location.pathname === '/history') { + data.bbox = map.getBounds().wrap().toBBoxString(); + } + $.ajax({ url: window.location.pathname, method: "GET", - data: {bbox: map.getBounds().toBBoxString()}, - success: function(html) { + data: data, + success: function(html, status, xhr) { $('#sidebar_content .changesets').html(html); updateMap(); } }); + + var feedLink = $('link[type="application/atom+xml"]'), + feedHref = feedLink.attr('href').split('?')[0]; + + feedLink.attr('href', feedHref + '?bbox=' + data.bbox); } function loadMore(e) { @@ -91,33 +106,36 @@ OSM.History = function(map) { for (var i = 0; i < changesets.length; ++i) { var changeset = changesets[i], rect = L.rectangle(changeset.bounds, - {weight: 1, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0}); + {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0}); rect.id = changeset.id; rect.addTo(group); } + + if (window.location.pathname !== '/history') { + var bounds = group.getBounds(); + if (bounds.isValid()) map.fitBounds(bounds); + } } page.pushstate = page.popstate = function(path) { $("#history_tab").addClass("current"); - map.invalidateSize(); - $("#sidebar_content").load(path, page.load); + OSM.loadSidebarContent(path, page.load); }; page.load = function() { - $("#sidebar").removeClass("minimized"); - map - .on("moveend", loadData) - .addLayer(group); + map.addLayer(group); - loadData(); + if (window.location.pathname === '/history') { + map.on("moveend", update); + } + + update(); }; page.unload = function() { - map - .off("moveend", loadData) - .removeLayer(group); + map.removeLayer(group); + map.off("moveend", update); - group.clearLayers(); $("#history_tab").removeClass("current"); };