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/styling/DefaultLabelingMethod.java

View differences:

DefaultLabelingMethod.java
32 32
import org.gvsig.fmap.mapcontext.ViewPort;
33 33
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
34 34
import org.gvsig.fmap.mapcontext.layers.vectorial.IntersectsEnvelopeEvaluator;
35
import org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory;
35 36
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelClass;
36 37
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelingMethod;
37 38
import org.gvsig.tools.ToolsLocator;
......
107 108
		Evaluator eva = null;
108 109
		
109 110
		if (viewPort != null) {
110
			FeatureType fty = featureStore.getDefaultFeatureType(); 
111
			eva = new IntersectsEnvelopeEvaluator(
112
					viewPort.getAdjustedEnvelope(),
113
					layer.getProjection(),
114
					fty, fty.getDefaultGeometryAttributeName());
115
			
111
                    eva = SpatialEvaluatorsFactory.getInstance().intersects(
112
                        viewPort.getAdjustedEnvelope(),
113
                        layer.getProjection(),
114
                        featureStore
115
                    );
116 116
		}
117 117
		
118 118
		if (lc.getSQLQuery() != null && lc.getSQLQuery().trim().length() > 0) {

Also available in: Unified diff