Revision 43020 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/impl/AbstractVectorialLegend.java
AbstractVectorialLegend.java | ||
---|---|---|
65 | 65 |
import org.gvsig.fmap.mapcontext.MapContextException; |
66 | 66 |
import org.gvsig.fmap.mapcontext.ViewPort; |
67 | 67 |
import org.gvsig.fmap.mapcontext.layers.vectorial.IntersectsEnvelopeEvaluator; |
68 |
import org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory; |
|
68 | 69 |
import org.gvsig.fmap.mapcontext.rendering.legend.ILegend; |
69 | 70 |
import org.gvsig.fmap.mapcontext.rendering.legend.IVectorLegend; |
70 | 71 |
import org.gvsig.fmap.mapcontext.rendering.legend.LegendException; |
... | ... | |
75 | 76 |
import org.gvsig.tools.ToolsLocator; |
76 | 77 |
import org.gvsig.tools.dispose.DisposableIterator; |
77 | 78 |
import org.gvsig.tools.dynobject.DynStruct; |
79 |
import org.gvsig.tools.evaluator.Evaluator; |
|
78 | 80 |
import org.gvsig.tools.exception.BaseException; |
79 | 81 |
import org.gvsig.tools.persistence.PersistenceManager; |
80 | 82 |
import org.gvsig.tools.persistence.PersistentState; |
... | ... | |
207 | 209 |
} |
208 | 210 |
|
209 | 211 |
if (use_intersection_cond) { |
210 |
FeatureType ft = featureStore.getDefaultFeatureType(); |
|
211 |
IntersectsEnvelopeEvaluator iee = |
|
212 |
new IntersectsEnvelopeEvaluator( |
|
213 |
vp_env_in_store_crs, |
|
214 |
store_crs, |
|
215 |
ft, ft.getDefaultGeometryAttributeName()); |
|
212 |
Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects( |
|
213 |
vp_env_in_store_crs, |
|
214 |
store_crs, |
|
215 |
featureStore |
|
216 |
); |
|
216 | 217 |
if (feat_query == null) { |
217 | 218 |
feat_query = featureStore.createFeatureQuery(); |
218 | 219 |
} |
... | ... | |
496 | 497 |
"Error, the projection parameter value is null"); |
497 | 498 |
} |
498 | 499 |
|
499 |
IntersectsEnvelopeEvaluator iee = new IntersectsEnvelopeEvaluator(
|
|
500 |
viewPortEnvelopeInMyProj, dataProjection,
|
|
501 |
featureStore.getDefaultFeatureType(), featureStore
|
|
502 |
.getDefaultFeatureType()
|
|
503 |
.getDefaultGeometryAttributeName());
|
|
500 |
Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects(
|
|
501 |
viewPortEnvelopeInMyProj,
|
|
502 |
dataProjection,
|
|
503 |
featureStore
|
|
504 |
); |
|
504 | 505 |
featureQuery.addFilter(iee); |
505 | 506 |
} |
506 | 507 |
if (queryParameters != null) { |
Also available in: Unified diff