Revision 43295 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/legend/impl/AbstractVectorialLegend.java

View differences:

AbstractVectorialLegend.java
212 212

  
213 213
                if (use_intersection_cond) {
214 214
                    Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects(
215
                            vp_env_in_store_crs, 
216
                            store_crs, 
215
                            vp_env_in_store_crs,
216
                            store_crs,
217 217
                            featureStore
218 218
                    );
219 219
                    if (feat_query == null) {
......
414 414
		// decide if the data must be drawn or not
415 415
		// Checks if the viewport envelope intersects with the data envelope
416 416
		// This condition may seem redundant, but sometimes the transformations may fail and cause false negatives.
417
		if (!viewPortEnvelope.intersects(reprojectedDataEnvelope) && !(reprojectedViewPortEnvelope!=null && reprojectedViewPortEnvelope.intersects(dataEnvelope))) {
417
		if ((viewPortEnvelope==null || !viewPortEnvelope.intersects(reprojectedDataEnvelope)) && !(reprojectedViewPortEnvelope!=null && reprojectedViewPortEnvelope.intersects(dataEnvelope))) {
418 418
			// The data is not visible in the current viewport, do nothing.
419 419
			return;
420 420
		}
......
501 501
            }
502 502

  
503 503
            Evaluator iee = SpatialEvaluatorsFactory.getInstance().intersects(
504
                    viewPortEnvelopeInMyProj, 
505
                    dataProjection, 
504
                    viewPortEnvelopeInMyProj,
505
                    dataProjection,
506 506
                    featureStore
507 507
            );
508 508
            featureQuery.addFilter(iee);

Also available in: Unified diff