Ticket #1044: kml_ns.patch

tests/Format/test_KML.html

@@ -28 +28 @@
-             "read geometry collection");
-    }
-
-
+_20
-        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);
@@ -37 +37 @@
-        
-    }
-    
+    function test_Format_KML_readCdataAttributes_21(t) {
+        t.plan(2);
+        var cdata = '<kml xmlns="http://earth.google.com/kml/2.1"><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
-        t.plan(1);

lib/OpenLayers/Format/KML.js

@@ -48 +48 @@
-     * {Boolean} Extract attributes from KML.  Default is true.
-     */
-    extractAttributes: true,
+    
+    /**
+     * Property: internalns
+     * {String} KML Namespace to use -- defaults to the namespace of the
+     *     Placemark node being parsed, but falls back to kmlns. 
+     */
+    internalns: null,
-
-    /**
-     * Constructor: OpenLayers.Format.KML
@@ -83 +90 @@
-            data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
-        }
-        var featureNodes = this.getElementsByTagNameNS(data,
-this.kmlns
+'*'
-                                                       "Placemark");
-        var numFeatures = featureNodes.length;
-        var features = new Array(numFeatures);
@@ -116 +123 @@
-        var type, nodeList, geometry, parser;
-        for(var i=0; i<order.length; ++i) {
-            type = order[i];
-
+
+
+
+
-            if(nodeList.length > 0) {
-                // only deal with first geometry of this type
-                var parser = this.parseGeometry[type.toLowerCase()];
@@ -165 +175 @@
-         * {<OpenLayers.Geometry.Point>} A point geometry.
-         */
-        point: function(node) {
-km
+interna
-                                                       "coordinates");
-            var coords = [];
-            if(nodeList.length > 0) {
@@ -200 +210 @@
-         * {<OpenLayers.Geometry.LineString>} A linestring geometry.
-         */
-        linestring: function(node, ring) {
-km
+interna
-                                                       "coordinates");
-            var line = null;
-            if(nodeList.length > 0) {
@@ -254 +264 @@
-         * {<OpenLayers.Geometry.Polygon>} A polygon geometry.
-         */
-        polygon: function(node) {
-km
+interna
-                                                       "LinearRing");
-            var numRings = nodeList.length;
-            var components = new Array(numRings);