Changeset 7826

Timestamp:

08/22/08 08:46:17 (5 months ago)

Author:

elemoine

Message:

apply ticket attached to #1543

Files:

• sandbox/camptocamp/unhcr/lib/OpenLayers.js (modified) (1 diff)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Filter/Spatial.js (added)
• sandbox/camptocamp/unhcr/lib/OpenLayers/Format/GML.js (modified) (4 diffs)
• sandbox/camptocamp/unhcr/tests/Filter/Spatial.html (added)
• sandbox/camptocamp/unhcr/tests/Format/GML.html (modified) (7 diffs)
• sandbox/camptocamp/unhcr/tests/list-tests.html (modified) (1 diff)

sandbox/camptocamp/unhcr/lib/OpenLayers.js

@@ -194 +194 @@
-            "OpenLayers/Filter/Logical.js",
-            "OpenLayers/Filter/Comparison.js",
+            "OpenLayers/Filter/Spatial.js",
-            "OpenLayers/Format.js",
-            "OpenLayers/Format/XML.js",

sandbox/camptocamp/unhcr/lib/OpenLayers/Format/GML.js

@@ -140 +140 @@
-        var order = ["MultiPolygon", "Polygon",
-                     "MultiLineString", "LineString",
-         "MultiPoint", "Point", "Envelope
+"MultiPoint", "Point", "Envelope","Box
-        var type, nodeList, geometry, parser;
-        for(var i=0; i<order.length; ++i) {
@@ -522 +522 @@
-            }
-            return envelope; 
+        },
+        
+        box: function(node){
+            var coords = [];
+            var coordString;
+
+            // look for <gml:coordinates>
+            if(coords.length == 0) {
+                nodeList = this.getElementsByTagNameNS(node, this.gmlns,
+                                                       "coordinates");
+                if(nodeList.length > 0) {
+                    coordString = nodeList[0].firstChild.nodeValue;
+                    coordString = coordString.replace(this.regExes.splitSpace,
+                                                      ",");
+                    coords = coordString.split(",");
+                }
+            }
+            if(this.xy){
+                var bounds = OpenLayers.Bounds.fromArray(coords);
+            } else {
+                var bounds = OpenLayers.Bounds.fromArray([coords[1],coords[0],coords[3],coords[2]]);
+            }
+
+            return bounds;
-        }
-    },
@@ -805 +829 @@
-            }
-            return gml;
+
+         },
+ 
+        /**
+         * Method: buildGeometry.bounds
+         * Given an OpenLayers bounds, create a GML box.
+         *
+         * Parameters:
+         * geometry - {<OpenLayers.Geometry.Bounds>} A bound.
+         * 
+         *
+         * Returns:
+         * {DOMElement} A GML box node.
+         */
+        bounds: function(geometry) {
+            var gml = this.createElementNS(this.gmlns, "gml:Box");
+            gml.appendChild(this.buildCoordinatesNode(geometry));
+            return gml;
-        }
-    },
@@ -826 +868 @@
-        coordinatesNode.setAttribute("cs", ",");
-        coordinatesNode.setAttribute("ts", " ");
-
-
+
-        var parts = [];
-
-
+
+
+
+
+
+
+
+
+
-        }
-

sandbox/camptocamp/unhcr/tests/Format/GML.html

@@ -37 +37 @@
-    }   
-    function test_Format_GML_write_geoms(t) {
-5
+6
-        var parser = new OpenLayers.Format.GML();
-        
@@ -69 +69 @@
-        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog
-        t.eq(output, multilinestring, "MultiLine geometry round trips correctly.");
+
+        var bounds = shell_start + serialize_geoms['bounds'] + shell_end;
+        data = parser.read(bounds);
+        var output = parser.write(data);
+        var output = output.replace(/<\?[^>]*\?>/, ''); // Remove XML Prolog
+        t.xml_eq(output, bounds, "Box/bounds round trips correctly.");
+
-    }    
-    function test_Format_GML_read_point_geom(t) {
@@ -179 +186 @@
-        t.eq(data[0].geometry.components.length, 1, "rings length correct");
-    }    
+    function test_Format_GML_read_bounds_geom(t) {
+        t.plan(5);
+        
+        var bounds = shell_start + geoms['bounds'] + shell_end;
+        var parser = new OpenLayers.Format.GML();
+        data = parser.read(bounds);
+        t.eq(data[0].geometry.CLASS_NAME, "OpenLayers.Bounds", "Box GML returns correct classname (Bounds)");
+        t.eq(data[0].geometry.left, 32, "first left coord correct");
+        t.eq(data[0].geometry.bottom, 5, "first bottom coord correct");
+        t.eq(data[0].geometry.right, 70, "second right coord correct");
+        t.eq(data[0].geometry.top, 112, "second top coord correct");
+    }    
-    ///////////////////////////////////////////////////////////////
-    // tests the y x order of gml point
@@ -311 +330 @@
-        t.eq(output, polygon_xy, "Poly geometry round trips correctly.");
-        
-multipoint_xy = shell_start + serialize_geoms['multipoint
-multipoint = shell_start + serialize_geoms_yx['multipoint
-multipoint
-
-
-multipoint_xy, "MultiPoint
-
+bounds_xy = shell_start + serialize_geoms['bounds
+bounds = shell_start + serialize_geoms_yx['bounds
+bounds
+
+
+bounds_xy, "Box/Bounds
+
-        var multilinestring_xy = shell_start + serialize_geoms['multilinestring'] + shell_end;
-        var multilinestring = shell_start + serialize_geoms_yx['multilinestring'] + shell_end;
@@ -366 +385 @@
-        'polygon': '<gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates decimal="." cs="," ts=" ">1,2 4,5 3,6 1,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon>',
-        'multipoint': '<gml:MultiPoint><gml:pointMember><gml:Point><gml:coordinates decimal="." cs="," ts=" ">1,2</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates decimal="." cs="," ts=" ">4,5</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>',
-
+
+
-    };
-    var geoms = {
@@ -375 +395 @@
-        'multipoint': '<gml:MultiPoint><gml:Point><gml:coordinates>1,2,3</gml:coordinates></gml:Point><gml:Point><gml:coordinates>4,5,6</gml:coordinates></gml:Point></gml:MultiPoint>',
-        'multilinestring': '<gml:MultiLineString><gml:LineString><gml:coordinates>1,2,3 4,5,6</gml:coordinates></gml:LineString><gml:LineString><gml:coordinates>11,12,13 14,15,16</gml:coordinates></gml:LineString></gml:MultiLineString>',
-
+
+
-        // 'multipolygon_with_holes': '<gml:MultiPolygon><gml:Polygon><gml:outerBoundaryIs>1,2 4,5 3,6 1,2</gml:outerBoundaryIs><gml:innerBoundaryIs>11,12 14,15 13,16 11,12</gml:innerBoundaryIs></gml:Polygon><gml:Polygon><gml:outerBoundaryIs>101,102 104,105 103,106 101,102</gml:outerBoundaryIs><gml:innerBoundaryIs>111,112 114,115 113,116 111,112</gml:innerBoundaryIs></gml:Polygon></gml:MultiPolygon>'
-    };
@@ -389 +410 @@
-        'polygon': '<gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates decimal="." cs="," ts=" ">2,1 5,4 6,3 2,1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon>',
-        'multipoint': '<gml:MultiPoint><gml:pointMember><gml:Point><gml:coordinates decimal="." cs="," ts=" ">2,1</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates decimal="." cs="," ts=" ">5,4</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>',
+        'bounds': '<gml:Box><gml:coordinates decimal="." cs="," ts=" ">2,1 5,4</gml:coordinates></gml:Box>',
-        'multilinestring': '<gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates decimal="." cs="," ts=" ">2,1 5,4</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates decimal="." cs="," ts=" ">12,11 15,14</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString>'
-    };

sandbox/camptocamp/unhcr/tests/list-tests.html

@@ -39 +39 @@
-    <li>Filter/FeatureId.html</li>
-    <li>Filter/Logical.html</li>
+    <li>Filter/Spatial.html</li>
-    <li>Format.html</li>
-    <li>Format/GeoJSON.html</li>