cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display the size warning when the data layer is disabled

Browse source
This commit is contained in:
Tom Hughes 2013-12-03 09:17:02 +00:00
parent cc57c65083
commit 6362f60a54
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/index/browse.js
View file

@ -26,6 +26,19 @@ function initializeBrowse(map) {
onSelect(e.layer); onSelect(e.layer);
}); });
dataLayer.on('statechange', function (e) {
if (e.checked) {
if (e.disabled) {
var size = map.getBounds().getSize();
$('#browse_status').html(
$("<p class='warning'></p>")
.text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) })));
} else {
$('#browse_status').empty();
}
}
});
map.on('layeradd', function (e) { map.on('layeradd', function (e) {
if (e.layer === dataLayer) { if (e.layer === dataLayer) {
map.on("moveend", updateData); map.on("moveend", updateData);
@ -61,15 +74,6 @@ function initializeBrowse(map) {
function getData() { function getData() {
var bounds = map.getBounds(); var bounds = map.getBounds();
var size = bounds.getSize();
if (size > OSM.MAX_REQUEST_AREA) {
$('#browse_status').html(
$("<p class='warning'></p>")
.text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) })));
return;
}
var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString(); var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
/* /*

2
app/assets/javascripts/leaflet.layers.js
View file

@ -168,6 +168,8 @@ L.OSM.layers = function(options) {
.trigger('change'); .trigger('change');
} }
layer.fire('statechange', {disabled: disabled, checked: checked});
$(item).attr('class', disabled ? 'disabled' : ''); $(item).attr('class', disabled ? 'disabled' : '');
item.attr('data-original-title', disabled ? item.attr('data-original-title', disabled ?
I18n.t('javascripts.site.' + refName + '_zoom_in_tooltip') : ''); I18n.t('javascripts.site.' + refName + '_zoom_in_tooltip') : '');