Add an option to writeTransaction to support 3D geometries

Close #6630
2017-04-06 18:10:34 +02:00
parent ea54543602
commit 870bc51ad9
7 changed files with 209 additions and 19 deletions
--- a/src/ol/format/gml2.js
+++ b/src/ol/format/gml2.js
@@ -352,6 +352,7 @@ ol.format.GML2.prototype.createCoordinatesNode_ = function(namespaceURI) {
 */
 ol.format.GML2.prototype.writeCoordinates_ = function(node, value, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  // only 2d for simple features profile
  var points = value.getCoordinates();
@@ -360,7 +361,7 @@ ol.format.GML2.prototype.writeCoordinates_ = function(node, value, objectStack)
  var point;
  for (var i = 0; i < len; ++i) {
    point = points[i];
-    parts[i] = this.getCoords_(point, srsName);
+    parts[i] = this.getCoords_(point, srsName, is3D);
  }
  ol.format.XSD.writeStringTextNode(node, parts.join(' '));
 };
@@ -388,6 +389,7 @@ ol.format.GML2.prototype.writeCurveSegments_ = function(node, line, objectStack)
 */
 ol.format.GML2.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  if (node.nodeName !== 'PolygonPatch' && srsName) {
    node.setAttribute('srsName', srsName);
@@ -395,7 +397,7 @@ ol.format.GML2.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objec
  if (node.nodeName === 'Polygon' || node.nodeName === 'PolygonPatch') {
    var rings = geometry.getLinearRings();
    ol.xml.pushSerializeAndPop(
-        {node: node, srsName: srsName},
+        {node: node, is3D: is3D, srsName: srsName},
        ol.format.GML2.RING_SERIALIZERS_,
        this.RING_NODE_FACTORY_,
        rings, objectStack, undefined, this);
@@ -456,17 +458,23 @@ ol.format.GML2.prototype.writeRing_ = function(node, ring, objectStack) {
 /**
 * @param {Array.<number>} point Point geometry.
 * @param {string=} opt_srsName Optional srsName
+ * @param {boolean=} opt_is3D whether the geometry is 3D or not.
 * @return {string} The coords string.
 * @private
 */
-ol.format.GML2.prototype.getCoords_ = function(point, opt_srsName) {
+ol.format.GML2.prototype.getCoords_ = function(point, opt_srsName, opt_is3D) {
  var axisOrientation = 'enu';
  if (opt_srsName) {
    axisOrientation = ol.proj.get(opt_srsName).getAxisOrientation();
  }
-  return ((axisOrientation.substr(0, 2) === 'en') ?
+  var coords = ((axisOrientation.substr(0, 2) === 'en') ?
      point[0] + ',' + point[1] :
      point[1] + ',' + point[0]);
+  if (opt_is3D) {
+    coords += ',' + point[2];
+  }
+
+  return coords;
 };


@@ -478,13 +486,14 @@ ol.format.GML2.prototype.getCoords_ = function(point, opt_srsName) {
 */
 ol.format.GML2.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  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.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName, curve: curve},
      ol.format.GML2.LINESTRINGORCURVEMEMBER_SERIALIZERS_,
      this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, lines,
      objectStack, undefined, this);
@@ -499,6 +508,7 @@ ol.format.GML2.prototype.writeMultiCurveOrLineString_ = function(node, geometry,
 */
 ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  if (srsName) {
    node.setAttribute('srsName', srsName);
@@ -506,7 +516,7 @@ ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) {
  var coordinates = this.createCoordinatesNode_(node.namespaceURI);
  node.appendChild(coordinates);
  var point = geometry.getCoordinates();
-  var coord = this.getCoords_(point, srsName);
+  var coord = this.getCoords_(point, srsName, is3D);
  ol.format.XSD.writeStringTextNode(coordinates, coord);
 };

@@ -520,12 +530,13 @@ ol.format.GML2.prototype.writePoint_ = function(node, geometry, objectStack) {
 ol.format.GML2.prototype.writeMultiPoint_ = function(node, geometry,
    objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  if (srsName) {
    node.setAttribute('srsName', srsName);
  }
  var points = geometry.getPoints();
-  ol.xml.pushSerializeAndPop({node: node, srsName: srsName},
+  ol.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName},
      ol.format.GML2.POINTMEMBER_SERIALIZERS_,
      ol.xml.makeSimpleNodeFactory('pointMember'), points,
      objectStack, undefined, this);
@@ -586,13 +597,14 @@ ol.format.GML2.prototype.writeLinearRing_ = function(node, geometry, objectStack
 */
 ol.format.GML2.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  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.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName, surface: surface},
      ol.format.GML2.SURFACEORPOLYGONMEMBER_SERIALIZERS_,
      this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, polygons,
      objectStack, undefined, this);
--- a/src/ol/format/gml3.js
+++ b/src/ol/format/gml3.js
@@ -565,6 +565,7 @@ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = {
 */
 ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  var axisOrientation = 'enu';
  if (srsName) {
@@ -578,6 +579,9 @@ ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) {
  } else {
    coords = (point[1] + ' ' + point[0]);
  }
+  if (is3D) {
+    coords += ' ' + point[2];
+  }
  ol.format.XSD.writeStringTextNode(node, coords);
 };

@@ -585,17 +589,23 @@ ol.format.GML3.prototype.writePos_ = function(node, value, objectStack) {
 /**
 * @param {Array.<number>} point Point geometry.
 * @param {string=} opt_srsName Optional srsName
+ * @param {boolean=} opt_is3D whether the geometry is 3D or not.
 * @return {string} The coords string.
 * @private
 */
-ol.format.GML3.prototype.getCoords_ = function(point, opt_srsName) {
+ol.format.GML3.prototype.getCoords_ = function(point, opt_srsName, opt_is3D) {
  var axisOrientation = 'enu';
  if (opt_srsName) {
    axisOrientation = ol.proj.get(opt_srsName).getAxisOrientation();
  }
-  return ((axisOrientation.substr(0, 2) === 'en') ?
+  var coords = ((axisOrientation.substr(0, 2) === 'en') ?
      point[0] + ' ' + point[1] :
      point[1] + ' ' + point[0]);
+  if (opt_is3D) {
+    coords += ' ' + point[2];
+  }
+
+  return coords;
 };


@@ -607,6 +617,7 @@ ol.format.GML3.prototype.getCoords_ = function(point, opt_srsName) {
 */
 ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  // only 2d for simple features profile
  var points = value.getCoordinates();
@@ -615,7 +626,7 @@ ol.format.GML3.prototype.writePosList_ = function(node, value, objectStack) {
  var point;
  for (var i = 0; i < len; ++i) {
    point = points[i];
-    parts[i] = this.getCoords_(point, srsName);
+    parts[i] = this.getCoords_(point, srsName, is3D);
  }
  ol.format.XSD.writeStringTextNode(node, parts.join(' '));
 };
@@ -717,6 +728,7 @@ ol.format.GML3.prototype.RING_NODE_FACTORY_ = function(value, objectStack, opt_n
 */
 ol.format.GML3.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  var srsName = context['srsName'];
  if (node.nodeName !== 'PolygonPatch' && srsName) {
    node.setAttribute('srsName', srsName);
@@ -724,7 +736,7 @@ ol.format.GML3.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objec
  if (node.nodeName === 'Polygon' || node.nodeName === 'PolygonPatch') {
    var rings = geometry.getLinearRings();
    ol.xml.pushSerializeAndPop(
-        {node: node, srsName: srsName},
+        {node: node, is3D: is3D, srsName: srsName},
        ol.format.GML3.RING_SERIALIZERS_,
        this.RING_NODE_FACTORY_,
        rings, objectStack, undefined, this);
@@ -771,13 +783,14 @@ ol.format.GML3.prototype.writeCurveOrLineString_ = function(node, geometry, obje
 */
 ol.format.GML3.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  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.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName, surface: surface},
      ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_,
      this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, polygons,
      objectStack, undefined, this);
@@ -794,11 +807,12 @@ ol.format.GML3.prototype.writeMultiPoint_ = function(node, geometry,
    objectStack) {
  var context = objectStack[objectStack.length - 1];
  var srsName = context['srsName'];
+  var is3D = context['is3D'];
  if (srsName) {
    node.setAttribute('srsName', srsName);
  }
  var points = geometry.getPoints();
-  ol.xml.pushSerializeAndPop({node: node, srsName: srsName},
+  ol.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName},
      ol.format.GML3.POINTMEMBER_SERIALIZERS_,
      ol.xml.makeSimpleNodeFactory('pointMember'), points,
      objectStack, undefined, this);
@@ -813,13 +827,14 @@ ol.format.GML3.prototype.writeMultiPoint_ = function(node, geometry,
 */
 ol.format.GML3.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) {
  var context = objectStack[objectStack.length - 1];
+  var is3D = context['is3D'];
  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.xml.pushSerializeAndPop({node: node, is3D: is3D, srsName: srsName, curve: curve},
      ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_,
      this.MULTIGEOMETRY_MEMBER_NODE_FACTORY_, lines,
      objectStack, undefined, this);
@@ -1168,7 +1183,7 @@ ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, o
 ol.format.GML3.prototype.writeGeometryNode = function(geometry, opt_options) {
  opt_options = this.adaptOptions(opt_options);
  var geom = ol.xml.createElementNS('http://www.opengis.net/gml', 'geom');
-  var context = {node: geom, srsName: this.srsName,
+  var context = {node: geom, is3D: this.is3D, srsName: this.srsName,
    curve: this.curve_, surface: this.surface_,
    multiSurface: this.multiSurface_, multiCurve: this.multiCurve_};
  if (opt_options) {
@@ -1208,6 +1223,7 @@ ol.format.GML3.prototype.writeFeaturesNode = function(features, opt_options) {
      'xsi:schemaLocation', this.schemaLocation);
  var context = {
    srsName: this.srsName,
+    is3D: this.is3D,
    curve: this.curve_,
    surface: this.surface_,
    multiSurface: this.multiSurface_,
--- a/src/ol/format/wfs.js
+++ b/src/ol/format/wfs.js
@@ -469,7 +469,7 @@ ol.format.WFS.writeUpdate_ = function(node, feature, objectStack) {
    }
    ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ (
      {'gmlVersion': context['gmlVersion'], node: node,
-        'srsName': context['srsName']}),
+        'is3D': context['is3D'], 'srsName': context['srsName']}),
        ol.format.WFS.TRANSACTION_SERIALIZERS_,
        ol.xml.makeSimpleNodeFactory('Property'), values,
        objectStack);
@@ -934,7 +934,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes,
  if (inserts) {
    obj = {node: node, 'featureNS': options.featureNS,
      'featureType': options.featureType, 'featurePrefix': options.featurePrefix,
-      'gmlVersion': gmlVersion, 'srsName': options.srsName};
+      'gmlVersion': gmlVersion, 'is3D': options.is3D, 'srsName': options.srsName};
    ol.obj.assign(obj, baseObj);
    ol.xml.pushSerializeAndPop(obj,
        ol.format.WFS.TRANSACTION_SERIALIZERS_,
@@ -944,7 +944,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes,
  if (updates) {
    obj = {node: node, 'featureNS': options.featureNS,
      'featureType': options.featureType, 'featurePrefix': options.featurePrefix,
-      'gmlVersion': gmlVersion, 'srsName': options.srsName};
+      'gmlVersion': gmlVersion, 'is3D': options.is3D, 'srsName': options.srsName};
    ol.obj.assign(obj, baseObj);
    ol.xml.pushSerializeAndPop(obj,
        ol.format.WFS.TRANSACTION_SERIALIZERS_,