Revision 34026 branches/v2_0_0_prep/libraries/libRemoteServices/src/org/gvsig/remoteclient/wfs/filters/filterencoding/FilterEncoding.java
FilterEncoding.java | ||
---|---|---|
50 | 50 |
import org.gvsig.remoteclient.wfs.WFSStatus; |
51 | 51 |
import org.gvsig.remoteclient.wfs.filters.AbstractFilter; |
52 | 52 |
import org.gvsig.remoteclient.wfs.filters.BinaryTree; |
53 |
import org.gvsig.remoteclient.wfs.filters.BinaryTree.Node; |
|
53 | 54 |
import org.gvsig.remoteclient.wfs.filters.DefaultSQLExpressionFormat; |
54 | 55 |
import org.gvsig.remoteclient.wfs.filters.ISQLExpressionFormat; |
55 |
import org.gvsig.remoteclient.wfs.filters.BinaryTree.Node; |
|
56 |
import org.gvsig.remoteclient.wfs.filters.filterencoding.wfs_1_0_0.EnvelopeFEQuery1_0_0; |
|
57 |
import org.gvsig.remoteclient.wfs.filters.filterencoding.wfs_1_1_0.EnvelopeFEQuery1_1_0; |
|
56 | 58 |
import org.gvsig.remoteclient.wfs.filters.operations.WFSEnvelopeFilterOperation; |
57 | 59 |
import org.gvsig.remoteclient.wfs.filters.operations.WFSGeometryFilterOperation; |
58 | 60 |
import org.gvsig.remoteclient.wfs.filters.operations.WFSSpatialFilterOperation; |
... | ... | |
161 | 163 |
* (non-Javadoc) |
162 | 164 |
* @see org.gvsig.remoteClient.filterEncoding.QueryLanguage#toString(org.gvsig.remoteClient.filterEncoding.BinaryTree) |
163 | 165 |
*/ |
164 |
public String toString(BinaryTree tree) { |
|
166 |
public String toString(BinaryTree tree, String version) {
|
|
165 | 167 |
//If is a filter by ids... |
166 | 168 |
StringBuffer idQuery = null; |
167 | 169 |
if (getIds() != null){ |
... | ... | |
197 | 199 |
if (spatialFilter instanceof WFSGeometryFilterOperation){ |
198 | 200 |
feQuery = new GeometryFEQuery((WFSGeometryFilterOperation)spatialFilter); |
199 | 201 |
}else if (spatialFilter instanceof WFSEnvelopeFilterOperation){ |
200 |
feQuery = new EnvelopeFEQuery((WFSEnvelopeFilterOperation)spatialFilter); |
|
202 |
//TODO add this for a manager |
|
203 |
if (version.equals("1.0.0")){ |
|
204 |
feQuery = new EnvelopeFEQuery1_0_0((WFSEnvelopeFilterOperation)spatialFilter); |
|
205 |
}else{ |
|
206 |
feQuery = new EnvelopeFEQuery1_1_0((WFSEnvelopeFilterOperation)spatialFilter); |
|
207 |
} |
|
201 | 208 |
} |
202 | 209 |
//If there is a spatial query |
203 | 210 |
if (feQuery != null){ |
Also available in: Unified diff