Changeset 4432

Timestamp:

09/21/07 09:32:42 (1 year ago)

Author:

crschmidt

Message:

Pullup changes for RC3:

• KML Examples broken (Closes #1001)
  
• drag handler doesn't reset properties on left or improperly modified mousedown (Closes #1003)
  
• Text nodes limited to 4096 in length (Closes #1006)
  
• KML/GML Attribute CDATA Parsing (Closes #1007)
  
• Control.MousePosition (Closes #1008)
  

Files:

• branches/openlayers/2.5/examples/kml-layer-linestring.html (deleted)
• branches/openlayers/2.5/examples/kml-layer.html (modified) (1 diff)
• branches/openlayers/2.5/lib/OpenLayers/Control/MousePosition.js (modified) (1 diff)
• branches/openlayers/2.5/lib/OpenLayers/Format/GML.js (modified) (3 diffs)
• branches/openlayers/2.5/lib/OpenLayers/Format/KML.js (modified) (1 diff)
• branches/openlayers/2.5/lib/OpenLayers/Format/XML.js (modified) (1 diff)
• branches/openlayers/2.5/lib/OpenLayers/Handler/Drag.js (modified) (2 diffs)
• branches/openlayers/2.5/tests/Control/test_MousePosition.html (copied) (copied from trunk/openlayers/tests/Control/test_MousePosition.html)
• branches/openlayers/2.5/tests/Format/test_GML.html (modified) (1 diff)
• branches/openlayers/2.5/tests/Format/test_KML.html (modified) (1 diff)
• branches/openlayers/2.5/tests/Handler/test_Drag.html (modified) (3 diffs)
• branches/openlayers/2.5/tests/list-tests.html (modified) (1 diff)

branches/openlayers/2.5/examples/kml-layer.html

@@ -20 +20 @@
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
-            map.addLayer(layer);
-mc-search
-MaxExtent(
+lines
+Extent(new OpenLayers.Bounds(-112.306698,36.017792,-112.03204,36.18087)
-        }
-    </script>

branches/openlayers/2.5/lib/OpenLayers/Control/MousePosition.js

@@ -63 +63 @@
-
-    /**
+     * Method: destroy
+     */
+     destroy: function() {
+         if (this.map) {
+             this.map.events.unregister('mousemove', this, this.redraw);
+         }
+         OpenLayers.Control.prototype.destroy.apply(this, arguments);
+     },
+
+    /**
-     * Method: draw
-     * {DOMElement}

branches/openlayers/2.5/lib/OpenLayers/Format/GML.js

@@ -296 +296 @@
-            nodeList = this.getElementsByTagNameNS(node, this.gmlns, "posList");
-            if(nodeList.length > 0) {
-nodeList[0].firstChild.nodeValue
+this.concatChildValues(nodeList[0])
-                coordString = coordString.replace(this.regExes.trimSpace, "");
-                coords = coordString.split(this.regExes.splitSpace);
@@ -315 +315 @@
-                                                       "coordinates");
-                if(nodeList.length > 0) {
-nodeList[0].firstChild.nodeValue
+this.concatChildValues(nodeList[0])
-                    coordString = coordString.replace(this.regExes.trimSpace,
-                                                      "");
@@ -454 +454 @@
-                        if(grandchildren.length == 1) {
-                            grandchild = grandchildren[0];
-
+
+
-                                name = (child.prefix) ?
-                                        child.nodeName.split(":")[1] :

branches/openlayers/2.5/lib/OpenLayers/Format/KML.js

@@ -327 +327 @@
-                if(grandchildren.length == 1) {
-                    grandchild = grandchildren[0];
-
+ || grandchild.nodeType == 4
-                        name = (child.prefix) ?
-                                child.nodeName.split(":")[1] :

branches/openlayers/2.5/lib/OpenLayers/Format/XML.js

@@ -257 +257 @@
-        return attributeValue;
-    },
+    
+    /**
+     * APIMethod: getChildValue
+     * Get the value of the first child node if it exists, or return an
+     *     optional default string.  Returns an empty string if no first child
+     *     exists and no default value is supplied.
+     *
+     * Parameters:
+     * node - {DOMElement} The element used to look for a first child value.
+     * def - {String} Optional string to return in the event that no
+     *     first child value exists.
+     *
+     * Returns:
+     * {String} The value of the first child of the given node.
+     */
+    getChildValue: function(node, def) {
+        var value;
+        try {
+            value = node.firstChild.nodeValue;
+        } catch(e) {
+            value = (def != undefined) ? def : "";
+        }
+        return value;
+    },
+
+    /**
+     * APIMethod: concatChildValues
+     * Concatenate the value of all child nodes if any exist, or return an
+     *     optional default string.  Returns an empty string if no children
+     *     exist and no default value is supplied.  Not optimized for large
+     *     numbers of child nodes.
+     *
+     * Parameters:
+     * node - {DOMElement} The element used to look for child values.
+     * def - {String} Optional string to return in the event that no
+     *     child exist.
+     *
+     * Returns:
+     * {String} The concatenated value of all child nodes of the given node.
+     */
+    concatChildValues: function(node, def) {
+        var value = "";
+        var child = node.firstChild;
+        var childValue;
+        while(child) {
+            childValue = child.nodeValue;
+            if(childValue) {
+                value += childValue;
+            }
+            child = child.nextSibling;
+        }
+        if(value == "" && def != undefined) {
+            value = def;
+        }
+        return value;
+    },
-
-    /**

branches/openlayers/2.5/lib/OpenLayers/Handler/Drag.js

@@ -144 +144 @@
-     */
-    mousedown: function (evt) {
+        var propagate = true;
+        this.dragging = false;
-        if (this.checkModifiers(evt) && OpenLayers.Event.isLeftClick(evt)) {
-            this.started = true;
-            this.dragging = false;
-            this.start = evt.xy;
-            this.last = evt.xy;
@@ -160 +161 @@
-            }
-            
-
-
-
+
+
+
+
+
+
+
-    },
-

branches/openlayers/2.5/tests/Format/test_GML.html

@@ -148 +148 @@
-    }
-    function test_Format_GML_read_attributes(t) {
-1
+2
-        var parser = new OpenLayers.Format.GML();
-        data = parser.read(test_content[0]);
-        t.eq(data[0].attributes['NAME'], "WY", "Simple Attribute data is read correctly.");
+        t.eq(data[0].attributes['LONGNAME'], "Wyoming", "Attribute data is read from CDATA node correctly.");
-    }    
-
-
+ogr:LONGNAME><![CDATA[Wyoming]]></ogr:LONGNAME>\n    <
- '<wfs:FeatureCollection' + 
- '   xmlns:fs="http://example.com/featureserver"' + 

branches/openlayers/2.5/tests/Format/test_KML.html

@@ -29 +29 @@
-    }
-
+    function test_Format_KML_readCdataAttributes(t) {
+        t.plan(2);
+        var cdata = '<kml xmlns="http://earth.google.com/kml/2.0"><Document><Placemark><name><![CDATA[Pezinok]]></name><description><![CDATA[Full of text.]]></description><styleUrl>#rel1.0</styleUrl><Point> <coordinates>17.266666, 48.283333</coordinates></Point></Placemark></Document></kml>';
+        var features = (new OpenLayers.Format.KML()).read(cdata);
+        t.eq(features[0].attributes.description, "Full of text.", "Description attribute in cdata read correctly");
+        t.eq(features[0].attributes.name, "Pezinok", "title attribute in cdata read correctly");
+        
+    }
+    
-    function test_Format_KML_write(t) {
-        // make sure id, name, and description are preserved

branches/openlayers/2.5/tests/Handler/test_Drag.html

@@ -88 +88 @@
-
-    function test_Handler_Drag_callbacks(t) {
-27
+33
-        
-        var map = new OpenLayers.Map('map', {controls: []});
@@ -116 +116 @@
-        handler.activate();
-        
-        // test mousedown
-        var oldIsLeftClick = OpenLayers.Event.isLeftClick;
-        var oldStop = OpenLayers.Event.stop;
-        var oldCheckModifiers = handler.checkModifiers;
+
+        // test mousedown with right click
+        OpenLayers.Event.isLeftClick = function() {
+            return false;
+        }
+        handler.checkModifiers = function() {
+            return true;
+        }
+        handler.started = true;
+        handler.start = {x: "foo", y: "bar"};
+        handler.last = {x: "foo", y: "bar"};
+        map.events.triggerEvent("mousedown", testEvents.down);
+        t.ok(!handler.started, "right-click sets started to false");
+        t.eq(handler.start, null, "right-click sets start to null");
+        t.eq(handler.last, null, "right-click sets last to null");
+
+        // test mousedown with improper modifier
+        OpenLayers.Event.isLeftClick = function() {
+            return true;
+        }
+        handler.checkModifiers = function() {
+            return false;
+        }
+        handler.started = true;
+        handler.start = {x: "foo", y: "bar"};
+        handler.last = {x: "foo", y: "bar"};
+        map.events.triggerEvent("mousedown", testEvents.down);
+        t.ok(!handler.started, "bad modifier sets started to false");
+        t.eq(handler.start, null, "bad modifier sets start to null");
+        t.eq(handler.last, null, "bad modifier sets last to null");
+
+        // test mousedown
-        handler.checkModifiers = function(evt) {
-            t.ok(evt.xy.x == testEvents.down.xy.x &&
@@ -152 +183 @@
-             handler.last.y == testEvents.down.xy.y,
-             "mouse down sets handler.last correctly");
+        
+        OpenLayers.Event.stop = oldStop;        
-        OpenLayers.Event.isLeftClick = oldIsLeftClick;
-        OpenLayers.Event.stop = oldStop;
-        handler.checkModifiers = oldCheckModifiers;
-

branches/openlayers/2.5/tests/list-tests.html

@@ -72 +72 @@
-    <li>Control/test_NavToolbar.html</li>
-    <li>Control/test_MouseToolbar.html</li>
+    <li>Control/test_MousePosition.html</li>
-    <li>Control/test_LayerSwitcher.html</li>
-    <li>Control/test_Panel.html</li>