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

more dot notation

Browse Source
This commit is contained in:
Bart van den Eijnden
2013-07-08 17:29:32 +02:00
parent 499319fb99
commit c299bfa1cb
3 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/parser/ogc/filter_v1.js
+47 -47
View File
@@ -33,12 +33,12 @@ ol.parser.ogc.Filter_v1 = function() {
switch (child.nodeType) { switch (child.nodeType) {
case 1: case 1:
obj = this.readNode(child); obj = this.readNode(child);
if (obj['property']) { if (obj.property) {
value += obj['property'].getName(); value += obj.property.getName();
} else if (goog.isDef(obj['value'])) { } else if (goog.isDef(obj.value)) {
// TODO adding this to value and then parsing causes // TODO adding this to value and then parsing causes
// ol.expr.UnexpectedToken on e.g. 10 // ol.expr.UnexpectedToken on e.g. 10
return obj['value']; return obj.value;
} }
break; break;
case 3: // text node case 3: // text node
@@ -53,15 +53,15 @@ ol.parser.ogc.Filter_v1 = function() {
}, },
'Filter': function(node, obj) { 'Filter': function(node, obj) {
var container = { var container = {
'filters': [] filters: []
}; };
this.readChildNodes(node, container); this.readChildNodes(node, container);
if (goog.isDef(container.fids)) { if (goog.isDef(container.fids)) {
obj['filter'] = new ol.expr.Call( obj.filter = new ol.expr.Call(
new ol.expr.Identifier(ol.expr.functions.FID), new ol.expr.Identifier(ol.expr.functions.FID),
goog.object.getValues(container.fids)); goog.object.getValues(container.fids));
} else if (container['filters'].length > 0) { } else if (container.filters.length > 0) {
obj['filter'] = container['filters'][0]; obj.filter = container.filters[0];
} }
}, },
'FeatureId': function(node, obj) { 'FeatureId': function(node, obj) {
@@ -76,90 +76,90 @@ ol.parser.ogc.Filter_v1 = function() {
} }
}, },
'And': function(node, obj) { 'And': function(node, obj) {
var container = {'filters': []}; var container = {filters: []};
this.readChildNodes(node, container); this.readChildNodes(node, container);
var filter = this.aggregateLogical_(container['filters'], var filter = this.aggregateLogical_(container.filters,
ol.expr.LogicalOp.AND); ol.expr.LogicalOp.AND);
obj['filters'].push(filter); obj.filters.push(filter);
}, },
'Or': function(node, obj) { 'Or': function(node, obj) {
var container = {'filters': []}; var container = {filters: []};
this.readChildNodes(node, container); this.readChildNodes(node, container);
var filter = this.aggregateLogical_(container['filters'], var filter = this.aggregateLogical_(container.filters,
ol.expr.LogicalOp.OR); ol.expr.LogicalOp.OR);
obj['filters'].push(filter); obj.filters.push(filter);
}, },
'Not': function(node, obj) { 'Not': function(node, obj) {
var container = {'filters': []}; var container = {filters: []};
this.readChildNodes(node, container); this.readChildNodes(node, container);
// Not is unary so can only contain 1 child filter // Not is unary so can only contain 1 child filter
obj['filters'].push(new ol.expr.Not( obj.filters.push(new ol.expr.Not(
container.filters[0])); container.filters[0]));
}, },
'PropertyIsNull': function(node, obj) { 'PropertyIsNull': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.EQ, ol.expr.ComparisonOp.EQ,
container['property'], container.property,
new ol.expr.Literal(null))); new ol.expr.Literal(null)));
}, },
'PropertyIsLessThan': function(node, obj) { 'PropertyIsLessThan': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.LT, ol.expr.ComparisonOp.LT,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsGreaterThan': function(node, obj) { 'PropertyIsGreaterThan': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.GT, ol.expr.ComparisonOp.GT,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsLessThanOrEqualTo': function(node, obj) { 'PropertyIsLessThanOrEqualTo': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.LTE, ol.expr.ComparisonOp.LTE,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsGreaterThanOrEqualTo': function(node, obj) { 'PropertyIsGreaterThanOrEqualTo': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.GTE, ol.expr.ComparisonOp.GTE,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsBetween': function(node, obj) { 'PropertyIsBetween': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Logical(ol.expr.LogicalOp.AND, obj.filters.push(new ol.expr.Logical(ol.expr.LogicalOp.AND,
new ol.expr.Comparison(ol.expr.ComparisonOp.GTE, new ol.expr.Comparison(ol.expr.ComparisonOp.GTE,
container['property'], container['lowerBoundary']), container.property, container.lowerBoundary),
new ol.expr.Comparison(ol.expr.ComparisonOp.LTE, new ol.expr.Comparison(ol.expr.ComparisonOp.LTE,
container['property'], container['upperBoundary']))); container.property, container.upperBoundary)));
}, },
'Literal': function(node, obj) { 'Literal': function(node, obj) {
var nodeValue = this.getChildValue(node); var nodeValue = this.getChildValue(node);
var value = goog.string.toNumber(nodeValue); var value = goog.string.toNumber(nodeValue);
obj['value'] = new ol.expr.Literal(isNaN(value) ? nodeValue : value); obj.value = new ol.expr.Literal(isNaN(value) ? nodeValue : value);
}, },
'PropertyName': function(node, obj) { 'PropertyName': function(node, obj) {
obj['property'] = new ol.expr.Identifier(this.getChildValue(node)); obj.property = new ol.expr.Identifier(this.getChildValue(node));
}, },
'LowerBoundary': function(node, obj) { 'LowerBoundary': function(node, obj) {
var readers = this.readers[this.defaultNamespaceURI]; var readers = this.readers[this.defaultNamespaceURI];
obj['lowerBoundary'] = readers._expression.call(this, node); obj.lowerBoundary = readers._expression.call(this, node);
}, },
'UpperBoundary': function(node, obj) { 'UpperBoundary': function(node, obj) {
var readers = this.readers[this.defaultNamespaceURI]; var readers = this.readers[this.defaultNamespaceURI];
obj['upperBoundary'] = readers._expression.call(this, node); obj.upperBoundary = readers._expression.call(this, node);
}, },
_spatial: function(node, obj, identifier) { _spatial: function(node, obj, identifier) {
var args = [], container = {}; var args = [], container = {};
@@ -172,17 +172,17 @@ ol.parser.ogc.Filter_v1 = function() {
new ol.expr.Literal(container.bounds[2]), new ol.expr.Literal(container.bounds[2]),
new ol.expr.Literal(container.bounds[3])]; new ol.expr.Literal(container.bounds[3])];
} }
if (goog.isDef(container['distance'])) { if (goog.isDef(container.distance)) {
args.push(container['distance']); args.push(container.distance);
} }
if (goog.isDef(container['distanceUnits'])) { if (goog.isDef(container.distanceUnits)) {
args.push(container['distanceUnits']); args.push(container.distanceUnits);
} }
args.push(new ol.expr.Literal(container.projection)); args.push(new ol.expr.Literal(container.projection));
if (goog.isDef(container['property'])) { if (goog.isDef(container.property)) {
args.push(container['property']); args.push(container.property);
} }
obj['filters'].push(new ol.expr.Call(new ol.expr.Identifier( obj.filters.push(new ol.expr.Call(new ol.expr.Identifier(
identifier), args)); identifier), args));
}, },
'BBOX': function(node, obj) { 'BBOX': function(node, obj) {
@@ -211,8 +211,8 @@ ol.parser.ogc.Filter_v1 = function() {
ol.expr.functions.DWITHIN); ol.expr.functions.DWITHIN);
}, },
'Distance': function(node, obj) { 'Distance': function(node, obj) {
obj['distance'] = new ol.expr.Literal(this.getChildValue(node)); obj.distance = new ol.expr.Literal(this.getChildValue(node));
obj['distanceUnits'] = new ol.expr.Literal(node.getAttribute('units')); obj.distanceUnits = new ol.expr.Literal(node.getAttribute('units'));
} }
} }
}; };
@@ -464,7 +464,7 @@ ol.parser.ogc.Filter_v1.prototype.read = function(data) {
} }
var obj = {}; var obj = {};
this.readNode(data, obj); this.readNode(data, obj);
return obj['filter']; return obj.filter;
}; };
src/ol/parser/ogc/filter_v1_0_0.js
+8 -8
View File
@@ -28,28 +28,28 @@ ol.parser.ogc.Filter_v1_0_0 = function() {
'PropertyIsEqualTo': function(node, obj) { 'PropertyIsEqualTo': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.EQ, ol.expr.ComparisonOp.EQ,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsNotEqualTo': function(node, obj) { 'PropertyIsNotEqualTo': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
obj['filters'].push(new ol.expr.Comparison( obj.filters.push(new ol.expr.Comparison(
ol.expr.ComparisonOp.NEQ, ol.expr.ComparisonOp.NEQ,
container['property'], container.property,
container['value'])); container.value));
}, },
'PropertyIsLike': function(node, obj) { 'PropertyIsLike': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
var args = []; var args = [];
args.push(container['property'], container['value'], args.push(container.property, container.value,
new ol.expr.Literal(node.getAttribute('wildCard')), new ol.expr.Literal(node.getAttribute('wildCard')),
new ol.expr.Literal(node.getAttribute('singleChar')), new ol.expr.Literal(node.getAttribute('singleChar')),
new ol.expr.Literal(node.getAttribute('escape'))); new ol.expr.Literal(node.getAttribute('escape')));
obj['filters'].push(new ol.expr.Call( obj.filters.push(new ol.expr.Call(
new ol.expr.Identifier(ol.expr.functions.LIKE), args)); new ol.expr.Identifier(ol.expr.functions.LIKE), args));
} }
}); });
src/ol/parser/ogc/filter_v1_1_0.js
+10 -10
View File
@@ -31,14 +31,14 @@ ol.parser.ogc.Filter_v1_1_0 = function() {
this.readChildNodes(node, container); this.readChildNodes(node, container);
if (matchCase === 'false' || matchCase === '0') { if (matchCase === 'false' || matchCase === '0') {
filter = new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.IEQ), filter = new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.IEQ),
[container['property'], container['value']]); [container.property, container.value]);
} else { } else {
filter = new ol.expr.Comparison( filter = new ol.expr.Comparison(
ol.expr.ComparisonOp.EQ, ol.expr.ComparisonOp.EQ,
container['property'], container.property,
container['value']); container.value);
} }
obj['filters'].push(filter); obj.filters.push(filter);
}, },
'PropertyIsNotEqualTo': function(node, obj) { 'PropertyIsNotEqualTo': function(node, obj) {
var matchCase = node.getAttribute('matchCase'); var matchCase = node.getAttribute('matchCase');
@@ -47,25 +47,25 @@ ol.parser.ogc.Filter_v1_1_0 = function() {
if (matchCase === 'false' || matchCase === '0') { if (matchCase === 'false' || matchCase === '0') {
filter = new ol.expr.Call(new ol.expr.Identifier( filter = new ol.expr.Call(new ol.expr.Identifier(
ol.expr.functions.INEQ), ol.expr.functions.INEQ),
[container['property'], container['value']]); [container.property, container.value]);
} else { } else {
filter = new ol.expr.Comparison( filter = new ol.expr.Comparison(
ol.expr.ComparisonOp.NEQ, ol.expr.ComparisonOp.NEQ,
container['property'], container.property,
container['value']); container.value);
} }
obj['filters'].push(filter); obj.filters.push(filter);
}, },
'PropertyIsLike': function(node, obj) { 'PropertyIsLike': function(node, obj) {
var container = {}; var container = {};
this.readChildNodes(node, container); this.readChildNodes(node, container);
var args = []; var args = [];
args.push(container['property'], container['value'], args.push(container.property, container.value,
new ol.expr.Literal(node.getAttribute('wildCard')), new ol.expr.Literal(node.getAttribute('wildCard')),
new ol.expr.Literal(node.getAttribute('singleChar')), new ol.expr.Literal(node.getAttribute('singleChar')),
new ol.expr.Literal(node.getAttribute('escapeChar')), new ol.expr.Literal(node.getAttribute('escapeChar')),
new ol.expr.Literal(node.getAttribute('matchCase'))); new ol.expr.Literal(node.getAttribute('matchCase')));
obj['filters'].push(new ol.expr.Call( obj.filters.push(new ol.expr.Call(
new ol.expr.Identifier(ol.expr.functions.LIKE), args)); new ol.expr.Identifier(ol.expr.functions.LIKE), args));
} }
}); });