ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix srsName wrong context

Browse Source
This commit is contained in:
Björn Harrtell
2020-08-09 22:47:03 +02:00
parent d3041295a1
commit c675ce5217
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/WFS.js
+13 -13
View File
@@ -301,7 +301,7 @@ class WFS extends XMLFeature {
readFeaturesFromNode(node, opt_options) { readFeaturesFromNode(node, opt_options) {
/** @type {import("../xml.js").NodeStackItem} */ /** @type {import("../xml.js").NodeStackItem} */
const context = { const context = {
node: node, node,
}; };
assign(context, { assign(context, {
'featureType': this.featureType_, 'featureType': this.featureType_,
@@ -494,7 +494,7 @@ class WFS extends XMLFeature {
); );
/** @type {import("../xml.js").NodeStackItem} */ /** @type {import("../xml.js").NodeStackItem} */
const context = { const context = {
node: node, node,
}; };
assign(context, { assign(context, {
'version': this.version_, 'version': this.version_,
@@ -551,7 +551,7 @@ class WFS extends XMLFeature {
: FEATURE_PREFIX; : FEATURE_PREFIX;
if (inserts) { if (inserts) {
obj = assign( obj = assign(
{node: node}, {node},
{ {
version, version,
'featureNS': options.featureNS, 'featureNS': options.featureNS,
@@ -573,7 +573,7 @@ class WFS extends XMLFeature {
} }
if (updates) { if (updates) {
obj = assign( obj = assign(
{node: node}, {node},
{ {
version, version,
'featureNS': options.featureNS, 'featureNS': options.featureNS,
@@ -832,7 +832,7 @@ function writeUpdate(node, feature, objectStack) {
/** @type {import("../xml.js").NodeStackItem} */ ({ /** @type {import("../xml.js").NodeStackItem} */ ({
version, version,
'gmlVersion': context['gmlVersion'], 'gmlVersion': context['gmlVersion'],
node: node, node,
'hasZ': context['hasZ'], 'hasZ': context['hasZ'],
'srsName': context['srsName'], 'srsName': context['srsName'],
}), }),
@@ -998,8 +998,8 @@ function writeQuery(node, featureType, objectStack) {
function writeFilterCondition(node, filter, objectStack) { function writeFilterCondition(node, filter, objectStack) {
const context = /** @type {Object} */ (objectStack[objectStack.length - 1]); const context = /** @type {Object} */ (objectStack[objectStack.length - 1]);
/** @type {import("../xml.js").NodeStackItem} */ /** @type {import("../xml.js").NodeStackItem} */
const item = {node: node}; const item = {node};
assign(item, {context: context}); assign(item, {context});
pushSerializeAndPop( pushSerializeAndPop(
item, item,
GETFEATURE_SERIALIZERS, GETFEATURE_SERIALIZERS,
@@ -1017,7 +1017,7 @@ function writeFilterCondition(node, filter, objectStack) {
function writeBboxFilter(node, filter, objectStack) { function writeBboxFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
context['srsName'] = filter.srsName; parent['srsName'] = filter.srsName;
const ns = OGCNS[context['version']]; const ns = OGCNS[context['version']];
writeOgcPropertyName(ns, node, filter.geometryName); writeOgcPropertyName(ns, node, filter.geometryName);
@@ -1032,7 +1032,7 @@ function writeBboxFilter(node, filter, objectStack) {
function writeContainsFilter(node, filter, objectStack) { function writeContainsFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
context['srsName'] = filter.srsName; parent['srsName'] = filter.srsName;
const ns = OGCNS[context['version']]; const ns = OGCNS[context['version']];
writeOgcPropertyName(ns, node, filter.geometryName); writeOgcPropertyName(ns, node, filter.geometryName);
@@ -1047,7 +1047,7 @@ function writeContainsFilter(node, filter, objectStack) {
function writeIntersectsFilter(node, filter, objectStack) { function writeIntersectsFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
context['srsName'] = filter.srsName; parent['srsName'] = filter.srsName;
const ns = OGCNS[context['version']]; const ns = OGCNS[context['version']];
writeOgcPropertyName(ns, node, filter.geometryName); writeOgcPropertyName(ns, node, filter.geometryName);
@@ -1062,7 +1062,7 @@ function writeIntersectsFilter(node, filter, objectStack) {
function writeWithinFilter(node, filter, objectStack) { function writeWithinFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
context['srsName'] = filter.srsName; parent['srsName'] = filter.srsName;
const ns = OGCNS[context['version']]; const ns = OGCNS[context['version']];
writeOgcPropertyName(ns, node, filter.geometryName); writeOgcPropertyName(ns, node, filter.geometryName);
@@ -1101,7 +1101,7 @@ function writeLogicalFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
/** @type {import("../xml.js").NodeStackItem} */ /** @type {import("../xml.js").NodeStackItem} */
const item = {node: node}; const item = {node};
assign(item, {context}); assign(item, {context});
const conditions = filter.conditions; const conditions = filter.conditions;
for (let i = 0, ii = conditions.length; i < ii; ++i) { for (let i = 0, ii = conditions.length; i < ii; ++i) {
@@ -1125,7 +1125,7 @@ function writeNotFilter(node, filter, objectStack) {
const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]); const parent = /** @type {Object} */ (objectStack[objectStack.length - 1]);
const context = parent['context']; const context = parent['context'];
/** @type {import("../xml.js").NodeStackItem} */ /** @type {import("../xml.js").NodeStackItem} */
const item = {node: node}; const item = {node};
assign(item, {context}); assign(item, {context});
const condition = filter.condition; const condition = filter.condition;
pushSerializeAndPop( pushSerializeAndPop(