Revision 41348 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/CrossEnvelopeEvaluator.java

View differences:

CrossEnvelopeEvaluator.java
77 77
	public Object evaluate(EvaluatorData data) throws EvaluatorException {
78 78
		if (isDefault) {
79 79
			Feature feature = (Feature) data.getContextValue("feature");
80
			//			return new Boolean(envelopeTrans.contains(feature
81
			//					.getDefaultEnvelope())
82
			//					|| envelopeTrans.intersects(feature.getDefaultEnvelope()));
83
//			System.out.println("== Filter[" + envelopeTrans.getLowerCorner()[0]
84
//					+ "," + envelopeTrans.getLowerCorner()[1] + "] ["
85
//					+ envelopeTrans.getUpperCorner()[0] + ","
86
//					+ envelopeTrans.getUpperCorner()[1] + "]");
87

  
88 80
			Envelope featureEnvelope = feature.getDefaultEnvelope();
89
//			System.out.println("== Geom ["
90
//					+ featureEnvelope.getLowerCorner()[0]
91
//					+ "," + featureEnvelope.getLowerCorner()[1] + "] ["
92
//					+ featureEnvelope.getUpperCorner()[0] + ","
93
//					+ featureEnvelope.getUpperCorner()[1] + "]");
81
                        if( featureEnvelope == null ) {
82
                            return Boolean.FALSE;
83
                        }
94 84
			Boolean r = new Boolean(envelopeTrans.intersects(featureEnvelope));
95
//			System.out.println("==3 "+r);
96 85
			return r;
97 86

  
98 87
		} else {
99 88
			Geometry geom = (Geometry) data.getDataValue(geomName);
100
			//			return new Boolean(envelopeTrans.contains(geom.getEnvelope())
101
			//					|| envelopeTrans.intersects(geom.getEnvelope()));
102

  
89
                        if( geom == null ) {
90
                            return Boolean.FALSE;
91
                        }
103 92
			return new Boolean(envelopeTrans.intersects(geom.getEnvelope()));
104 93

  
105 94
		}

Also available in: Unified diff