Revision 39282
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/WithinGeometryEvaluator.java | ||
---|---|---|
34 | 34 |
this.geometry = geometry; |
35 | 35 |
this.geometryTrans = geometry.cloneGeometry(); |
36 | 36 |
this.srs = envelopeProjection.getAbrev(); |
37 |
ICoordTrans ct = envelopeProjection.getCT(fad.getSRS()); |
|
37 |
|
|
38 |
IProjection fad_proj = fad.getSRS(); |
|
39 |
ICoordTrans ct = null; |
|
40 |
|
|
41 |
if (fad_proj != null && !fad_proj.equals(envelopeProjection)) { |
|
42 |
ct = envelopeProjection.getCT(fad_proj); |
|
43 |
} |
|
44 |
|
|
38 | 45 |
if (ct != null) { |
39 | 46 |
geometryTrans.reProject(ct); |
40 | 47 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/OutGeometryEvaluator.java | ||
---|---|---|
34 | 34 |
this.geometry = geometry; |
35 | 35 |
this.geometryTrans = geometry.cloneGeometry(); |
36 | 36 |
this.srs = envelopeProjection.getAbrev(); |
37 |
ICoordTrans ct = envelopeProjection.getCT(fad.getSRS()); |
|
37 |
|
|
38 |
IProjection fad_proj = fad.getSRS(); |
|
39 |
ICoordTrans ct = null; |
|
40 |
|
|
41 |
if (fad_proj != null && !fad_proj.equals(envelopeProjection)) { |
|
42 |
ct = envelopeProjection.getCT(fad_proj); |
|
43 |
} |
|
44 |
|
|
38 | 45 |
if (ct != null) { |
39 | 46 |
geometryTrans.reProject(ct); |
40 | 47 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/TouchesGeometryEvaluator.java | ||
---|---|---|
34 | 34 |
this.geometry = geometry; |
35 | 35 |
this.geometryTrans = geometry.cloneGeometry(); |
36 | 36 |
this.srs = envelopeProjection.getAbrev(); |
37 |
ICoordTrans ct = envelopeProjection.getCT(fad.getSRS()); |
|
37 |
|
|
38 |
IProjection fad_proj = fad.getSRS(); |
|
39 |
ICoordTrans ct = null; |
|
40 |
|
|
41 |
if (fad_proj != null && !fad_proj.equals(envelopeProjection)) { |
|
42 |
ct = envelopeProjection.getCT(fad_proj); |
|
43 |
} |
|
44 |
|
|
38 | 45 |
if (ct != null) { |
39 | 46 |
geometryTrans.reProject(ct); |
40 | 47 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/ContainsGeometryEvaluator.java | ||
---|---|---|
39 | 39 |
this.geometry = geometry; |
40 | 40 |
this.geometryTrans = geometry.cloneGeometry(); |
41 | 41 |
this.srs = projection.getAbrev(); |
42 |
ICoordTrans ct = projection.getCT(fad.getSRS()); |
|
42 |
|
|
43 |
IProjection fad_proj = fad.getSRS(); |
|
44 |
ICoordTrans ct = null; |
|
45 |
if (fad_proj != null && !fad_proj.equals(projection)) { |
|
46 |
ct = projection.getCT(fad_proj); |
|
47 |
} |
|
48 |
|
|
43 | 49 |
if (ct != null) { |
44 | 50 |
geometryTrans.reProject(ct); |
45 | 51 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/CrossesGeometryEvaluator.java | ||
---|---|---|
39 | 39 |
this.geometry = geometry; |
40 | 40 |
this.geometryTrans = geometry.cloneGeometry(); |
41 | 41 |
this.srs = projection.getAbrev(); |
42 |
ICoordTrans ct = projection.getCT(fad.getSRS()); |
|
42 |
|
|
43 |
ICoordTrans ct = null; |
|
44 |
IProjection fad_proj = fad.getSRS(); |
|
45 |
|
|
46 |
if (fad_proj != null && !fad_proj.equals(projection)) { |
|
47 |
ct = projection.getCT(fad_proj); |
|
48 |
} |
|
49 |
|
|
43 | 50 |
if (ct != null) { |
44 | 51 |
geometryTrans.reProject(ct); |
45 | 52 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/DisjointGeometryEvaluator.java | ||
---|---|---|
40 | 40 |
this.geometry = geometry; |
41 | 41 |
this.geometryTrans = geometry.cloneGeometry(); |
42 | 42 |
this.srs = projection.getAbrev(); |
43 |
ICoordTrans ct = projection.getCT(fad.getSRS()); |
|
43 |
|
|
44 |
IProjection fad_proj = fad.getSRS(); |
|
45 |
ICoordTrans ct = null; |
|
46 |
|
|
47 |
if (fad_proj != null && !fad_proj.equals(projection)) { |
|
48 |
ct = projection.getCT(fad_proj); |
|
49 |
} |
|
50 |
|
|
44 | 51 |
if (ct != null) { |
45 | 52 |
geometryTrans.reProject(ct); |
46 | 53 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsGeometryEvaluator.java | ||
---|---|---|
38 | 38 |
ICoordTrans ct = null; |
39 | 39 |
|
40 | 40 |
IProjection ipro = fad.getSRS(); |
41 |
if (ipro != null) { |
|
41 |
if (ipro != null && !ipro.equals(projection)) {
|
|
42 | 42 |
ct = projection.getCT(ipro); |
43 | 43 |
} |
44 | 44 |
|
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/EqualsGeometryEvaluator.java | ||
---|---|---|
39 | 39 |
this.geometry = geometry; |
40 | 40 |
this.geometryTrans = geometry.cloneGeometry(); |
41 | 41 |
this.srs = projection.getAbrev(); |
42 |
ICoordTrans ct = projection.getCT(fad.getSRS()); |
|
42 |
|
|
43 |
IProjection fad_proj = fad.getSRS(); |
|
44 |
ICoordTrans ct = null; |
|
45 |
|
|
46 |
if (fad_proj != null && !fad_proj.equals(projection)) { |
|
47 |
ct = projection.getCT(fad_proj); |
|
48 |
} |
|
49 |
|
|
43 | 50 |
if (ct != null) { |
44 | 51 |
geometryTrans.reProject(ct); |
45 | 52 |
} |
branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/OverlapsGeometryEvaluator.java | ||
---|---|---|
34 | 34 |
this.geometry = geometry; |
35 | 35 |
this.geometryTrans = geometry.cloneGeometry(); |
36 | 36 |
this.srs = envelopeProjection.getAbrev(); |
37 |
ICoordTrans ct = envelopeProjection.getCT(fad.getSRS()); |
|
37 |
|
|
38 |
IProjection fad_proj = fad.getSRS(); |
|
39 |
ICoordTrans ct = null; |
|
40 |
|
|
41 |
if (fad_proj != null && !fad_proj.equals(envelopeProjection)) { |
|
42 |
ct = envelopeProjection.getCT(fad_proj); |
|
43 |
} |
|
44 |
|
|
38 | 45 |
if (ct != null) { |
39 | 46 |
geometryTrans.reProject(ct); |
40 | 47 |
} |
Also available in: Unified diff