X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a01195f1497b4f4c6b7d019c7affc794d41101cd..be79156f43975a90399bb2629684bea6c580f238:/app/assets/javascripts/index/browse.js?ds=sidebyside
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index f52c58019..5db23a975 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,15 +1,6 @@
-//= require templates/browse/feature
-//= require templates/browse/feature_list
-//= require templates/browse/feature_history
-
-function initializeBrowse(map, params) {
+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, params) {
});
dataLayer.isWayArea = function () {
- return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+ return false;
};
dataLayer.on("click", function (e) {
@@ -37,125 +28,42 @@ function initializeBrowse(map, params) {
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);
+ $('#browse_status').empty();
}
});
- if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
- if (params.layers.indexOf(dataLayer.options.code) >= 0) {
- map.addLayer(dataLayer);
- }
- }
-
- 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'));
- }
+ var bounds = map.getBounds();
+ if (!browseBounds || !browseBounds.contains(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();
- }
-
- 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) {
- clearStatus();
-
- var div = document.createElement("div");
-
- var p = document.createElement("p");
- p.appendChild(document.createTextNode(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })));
- div.appendChild(p);
-
- var input = document.createElement("input");
- input.type = "submit";
- input.value = I18n.t('browse.start_rjs.load_data');
- input.onclick = callback;
- div.appendChild(input);
-
- $("#browse_content").html("");
- $("#browse_content").append(div);
+ function displayFeatureWarning(count, limit, add, cancel) {
+ $('#browse_status').html(
+ $("")
+ .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
+ .prepend(
+ $("")
+ .click(cancel))
+ .append(
+ $("")
+ .val(I18n.t('browse.start_rjs.load_data'))
+ .click(add)));
}
var dataLoader;
function getData() {
- var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
- var size = bounds.getSize();
-
- if (size > OSM.MAX_REQUEST_AREA) {
- setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
- return;
- }
-
- setStatus(I18n.t('browse.start_rjs.loading'));
-
+ var bounds = map.getBounds();
var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
/*
@@ -178,41 +86,25 @@ function initializeBrowse(map, params) {
dataLoader = $.ajax({
url: url,
success: function (xml) {
- clearStatus();
-
- $("#browse_content").empty();
dataLayer.clearLayers();
selectedLayer = null;
var features = dataLayer.buildFeatures(xml);
function addFeatures() {
+ $('#browse_status').empty();
dataLayer.addData(features);
+ browseBounds = bounds;
+ }
- 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();
+ function cancelAddFeatures() {
+ $('#browse_status').empty();
}
if (features.length < maxFeatures) {
addFeatures();
} else {
- displayFeatureWarning(features.length, maxFeatures, addFeatures);
+ displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
}
dataLoader = null;
@@ -220,25 +112,6 @@ function initializeBrowse(map, params) {
});
}
- 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) {
@@ -249,91 +122,9 @@ function initializeBrowse(map, params) {
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.router.route('/' + 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();
- }
}