fix #1263 FilterUtils wrong usage of this removed most of the places#1285
Merged
mbarto merged 4 commits intoNov 18, 2016
Merged
Conversation
… of the places
mbarto
suggested changes
Nov 17, 2016
mbarto
left a comment
Contributor
There was a problem hiding this comment.
Not the proper way to fix this. You should simply avoid storing stuff in this or FilterUtils and pass all the needed values in function calls.
mbarto
suggested changes
Nov 17, 2016
|
|
||
| toOGCFilter: function(ftName, json, version, sortOptions = null, hits = false, format = null, propertyNames = null) { | ||
| try { | ||
| this.objFilter = (json instanceof Object) ? json : JSON.parse(json); |
Contributor
There was a problem hiding this comment.
the JSON.parse has disappeared?
| */ | ||
| processOGCCrossLayerFilter: function(crossLayerFilter) { | ||
| let ogc = this.ogcSpatialOperator[crossLayerFilter.operation].startTag; | ||
| processOGCCrossLayerFilter: function(crossLayerFilter, nsplaceholder) { |
Contributor
There was a problem hiding this comment.
put a default value of "ogc" for nsplaceholder
| FilterUtils.setOperatorsPlaceholders("{namespace}", "ogc"); | ||
|
|
||
| let filter = FilterUtils.processOGCCrossLayerFilter(crossLayerFilterObj); | ||
| let filter = FilterUtils.processOGCCrossLayerFilter(crossLayerFilterObj, "ogc"); |
Contributor
There was a problem hiding this comment.
Remove "ogc" argument, we cannot change public methods behaviour
| ogc += ogcSpatialOperator[crossLayerFilter.operation].endTag; | ||
| return ogc; | ||
| }, | ||
| getGmlPointElement: function(coordinates, srsName, version) { |
Contributor
There was a problem hiding this comment.
These methods were public, so they could be used elsewhere, removing them could break a lot of code
mbarto
suggested changes
Nov 18, 2016
| } | ||
| }); | ||
| }, | ||
| getGetFeatureBase: function(version, pagination, hits, format) { |
|
|
||
| return getFeature; | ||
| }, | ||
| processOGCFilterGroup: function(root) { |
|
|
||
| return ogc; | ||
| }, | ||
| processOGCFilterFields: function(group) { |
|
|
||
| return filter; | ||
| }, | ||
| processOGCSimpleFilterField: function(field) { |
| } | ||
| return filter; | ||
| }, | ||
| ogcDateField: function(attribute, operator, value) { |
| } | ||
| return fieldFilter; | ||
| }, | ||
| cqlDateField: function(attribute, operator, value) { |
| } | ||
| return fieldFilter; | ||
| }, | ||
| processCQLSpatialFilter: function() { |
|
|
||
| return cql + ")"; | ||
| }, | ||
| getCQLGeometryElement: function(coordinates, type) { |
| geometry += ")"; | ||
| return geometry; | ||
| }, | ||
| findSubGroups: function(root, groups) { |
| // please remove when fixed | ||
| FilterUtils.nsplaceholder = "ogc"; | ||
| FilterUtils.setOperatorsPlaceholders("{namespace}", "ogc"); | ||
| FilterUtils.setOperatorsPlaceholders("{namespace}", FilterUtils.nsplaceholder); |
Contributor
There was a problem hiding this comment.
Not this way: the FilterUtils.setOperatorsPlaceholders function should have a default for the second argument:
setOperatorsPlaceholders: function(placeholder, replacement = "ogc") {
...
}
mbarto
approved these changes
Nov 18, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.