Ticket #973: georss.2.patch

tests/Format/test_GeoRSS.html

@@ -18 +18 @@
-    function test_Format_GeoRSS_serializeline(t) { 
-        t.plan(1);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
+             
+    var shell_start = '<feed xmlns="http://www.w3.org/2005/Atom" \n              xmlns:georss="http://www.georss.org/georss">\n              <title>scribble</title>\n              <id>http://featureserver.org/featureserver.cgi/scribble?format=atom</id>\n              <author><name>FeatureServer</name></author>\n';             
+    var shell_end = '</feed>'; 
+    var input = ['<entry><id>http://featureserver.org/featureserver.cgi/scribble/562.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/562.atom"/><title>Feature 2</title><content type="html">&lt;b&gt;strokeColor&lt;/b&gt;: red&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 2&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</content><georss:polygon>-5.9765625 -131.484375 -58.0078125 -112.5 -50.2734375 -32.34375 52.3828125 -114.609375 -35.5078125 -167.34375 -57.3046875 -146.953125 -34.1015625 -139.921875 -5.9765625 -131.484375</georss:polygon></entry>',
+    '<entry><id>http://featureserver.org/featureserver.cgi/scribble/796.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/796.atom"/><title>Feature 2</title><content type="html">&lt;b&gt;strokeColor&lt;/b&gt;: 00ccff&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 2&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</content><georss:point>75.5859375 15.46875</georss:point></entry>',
+    '<entry><id>http://featureserver.org/featureserver.cgi/scribble/794.atom</id><link href="http://featureserver.org/featureserver.cgi/scribble/794.atom"/><title>Feature 5</title><content type="html">&lt;b&gt;strokeColor&lt;/b&gt;: red&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 5&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</content><georss:line>28.828125 32.6953125 49.921875 34.8046875 39.375 58.0078125 39.375 58.0078125 40.078125 58.0078125 41.484375 58.0078125 43.59375 58.0078125 45.703125 58.7109375 47.8125 58.7109375 49.21875 58.7109375 51.328125 59.4140625 52.03125 59.4140625 54.140625 60.8203125 56.25 61.5234375 56.25 62.2265625 57.65625 62.2265625 57.65625 62.9296875 58.359375 63.6328125 58.359375 65.0390625 58.359375 65.7421875 59.0625 66.4453125 59.0625 67.1484375 59.0625 68.5546875 59.765625 69.9609375 59.765625 72.0703125 59.765625 73.4765625 59.765625 76.2890625 59.765625 78.3984375 59.765625 79.8046875 59.765625 81.9140625 59.765625 83.3203125 59.0625 84.7265625 59.0625 86.8359375 58.359375 87.5390625 58.359375 88.2421875 56.953125 89.6484375 56.25 91.0546875 54.84375 93.8671875 52.03125 96.6796875 51.328125 98.7890625 50.625 100.1953125 49.21875 102.3046875 48.515625 103.7109375 47.8125 104.4140625 47.109375 105.8203125 46.40625 106.5234375 46.40625 107.9296875 45.703125 109.3359375 45 110.7421875 43.59375 112.8515625 43.59375 114.2578125 43.59375 114.9609375 42.890625 117.0703125 42.890625 117.7734375 42.1875 118.4765625 42.1875 119.1796875 42.1875 119.8828125</georss:line></entry>' 
+    ];
+    var output= ['<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description>&lt;b&gt;strokeColor&lt;/b&gt;: red&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 2&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/562.atom</link><georss:polygon xmlns:georss="http://www.georss.org/georss">-5.9765625 -131.484375 -58.0078125 -112.5 -50.2734375 -32.34375 52.3828125 -114.609375 -35.5078125 -167.34375 -57.3046875 -146.953125 -34.1015625 -139.921875 -5.9765625 -131.484375</georss:polygon></item></rss>',
+   '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 2</title><description>&lt;b&gt;strokeColor&lt;/b&gt;: 00ccff&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 2&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/796.atom</link><georss:point xmlns:georss="http://www.georss.org/georss">75.5859375 15.46875</georss:point></item></rss>',
+   '<rss xmlns="http://backend.userland.com/rss2"><item><title>Feature 5</title><description>&lt;b&gt;strokeColor&lt;/b&gt;: red&lt;br /&gt;&lt;b&gt;title&lt;/b&gt;: Feature 5&lt;br /&gt;&lt;b&gt;author&lt;/b&gt;: Your Name Here</description><link>http://featureserver.org/featureserver.cgi/scribble/794.atom</link><georss:line xmlns:georss="http://www.georss.org/georss">28.828125 32.6953125 49.921875 34.8046875 39.375 58.0078125 39.375 58.0078125 40.078125 58.0078125 41.484375 58.0078125 43.59375 58.0078125 45.703125 58.7109375 47.8125 58.7109375 49.21875 58.7109375 51.328125 59.4140625 52.03125 59.4140625 54.140625 60.8203125 56.25 61.5234375 56.25 62.2265625 57.65625 62.2265625 57.65625 62.9296875 58.359375 63.6328125 58.359375 65.0390625 58.359375 65.7421875 59.0625 66.4453125 59.0625 67.1484375 59.0625 68.5546875 59.765625 69.9609375 59.765625 72.0703125 59.765625 73.4765625 59.765625 76.2890625 59.765625 78.3984375 59.765625 79.8046875 59.765625 81.9140625 59.765625 83.3203125 59.0625 84.7265625 59.0625 86.8359375 58.359375 87.5390625 58.359375 88.2421875 56.953125 89.6484375 56.25 91.0546875 54.84375 93.8671875 52.03125 96.6796875 51.328125 98.7890625 50.625 100.1953125 49.21875 102.3046875 48.515625 103.7109375 47.8125 104.4140625 47.109375 105.8203125 46.40625 106.5234375 46.40625 107.9296875 45.703125 109.3359375 45 110.7421875 43.59375 112.8515625 43.59375 114.2578125 43.59375 114.9609375 42.890625 117.0703125 42.890625 117.7734375 42.1875 118.4765625 42.1875 119.1796875 42.1875 119.8828125</georss:line></item></rss>'];
-
-    </script> 
-</head> 

lib/OpenLayers/Format/GeoRSS.js

@@ -4 +4 @@
-
-/**
- * @requires OpenLayers/Format.js
+ * @requires OpenLayers/Format/XML.js
- *
- * Class: OpenLayers.Format.GeoRSS
-Write-only GeoRSS
+Read/write GeoRSS parser
- *     <OpenLayers.Format.GeoRSS> constructor.
- *
- * Inherits from:
-
+.XML
- */
-
+.XML
-    
-    /**
-     * APIProperty: rssns
-
+
+
-     */
-    rssns: "http://backend.userland.com/rss2",
-    
-    /**
-     * APIProperty: featurens
-
+
+
-     */
-    featureNS: "http://mapserver.gis.umn.edu/mapserver",
-    
-    /**
-     * APIProperty: georssns
-
+
+
-     */
-    georssns: "http://www.georss.org/georss",
-    
+    /**
+     * APIProperty: featureTitle
+     * {String} Default title for features.  Defaults to "Untitled"
+     */
+    featureTitle: "Untitled",
-    
-    /**
+     * APIProperty: featureDescription
+     * {String} Default description for features.  Defaults to "No Description"
+     */
+    featureDescription: "No Description",
+    
+    /**
-     * Constructor: OpenLayers.Format.GeoRSS
-
+.
-     *
-     * Parameters:
-     * options - {Object} An optional object whose properties will be set on
-               
+
-     */
-    initialize: function(options) {
-
+XML.
-    },
+    
+    /**
+     * Method: createGeometryFromItem
+     * Return a geometry from a GeoRSS Item.
+     *
+     * Parameters:
+     * item - {DOMElement} A GeoRSS item node.
+     *
+     * Returns:
+     * {<OpenLayers.Geometry>} A geometry representing the node.
+     */
+    createGeometryFromItem: function(item) {
+        var point = this.getElementsByTagNameNS(item, this.georssns, "point");
+        var lat = this.getElementsByTagNameNS(item, this.geons, 'lat');
+        var lon = this.getElementsByTagNameNS(item, this.geons, 'long');
+        
+        var line = this.getElementsByTagNameNS(item,
+                                                this.georssns,
+                                                "line");
+        var polygon = this.getElementsByTagNameNS(item,
+                                                this.georssns,
+                                                "polygon");
+        
+        if (point.length > 0 || (lat.length > 0 && lon.length > 0)) {
+            if (point.length > 0) {
+                var location = OpenLayers.String.trim(
+                                point[0].firstChild.nodeValue).split(/\s+/);
+                
+                if (location.length !=2) {
+                    var location = OpenLayers.String.trim(
+                                point[0].firstChild.nodeValue).split(/\s*,\s*/);
+                }
+            } else {
+                var location = [parseFloat(lat[0].firstChild.nodeValue),
+                                parseFloat(lon[0].firstChild.nodeValue)];
+            }    
+            var geometry = new OpenLayers.Geometry.Point(parseFloat(location[1]),
+                                                     parseFloat(location[0]));
+        } else if (line.length > 0) {
+            var coords = OpenLayers.String.trim(line[0].firstChild.nodeValue).split(/\s+/);
+            var components = []; 
+            for (var i=0; i < coords.length; i+=2) {
+                var point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), parseFloat(coords[i]));
+                components.push(point);
+            }
+            geometry = new OpenLayers.Geometry.LineString(components);
+        } else if (polygon.length > 0) { 
+            var coords = OpenLayers.String.trim(polygon[0].firstChild.nodeValue).split(/\s+/);
+            var components = []; 
+            for (var i=0; i < coords.length; i+=2) {
+                var point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), parseFloat(coords[i]));
+                components.push(point);
+            }
+            geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);
+        }
+        return geometry;
+    },        
-
-    /**
+     * Method: createGeometryFromItem
+     * Return a feature from a GeoRSS Item.
+     *
+     * Parameters:
+     * item - {DOMElement} A GeoRSS item node.
+     *
+     * Returns:
+     * {<OpenLayers.Feature.Vector>} A feature representing the item.
+     */
+    createFeatureFromItem: function(item) {
+        var geometry = this.createGeometryFromItem(item);
+        /* Provide defaults for title and description */
+        var title = this.getChildValue(item, "*", "title", this.featureTitle);
+       
+        /* First try RSS descriptions, then Atom summaries */
+        var description = this.getChildValue(
+            item, "*", "description",
+            this.getChildValue(item, "*", "content", this.featureDescription)
+        );
+
+        /* If no link URL is found in the first child node, try the
+           href attribute */
+        var link = this.getChildValue(item, "*", "link");
+        if(!link) {
+            try {
+                link = this.getElementsByTagNameNS(item, "*", "link")[0].getAttribute("href");
+            } catch(e) {
+                link = null;
+            }
+        }
+
+        var id = this.getChildValue(item, "*", "id", null);
+        
+        var data = {
+            "title": title,
+            "description": description,
+            "link": link
+        };
+        var feature = new OpenLayers.Feature.Vector(geometry, data);
+        feature.fid = id;
+        return feature;
+    },        
+    
+    /**
+     * Method: getChildValue
+     *
+     * Parameters:
+     * node - {DOMElement}
+     * nsuri - {String} Child node namespace uri ("*" for any).
+     * name - {String} Child node name.
+     * def - {String} Optional string default to return if no child found.
+     *
+     * Returns:
+     * {String} The value of the first child with the given tag name.  Returns
+     *     default value or empty string if none found.
+     */
+    getChildValue: function(node, nsuri, name, def) {
+        var value;
+        try {
+            value = this.getElementsByTagNameNS(node, nsuri, name)[0].firstChild.nodeValue;
+        } catch(e) {
+            value = (def == undefined) ? "" : def;
+        }
+        return value;
+    },
+    
+    /**
+     * APIMethod: read
+     * Return a list of features from a GeoRSS doc
+     
+     * Parameters:
+     * data - {Element} 
+     *
+     * Returns:
+     * An Array of <OpenLayers.Feature.Vector>s
+     */
+    read: function(doc) {
+        if (typeof doc == "string") { 
+            doc = OpenLayers.Format.XML.prototype.read.apply(this, [doc]);
+        }
+
+        /* Try RSS items first, then Atom entries */
+        var itemlist = null;
+        itemlist = this.getElementsByTagNameNS(doc, '*', 'item');
+        if (itemlist.length == 0) {
+            itemlist = this.getElementsByTagNameNS(doc, '*', 'entry');
+        }
+        
+        var numItems = itemlist.length;
+        var features = new Array(numItems);
+        for(var i=0; i<numItems; i++) {
+            features[i] = this.createFeatureFromItem(itemlist[i]);
+        }
+        return features;
+    },
+    
+
+    /**
-     * APIMethod: write
-     * Accept Feature Collection, and return a string. 
-     * 
-     * Parameters: 
-     * features - Array({<OpenLayers.Feature.Vector>}) List of features to serialize into a string.
-     */
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-featureCollection
- 
-
+OpenLayers.Format.XML.prototype.write.apply(this, [georss])
+
+
-    /**
-     * Method: createFeatureXML
-     * Accept an <OpenLayers.Feature.Vector>, and build a geometry for it.
@@ -72 +247 @@
-     */
-    createFeatureXML: function(feature) {
-        var geometryNode = this.buildGeometryNode(feature.geometry);
-document
-document
-document
-document
-document
+this
+this
+this
+this
+this
-        featureNode.appendChild(titleNode);
-        featureNode.appendChild(descNode);
+        if (feature.attributes.link) {
+            var linkNode = this.createElementNS(this.rssns, "link");
+            linkNode.appendChild(this.createTextNode(feature.attributes.link));
+            featureNode.appendChild(linkNode);
+        }    
-        for(var attr in feature.attributes) {
-
+
+
-            var nodename = attr;
-            if (attr.search(":") != -1) {
-                nodename = attr.split(":")[1];
-            }    
-document
+this
-            attrContainer.appendChild(attrText);
-            featureNode.appendChild(attrContainer);
-        }    
@@ -98 +279 @@
-     * builds a GeoRSS node with a given geometry
-     * 
-     * Parameters:
-
+
+
+
+
-     */
-    buildGeometryNode: function(geometry) {
-gml = ""
-MultiPolygon or 
+node
+
-        if (geometry.CLASS_NAME == "OpenLayers.Geometry.Polygon") {
-    gml = document
-    
-    gml
-    
-MultiLineString or 
+node = this
+
+node
+
+
-        else if (geometry.CLASS_NAME == "OpenLayers.Geometry.LineString") {
-         gml = document
-         
-         gml
-         
-MultiPoint or 
+node = this
+
+node
+
+
-        else if (geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
-    gml = document
-    gml
-    
-alert("Couldn't parse " + geometry.CLASS_NAME)
+node = this
+node
+
+  throw "Couldn't parse " + geometry.CLASS_NAME
-        }  
-gml
+node
-    },
-    
-    /** 
@@ -137 +321 @@
-            points = geometry.components;
-        }
-
- = ""
+
-        if (points) {
-
-
+
+
+
+
-            }
+            path = parts.join(" ");
-        } else {
-+= geometry.y + " " + geometry.x + " "
+= geometry.y + " " + geometry.x
-        }
-document
+this
-    },
-
-    CLASS_NAME: "OpenLayers.Format.GeoRSS" 

examples/vector-formats.html

@@ -77 +77 @@
-            formats = {
-                wkt: new OpenLayers.Format.WKT(),
-                geojson: new OpenLayers.Format.GeoJSON(),
+                georss: new OpenLayers.Format.GeoRSS(),
-                gml: new OpenLayers.Format.GML(),
-                kml: new OpenLayers.Format.KML()
-            };
@@ -147 +148 @@
-            <select name="formatType" id="formatType">
-                <option value="geojson" selected="selected">GeoJSON</option>
-                <option value="kml">KML</option>
+                <option value="georss">GeoRSS</option>
-                <option value="gml">GML</option>
-                <option value="wkt">Well-Known Text (WKT)</option>
-            </select>