Changeset 7920

Timestamp:

09/02/08 03:30:34 (3 months ago)

Author:

elemoine

Message:

svn merge -r 7875:HEAD http://svn.openlayers.org/trunk/openlayers .

Files:

• sandbox/camptocamp/unhcr/examples/popupMatrix.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/examples/wfs-reprojection.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/BaseTypes/Element.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Control/Permalink.js (modified) (7 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/Collection.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/LinearRing.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/Point.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Map.js (modified) (4 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Popup.js (modified) (11 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/Anchored.js (modified) (4 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/AnchoredBubble.js (modified) (3 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/Framed.js (modified) (4 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/FramedCloud.js (modified) (2 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Renderer/Canvas.js (modified) (3 diffs)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Renderer/Elements.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Util.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/BaseTypes/Element.html (modified) (2 diffs)
• sandbox/camptocamp/unhcr/tests/Control/Permalink.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Control/SelectFeature.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Geometry/Collection.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Geometry/Point.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Geometry/Polygon.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Layer/WFS.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Map.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Popup.html (modified) (2 diffs)
• sandbox/camptocamp/unhcr/tests/Popup/Anchored.html (modified) (1 diff)
• sandbox/camptocamp/unhcr/tests/Renderer/Elements.html (modified) (5 diffs)
• sandbox/camptocamp/unhcr/tests/manual/vector-layer-zindex.html (modified) (2 props)

sandbox/camptocamp/unhcr/examples/popupMatrix.html

@@ -880 +880 @@
-
-        <!-- preloading these images so the autosize will work correctly -->
-        <img src="small.jpg" style="position:absolute; top:-5000px; left: -5000px"></img>
-        <img src="wideshort.jpg" style="position:absolute; top:-5000px; left: -5000px"></img>
-        <img src="widelong.jpg" style="position:absolute; top:-5000px; left: -5000px"></img>
-        <img src="thinlong.jpg" style="position:absolute; top:-5000px; left: -5000px"></img>
+
+       <p> All of the images in this file a pre-cached, meaning they are 
+           loaded immediately when you load the page (they are just placed 
+           far offscreen, that's why you don't see them). 
+       </p>
+       <br>    
+       <p> The only image that is *not* preloaded is small.jpg, the brazilian
+           flag. We do this in order to test out to make sure that our auto-sizing
+             code does in fact activate itself as the images load. To verify 
+             this, clear your cache and reload this example page. Click on 
+             any of the markers in the 'AutoSize' row. If the popup autosizes
+             to correctly contain the entire flag: golden. If the popup is 
+             tiny and you can only see a corner of it, then this code is broken.
+        </p>
-
-      <br/>      

sandbox/camptocamp/unhcr/examples/wfs-reprojection.html

@@ -9 +9 @@
-
-        var map, layer, styleMap;
-cgi-bin/proxy.cgi
+proxy/
-        function init(){
-

sandbox/camptocamp/unhcr/lib/OpenLayers/BaseTypes/Element.js

@@ -216 +216 @@
-    getStyle: function(element, style) {
-        element = OpenLayers.Util.getElement(element);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-}
-
-var positions = ['left', 'top', 'right', 'bottom'];
-if (window.opera
-(OpenLayers.Util.indexOf(positions,style) != -1) &&
-(OpenLayers.Element.getStyle(element, 'position') == 'static')) { 
-value = 'auto';
+
+        var positions = ['left', 'top', 'right', 'bottom'];
+    if (window.opera &&
+        (OpenLayers.Util.indexOf(positions,style) != -1)
+    (OpenLayers.Element.getStyle(element, 'position') == 'static')) { 
+    value = 'auto';
+}
-        }
-    

sandbox/camptocamp/unhcr/lib/OpenLayers/Control/Permalink.js

@@ -16 +16 @@
- */
-OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
+    
+    /**
+     * APIProperty: argParserClass
+     * {Class} The ArgParser control class (not instance) to use with this
+     *     control.
+     */
+    argParserClass: OpenLayers.Control.ArgParser,
-
-    /** 
@@ -82 +89 @@
-        for(var i=0, len=this.map.controls.length; i<len; i++) {
-            var control = this.map.controls[i];
-"OpenLayers.Control.ArgParser"
+this.argParserClass.CLASS_NAME
-                
-                // If a permalink is added to the map, and an ArgParser already
@@ -95 +102 @@
-        }
-        if (i == this.map.controls.length) {
-OpenLayers.Control.ArgParser
+this.argParserClass
-                { 'displayProjection': this.displayProjection }));       
-        }
@@ -111 +118 @@
-          
-        if (!this.element) {
+            this.div.className = this.displayClass;
-            this.element = document.createElement("a");
-            this.element.innerHTML = OpenLayers.i18n("permalink");
@@ -122 +130 @@
-            scope: this
-        });
+        
+        // Make it so there is at least a link even though the map may not have
+        // moved yet.
+        this.updateLink();
+        
-        return this.div;
-    },
@@ -129 +142 @@
-     */
-    updateLink: function() {
-        var center = this.map.getCenter();
-        
-        // Map not initialized yet. Break out of this function.
-        if (!center) { 
-            return; 
-        }
-
-        var params = OpenLayers.Util.getParameters(this.base);
-        
-        params.zoom = this.map.getZoom(); 
-        var lat = center.lat;
-        var lon = center.lon;
-        
-        if (this.displayProjection) {
-            var mapPosition = OpenLayers.Projection.transform(
-              { x: lon, y: lat }, 
-              this.map.getProjectionObject(), 
-              this.displayProjection );
-            lon = mapPosition.x;  
-            lat = mapPosition.y;  
-        }       
-        params.lat = Math.round(lat*100000)/100000;
-        params.lon = Math.round(lon*100000)/100000;
-        
-        params.layers = '';
-        for (var i=0, len=this.map.layers.length; i<len; i++) {
-            var layer = this.map.layers[i];
-
-            if (layer.isBaseLayer) {
-                params.layers += (layer == this.map.baseLayer) ? "B" : "0";
-            } else {
-                params.layers += (layer.getVisibility()) ? "T" : "F";           
-            }
-        }
-
-        var href = this.base;
-        if (href.indexOf('?') != -1) {
@@ -169 +147 @@
-        }
-
-params
+this.createParams()
-        this.element.href = href;
-    }, 
+    
+    /**
+     * APIMethod: createParams
+     * Creates the parameters that need to be encoded into the permalink url.
+     * 
+     * Parameters:
+     * center - {<OpenLayers.LonLat>} center to encode in the permalink.
+     *     Defaults to the current map center.
+     * zoom - {Integer} zoom level to encode in the permalink. Defaults to the
+     *     current map zoom level.
+     * layers - {Array(<OpenLayers.Layer>)} layers to encode in the permalink.
+     *     Defaults to the current map layers.
+     * 
+     * Returns:
+     * {Object} Hash of parameters that will be url-encoded into the
+     * permalink.
+     */
+    createParams: function(center, zoom, layers) {
+        center = center || this.map.getCenter();
+        zoom = zoom || this.map.getZoom();
+        layers = layers || this.map.layers;  
+          
+        var params = OpenLayers.Util.getParameters(this.base);
+        
+        // If there's still no center, map is not initialized yet. 
+        // Break out of this function, and simply return the params from the
+        // base link.
+        if (center) { 
+    
+            params.zoom = this.map.getZoom(); 
+            var lat = center.lat;
+            var lon = center.lon;
+            
+            if (this.displayProjection) {
+                var mapPosition = OpenLayers.Projection.transform(
+                  { x: lon, y: lat }, 
+                  this.map.getProjectionObject(), 
+                  this.displayProjection );
+                lon = mapPosition.x;  
+                lat = mapPosition.y;  
+            }       
+            params.lat = Math.round(lat*100000)/100000;
+            params.lon = Math.round(lon*100000)/100000;
+            
+            params.layers = '';
+            for (var i=0, len=this.map.layers.length; i<len; i++) {
+                var layer = this.map.layers[i];
+    
+                if (layer.isBaseLayer) {
+                    params.layers += (layer == this.map.baseLayer) ? "B" : "0";
+                } else {
+                    params.layers += (layer.getVisibility()) ? "T" : "F";           
+                }
+            }
+        }
+
+        return params;
+    }, 
-
-    CLASS_NAME: "OpenLayers.Control.Permalink"

sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/Collection.js

@@ -326 +326 @@
-                component.transform(source, dest);
-            }
-
+
+
-        return this;
-    },

sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/LinearRing.js

@@ -173 +173 @@
-                component.transform(source, dest);
-            }
+            this.bounds = null;
-        }
-        return this;

sandbox/camptocamp/unhcr/lib/OpenLayers/Geometry/Point.js

@@ -207 +207 @@
-            OpenLayers.Projection.transform(
-                this, source, dest); 
+            this.bounds = null;
-        }       
-        return this;

sandbox/camptocamp/unhcr/lib/OpenLayers/Map.js

@@ -1941 +1941 @@
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
-
-
+
+
+
+
+
+
+
-        var center = bounds.getCenterLonLat();
-        if (this.baseLayer.wrapDateLine) {
@@ -1966 +1971 @@
-            center = bounds.getCenterLonLat().wrapDateLine(maxExtent);
-        }
-
+, closest
-    },
-
@@ -1996 +2001 @@
-     * Parameters:
-     * scale - {float}
-
-
+
+
+
+
+
+
+
-        var res = OpenLayers.Util.getResolutionFromScale(scale, 
-                                                         this.baseLayer.units);
@@ -2009 +2019 @@
-                                           center.lon + w_deg / 2,
-                                           center.lat + h_deg / 2);
-
+, closest
-    },
-    

sandbox/camptocamp/unhcr/lib/OpenLayers/Popup.js

@@ -49 +49 @@
-
-    /** 
+     * Property: contentSize 
+     * {<OpenLayers.Size>} the width and height of the content.
+     */
+    contentSize: null,    
+
+    /** 
-     * Property: size 
-     * {<OpenLayers.Size>} the width and height of the popup.
@@ -56 +62 @@
-    /** 
-     * Property: contentHTML 
-The HTML that this popup displays
-
-""
+An HTML string for this popup to display
+
+null
-    
-    /** 
@@ -184 +190 @@
-    * lonlat - {<OpenLayers.LonLat>}  The position on the map the popup will
-    *                                 be shown.
-size - {<OpenLayers.Size>}      The size of the popup
-The HTML content to display inside the
+contentSize - {<OpenLayers.Size>} The size of the content
+An HTML string to display inside the  
-    *                                 popup.
-    * closeBox - {Boolean}            Whether to display a close box inside
@@ -191 +197 @@
-    * closeBoxCallback - {Function}   Function to be called on closeBox click.
-    */
-s
+contentS
-        if (id == null) {
-            id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
@@ -198 +204 @@
-        this.id = id;
-        this.lonlat = lonlat;
-
+
+
-                                  : new OpenLayers.Size(
-                                                   OpenLayers.Popup.WIDTH,
@@ -219 +226 @@
-
-        var id = this.div.id + "_contentDiv";
-s
+contentS
-                                                    null, "relative");
-        this.contentDiv.className = this.contentDisplayClass;
@@ -311 +318 @@
-
-        this.moveTo(px);
-
-s
+ && !this.size
+contentS
-        }
-        this.setBackgroundColor();
@@ -400 +407 @@
-     *
-     * Parameters:
-
-
-
-
-
-
-
+
+
+
+
+
-        
-        // if our contentDiv has a css 'padding' set on it by a stylesheet, we 
@@ -434 +439 @@
-        // me want to shoot someone, but so it goes.
-        if (OpenLayers.Util.getBrowserName() == "msie") {
-
-
+
+
+
+
-        }
-
@@ -449 +456 @@
-
-    /**
+     * APIMethod: updateSize
+     * Auto size the popup so that it precisely fits its contents (as 
+     *     determined by this.contentDiv.innerHTML). Popup size will, of
+     *     course, be limited by the available space on the current map
+     */
+    updateSize: function() {
+        
+        // determine actual render dimensions of the contents by putting its
+        // contents into a fake contentDiv (for the CSS) and then measuring it
+        var preparedHTML = "<div class='" + this.contentDisplayClass+ "'>" + 
+            this.contentDiv.innerHTML + 
+            "<div>";
+        var realSize = OpenLayers.Util.getRenderedDimensions(
+            preparedHTML, null, { displayClass: this.displayClass }
+        );
+
+        // is the "real" size of the div is safe to display in our map?
+        var safeSize = this.getSafeContentSize(realSize);
+
+        var newSize = null;
+        if (safeSize.equals(realSize)) {
+            //real size of content is small enough to fit on the map, 
+            // so we use real size.
+            newSize = realSize;
+
+        } else {
+
+            //make a new OL.Size object with the clipped dimensions 
+            // set or null if not clipped.
+            var fixedSize = new OpenLayers.Size();
+            fixedSize.w = (safeSize.w < realSize.w) ? safeSize.w : null;
+            fixedSize.h = (safeSize.h < realSize.h) ? safeSize.h : null;
+        
+            if (fixedSize.w && fixedSize.h) {
+                //content is too big in both directions, so we will use 
+                // max popup size (safeSize), knowing well that it will 
+                // overflow both ways.                
+                newSize = safeSize;
+            } else {
+                //content is clipped in only one direction, so we need to 
+                // run getRenderedDimensions() again with a fixed dimension
+                var clippedSize = OpenLayers.Util.getRenderedDimensions(
+                    preparedHTML, fixedSize, 
+                    { displayClass: this.contentDisplayClass }
+                );
+                
+                //if the clipped size is still the same as the safeSize, 
+                // that means that our content must be fixed in the 
+                // offending direction. If overflow is 'auto', this means 
+                // we are going to have a scrollbar for sure, so we must 
+                // adjust for that.
+                //
+                var currentOverflow = OpenLayers.Element.getStyle(
+                    this.contentDiv, "overflow"
+                );
+                if ( (currentOverflow != "hidden") && 
+                     (clippedSize.equals(safeSize)) ) {
+                    var scrollBar = OpenLayers.Util.getScrollbarWidth();
+                    if (fixedSize.w) {
+                        clippedSize.h += scrollBar;
+                    } else {
+                        clippedSize.w += scrollBar;
+                    }
+                }
+                
+                newSize = this.getSafeContentSize(clippedSize);
+            }
+        }                        
+        this.setSize(newSize);     
+    },    
+
+    /**
-     * Method: setBackgroundColor
-     * Sets the background color of the popup.
@@ -512 +591 @@
-    setContentHTML:function(contentHTML) {
-
-        var preparedHTML;
-        if (contentHTML != null) {
-            this.contentHTML = contentHTML;
-        }
-       
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**

sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/Anchored.js

@@ -36 +36 @@
-    * id - {String}
-    * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-    * contentHTML - {String}
-    * anchor - {Object} Object which must expose a 'size' <OpenLayers.Size> 
@@ -43 +43 @@
-    * closeBoxCallback - {Function} Function to be called on closeBox click.
-    */
-s
+contentS
-                        closeBoxCallback) {
-
-
+
+
+
-        OpenLayers.Popup.prototype.initialize.apply(this, newArguments);
-
@@ -109 +110 @@
-     * 
-     * Parameters:
-
+
+
-     */
-s
+contentS
-        OpenLayers.Popup.prototype.setSize.apply(this, arguments);
-
@@ -165 +167 @@
-    calculateNewPx:function(px) {
-        var newPx = px.offset(this.anchor.offset);
+        
+        //use contentSize if size is not already set
+        var size = this.size || this.contentSize;
-
-        var top = (this.relativePosition.charAt(0) == 't');
-this.
+
-        
-        var left = (this.relativePosition.charAt(1) == 'l');
-this.
+
-
-        return newPx;   

sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/AnchoredBubble.js

@@ -29 +29 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -37 +37 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-        
@@ -82 +82 @@
-     * 
-     * Parameters:
-
+
+
-     */
-s
+contentS
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-

sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/Framed.js

@@ -86 +86 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -94 +94 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-
@@ -189 +189 @@
-     * 
-     * Parameters:
-
-
-
+
+
+
+
-        OpenLayers.Popup.Anchored.prototype.setSize.apply(this, arguments);
-
@@ -297 +298 @@
-        }
-        
-
+size && this.
-            var position = this.positionBlocks[this.relativePosition];
-            for (var i = 0; i < position.blocks.length; i++) {

sandbox/camptocamp/unhcr/lib/OpenLayers/Popup/FramedCloud.js

@@ -204 +204 @@
-     * id - {String}
-     * lonlat - {<OpenLayers.LonLat>}
-s
+contentS
-     * contentHTML - {String}
-     * anchor - {Object} Object to which we'll anchor the popup. Must expose 
@@ -212 +212 @@
-     * closeBoxCallback - {Function} Function to be called on closeBox click.
-     */
-s
+contentS
-                        closeBoxCallback) {
-

sandbox/camptocamp/unhcr/lib/OpenLayers/Renderer/Canvas.js

@@ -4 +4 @@
-
-/**
+ * @requires OpenLayers/Renderer.js
+ */
+
+/**
- * Class: OpenLayers.Renderer.Canvas 
- * A renderer based on the 2D 'canvas' drawing element.element
-
+
+
+
- */
-OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
@@ -37 +43 @@
- 
-    /**
- 
+.Canvas
-     *
-     * Parameters:
@@ -398 +404 @@
-            delete this.features[features[i].id];
-        }
-
-
-
+
-    },
-

sandbox/camptocamp/unhcr/lib/OpenLayers/Renderer/Elements.js

@@ -464 +464 @@
-        };
-
-        //
-        if (style.backgroundGraphic) {
-            this.redrawBackgroundNode(geometry.id, geometry, style, featureId);
-        }
-        
-        if (style.display != "none") {
-
+
+
+
+
-        } else {
-            var node = OpenLayers.Util.getElement(geometry.id);
-            if (node) {