Work towards integrating data overlay and browse pages
This commit is contained in:
John Firebaugh
parent
8530e3eedb
commit
e5ca823f30
4 changed files with 12 additions and 232 deletions
|
|
@ -1,15 +1,6 @@
|
|||
//= require templates/browse/feature
|
||||
//= require templates/browse/feature_list
|
||||
//= require templates/browse/feature_history
|
||||
|
||||
function initializeBrowse(map) {
|
||||
var browseBounds;
|
||||
var layersById;
|
||||
var selectedLayer;
|
||||
var browseObjectList;
|
||||
var areasHidden = false;
|
||||
var locationFilter;
|
||||
|
||||
var dataLayer = map.dataLayer;
|
||||
|
||||
dataLayer.setStyle({
|
||||
|
|
@ -28,7 +19,7 @@ function initializeBrowse(map) {
|
|||
});
|
||||
|
||||
dataLayer.isWayArea = function () {
|
||||
return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
|
||||
return false;
|
||||
};
|
||||
|
||||
dataLayer.on("click", function (e) {
|
||||
|
|
@ -37,85 +28,27 @@ function initializeBrowse(map) {
|
|||
|
||||
map.on('layeradd', function (e) {
|
||||
if (e.layer === dataLayer) {
|
||||
$.ajax({ url: "/browse/start", success: function (sidebarHtml) {
|
||||
startBrowse(sidebarHtml);
|
||||
}});
|
||||
map.on("moveend", updateData);
|
||||
updateData();
|
||||
}
|
||||
});
|
||||
|
||||
map.on('layerremove', function (e) {
|
||||
if (e.layer === dataLayer) {
|
||||
closeSidebar();
|
||||
map.off("moveend", updateData);
|
||||
}
|
||||
});
|
||||
|
||||
function startBrowse(sidebarHtml) {
|
||||
locationFilter = new L.LocationFilter({
|
||||
enableButton: false,
|
||||
adjustButton: false
|
||||
}).addTo(map);
|
||||
|
||||
locationFilter.on("change", getData);
|
||||
|
||||
$("#sidebar_content").html(sidebarHtml);
|
||||
|
||||
if (browseObjectList) loadObjectList();
|
||||
|
||||
map.on("moveend", updateData);
|
||||
updateData();
|
||||
|
||||
$("#browse_filter_toggle").click(toggleFilter);
|
||||
|
||||
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
|
||||
$("#browse_hide_areas_box").click(toggleAreas);
|
||||
|
||||
$("#sidebar").one("closed", function () {
|
||||
map.removeLayer(dataLayer);
|
||||
map.removeLayer(locationFilter);
|
||||
map.off("moveend", updateData);
|
||||
locationFilter.off("change", getData);
|
||||
});
|
||||
}
|
||||
|
||||
function updateData() {
|
||||
if (!locationFilter.isEnabled()) {
|
||||
if (map.getZoom() >= 15) {
|
||||
var bounds = map.getBounds();
|
||||
if (!browseBounds || !browseBounds.contains(bounds)) {
|
||||
browseBounds = bounds;
|
||||
getData();
|
||||
}
|
||||
} else {
|
||||
setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
|
||||
if (map.getZoom() >= 15) {
|
||||
var bounds = map.getBounds();
|
||||
if (!browseBounds || !browseBounds.contains(bounds)) {
|
||||
browseBounds = bounds;
|
||||
getData();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function toggleFilter() {
|
||||
if (locationFilter.isEnabled()) {
|
||||
$("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
|
||||
locationFilter.disable();
|
||||
} else {
|
||||
$("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
|
||||
locationFilter.setBounds(map.getBounds().pad(-0.2));
|
||||
locationFilter.enable();
|
||||
setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
|
||||
}
|
||||
|
||||
getData();
|
||||
}
|
||||
|
||||
function toggleAreas(e) {
|
||||
e.preventDefault();
|
||||
|
||||
if (areasHidden) {
|
||||
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
|
||||
areasHidden = false;
|
||||
} else {
|
||||
$("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
|
||||
areasHidden = true;
|
||||
}
|
||||
|
||||
getData();
|
||||
}
|
||||
|
||||
function displayFeatureWarning(count, limit, callback) {
|
||||
|
|
@ -140,7 +73,7 @@ function initializeBrowse(map) {
|
|||
var dataLoader;
|
||||
|
||||
function getData() {
|
||||
var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
|
||||
var bounds = map.getBounds();
|
||||
var size = bounds.getSize();
|
||||
|
||||
if (size > OSM.MAX_REQUEST_AREA) {
|
||||
|
|
@ -174,7 +107,6 @@ function initializeBrowse(map) {
|
|||
success: function (xml) {
|
||||
clearStatus();
|
||||
|
||||
$("#browse_content").empty();
|
||||
dataLayer.clearLayers();
|
||||
selectedLayer = null;
|
||||
|
||||
|
|
@ -182,25 +114,6 @@ function initializeBrowse(map) {
|
|||
|
||||
function addFeatures() {
|
||||
dataLayer.addData(features);
|
||||
|
||||
layersById = {};
|
||||
|
||||
dataLayer.eachLayer(function (layer) {
|
||||
var feature = layer.feature;
|
||||
layersById[feature.id] = layer;
|
||||
$.extend(feature, {
|
||||
typeName: featureTypeName(feature),
|
||||
url: "/browse/" + feature.type + "/" + feature.id,
|
||||
name: featureName(feature)
|
||||
});
|
||||
});
|
||||
|
||||
browseObjectList = $(JST["templates/browse/feature_list"]({
|
||||
features: features,
|
||||
url: url
|
||||
}))[0];
|
||||
|
||||
loadObjectList();
|
||||
}
|
||||
|
||||
if (features.length < maxFeatures) {
|
||||
|
|
@ -214,25 +127,6 @@ function initializeBrowse(map) {
|
|||
});
|
||||
}
|
||||
|
||||
function viewFeatureLink() {
|
||||
var layer = layersById[$(this).data("feature-id")];
|
||||
|
||||
onSelect(layer);
|
||||
|
||||
if (locationFilter.isEnabled()) {
|
||||
map.panTo(layer.getBounds().getCenter());
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function loadObjectList() {
|
||||
$("#browse_content").html(browseObjectList);
|
||||
$("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function onSelect(layer) {
|
||||
// Unselect previously selected feature
|
||||
if (selectedLayer) {
|
||||
|
|
@ -243,91 +137,15 @@ function initializeBrowse(map) {
|
|||
layer.originalStyle = layer.options;
|
||||
layer.setStyle({color: '#0000ff', weight: 8});
|
||||
|
||||
// If the current object is the list, don't innerHTML="", since that could clear it.
|
||||
if ($("#browse_content").firstChild == browseObjectList) {
|
||||
$("#browse_content").removeChild(browseObjectList);
|
||||
} else {
|
||||
$("#browse_content").empty();
|
||||
}
|
||||
|
||||
var feature = layer.feature;
|
||||
|
||||
$("#browse_content").html(JST["templates/browse/feature"]({
|
||||
name: featureNameSelect(feature),
|
||||
url: "/browse/" + feature.type + "/" + feature.id,
|
||||
attributes: feature.tags
|
||||
}));
|
||||
|
||||
$("#browse_content").find("a.browse_show_list").click(loadObjectList);
|
||||
$("#browse_content").find("a.browse_show_history").click(loadHistory);
|
||||
OSM.route('/browse/' + layer.feature.type + '/' + layer.feature.id);
|
||||
|
||||
// Stash the currently drawn feature
|
||||
selectedLayer = layer;
|
||||
}
|
||||
|
||||
function loadHistory() {
|
||||
$(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
|
||||
|
||||
var feature = selectedLayer.feature;
|
||||
|
||||
$.ajax({
|
||||
url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
|
||||
success: function (xml) {
|
||||
if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
|
||||
return;
|
||||
}
|
||||
|
||||
$(this).remove();
|
||||
|
||||
var history = [];
|
||||
var nodes = xml.getElementsByTagName(feature.type);
|
||||
for (var i = nodes.length - 1; i >= 0; i--) {
|
||||
history.push({
|
||||
user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
|
||||
timestamp: nodes[i].getAttribute("timestamp")
|
||||
});
|
||||
}
|
||||
|
||||
$("#browse_content").append(JST["templates/browse/feature_history"]({
|
||||
name: featureNameHistory(feature),
|
||||
url: "/browse/" + feature.type + "/" + feature.id,
|
||||
history: history
|
||||
}));
|
||||
}.bind(this)
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function featureTypeName(feature) {
|
||||
return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
|
||||
}
|
||||
|
||||
function featureName(feature) {
|
||||
return feature.tags['name:' + $('html').attr('lang')] ||
|
||||
feature.tags.name ||
|
||||
feature.id;
|
||||
}
|
||||
|
||||
function featureNameSelect(feature) {
|
||||
return feature.tags['name:' + $('html').attr('lang')] ||
|
||||
feature.tags.name ||
|
||||
I18n.t("browse.start_rjs.object_list.selected.type." + feature.type, { id: feature.id });
|
||||
}
|
||||
|
||||
function featureNameHistory(feature) {
|
||||
return feature.tags['name:' + $('html').attr('lang')] ||
|
||||
feature.tags.name ||
|
||||
I18n.t("browse.start_rjs.object_list.history.type." + feature.type, { id: feature.id });
|
||||
}
|
||||
|
||||
function setStatus(status) {
|
||||
$("#browse_status").html(status);
|
||||
$("#browse_status").show();
|
||||
}
|
||||
|
||||
function clearStatus() {
|
||||
$("#browse_status").html("");
|
||||
$("#browse_status").hide();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
<div class="browse_details">
|
||||
|
||||
<h4><%- name %></h4>
|
||||
<a class='more-details' href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.details') %></a>
|
||||
|
||||
<ul class="inner12">
|
||||
<% for (var key in attributes) { %>
|
||||
<li><b><%- key %></b>: <%- attributes[key] %></li>
|
||||
<% } %>
|
||||
<li> <a href="<%- url %>/history" class="browse_show_history"><%- I18n.t('browse.start_rjs.show_history') %></a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<a href="#" class="browse_show_list button"><%- I18n.t('browse.start_rjs.object_list.back') %></a>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<div class="browse_details">
|
||||
<h4><%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %></h4>
|
||||
<a class='more-details' href="<%- url %>/history"><%- I18n.t('browse.start_rjs.details') %></a>
|
||||
|
||||
<ul class="inner12">
|
||||
<% for (var i = 0; i < history.length; i++) { %>
|
||||
<li><%- I18n.t("browse.start_rjs.edited_by_user_at_timestamp", history[i]) %></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<div>
|
||||
<h4 class="browse_heading"><%- I18n.t('browse.start_rjs.object_list.heading') %></h4>
|
||||
<div>
|
||||
<ul class='inner12'>
|
||||
<% for (var i = 0; i < features.length; i++) { %>
|
||||
<li><%- features[i].typeName %> <a href="<%- features[i].url %>" data-feature-id="<%- features[i].id %>"><%- features[i].name %></a></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class='inner12'><a href="<%- url %>" class='button'><%- I18n.t('browse.start_rjs.object_list.api') %></a></div>
|
||||
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue