Revision 42331 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.operation.jts/src/main/java/org/gvsig/fmap/geom/operation/relationship/Contains.java

View differences:

Contains.java
25 25

  
26 26
import org.gvsig.fmap.geom.Geometry;
27 27
import org.gvsig.fmap.geom.GeometryLocator;
28
import org.gvsig.fmap.geom.jts.GeometryJTS;
29
import org.gvsig.fmap.geom.jts.primitive.DefaultNullGeometry;
30 28
import org.gvsig.fmap.geom.operation.GeometryOperation;
31 29
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
32 30
import org.gvsig.fmap.geom.operation.GeometryOperationException;
33 31
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
34
import org.gvsig.fmap.geom.operation.tojts.ToJTS;
32
import org.gvsig.fmap.geom.primitive.NullGeometry;
35 33

  
36 34
/**
37 35
 *
......
61 59
    public Object invoke(Geometry geom, GeometryOperationContext ctx)
62 60
            throws GeometryOperationException {
63 61
        Geometry otherGeom = (Geometry) ctx.getAttribute("geom");
64
        if (otherGeom instanceof DefaultNullGeometry || geom instanceof DefaultNullGeometry || !otherGeom.getEnvelope().intersects(geom.getEnvelope())){
62
        if (otherGeom instanceof NullGeometry || geom instanceof NullGeometry || !otherGeom.getEnvelope().intersects(geom.getEnvelope())){
65 63
            return new Boolean(false);
66 64
        }
67 65

  
68 66
        try {
69
            return new Boolean(((GeometryJTS)geom).contains(otherGeom));
67
            return new Boolean(geom.contains(otherGeom));
70 68
        } catch (GeometryOperationNotSupportedException e) {
71 69
            throw new GeometryOperationException(e);
72 70
        }

Also available in: Unified diff