Changeset 6402

Timestamp:

02/28/08 17:46:43 (11 months ago)

Author:

euzuro

Message:

bringing up to date from trunk 6325:trunk

Files:

• sandbox/euzuro/pop/build/full.cfg (modified) (1 diff)
• sandbox/euzuro/pop/examples/fractional-zoom.html (modified) (3 diffs)
• sandbox/euzuro/pop/examples/mapguide.html (copied) (copied from trunk/openlayers/examples/mapguide.html)
• sandbox/euzuro/pop/examples/styles-unique.html (copied) (copied from trunk/openlayers/examples/styles-unique.html)
• sandbox/euzuro/pop/lib/OpenLayers.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Control/OverviewMap.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Control/PanZoomBar.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Format/WFS.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Format/WMC.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Format/WMC/v1.js (modified) (3 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Layer.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Layer/MapGuide.js (copied) (copied from trunk/openlayers/lib/OpenLayers/Layer/MapGuide.js)
• sandbox/euzuro/pop/lib/OpenLayers/Layer/Vector.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Map.js (modified) (6 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Popup.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Renderer/SVG.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Rule.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Style.js (modified) (6 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/StyleMap.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Tween.js (modified) (5 diffs)
• sandbox/euzuro/pop/tests/Format/WMC/test_v1.html (copied) (copied from trunk/openlayers/tests/Format/WMC/test_v1.html)
• sandbox/euzuro/pop/tests/Format/test_XML.html (modified) (3 diffs)
• sandbox/euzuro/pop/tests/Layer/test_MapGuide.html (copied) (copied from trunk/openlayers/tests/Layer/test_MapGuide.html)
• sandbox/euzuro/pop/tests/Renderer/test_SVG.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/Rule/test_Comparison.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/Tile/test_WFS.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/list-tests.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/manual/ajax.html (modified) (3 diffs)
• sandbox/euzuro/pop/tests/run-tests.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_Layer.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_Style.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_Tween.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_Util.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/xml_eq.js (copied) (copied from trunk/openlayers/tests/xml_eq.js)

sandbox/euzuro/pop/build/full.cfg

@@ -14 +14 @@
-Firebug/firebug.js
-Firebug/firebugx.js
+OpenLayers/Lang/de.js
+OpenLayers/Lang/en-CA.js
+OpenLayers/Lang/fr.js

sandbox/euzuro/pop/examples/fractional-zoom.html

@@ -14 +14 @@
-
-        function init() {
-
+
+
+
+
-            var wms = new OpenLayers.Layer.WMS(
-                "OpenLayers WMS",
@@ -23 +26 @@
-
-            map.events.register("moveend", null, displayZoom);
-            map.addControl( new OpenLayers.Control.LayerSwitcher() );
-
-            map.zoomToMaxExtent();
@@ -37 +39 @@
-        function update(input) {
-            map.fractionalZoom = input.checked;
+            map.zoomTo(Math.round(map.zoom));
-        }
-    </script>

sandbox/euzuro/pop/lib/OpenLayers.js

@@ -105 +105 @@
-            "OpenLayers/Layer/HTTPRequest.js",
-            "OpenLayers/Layer/Grid.js",
+            "OpenLayers/Layer/MapGuide.js",
-            "OpenLayers/Layer/MapServer.js",
-            "OpenLayers/Layer/MapServer/Untiled.js",

sandbox/euzuro/pop/lib/OpenLayers/Control/OverviewMap.js

@@ -328 +328 @@
-                                                   newTop));
-        this.updateMapToRect();
-        OpenLayers.Event.stop(evt);
-    },
-

sandbox/euzuro/pop/lib/OpenLayers/Control/PanZoomBar.js

@@ -242 +242 @@
-        var y = evt.xy.y;
-        var top = OpenLayers.Util.pagePosition(evt.object)[1];
-
-
+
+
+
+
+
+
+
+
-        OpenLayers.Event.stop(evt);
-    },
@@ -315 +321 @@
-            });
-            var deltaY = this.zoomStart.y - evt.xy.y;
-
+
+
+
+
+
+
+
+
+
-            this.moveZoomBar();
-            this.mouseDragStart = null;

sandbox/euzuro/pop/lib/OpenLayers/Format/WFS.js

@@ -190 +190 @@
-            return false; 
-        }
-featureNS
+wfsns
-        deleteNode.setAttribute("typeName", this.layerName);
-

sandbox/euzuro/pop/lib/OpenLayers/Format/WMC.js

@@ -88 +88 @@
-        var context = this.parser.read(data, options);
-        var map;
-
-
+
+
+
+
+
+
+
-        } else {
-
+
+
-        }
-        return map;

sandbox/euzuro/pop/lib/OpenLayers/Format/WMC/v1.js

@@ -123 +123 @@
-            childNode = children[i];
-            if(childNode.nodeType == 1) {
-
-
-
+
-                local = childNode.nodeName.split(":").pop();
-                processor = this["read_" + prefix + "_" + local];
@@ -313 +311 @@
-        this.runChildNodes(style, node);
-        if(node.getAttribute("current") == "1") {
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        layerInfo.styles.push(style);
+    },
+    
+    /**
+     * Method: read_wmc_SLD
+     */
+    read_wmc_SLD: function(style, node) {
+        this.runChildNodes(style, node);
+        // style either comes back with an href or a body property
+    },
+    
+    /**
+     * Method: read_sld_StyledLayerDescriptor
+     */
+    read_sld_StyledLayerDescriptor: function(sld, node) {
+        var xml = OpenLayers.Format.XML.prototype.write.apply(this, [node]);
+        sld.body = xml;
-    },
-
@@ -732 +757 @@
-            "Style", null, {current: "1"}
-        );
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        node.appendChild(style);
-        return node;

sandbox/euzuro/pop/lib/OpenLayers/Layer.js

@@ -716 +716 @@
-
-            // determine numZoomLevels if not already set on the layer
+            // this gives numZoomLevels assuming approximately base 2 scaling
-            if (confProps.minResolution != null &&
-                this.options.numZoomLevels == undefined) {
@@ -728 +729 @@
-            var base = 2;
-            if(typeof confProps.minResolution == "number" &&
-this.option
+confProp
-                /**
-
-
-
-
-
+
+
+
+
-                 */
-                base = Math.pow(

sandbox/euzuro/pop/lib/OpenLayers/Layer/Vector.js

@@ -151 +151 @@
-        
-        // concatenate events specific to vector with those from the base
-
+
+
-            OpenLayers.Layer.prototype.EVENT_TYPES
-        );
@@ -271 +272 @@
-        if (!dragging) {
-            this.renderer.root.style.visibility = "hidden";
+            // force a reflow on gecko based browsers to actually hide the svg
+            if (navigator.userAgent.toLowerCase().indexOf("gecko") != -1) {
+                this.div.scrollLeft = this.div.scrollLeft;
+            }
-            
-            this.div.style.left = -parseInt(this.map.layerContainerDiv.style.left) + "px";

sandbox/euzuro/pop/lib/OpenLayers/Map.js

@@ -47 +47 @@
-     *
-     * Supported map event types:
+     *  - *preaddlayer* triggered before a layer has been added.  The event
+     *      object will include a *layer* property that references the layer  
+     *      to be added.
-     *  - *addlayer* triggered after a layer has been added.  The event object
-     *      will include a *layer* property that references the added layer.
@@ -75 +78 @@
-     */
-    EVENT_TYPES: [ 
-addlayer", "removelayer", "changelayer", "movestart", "move", 
-
+preaddlayer", "addlayer", "removelayer", "changelayer", "movestart",
+", "move
-        "addmarker", "removemarker", "clearmarkers", "mouseover",
-        "mouseout", "mousemove", "dragstart", "drag", "dragend",
@@ -316 +319 @@
-     */
-    fallThrough: true,
+    
+    /**
+     * Property: panTween
+     * {OpenLayers.Tween} Animated panning tween object, see panTo()
+     */
+    panTween: null,
-
-    /**
@@ -733 +742 @@
-            }
-        }    
+
+        this.events.triggerEvent("preaddlayer", {layer: layer});
-        
-        layer.div.className = "olLayerDiv";
@@ -1439 +1450 @@
-        if (zoomChanged || centerChanged || !dragging) {
-
-
+this.
-                this.events.triggerEvent("movestart");
-            }
@@ -1512 +1523 @@
-            this.events.triggerEvent("moveend");
-        }
+        
+        // Store the map dragging state for later use
+        this.dragging = !!dragging; 
+
-    },
-

sandbox/euzuro/pop/lib/OpenLayers/Popup.js

@@ -289 +289 @@
-    updatePosition: function() {
-        if ((this.lonlat) && (this.map)) {
-    
-    
-    
-    
+
+
+
+
-        }
-    },

sandbox/euzuro/pop/lib/OpenLayers/Renderer/SVG.js

@@ -193 +193 @@
-        style = style  || node._style;
-        options = options || node._options;
-
+
+
+
-            if (style.externalGraphic) {
-var x = parseFloat(node.getAttributeNS(null, "cx")
+x = parseFloat(x
-                var y = parseFloat(node.getAttributeNS(null, "cy"));
-                
@@ -338 +340 @@
-            node.setAttributeNS(null, "r", radius);
-        } else {
-if (node.parentNode == this.root) {
-    this.root.removeChild(node
-}
+node.setAttributeNS(null, "cx", "");
+node.setAttributeNS(null, "cy", ""
+node.setAttributeNS(null, "r", 0);
-        }    
-            

sandbox/euzuro/pop/lib/OpenLayers/Rule.js

@@ -23 +23 @@
-    /**
-     * Property: context
-and its
-symbolizers' property values should be evaluatad against. If no
-context is specified, feature.attributes will be used
+should be
+evaluatad against. If no context is specified, feature.attributes will
+be used.
-     */
-    context: null,
@@ -41 +41 @@
-    /**
-     * Property: symbolizer
-Hash of styles for this rule. Contains hashes of feature
-tyles. K
+Symbolizer or hash of symbolizers for this rule. If hash of
+ymbolizers, k
-     */
-    symbolizer: null,

sandbox/euzuro/pop/lib/OpenLayers/Style.js

@@ -42 +42 @@
-    
-    /**
+     * Property: context
+     * {Object} An optional object with properties that symbolizers' property
+     * values should be evaluatad against. If no context is specified,
+     * feature.attributes will be used
+     */
+    context: null,
+
+    /**
-     * Property: defaultStyle
-     * {Object} hash of style properties to use as default for merging
@@ -117 +125 @@
-        for(var i=0; i<rules.length; i++) {
-            rule = rules[i];
-            context = rule.context;
-            if (!context) {
-                context = feature.attributes || feature.data;
-            }
-            // does the rule apply?
-            var applies = rule.evaluate(feature);
@@ -129 +133 @@
-                } else {
-                    appliedRules = true;
-, context
+
-                }
-            }
@@ -138 +142 @@
-            appliedRules = true;
-            for(var i=0; i<elseRules.length; i++) {
-, context
+
-            }
-        }
@@ -159 +163 @@
-     * style - {Object}
-     * feature - {<OpenLayer.Feature.Vector>}
-     * context - {Object}
-     *
-     * Returns:
-     * {Object} A style with new symbolizer applied.
-     */
-, context
+
-        var symbolizerPrefix = feature.geometry ?
-                this.getSymbolizerPrefix(feature.geometry) :
-                OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
-
-
-
+
+
+
+
-        // merge the style with the current style
-        return this.createLiterals(
@@ -213 +218 @@
-        // check the default style
-        var style = this.defaultStyle;
-
-
-
-
-
+
-
-        // walk through all rules to check for properties in their symbolizer
-        var rules = this.rules;
-prefixes = OpenLayers.Style.SYMBOLIZER_PREFIXES
+symbolizer, value
-        for (var i=0; i<rules.length; i++) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
+            }
+        }
+        return propertyStyles;
+    },
+    
+    /**
+     * Method: addPropertyStyles
+     * 
+     * Parameters:
+     * propertyStyles - {Object} hash to add new property styles to. Will be
+     *                  modified inline
+     * symbolizer     - {Object} search this symbolizer for property styles
+     * 
+     * Returns:
+     * {Object} propertyStyles hash
+     */
+    addPropertyStyles: function(propertyStyles, symbolizer) {
+        var property;
+        for (var key in symbolizer) {
+            property = symbolizer[key];
+            if (typeof property == "string" &&
+                    property.match(/\$\{\w+\}/)) {
+                propertyStyles[key] = true;
-            }
-        }

sandbox/euzuro/pop/lib/OpenLayers/StyleMap.js

@@ -111 +111 @@
-            this.styles[intent].createSymbolizer(feature));
-    },
+    
+    /**
+     * Method: addUniqueValueRules
+     * Convenience method to create comparison rules for unique values of a
+     * property. The rules will be added to the style object for a specified
+     * rendering intent. This method is a shortcut for creating something like
+     * the "unique value legends" familiar from well known desktop GIS systems
+     * 
+     * Parameters:
+     * renderIntent - {String} rendering intent to add the rules to
+     * property     - {String} values of feature attributes to create the
+     *                rules for
+     * symbolizers  - {Object} Hash of symbolizers, keyed by the desired
+     *                property values 
+     */
+    addUniqueValueRules: function(renderIntent, property, symbolizers) {
+        var rules = [];
+        for (var value in symbolizers) {
+            rules.push(new OpenLayers.Rule.Comparison({
+                type: OpenLayers.Rule.Comparison.EQUAL_TO,
+                property: property,
+                value: value,
+                symbolizer: symbolizers[value]}));
+        }
+        this.styles[renderIntent].addRules(rules);
+    },
-
-    CLASS_NAME: "OpenLayers.StyleMap"

sandbox/euzuro/pop/lib/OpenLayers/Tween.js

@@ -59 +59 @@
-    interval: null,
-    
+    /**
+     * Property: playing
+     * {Boolean} Tells if the easing is currently playing
+     */
+    playing: false,
+    
-    /** 
-     * Constructor: OpenLayers.Tween
@@ -81 +87 @@
-     */
-    start: function(begin, finish, duration, options) {
+        this.playing = true;
-        this.begin = begin;
-        this.finish = finish;
@@ -99 +106 @@
-    /**
-     * APIMethod: stop
-
+
+
-     */
-    stop: function() {
+        if (!this.playing) {
+            return;
+        }
+        
-        if (this.callbacks && this.callbacks.done) {
-            this.callbacks.done.call(this, this.finish);
@@ -107 +119 @@
-        window.clearInterval(this.interval);
-        this.interval = null;
+        this.playing = false;
-    },
-    
@@ -134 +147 @@
-            if (this.callbacks && this.callbacks.done) {
-                this.callbacks.done.call(this, this.finish);
+                this.playing = false;
-            }
-            window.clearInterval(this.interval);

sandbox/euzuro/pop/tests/Format/test_XML.html

@@ -44 +44 @@
-        
-        var format = new OpenLayers.Format.XML();
-1 : 10
+0 : 9
-
-        var doc = format.read(text);
@@ -53 +53 @@
-        t.ok(doc.documentElement,
-             "ok to access doc.documentElement");
-
-
-
-
+
+
-        
-        // read can also be called on the prototype directly
@@ -66 +64 @@
-        t.ok(doc.documentElement,
-             "ok to access doc.documentElement");
-
-
-
-
+
+
-        
-        // where appropriate, make sure doc is loaded into xmldom property
-        if(format.xmldom) {
-
-
-
+
+
-        }
+        
+        // test equivalence with different namespace alias
+        var pre1 = 
+            "<pre1:parent xmlns:pre1='http://namespace'>" +
+                "<pre1:child1>value2</pre1:child1>" +
+                "<pre1:child2 pre1:attr1='foo'>value2</pre1:child2>" +
+                "<pre1:child3 chicken:attr='hot' xmlns:chicken='http://soup'/>" +
+            "</pre1:parent>";
+        var pre2 = 
+            "<pre2:parent xmlns:pre2='http://namespace'>" +
+                "<pre2:child1>value2</pre2:child1>" +
+                "<pre2:child2 pre2:attr1='foo'>value2</pre2:child2>" +
+                "<pre2:child3 pea:attr='hot' xmlns:pea='http://soup'/>" +
+            "</pre2:parent>";
+        var doc1 = format.read(pre1);
+        t.xml_eq(doc1.documentElement, pre2, "read correctly sets namespaces");
+        
-    }
-

sandbox/euzuro/pop/tests/Renderer/test_SVG.html

@@ -156 +156 @@
-        r.drawCircle(node, geometry, "blah_4000");
-        
-2
--4
-3
+
+
+0
-    }
-    

sandbox/euzuro/pop/tests/Rule/test_Comparison.html

@@ -39 +39 @@
-    
-    function test_Comparison_evaluate(t) {
-3
+4
-        
-        var rule = new OpenLayers.Rule.Comparison({
@@ -63 +63 @@
-                    " evaluates to "+result.toString()+" correctly.");
-        }
+        rule.context = {
+            area: 4998
+        }
+        var result = rule.evaluate();
+        t.eq(result, true, "evaluation against custom rule context works.");
-    }
-    </script> 

sandbox/euzuro/pop/tests/Tile/test_WFS.html

@@ -30 +30 @@
-        t.plan(2);
-
-       
-           
-       
-
-       
-
-       
+        
+            
+        
+
+        
+
+        
-
-        var layer = {}; // bogus layer
@@ -52 +52 @@
-    
-    function test_Tile_WFS_loadFeaturesForRegion(t) {
-   
-
-       
-           
-       
+    
+
+        
+            
+        
-
-
+
-
-       
-       
-           
-           
-           
-           
-       
-
-   
-       
+        
+        
+            
+            
+            
+            
+        
+
+    
+        
-
-   
-       
-           'transport'
-               
-                   
-               
-           
-       
-       
-
-       
+    
+        
+            transport
+                
+                        
+                
+            
+        
+        
+
+        
-    }
-    

sandbox/euzuro/pop/tests/list-tests.html

@@ -33 +33 @@
-    <li>Format/test_WMC.html</li>
-    <li>Format/WMC/test_v1_1_0.html</li>
+    <li>Format/WMC/test_v1.html</li>
-    <li>Format/test_XML.html</li>
-    <li>test_Icon.html</li>
@@ -62 +63 @@
-    <li>Layer/test_Image.html</li>
-    <li>Layer/test_KaMap.html</li>
+    <li>Layer/test_MapGuide.html</li>
-    <li>Layer/test_MapServer.html</li>
-    <li>Layer/test_Markers.html</li>

sandbox/euzuro/pop/tests/manual/ajax.html

@@ -23 +23 @@
-        function sendSynchronous(){
-            var request = new OpenLayers.Ajax.Request(url, {
+               'asynchronous': false,
-                onComplete: function() {
-                    document.getElementById('send_sync').value += 'request completed\n';
@@ -31 +32 @@
-        function sendAsynchronous(){
-            var request = new OpenLayers.Ajax.Request(url, {
-               'asynchronous': false,
-                onComplete: function() {