Changeset 7214

Timestamp:

05/19/08 01:08:22 (7 months ago)

Author:

tschaub

Message:

more complete gml rewrite - minus tests and envelope handling

Files:

• sandbox/vector-behavior/lib/OpenLayers/Format/GML/Base.js (modified) (4 diffs)

sandbox/vector-behavior/lib/OpenLayers/Format/GML/Base.js

@@ -155 +155 @@
-            },
-            "Point": function(node, container) {
-                /**
-                 * Three coordinate variations to consider:
-                 * 1) <gml:pos>x y z</gml:pos> (GML3)
-                 * 2) <gml:coordinates>x, y, z</gml:coordinates>
-                 * 3) <gml:coord><gml:X>x</gml:X><gml:Y>y</gml:Y></gml:coord>
-                 */
-                var obj = {};
-                this.readChildNodes(node, obj);
-
-
-
-
-
-
-
-
-
-
-
-
+
-            },
-            // GML3
-            "pos": function(node, obj) {
-                var nodeList, coordString;
-                var coords = [];
-    
-                // look for <gml:pos>
-                var str = this.getChildValue(node).replace(
-                    this.regExes, trimSpace, ""
-                );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            },
-            "coordinates": function(node, obj) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            },
-            "coord": function(node, obj) {
-                var coord = {};
-                this.readChildNodes(node, coord);
-
+
+
+
-            },
-            "X": function(node, coord) {
@@ -214 +221 @@
-                container.components = [
-                    new OpenLayers.Geometry.MultiPoint(obj.components)
+                ];
+            },
+            "LineString": function(node, container) {
+                var obj = {};
+                this.readChildNodes(node, obj);
+                container.components.push(
+                    new OpenLayers.Geometry.LineString(obj.points)
+                );
+            },
+            // GML3
+            "posList": function(node, obj) {
+                var str = this.concatChildValues(node).replace(
+                    this.regExes.trimSpace, ""
+                );
+                var coords = str.split(this.regExes.splitSpace);
+                var dim = parseInt(node.getAttribute("dimension"));
+                var j, x, y, z;
+                var points = [];
+                var numPoints = coords.length / dim;
+                var points = new Array(numPoints);
+                for(var i=0; i<coords.length; i += dim) {
+                    x = coords[i];
+                    y = coords[i+1];
+                    z = (dim == 2) ? null : coords[i+2];
+                    if (this.xy) {
+                        points[i/dim] = new OpenLayers.Geometry.Point(x, y, z);
+                    } else {
+                        points[i/dim] = new OpenLayers.Geometry.Point(y, x, z);
+                    }
+                }
+                obj.points = points;
+            },
+            "MultiLineString": function(node, container) {
+                var obj = {};
+                this.readChildNodes(node, obj);
+                container.components = [
+                    new OpenLayers.Geometry.MultiLineString(obj.components)
+                ];
+            },
+            "Polygon": function(node, container) {
+                var obj = {outer: null, inner: []};
+                this.readChildNodes(node, obj);
+                obj.inner.unshift(obj.outer);
+                container.components.push(
+                    new OpenLayers.Geometry.Polygon(obj.inner)
+                );
+            },
+            "outerBoundaryIs": function(node, container) {
+                var obj = {};
+                this.readChildNodes(node, obj);
+                container.outer = obj.ring;
+            },
+            "innerBoundaryIs": function(node, container) {
+                var obj = {};
+                this.readChildNodes(node, obj);
+                container.inner.push(obj.ring);
+            },
+            "LinearRing": function(node, obj) {
+                var container = {};
+                this.readChildNodes(node, container);
+                obj.ring = new OpenLayers.Geometry.LinearRing(
+                    container.points
+                );
+            },
+            "MultiPolygon": function(node, container) {
+                var obj = {};
+                this.readChildNodes(node, obj);
+                container.components = [
+                    new OpenLayers.Geometry.MultiPolygon(obj.components)
-                ];
-            }
@@ -303 +379 @@
-            "Point": function(geometry) {
-                var node = this.createElementNSPlus("gml:Point");
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return this.createElementNSPlus("gml:coordinates", {
-array.join(",
+(numPoints == 1) ? parts[0] : parts.join(" 
-                });
-            },
@@ -321 +402 @@
-                for(var i=0; i<geometry.components.length; ++i) {
-                    this.writeNode(node, "Point", geometry.components[i]);
+                }
+                return node;
+            },
+            "LineString": function(geometry) {
+                var node = this.createElementNSPlus("gml:LineString");
+                this.writeNode(node, "coordinates", geometry.components);
+                return node;
+            },
+            "MultiLineString": function(geometry) {
+                var node = this.createElementNSPlus("gml:MultiLineString");
+                for(var i=0; i<geometry.components.length; ++i) {
+                    this.writeNode(node, "LineString", geometry.components[i]);
+                }
+                return node;
+            },
+            "Polygon": function(geometry) {
+                var node = this.createElementNSPlus("gml:Polygon");
+                this.writeNode(node, "outerBoundaryIs", geometry.components[0]);
+                for(var i=1; i<geometry.components.length; ++i) {
+                    this.writeNode(
+                        node, "innerBoundaryIs", geometry.components[i]
+                    );
+                }
+                return node;
+            },
+            "outerBoundaryIs": function(ring) {
+                var node = this.createElementNSPlus("gml:outerBoundaryIs");
+                this.writeNode(node, "LinearRing", ring);
+                return node;
+            },
+            "innerBoundaryIs": function(ring) {
+                var node = this.createElementNSPlus("gml:innerBoundaryIs");
+                this.writeNode(node, "LinearRing", ring);
+                return node;
+            },
+            "LinearRing": function(ring) {
+                var node = this.createElementNSPlus("gml:LinearRing");
+                this.writeNode(node, "coordinates", ring.components);
+                return node;
+            },
+            "MultiPolygon": function(geometry) {
+                var node = this.createElementNSPlus("gml:MultiPolygon");
+                for(var i=0; i<geometry.components.length; ++i) {
+                    this.writeNode(
+                        node, "Polygon", geometry.components[i]
+                    );
-                }
-                return node;