From 7f0ed448284683cbbc23f133d5961110402adad3 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 15:38:19 +0100 Subject: [PATCH 1/8] Boostrap GML2 serializers - Add writeFeatureElement (copied and adapted from ol.format.GML3) - Add writeGeometryElement (copied and adapted from ol.format.GML3) - Add related constants (GEOMETRY_SERIALIZERS_, GEOMETRY_NODE_FACTORY_) - Add empty serialization methods --- src/ol/format/gml2.js | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 4c536301a4..56be48e6f2 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -2,8 +2,10 @@ goog.provide('ol.format.GML2'); goog.require('ol'); goog.require('ol.extent'); +goog.require('ol.format.Feature'); goog.require('ol.format.GMLBase'); goog.require('ol.format.XSD'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -204,3 +206,235 @@ ol.format.GML2.prototype.GEOMETRY_PARSERS_ = { 'Box': ol.xml.makeReplacer(ol.format.GML2.prototype.readBox_) } }; + + +/** + * @const + * @param {*} value Value. + * @param {Array.<*>} objectStack Object stack. + * @param {string=} opt_nodeName Node name. + * @return {Node|undefined} Node. + * @private + */ +ol.format.GML2.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { + var context = objectStack[objectStack.length - 1]; + var multiSurface = context['multiSurface']; + var surface = context['surface']; + var curve = context['curve']; + var multiCurve = context['multiCurve']; + var nodeName; + if (!Array.isArray(value)) { + nodeName = /** @type {ol.geom.Geometry} */ (value).getType(); + if (nodeName === 'MultiPolygon' && multiSurface === true) { + nodeName = 'MultiSurface'; + } else if (nodeName === 'Polygon' && surface === true) { + nodeName = 'Surface'; + } else if (nodeName === 'LineString' && curve === true) { + nodeName = 'Curve'; + } else if (nodeName === 'MultiLineString' && multiCurve === true) { + nodeName = 'MultiCurve'; + } + } else { + nodeName = 'Envelope'; + } + return ol.xml.createElementNS('http://www.opengis.net/gml', + nodeName); +}; + + +/** + * @param {Node} node Node. + * @param {ol.Feature} feature Feature. + * @param {Array.<*>} objectStack Node stack. + */ +ol.format.GML2.prototype.writeFeatureElement = function(node, feature, objectStack) { + var fid = feature.getId(); + if (fid) { + node.setAttribute('fid', fid); + } + var context = /** @type {Object} */ (objectStack[objectStack.length - 1]); + var featureNS = context['featureNS']; + var geometryName = feature.getGeometryName(); + if (!context.serializers) { + context.serializers = {}; + context.serializers[featureNS] = {}; + } + var properties = feature.getProperties(); + var keys = [], values = []; + for (var key in properties) { + var value = properties[key]; + if (value !== null) { + keys.push(key); + values.push(value); + if (key == geometryName || value instanceof ol.geom.Geometry) { + if (!(key in context.serializers[featureNS])) { + context.serializers[featureNS][key] = ol.xml.makeChildAppender( + this.writeGeometryElement, this); + } + } else { + if (!(key in context.serializers[featureNS])) { + context.serializers[featureNS][key] = ol.xml.makeChildAppender( + ol.format.XSD.writeStringTextNode); + } + } + } + } + var item = ol.obj.assign({}, context); + item.node = node; + ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ + (item), context.serializers, + ol.xml.makeSimpleNodeFactory(undefined, featureNS), + values, + objectStack, keys); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Geometry|ol.Extent} geometry Geometry. + * @param {Array.<*>} objectStack Node stack. + */ +ol.format.GML2.prototype.writeGeometryElement = function(node, geometry, objectStack) { + var context = /** @type {olx.format.WriteOptions} */ (objectStack[objectStack.length - 1]); + var item = ol.obj.assign({}, context); + item.node = node; + var value; + if (Array.isArray(geometry)) { + if (context.dataProjection) { + value = ol.proj.transformExtent( + geometry, context.featureProjection, context.dataProjection); + } else { + value = geometry; + } + } else { + value = + ol.format.Feature.transformWithOptions(/** @type {ol.geom.Geometry} */ (geometry), true, context); + } + ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ + (item), ol.format.GML2.GEOMETRY_SERIALIZERS_, + this.GEOMETRY_NODE_FACTORY_, [value], + objectStack, undefined, this); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LineString} geometry LineString geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeCurveOrLineString_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.MultiLineString} geometry MultiLineString geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Point} geometry Point geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.MultiPoint} geometry MultiPoint geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeMultiPoint_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LineString} line LineString geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeLineStringOrCurveMember_ = function(node, line, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LinearRing} geometry LinearRing geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeLinearRing_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Polygon} geometry Polygon geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.MultiPolygon} geometry MultiPolygon geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) { +}; + + +/** + * @param {Node} node Node. + * @param {ol.Extent} extent Extent. + * @param {Array.<*>} objectStack Node stack. + */ +ol.format.GML2.prototype.writeEnvelope = function(node, extent, objectStack) { +}; + + +/** + * @const + * @type {Object.>} + * @private + */ +ol.format.GML2.GEOMETRY_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'Curve': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeCurveOrLineString_), + 'MultiCurve': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeMultiCurveOrLineString_), + 'Point': ol.xml.makeChildAppender(ol.format.GML2.prototype.writePoint_), + 'MultiPoint': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeMultiPoint_), + 'LineString': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeCurveOrLineString_), + 'MultiLineString': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeMultiCurveOrLineString_), + 'LinearRing': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeLinearRing_), + 'Polygon': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeSurfaceOrPolygon_), + 'MultiPolygon': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_), + 'Surface': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeSurfaceOrPolygon_), + 'MultiSurface': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_), + 'Envelope': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeEnvelope) + } +}; From 21394826b66b4b310bcee080eae31527de93b4d1 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 15:48:10 +0100 Subject: [PATCH 2/8] Add GML2 serializer for Curve and LineString Adapt the code from ol.format.GML3. --- src/ol/format/gml2.js | 75 +++++++++++++++++++++++++++++++-- test/spec/ol/format/gml.test.js | 35 +++++++++++++++ 2 files changed, 107 insertions(+), 3 deletions(-) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 56be48e6f2..57272acbcf 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -220,7 +220,6 @@ ol.format.GML2.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, o var context = objectStack[objectStack.length - 1]; var multiSurface = context['multiSurface']; var surface = context['surface']; - var curve = context['curve']; var multiCurve = context['multiCurve']; var nodeName; if (!Array.isArray(value)) { @@ -229,8 +228,6 @@ ol.format.GML2.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, o nodeName = 'MultiSurface'; } else if (nodeName === 'Polygon' && surface === true) { nodeName = 'Surface'; - } else if (nodeName === 'LineString' && curve === true) { - nodeName = 'Curve'; } else if (nodeName === 'MultiLineString' && multiCurve === true) { nodeName = 'MultiCurve'; } @@ -324,6 +321,78 @@ ol.format.GML2.prototype.writeGeometryElement = function(node, geometry, objectS * @private */ ol.format.GML2.prototype.writeCurveOrLineString_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (node.nodeName !== 'LineStringSegment' && srsName) { + node.setAttribute('srsName', srsName); + } + if (node.nodeName === 'LineString' || + node.nodeName === 'LineStringSegment') { + var coordinates = ol.xml.createElementNS(node.namespaceURI, 'coordinates'); + coordinates.setAttribute('decimal', '.'); + coordinates.setAttribute('cs', ','); + coordinates.setAttribute('ts', ' '); + node.appendChild(coordinates); + this.writeCoordinates_(coordinates, geometry, objectStack); + } else if (node.nodeName === 'Curve') { + var segments = ol.xml.createElementNS(node.namespaceURI, 'segments'); + node.appendChild(segments); + this.writeCurveSegments_(segments, + geometry, objectStack); + } +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LineString|ol.geom.LinearRing} value Geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeCoordinates_ = function(node, value, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + // only 2d for simple features profile + var points = value.getCoordinates(); + var len = points.length; + var parts = new Array(len); + var point; + for (var i = 0; i < len; ++i) { + point = points[i]; + parts[i] = this.getCoords_(point, srsName); + } + ol.format.XSD.writeStringTextNode(node, parts.join(' ')); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LineString} line LineString geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeCurveSegments_ = function(node, line, objectStack) { + var child = ol.xml.createElementNS(node.namespaceURI, + 'LineStringSegment'); + node.appendChild(child); + this.writeCurveOrLineString_(child, line, objectStack); +}; + + +/** + * @param {Array.} point Point geometry. + * @param {string=} opt_srsName Optional srsName + * @return {string} The coords string. + * @private + */ +ol.format.GML2.prototype.getCoords_ = function(point, opt_srsName) { + var axisOrientation = 'enu'; + if (opt_srsName) { + axisOrientation = ol.proj.get(opt_srsName).getAxisOrientation(); + } + return ((axisOrientation.substr(0, 2) === 'en') ? + point[0] + ',' + point[1] : + point[1] + ',' + point[0]); }; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index 8c83e7a9ac..e2147c862c 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -131,6 +131,41 @@ describe('ol.format.GML2', function() { }); }); }); + + describe('#writeFeatureElement', function() { + var node; + var featureNS = 'http://www.openlayers.org/'; + beforeEach(function() { + node = ol.xml.createElementNS(featureNS, 'lines'); + }); + + it('can serialize a LineString', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' 2,1.1 4.2,3' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.LineString([[1.1, 2], [3, 4.2]]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); + }); }); describe('ol.format.GML3', function() { From dd90c908197cf3b47159371519c183267c3d7e75 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 16:23:16 +0100 Subject: [PATCH 3/8] Add GML2 serializer for Surface and Polygon - Adapt the code from ol.format.GML3. - Create utility function to create coordinates nodes with proper attributes --- src/ol/format/gml2.js | 123 ++++++++++++++++++++++++++++---- test/spec/ol/format/gml.test.js | 35 ++++++++- 2 files changed, 142 insertions(+), 16 deletions(-) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 57272acbcf..c57bae5391 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -328,10 +328,7 @@ ol.format.GML2.prototype.writeCurveOrLineString_ = function(node, geometry, obje } if (node.nodeName === 'LineString' || node.nodeName === 'LineStringSegment') { - var coordinates = ol.xml.createElementNS(node.namespaceURI, 'coordinates'); - coordinates.setAttribute('decimal', '.'); - coordinates.setAttribute('cs', ','); - coordinates.setAttribute('ts', ' '); + var coordinates = this.createCoordinatesNode_(node.namespaceURI); node.appendChild(coordinates); this.writeCoordinates_(coordinates, geometry, objectStack); } else if (node.nodeName === 'Curve') { @@ -343,6 +340,21 @@ ol.format.GML2.prototype.writeCurveOrLineString_ = function(node, geometry, obje }; +/** + * @param {string} namespaceURI XML namespace. + * @returns {Node} coordinates node. + * @private + */ +ol.format.GML2.prototype.createCoordinatesNode_ = function(namespaceURI) { + var coordinates = ol.xml.createElementNS(namespaceURI, 'coordinates'); + coordinates.setAttribute('decimal', '.'); + coordinates.setAttribute('cs', ','); + coordinates.setAttribute('ts', ' '); + + return coordinates; +}; + + /** * @param {Node} node Node. * @param {ol.geom.LineString|ol.geom.LinearRing} value Geometry. @@ -379,6 +391,79 @@ ol.format.GML2.prototype.writeCurveSegments_ = function(node, line, objectStack) }; +/** + * @param {Node} node Node. + * @param {ol.geom.Polygon} geometry Polygon geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (node.nodeName !== 'PolygonPatch' && srsName) { + node.setAttribute('srsName', srsName); + } + if (node.nodeName === 'Polygon' || node.nodeName === 'PolygonPatch') { + var rings = geometry.getLinearRings(); + ol.xml.pushSerializeAndPop( + {node: node, srsName: srsName}, + ol.format.GML2.RING_SERIALIZERS_, + this.RING_NODE_FACTORY_, + rings, objectStack, undefined, this); + } else if (node.nodeName === 'Surface') { + var patches = ol.xml.createElementNS(node.namespaceURI, 'patches'); + node.appendChild(patches); + this.writeSurfacePatches_( + patches, geometry, objectStack); + } +}; + + +/** + * @param {*} value Value. + * @param {Array.<*>} objectStack Object stack. + * @param {string=} opt_nodeName Node name. + * @return {Node} Node. + * @private + */ +ol.format.GML2.prototype.RING_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { + var context = objectStack[objectStack.length - 1]; + var parentNode = context.node; + var exteriorWritten = context['exteriorWritten']; + if (exteriorWritten === undefined) { + context['exteriorWritten'] = true; + } + return ol.xml.createElementNS(parentNode.namespaceURI, + exteriorWritten !== undefined ? 'innerBoundaryIs' : 'outerBoundaryIs'); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Polygon} polygon Polygon geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeSurfacePatches_ = function(node, polygon, objectStack) { + var child = ol.xml.createElementNS(node.namespaceURI, 'PolygonPatch'); + node.appendChild(child); + this.writeSurfaceOrPolygon_(child, polygon, objectStack); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.LinearRing} ring LinearRing geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeRing_ = function(node, ring, objectStack) { + var linearRing = ol.xml.createElementNS(node.namespaceURI, 'LinearRing'); + node.appendChild(linearRing); + this.writeLinearRing_(linearRing, ring, objectStack); +}; + + /** * @param {Array.} point Point geometry. * @param {string=} opt_srsName Optional srsName @@ -443,16 +528,14 @@ ol.format.GML2.prototype.writeLineStringOrCurveMember_ = function(node, line, ob * @private */ ol.format.GML2.prototype.writeLinearRing_ = function(node, geometry, objectStack) { -}; - - -/** - * @param {Node} node Node. - * @param {ol.geom.Polygon} geometry Polygon geometry. - * @param {Array.<*>} objectStack Node stack. - * @private - */ -ol.format.GML2.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var coordinates = this.createCoordinatesNode_(node.namespaceURI); + node.appendChild(coordinates); + this.writeCoordinates_(coordinates, geometry, objectStack); }; @@ -507,3 +590,15 @@ ol.format.GML2.GEOMETRY_SERIALIZERS_ = { ol.format.GML2.prototype.writeEnvelope) } }; + + +/** + * @type {Object.>} + * @private + */ +ol.format.GML2.RING_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'outerBoundaryIs': ol.xml.makeChildAppender(ol.format.GML2.prototype.writeRing_), + 'innerBoundaryIs': ol.xml.makeChildAppender(ol.format.GML2.prototype.writeRing_) + } +}; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index e2147c862c..4d31b029a3 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -136,12 +136,12 @@ describe('ol.format.GML2', function() { var node; var featureNS = 'http://www.openlayers.org/'; beforeEach(function() { - node = ol.xml.createElementNS(featureNS, 'lines'); + node = ol.xml.createElementNS(featureNS, 'layer'); }); it('can serialize a LineString', function() { var expected = - '' + + '' + ' ' + ' ' + @@ -165,6 +165,37 @@ describe('ol.format.GML2', function() { expect(node).to.xmleql(ol.xml.parse(expected)); }); + + it('can serialize a Polygon', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' 2,1.1 4.2,3 6,5.2' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.Polygon([[[1.1, 2], [3, 4.2], [5.2, 6]]]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); }); }); From f8c6863fa7337e3c3c44bd7005bb10d4b9078fb1 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 16:28:52 +0100 Subject: [PATCH 4/8] Add GML2 serializer for Point --- src/ol/format/gml2.js | 10 ++++++++++ test/spec/ol/format/gml.test.js | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index c57bae5391..74d9c256bc 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -498,6 +498,16 @@ ol.format.GML2.prototype.writeMultiCurveOrLineString_ = function(node, geometry, * @private */ ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var coordinates = this.createCoordinatesNode_(node.namespaceURI); + node.appendChild(coordinates); + var point = geometry.getCoordinates(); + var coord = this.getCoords_(point, srsName); + ol.format.XSD.writeStringTextNode(coordinates, coord); }; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index 4d31b029a3..1d99f12209 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -196,6 +196,33 @@ describe('ol.format.GML2', function() { expect(node).to.xmleql(ol.xml.parse(expected)); }); + + it('can serialize a Point', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' 2,1.1' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.Point([1.1, 2]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); }); }); From 650837b207661f9ef3687e6065d959d539d7b5d1 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 16:39:48 +0100 Subject: [PATCH 5/8] Add GML2 serializer for MultiPoint --- src/ol/format/gml2.js | 38 ++++++++++++++++++++++++++++++++- test/spec/ol/format/gml.test.js | 31 +++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 74d9c256bc..32c878ea86 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -517,7 +517,31 @@ ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) { * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML2.prototype.writeMultiPoint_ = function(node, geometry, objectStack) { +ol.format.GML2.prototype.writeMultiPoint_ = function(node, geometry, + objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var points = geometry.getPoints(); + ol.xml.pushSerializeAndPop({node: node, srsName: srsName}, + ol.format.GML2.POINTMEMBER_SERIALIZERS_, + ol.xml.makeSimpleNodeFactory('pointMember'), points, + objectStack, undefined, this); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Point} point Point geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writePointMember_ = function(node, point, objectStack) { + var child = ol.xml.createElementNS(node.namespaceURI, 'Point'); + node.appendChild(child); + this.writePoint_(child, point, objectStack); }; @@ -612,3 +636,15 @@ ol.format.GML2.RING_SERIALIZERS_ = { 'innerBoundaryIs': ol.xml.makeChildAppender(ol.format.GML2.prototype.writeRing_) } }; + + +/** + * @type {Object.>} + * @private + */ +ol.format.GML2.POINTMEMBER_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'pointMember': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writePointMember_) + } +}; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index 1d99f12209..f04615499f 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -223,6 +223,37 @@ describe('ol.format.GML2', function() { expect(node).to.xmleql(ol.xml.parse(expected)); }); + + it('can serialize a Multi Point', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' 2,1.1' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.MultiPoint([[1.1, 2]]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); }); }); From 579ec3955ef7297650d60472abe39a3a708a07ed Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 16:50:54 +0100 Subject: [PATCH 6/8] Add GML2 MultiLineString serialiazer --- src/ol/format/gml2.js | 57 +++++++++++++++++++++++++++++++++ test/spec/ol/format/gml.test.js | 31 ++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 32c878ea86..b4a66c7e07 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -488,6 +488,17 @@ ol.format.GML2.prototype.getCoords_ = function(point, opt_srsName) { * @private */ ol.format.GML2.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + var curve = context['curve']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var lines = geometry.getLineStrings(); + ol.xml.pushSerializeAndPop({node: node, srsName: srsName, curve: curve}, + ol.format.GML2.LINESTRINGORCURVEMEMBER_SERIALIZERS_, + this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, lines, + objectStack, undefined, this); }; @@ -552,6 +563,11 @@ ol.format.GML2.prototype.writePointMember_ = function(node, point, objectStack) * @private */ ol.format.GML2.prototype.writeLineStringOrCurveMember_ = function(node, line, objectStack) { + var child = this.GEOMETRY_NODE_FACTORY_(line, objectStack); + if (child) { + node.appendChild(child); + this.writeCurveOrLineString_(child, line, objectStack); + } }; @@ -648,3 +664,44 @@ ol.format.GML2.POINTMEMBER_SERIALIZERS_ = { ol.format.GML2.prototype.writePointMember_) } }; + + +/** + * @type {Object.>} + * @private + */ +ol.format.GML2.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'lineStringMember': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeLineStringOrCurveMember_), + 'curveMember': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeLineStringOrCurveMember_) + } +}; + + +/** + * @const + * @param {*} value Value. + * @param {Array.<*>} objectStack Object stack. + * @param {string=} opt_nodeName Node name. + * @return {Node|undefined} Node. + * @private + */ +ol.format.GML2.prototype.MULTIGEOMETRY_MEMBER_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { + var parentNode = objectStack[objectStack.length - 1].node; + return ol.xml.createElementNS('http://www.opengis.net/gml', + ol.format.GML2.MULTIGEOMETRY_TO_MEMBER_NODENAME_[parentNode.nodeName]); +}; + +/** + * @const + * @type {Object.} + * @private + */ +ol.format.GML2.MULTIGEOMETRY_TO_MEMBER_NODENAME_ = { + 'MultiLineString': 'lineStringMember', + 'MultiCurve': 'curveMember', + 'MultiPolygon': 'polygonMember', + 'MultiSurface': 'surfaceMember' +}; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index f04615499f..4d0093bddd 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -254,6 +254,37 @@ describe('ol.format.GML2', function() { expect(node).to.xmleql(ol.xml.parse(expected)); }); + + it('can serialize a Multi Line String', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' 2,1.1 4.2,3' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.MultiLineString([[[1.1, 2], [3, 4.2]]]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); }); }); From fec279c46012d81b21947a00417f4292c30b105a Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 16:57:45 +0100 Subject: [PATCH 7/8] Add GML2 serializer for MultiSurface and MultiPolygon --- src/ol/format/gml2.js | 43 +++++++++++++++++++++++++++++++++ test/spec/ol/format/gml.test.js | 35 +++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index b4a66c7e07..1d7334b48a 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -596,6 +596,33 @@ ol.format.GML2.prototype.writeLinearRing_ = function(node, geometry, objectStack * @private */ ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + var surface = context['surface']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var polygons = geometry.getPolygons(); + ol.xml.pushSerializeAndPop({node: node, srsName: srsName, surface: surface}, + ol.format.GML2.SURFACEORPOLYGONMEMBER_SERIALIZERS_, + this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, polygons, + objectStack, undefined, this); +}; + + +/** + * @param {Node} node Node. + * @param {ol.geom.Polygon} polygon Polygon geometry. + * @param {Array.<*>} objectStack Node stack. + * @private + */ +ol.format.GML2.prototype.writeSurfaceOrPolygonMember_ = function(node, polygon, objectStack) { + var child = this.GEOMETRY_NODE_FACTORY_( + polygon, objectStack); + if (child) { + node.appendChild(child); + this.writeSurfaceOrPolygon_(child, polygon, objectStack); + } }; @@ -603,6 +630,7 @@ ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, * @param {Node} node Node. * @param {ol.Extent} extent Extent. * @param {Array.<*>} objectStack Node stack. + * @private */ ol.format.GML2.prototype.writeEnvelope = function(node, extent, objectStack) { }; @@ -705,3 +733,18 @@ ol.format.GML2.MULTIGEOMETRY_TO_MEMBER_NODENAME_ = { 'MultiPolygon': 'polygonMember', 'MultiSurface': 'surfaceMember' }; + + +/** + * @const + * @type {Object.>} + * @private + */ +ol.format.GML2.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'surfaceMember': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeSurfaceOrPolygonMember_), + 'polygonMember': ol.xml.makeChildAppender( + ol.format.GML2.prototype.writeSurfaceOrPolygonMember_) + } +}; diff --git a/test/spec/ol/format/gml.test.js b/test/spec/ol/format/gml.test.js index 4d0093bddd..f5a9dce525 100644 --- a/test/spec/ol/format/gml.test.js +++ b/test/spec/ol/format/gml.test.js @@ -285,6 +285,41 @@ describe('ol.format.GML2', function() { expect(node).to.xmleql(ol.xml.parse(expected)); }); + + it('can serialize a Multi Polygon', function() { + var expected = + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' 2,1.1 4.2,3 6,5.2' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' '; + + var feature = new ol.Feature({ + geometry: new ol.geom.MultiPolygon([[[[1.1, 2], [3, 4.2], [5.2, 6]]]]) + }); + feature.setId(1); + var objectStack = [{ + featureNS: featureNS, + srsName: 'EPSG:4326' + }]; + format.writeFeatureElement(node, feature, objectStack); + + expect(node).to.xmleql(ol.xml.parse(expected)); + }); }); }); From 5f5c906129a4f7b9fd85b4ea4eb0aadb182d4570 Mon Sep 17 00:00:00 2001 From: Julien Enselme Date: Fri, 17 Feb 2017 17:00:09 +0100 Subject: [PATCH 8/8] Add GML2 serializer for Envelope --- src/ol/format/gml2.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/ol/format/gml2.js b/src/ol/format/gml2.js index 1d7334b48a..dce88074e3 100644 --- a/src/ol/format/gml2.js +++ b/src/ol/format/gml2.js @@ -633,6 +633,18 @@ ol.format.GML2.prototype.writeSurfaceOrPolygonMember_ = function(node, polygon, * @private */ ol.format.GML2.prototype.writeEnvelope = function(node, extent, objectStack) { + var context = objectStack[objectStack.length - 1]; + var srsName = context['srsName']; + if (srsName) { + node.setAttribute('srsName', srsName); + } + var keys = ['lowerCorner', 'upperCorner']; + var values = [extent[0] + ' ' + extent[1], extent[2] + ' ' + extent[3]]; + ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ + ({node: node}), ol.format.GML2.ENVELOPE_SERIALIZERS_, + ol.xml.OBJECT_PROPERTY_NODE_FACTORY, + values, + objectStack, keys, this); }; @@ -748,3 +760,15 @@ ol.format.GML2.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { ol.format.GML2.prototype.writeSurfaceOrPolygonMember_) } }; + + +/** + * @type {Object.>} + * @private + */ +ol.format.GML2.ENVELOPE_SERIALIZERS_ = { + 'http://www.opengis.net/gml': { + 'lowerCorner': ol.xml.makeChildAppender(ol.format.XSD.writeStringTextNode), + 'upperCorner': ol.xml.makeChildAppender(ol.format.XSD.writeStringTextNode) + } +};