OpenLayers OpenLayers

Changeset 343

Show
Ignore:
Timestamp:
05/24/06 20:54:45 (3 years ago)
Author:
euzuro
Message:

moved oppositeQuadrant() function from Anchored.js to Util.js, where it is now a static function on the OpenLayers.Bounds class. Updated usage in code accordingly. Added test.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/openlayers/lib/OpenLayers/Popup/Anchored.js

    r342 r343  
    6262        var quadrant = extent.determineQuadrant(lonlat); 
    6363         
    64         return this.oppositeQuadrant(quadrant); 
     64        return OpenLayers.Bounds.oppositeQuadrant(quadrant); 
    6565    },  
    6666 
     
    9898    }, 
    9999 
    100     /** 
    101      * @private  
    102      *  
    103      * @param {String} quadrant  
    104      *  
    105      * @returns The opposing quadrant ("br" "tr" "tl" "bl"). For Example, if  
    106      *           you pass in "bl" it returns "tr", if you pass in "br" it  
    107      *           returns "tl", etc. 
    108      * @type String 
    109      */ 
    110     oppositeQuadrant: function(quadrant) { 
    111         var opp = ""; 
    112          
    113         opp += (quadrant.charAt(0) == 't') ? 'b' : 't'; 
    114         opp += (quadrant.charAt(1) == 'l') ? 'r' : 'l'; 
    115          
    116         return opp; 
    117     }, 
    118  
    119100    CLASS_NAME: "OpenLayers.Popup.Anchored" 
    120101}); 
  • trunk/openlayers/lib/OpenLayers/Util.js

    r334 r343  
    455455 
    456456 
     457/** 
     458 * @param {String} quadrant  
     459 *  
     460 * @returns The opposing quadrant ("br" "tr" "tl" "bl"). For Example, if  
     461 *           you pass in "bl" it returns "tr", if you pass in "br" it  
     462 *           returns "tl", etc. 
     463 * @type String 
     464 */ 
     465OpenLayers.Bounds.oppositeQuadrant = function(quadrant) { 
     466    var opp = ""; 
     467     
     468    opp += (quadrant.charAt(0) == 't') ? 'b' : 't'; 
     469    opp += (quadrant.charAt(1) == 'l') ? 'r' : 'l'; 
     470     
     471    return opp; 
     472}; 
    457473 
    458474// Some other helpful things 
  • trunk/openlayers/tests/test_Bounds.html

    r334 r343  
    155155        t.eq( bounds.determineQuadrant(br), "br", "bounds.determineQuadrant correctly identifies a coordinate in the bottom right quadrant"); 
    156156     } 
    157       
     157 
     158     function test_10_Bounds_oppositeQuadrant(t) { 
     159 
     160        t.plan( 4 ); 
     161 
     162        t.eq( OpenLayers.Bounds.oppositeQuadrant("tl"), "br", "OpenLayers.Bounds.oppositeQuadrant returns 'br' for 'tl'"); 
     163        t.eq( OpenLayers.Bounds.oppositeQuadrant("tr"), "bl", "OpenLayers.Bounds.oppositeQuadrant returns 'bl' for 'tr'"); 
     164        t.eq( OpenLayers.Bounds.oppositeQuadrant("bl"), "tr", "OpenLayers.Bounds.oppositeQuadrant returns 'tr' for 'bl'"); 
     165        t.eq( OpenLayers.Bounds.oppositeQuadrant("br"), "tl", "OpenLayers.Bounds.oppositeQuadrant returns 'tl' for 'br'"); 
     166     }      
    158167  // --> 
    159168  </script>