Revision 30 org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.intersection/src/main/java/org/gvsig/sextante/app/algorithm/intersection/IntersectionOperation.java

View differences:

IntersectionOperation.java
31 31
import org.gvsig.fmap.dal.feature.FeatureSet;
32 32
import org.gvsig.fmap.dal.feature.FeatureStore;
33 33
import org.gvsig.fmap.geom.exception.CreateGeometryException;
34
import org.gvsig.fmap.geom.util.Converter;
34
import org.gvsig.fmap.geom.operation.GeometryOperationException;
35
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
36
import org.gvsig.fmap.geom.operation.tojts.ToJTS;
35 37
import org.gvsig.sextante.app.algorithm.base.core.DALFeaturePersister;
36 38

  
37 39
import com.vividsolutions.jts.geom.Geometry;
......
45 47
public class IntersectionOperation {
46 48

  
47 49
	private FeatureStore                     storeOverlay     = null;
48
	
49 50
	private DALFeaturePersister              persister        = null;
50
	
51 51
	private EditableFeature                  lastEditFeature  = null;
52 52

  
53 53
	public IntersectionOperation(FeatureStore overlayLayer) {
......
75 75
		if(g == null)
76 76
			return lastEditFeature;
77 77

  
78
		Geometry jtsGeom = Converter.geometryToJts(g);
78
		Geometry jtsGeom = null;
79
		try {
80
			jtsGeom = (Geometry)g.invokeOperation(ToJTS.CODE, null);
81
		} catch (GeometryOperationNotSupportedException e1) {
82
			Sextante.addErrorToLog(e1);
83
		} catch (GeometryOperationException e1) {
84
			Sextante.addErrorToLog(e1);
85
		}
79 86
		
80 87
		FeatureSet features = null;
81 88
		DisposableIterator it = null;
......
110 117
											org.gvsig.fmap.geom.Geometry overGeom, 
111 118
											Feature featureInput, 
112 119
											Feature featureOverlay) {
113
		Geometry overlaysGeom = Converter.geometryToJts(overGeom);
120
		Geometry overlaysGeom = null;
114 121
		try {
122
			overlaysGeom = (Geometry)overGeom.invokeOperation(ToJTS.CODE, null);
123
		} catch (GeometryOperationNotSupportedException e1) {
124
			Sextante.addErrorToLog(e1);
125
			return null;
126
		} catch (GeometryOperationException e1) {
127
			Sextante.addErrorToLog(e1);
128
			return null;
129
		}
130
		
131
		try {
115 132
			if(!jtsGeom.getEnvelope().intersects(overlaysGeom.getEnvelope())) 
116 133
				return lastEditFeature;
117 134

  

Also available in: Unified diff