Avoid integer overflow when computing shortcodes

[rails.git] / app / views / browse / start.rjs

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 220295663f8c9753e083c3738e504ba05f0c9798..d4ef1f530ca85b1aa170d6393edbccec7a016fd8 100644 (file)
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -2,7 +2,6 @@ page.replace_html :sidebar_title, t('browse.start_rjs.data_frame_title')
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;

-  var browseActive;

   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;
   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;


@@ -15,7 +14,7 @@ page << <<EOJ
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {

-    browseActive = true;
+    map.dataLayer.active = true;

 
     openSidebar({ onclose: stopBrowse });
 
 
     openSidebar({ onclose: stopBrowse });
 


@@ -26,10 +25,10 @@ page << <<EOJ
         sides: 4,
         snapAngle: 90,
         irregular: true,
         sides: 4,
         snapAngle: 90,
         irregular: true,

-        persist: true,
-        callbacks: { done: endDrag }
+        persist: true

       }
     });
       }
     });

+    browseBoxControl.handler.callbacks.done = endDrag;

     map.addControl(browseBoxControl);
 
     map.events.register("moveend", map, showData);
     map.addControl(browseBoxControl);
 
     map.events.register("moveend", map, showData);


@@ -47,8 +46,8 @@ page << <<EOJ
   }
 
   function stopBrowse() {
   }
 
   function stopBrowse() {

-    if (browseActive) {
-      browseActive = false;
+    if (map.dataLayer.active) {
+      map.dataLayer.active = false;

 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  


@@ -154,7 +153,7 @@ page << <<EOJ
   }    
 
   function customDataLoader(request) {
   }    
 
   function customDataLoader(request) {

-    if (browseActive) {
+    if (this.map.dataLayer.active) {

       var doc = request.responseXML;
 
       if (!doc || !doc.documentElement) {
       var doc = request.responseXML;
 
       if (!doc || !doc.documentElement) {


@@ -186,8 +185,8 @@ page << <<EOJ
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 

-    if (size > #{APP_CONFIG['max_request_area']}) {
-      setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));
+    if (size > #{MAX_REQUEST_AREA}) {
+      setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA)}", { bbox_size: size }));

     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }
     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }


@@ -238,9 +237,9 @@ page << <<EOJ
   }
 
   function dataLoaded() {
   }
 
   function dataLoaded() {

-    if (browseActive) {
+    if (this.map.dataLayer.active) {

       clearStatus();
       clearStatus();

-        
+

       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");
       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");