From 5777c5e925acf5317f221073368ab8d81b10fd05 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 3 Apr 2011 14:59:43 +0100
Subject: [PATCH] Tidy up the data browser javascript

---
 app/views/browse/_start.html.erb |  2 ++
 app/views/browse/start.rjs       | 26 +++++++++++++++-----------
 config/locales/en.yml            |  2 ++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/views/browse/_start.html.erb b/app/views/browse/_start.html.erb
index 9a1d50a82..3777d710a 100644
--- a/app/views/browse/_start.html.erb
+++ b/app/views/browse/_start.html.erb
@@ -4,6 +4,8 @@
       <a id="browse_select_view" href="#"><%= t'browse.start.view_data' %></a>
       <br />
       <a id="browse_select_box" href="#"><%= t'browse.start.manually_select' %></a>  
+      <br />
+      <a id="browse_hide_areas_box" href="#"><%= t'browse.start.hide_areas' %></a>  
     </p>
   </div>
   <div id="browse_status" style="text-align: center; display: none">
diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 31d7c9ecc..b96e8c39c 100644
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -34,6 +34,7 @@ page << <<EOJ
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");
+
     $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
     $("browse_hide_areas_box").style.display = "inline";
     $("browse_hide_areas_box").onclick = hideAreas;
@@ -60,7 +61,7 @@ page << <<EOJ
 
       if (browseBoxControl) {
     	browseBoxControl.destroy();
-	browseBoxControl = null;
+        browseBoxControl = null;
       }		
 
       if (browseActiveFeature) {
@@ -116,7 +117,9 @@ page << <<EOJ
       $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.show_areas')}";
       $("browse_hide_areas_box").style.display = "inline";
       $("browse_hide_areas_box").onclick = showAreas;
+
       areasHidden = true;
+
       useMap(true);
   }
 
@@ -124,7 +127,9 @@ page << <<EOJ
       $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
       $("browse_hide_areas_box").style.display = "inline";
       $("browse_hide_areas_box").onclick = hideAreas;
-      areasHidden = false; 
+
+      areasHidden = false;
+
       useMap(true);
   }
 
@@ -142,7 +147,6 @@ page << <<EOJ
 
     $("browse_select_box").innerHTML = "#{I18n.t('browse.start_rjs.manually_select')}";
     $("browse_select_view").style.display = "inline";
-
   }
 
   function displayFeatureWarning() {
@@ -202,7 +206,7 @@ page << <<EOJ
     }
   }
 
-  function getData(bounds,reload) {
+  function getData(bounds, reload) {
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 
@@ -213,15 +217,16 @@ page << <<EOJ
     }
   }
 
-  function loadGML(url,reload) {
+  function loadGML(url, reload) {
     setStatus("#{I18n.t('browse.start_rjs.loading')}");
     $("browse_content").innerHTML = "";
 
-    fOptions = {
-      checkTags: true, 
+    var formatOptions = {
+      checkTags: true,
       interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
     };
-    if (areasHidden) fOptions.areaTags = [];
+
+    if (areasHidden) formatOptions.areaTags = [];
 
     if (!browseDataLayer || reload) {
       var style = new OpenLayers.Style();
@@ -238,7 +243,7 @@ page << <<EOJ
 
       browseDataLayer = new OpenLayers.Layer.GML("Data", url, {
         format: OpenLayers.Format.OSM,
-        formatOptions: fOptions,
+        formatOptions: formatOptions,
         maxFeatures: 100,
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,
@@ -248,7 +253,6 @@ page << <<EOJ
         })
       });
       browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
-
       map.addLayer(browseDataLayer);
             
       browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
@@ -258,7 +262,7 @@ page << <<EOJ
       browseSelectControl.activate();
     } else {
       browseDataLayer.destroyFeatures();
-      browseDataLayer.format(fOptions);
+      browseDataLayer.format(formatOptions);
       browseDataLayer.setUrl(url);
     }
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 09b4838e7..1f3529ee7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -219,6 +219,8 @@ en:
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       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."
       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}})"
-- 
2.43.2