Ticket #1543: ticket1543.patch

lib/OpenLayers/Filter/Spatial.js

@@ +1 @@
+/* Copyright (c) 2006-2008 MetaCarta, Inc., published under the Clear BSD
+ * license.  See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+  * full text of the license. */
+
+/**
+ * @requires OpenLayers/Filter.js
+ */
+
+/**
+ * Class: OpenLayers.Filter.Spatial
+ * This class represents a spatial filter.
+ * Currently implemented: BBOX, DWithin and Intersects
+ * 
+ * Inherits from
+ * - <OpenLayers.Filter>
+ */
+OpenLayers.Filter.Spatial = OpenLayers.Class(OpenLayers.Filter, {
+
+    /**
+     * APIProperty: type
+     * {String} type: type of spatial filter. This is one of
+     * - OpenLayers.Filter.Spatial.BBOX                 = "BBOX";
+     * - OpenLayers.Filter.Spatial.INTERSECTS             = "INTERSECTS";
+     * - OpenLayers.Filter.Spatial.DWITHIN                = "DWITHIN";
+     */
+    type: null,
+    
+    /**
+     * APIProperty: property
+     * {String}
+     * name of the context property to compare
+     */
+    property: null,
+    
+    /**
+     * APIProperty: value
+     * {<OpenLayers.Geometry>}
+     * The geometry to pass into the spatial filter
+     */
+    value: null,
+
+    /**
+     * APIProperty: distance
+     * {Number}
+     * The distance to use in a DWithin spatial filter
+     */
+    distance: null,
+
+    /**
+     * APIProperty: distanceUnits
+     * {String}
+     * The units to use for the distance, e.g. m
+     */
+    distanceUnits: null,
+
+    
+    /** 
+     * Constructor: OpenLayers.Filter.Spatial
+     * Creates a spatial filter.
+     *
+     * Parameters:
+     * options - {Object} An optional object with properties to set on the
+     *           filter
+     * 
+     * Returns:
+     * {<OpenLayers.Filter.Spatial>}
+     */
+    initialize: function(options) {
+        OpenLayers.Filter.prototype.initialize.apply(this, [options]);
+    },
+
+    CLASS_NAME: "OpenLayers.Filter.Spatial"
+});
+
+
+OpenLayers.Filter.Spatial.BBOX                 = "BBOX";
+OpenLayers.Filter.Spatial.INTERSECTS             = "INTERSECTS";
+OpenLayers.Filter.Spatial.DWITHIN                = "DWITHIN";

lib/OpenLayers/Format/SLD/v1.js

@@ -991 +991 @@
-                var node = this.createElementNSPlus("ogc:UpperBoundary");
-                this.writeNode(node, "Literal", filter.upperBoundary);
-                return node;
+            },
+            "BBOX": function(filter) {
+                var node = this.createElementNSPlus("ogc:BBOX");
+                this.writeNode(node, "PropertyName", filter);
+                var gml = new OpenLayers.Format.GML();
+                node.appendChild(gml.buildGeometryNode(filter.value)); 
+                return node;
+            },
+            "DWITHIN": function(filter) {
+                var node = this.createElementNSPlus("ogc:DWithin");
+                this.writeNode(node, "PropertyName", filter);
+                var gml = new OpenLayers.Format.GML();
+                node.appendChild(gml.buildGeometryNode(filter.value));
+                this.writeNode(node, "Distance", filter);
+                return node;
+            },
+            "INTERSECTS": function(filter) {
+                var node = this.createElementNSPlus("ogc:Intersects");
+                this.writeNode(node, "PropertyName", filter);
+                var gml = new OpenLayers.Format.GML();
+                node.appendChild(gml.buildGeometryNode(filter.value));
+                return node;
+            },
+            "Distance": function(filter) {
+                return this.createElementNSPlus("ogc:Distance", 
+                    {attributes: {units: filter.distanceUnits}, 
+                        value: filter.distance});
-            }
-        }
-    },
@@ -1022 +1049 @@
-        "<=": "PropertyIsLessThanOrEqualTo",
-        ">=": "PropertyIsGreaterThanOrEqualTo",
-        "..": "PropertyIsBetween",
-
+
+
+
+
-    },
-    
-