Revision 44043 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/OutGeometryEvaluator.java

View differences:

OutGeometryEvaluator.java
24 24

  
25 25
import org.cresques.cts.ICoordTrans;
26 26
import org.cresques.cts.IProjection;
27
import org.gvsig.fmap.dal.ExpressionBuilder;
27
import org.gvsig.expressionevaluator.ExpressionBuilder;
28 28
import org.gvsig.fmap.dal.feature.Feature;
29 29
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
30 30
import org.gvsig.fmap.dal.feature.FeatureType;
......
42 42
    private final ExpressionBuilder builder;
43 43
    private final IProjection projection;
44 44
    private final FeatureAttributeDescriptor fad;
45

  
46
    /**
47
     * @param geometry
48
     * @param envelopeProjection
49
     * @param featureType
50
     * @param geomName
51
     * @deprecated  use @{link org.gvsig.fmap.mapcontext.layers.vectorial.SpatialEvaluatorsFactory}
52
     */
53
    public OutGeometryEvaluator(
54
            Geometry geometry,
55
            IProjection envelopeProjection, 
56
            FeatureType featureType,
57
            String geomName
58
    ) {
59
        this(
60
                geometry, 
61
                envelopeProjection, 
62
                featureType, 
63
                geomName, 
64
                SpatialEvaluatorsFactory.getInstance().createBuilder()
65
        );
66
    }   
67 45
    
68 46
    OutGeometryEvaluator(
69 47
            Geometry geometry,
......
127 105
                builder.not(
128 106
                    builder.ST_Contains(
129 107
                            builder.geometry(geometry, projection),
130
                            builder.column(fad)
108
                            builder.column(fad.getName())
131 109
                    )
132 110
                )
133 111
        ).toString();

Also available in: Unified diff