Report the feature limit correctly in the data browser

diff --git a/app/views/browse/start.js.erb b/app/views/browse/start.js.erb
index 4426ed7e0743a7d7e4c4b3dcbc423774960bad0e..8f04d7a8344a90b9ae95224cc5d66973701fa162 100644 (file)
--- a/app/views/browse/start.js.erb
+++ b/app/views/browse/start.js.erb
@@ -149,13 +149,13 @@ function endDrag(bbox) {
   $("#browse_select_view").show();
 }
 
   $("#browse_select_view").show();
 }
 

-function displayFeatureWarning(count, callback) {
+function displayFeatureWarning(count, limit, callback) {

   clearStatus();
 
   var div = document.createElement("div");
 
   var p = document.createElement("p");
   clearStatus();
 
   var div = document.createElement("div");
 
   var p = document.createElement("p");

-  p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: count })));
+  p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: count, max_features: limit })));

   div.appendChild(p);
 
   var input = document.createElement("input");
   div.appendChild(p);
 
   var input = document.createElement("input");


@@ -182,7 +182,7 @@ function customDataLoader(resp, options) {
     if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
       options.callback.call(options.scope, resp);
     } else {
     if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
       options.callback.call(options.scope, resp);
     } else {

-      displayFeatureWarning(resp.features.length, function () {
+      displayFeatureWarning(resp.features.length, this.maxFeatures, function () {

         options.callback.call(options.scope, resp);
       });
     }
         options.callback.call(options.scope, resp);
       });
     }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7bfda9593bf5d89f4e8af25ca0a47534511f72f5..ce40b3d8df9eb21a93cb8eea1b63133d198f2408 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -235,7 +235,7 @@ en:
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"

-      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."

       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})"
       loading: "Loading..."
       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})"
       loading: "Loading..."