Changeset 9976

Timestamp:

01/27/10 08:44:35 (1 month ago)

Author:

fredj

Message:

Don't create Folder name or description if foldersName or foldersDesc are null. r=pgiraud (closes #2417)

Files:

• trunk/openlayers/lib/OpenLayers/Format/KML.js (modified) (4 diffs)
• trunk/openlayers/tests/Format/KML.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Format/KML.js

@@ -33 +33 @@
-    /** 
-     * APIProperty: placemarksDesc
-."
+".
-     */
-    placemarksDesc: "No description available",
@@ -39 +39 @@
-    /** 
-     * APIProperty: foldersName
-
+
+
-     */
-    foldersName: "OpenLayers export",
@@ -46 +47 @@
-     * APIProperty: foldersDesc
-     * {String} Description of the folders. Default is "Exported on [date]."
+     *          If set to null, no description element will be created.
-     */
-    foldersDesc: "Exported on " + new Date(),
@@ -984 +986 @@
-     */
-    createFolderXML: function() {
-        // Folder name
-        var folderName = this.createElementNS(this.kmlns, "name");
-        var folderNameText = this.createTextNode(this.foldersName); 
-        folderName.appendChild(folderNameText);
-
-        // Folder description
-        var folderDesc = this.createElementNS(this.kmlns, "description");        
-        var folderDescText = this.createTextNode(this.foldersDesc); 
-        folderDesc.appendChild(folderDescText);
-
-        // Folder
-        var folder = this.createElementNS(this.kmlns, "Folder");
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return folder;
-    },

trunk/openlayers/tests/Format/KML.html

@@ -67 +67 @@
-        var kmlExpected = this.test_content;
-        var options = {
-
+s
-            foldersDesc: "Vector geometries from OpenLayers"
-
+;
-
-        var format = new OpenLayers.Format.KML(options);
@@ -76 +76 @@
-        var kmlOut = kmlOut.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog
-        t.eq(kmlOut, kmlExpected, "correctly writes an KML doc string");
+    }
+
+    function test_Format_KML_write_noNameDesc(t) {
+        t.plan(1);
+        var format = new OpenLayers.Format.KML({
+            foldersName: null,
+            foldersDesc: null
+        });
+        var geom = new OpenLayers.Geometry.Point(0, 0)
+        var feature = new OpenLayers.Feature.Vector(geom);
+        feature.id = 42;
+        var kmlOut = format.write(feature);
+        var expected = '<kml xmlns="http://earth.google.com/kml/2.0"><Folder><Placemark><name>42</name><description>No description available</description><Point><coordinates>0,0</coordinates></Point></Placemark></Folder></kml>'
+        t.eq(kmlOut, expected, "null foldersName or foldersDesc don't create elements");
-    }
-