Revision 44644 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/SpatialEvaluatorsFactory.java
SpatialEvaluatorsFactory.java | ||
---|---|---|
1 | 1 |
package org.gvsig.fmap.mapcontext.layers.vectorial; |
2 | 2 |
|
3 | 3 |
import org.cresques.cts.IProjection; |
4 |
import org.gvsig.expressionevaluator.ExpressionBuilder; |
|
4 |
import org.gvsig.expressionevaluator.GeometryExpressionBuilder; |
|
5 |
import org.gvsig.expressionevaluator.GeometryExpressionUtils; |
|
5 | 6 |
import org.gvsig.fmap.dal.exception.DataException; |
6 | 7 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
7 | 8 |
import org.gvsig.fmap.dal.feature.FeatureType; |
... | ... | |
32 | 33 |
IProjection projection, |
33 | 34 |
FeatureType featureType, |
34 | 35 |
String geomName, |
35 |
ExpressionBuilder builder |
|
36 |
GeometryExpressionBuilder builder
|
|
36 | 37 |
) { |
37 | 38 |
return new IntersectsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
38 | 39 |
} |
... | ... | |
42 | 43 |
IProjection projection, |
43 | 44 |
FeatureType featureType, |
44 | 45 |
String geomName, |
45 |
ExpressionBuilder builder |
|
46 |
GeometryExpressionBuilder builder
|
|
46 | 47 |
) { |
47 | 48 |
return new IntersectsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
48 | 49 |
} |
... | ... | |
55 | 56 |
try { |
56 | 57 |
FeatureType featureType = store.getDefaultFeatureType(); |
57 | 58 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
58 |
ExpressionBuilder builder = (ExpressionBuilder) store.createExpressionBuilder();
|
|
59 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
59 | 60 |
return intersects(geometry, projection, featureType, geomName,builder); |
60 | 61 |
} catch (DataException ex) { |
61 | 62 |
throw new RuntimeException("Can't create intersects evaluator.",ex); |
... | ... | |
70 | 71 |
) { |
71 | 72 |
try { |
72 | 73 |
FeatureType featureType = store.getDefaultFeatureType(); |
73 |
ExpressionBuilder builder = (ExpressionBuilder) store.createExpressionBuilder();
|
|
74 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
74 | 75 |
return intersects(geometry, projection, featureType, geomfield, builder); |
75 | 76 |
} catch (DataException ex) { |
76 | 77 |
throw new RuntimeException("Can't create intersects evaluator.",ex); |
... | ... | |
85 | 86 |
try { |
86 | 87 |
FeatureType featureType = store.getDefaultFeatureType(); |
87 | 88 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
88 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
89 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
89 | 90 |
return intersects(envelope, projection, featureType, geomName,builder); |
90 | 91 |
} catch (DataException ex) { |
91 | 92 |
throw new RuntimeException("Can't create intersects evaluator.",ex); |
... | ... | |
97 | 98 |
IProjection projection, |
98 | 99 |
FeatureType featureType, |
99 | 100 |
String geomName, |
100 |
ExpressionBuilder builder |
|
101 |
GeometryExpressionBuilder builder
|
|
101 | 102 |
){ |
102 | 103 |
return new ContainsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
103 | 104 |
} |
... | ... | |
107 | 108 |
IProjection projection, |
108 | 109 |
FeatureType featureType, |
109 | 110 |
String geomName, |
110 |
ExpressionBuilder builder |
|
111 |
GeometryExpressionBuilder builder
|
|
111 | 112 |
){ |
112 | 113 |
return new ContainsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
113 | 114 |
} |
... | ... | |
120 | 121 |
try { |
121 | 122 |
FeatureType featureType = store.getDefaultFeatureType(); |
122 | 123 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
123 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
124 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
124 | 125 |
return this.contains(geometry, projection, featureType, geomName,builder); |
125 | 126 |
} catch (DataException ex) { |
126 | 127 |
throw new RuntimeException("Can't create contains evaluator.",ex); |
... | ... | |
135 | 136 |
try { |
136 | 137 |
FeatureType featureType = store.getDefaultFeatureType(); |
137 | 138 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
138 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
139 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
139 | 140 |
return this.contains(envelope, projection, featureType, geomName,builder); |
140 | 141 |
} catch (DataException ex) { |
141 | 142 |
throw new RuntimeException("Can't create contains evaluator.",ex); |
... | ... | |
147 | 148 |
IProjection projection, |
148 | 149 |
FeatureType featureType, |
149 | 150 |
String geomName, |
150 |
ExpressionBuilder builder |
|
151 |
GeometryExpressionBuilder builder
|
|
151 | 152 |
){ |
152 | 153 |
return new OutGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
153 | 154 |
} |
... | ... | |
160 | 161 |
try { |
161 | 162 |
FeatureType featureType = store.getDefaultFeatureType(); |
162 | 163 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
163 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
164 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
164 | 165 |
return this.not_contains(geometry, projection, featureType, geomName,builder); |
165 | 166 |
} catch (DataException ex) { |
166 | 167 |
throw new RuntimeException("Can't create not_contains evaluator.",ex); |
... | ... | |
172 | 173 |
IProjection projection, |
173 | 174 |
FeatureType featureType, |
174 | 175 |
String geomName, |
175 |
ExpressionBuilder builder |
|
176 |
GeometryExpressionBuilder builder
|
|
176 | 177 |
) { |
177 | 178 |
return new CrossesGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
178 | 179 |
} |
... | ... | |
182 | 183 |
IProjection projection, |
183 | 184 |
FeatureType featureType, |
184 | 185 |
String geomName, |
185 |
ExpressionBuilder builder |
|
186 |
GeometryExpressionBuilder builder
|
|
186 | 187 |
) { |
187 | 188 |
return new CrossEnvelopeEvaluator(envelope, projection, featureType, geomName, builder); |
188 | 189 |
} |
... | ... | |
195 | 196 |
try { |
196 | 197 |
FeatureType featureType = store.getDefaultFeatureType(); |
197 | 198 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
198 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
199 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
199 | 200 |
return this.crosses(geometry, projection, featureType, geomName,builder); |
200 | 201 |
} catch (DataException ex) { |
201 | 202 |
throw new RuntimeException("Can't create crosses evaluator.",ex); |
... | ... | |
210 | 211 |
try { |
211 | 212 |
FeatureType featureType = store.getDefaultFeatureType(); |
212 | 213 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
213 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
214 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
214 | 215 |
return this.crosses(envelope, projection, featureType, geomName,builder); |
215 | 216 |
} catch (DataException ex) { |
216 | 217 |
throw new RuntimeException("Can't create crosses evaluator.",ex); |
... | ... | |
222 | 223 |
IProjection projection, |
223 | 224 |
FeatureType featureType, |
224 | 225 |
String geomName, |
225 |
ExpressionBuilder builder |
|
226 |
GeometryExpressionBuilder builder
|
|
226 | 227 |
) { |
227 | 228 |
return new DisjointGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
228 | 229 |
} |
... | ... | |
235 | 236 |
try { |
236 | 237 |
FeatureType featureType = store.getDefaultFeatureType(); |
237 | 238 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
238 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
239 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
239 | 240 |
return this.disjoint(geometry, projection, featureType, geomName,builder); |
240 | 241 |
} catch (DataException ex) { |
241 | 242 |
throw new RuntimeException("Can't create disjoint evaluator.",ex); |
... | ... | |
247 | 248 |
IProjection projection, |
248 | 249 |
FeatureType featureType, |
249 | 250 |
String geomName, |
250 |
ExpressionBuilder builder |
|
251 |
GeometryExpressionBuilder builder
|
|
251 | 252 |
) { |
252 | 253 |
return new OverlapsGeometryEvaluator(geometry, projection, featureType, geomName, builder); |
253 | 254 |
} |
... | ... | |
260 | 261 |
try { |
261 | 262 |
FeatureType featureType = store.getDefaultFeatureType(); |
262 | 263 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
263 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
264 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
264 | 265 |
return this.overlaps(geometry, projection, featureType, geomName,builder); |
265 | 266 |
} catch (DataException ex) { |
266 | 267 |
throw new RuntimeException("Can't create overlaps evaluator.",ex); |
... | ... | |
272 | 273 |
IProjection projection, |
273 | 274 |
FeatureType featureType, |
274 | 275 |
String geomName, |
275 |
ExpressionBuilder builder |
|
276 |
GeometryExpressionBuilder builder
|
|
276 | 277 |
) { |
277 | 278 |
return new TouchesGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
278 | 279 |
} |
... | ... | |
285 | 286 |
try { |
286 | 287 |
FeatureType featureType = store.getDefaultFeatureType(); |
287 | 288 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
288 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
289 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
289 | 290 |
return this.touches(geometry, projection, featureType, geomName,builder); |
290 | 291 |
} catch (DataException ex) { |
291 | 292 |
throw new RuntimeException("Can't create touches evaluator.",ex); |
... | ... | |
297 | 298 |
IProjection projection, |
298 | 299 |
FeatureType featureType, |
299 | 300 |
String geomName, |
300 |
ExpressionBuilder builder |
|
301 |
GeometryExpressionBuilder builder
|
|
301 | 302 |
) { |
302 | 303 |
return new WithinGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
303 | 304 |
} |
... | ... | |
310 | 311 |
try { |
311 | 312 |
FeatureType featureType = store.getDefaultFeatureType(); |
312 | 313 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
313 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
314 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
314 | 315 |
return this.within(geometry, projection, featureType, geomName,builder); |
315 | 316 |
} catch (DataException ex) { |
316 | 317 |
throw new RuntimeException("Can't create within evaluator.",ex); |
... | ... | |
322 | 323 |
IProjection projection, |
323 | 324 |
FeatureType featureType, |
324 | 325 |
String geomName, |
325 |
ExpressionBuilder builder |
|
326 |
GeometryExpressionBuilder builder
|
|
326 | 327 |
) { |
327 | 328 |
return new EqualsGeometryEvaluator(geometry, projection, featureType, geomName,builder); |
328 | 329 |
} |
... | ... | |
335 | 336 |
try { |
336 | 337 |
FeatureType featureType = store.getDefaultFeatureType(); |
337 | 338 |
String geomName = featureType.getDefaultGeometryAttributeName(); |
338 |
ExpressionBuilder builder = store.createExpressionBuilder();
|
|
339 |
GeometryExpressionBuilder builder = GeometryExpressionUtils.createExpressionBuilder();
|
|
339 | 340 |
return this.equals(geometry, projection, featureType, geomName,builder); |
340 | 341 |
} catch (DataException ex) { |
341 | 342 |
throw new RuntimeException("Can't create equals evaluator.",ex); |
Also available in: Unified diff