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/ContainsGeometryEvaluator.java

View differences:

ContainsGeometryEvaluator.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;
......
43 43
    private final ExpressionBuilder builder;
44 44
    private final IProjection projection;
45 45
    private final FeatureAttributeDescriptor fad;
46

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

Also available in: Unified diff