Revision 27092
branches/v2_0_0_prep/extensions/extWMS/src/com/iver/cit/gvsig/fmap/layers/FLyrWMS.java | ||
---|---|---|
78 | 78 |
import org.exolab.castor.xml.ValidationException; |
79 | 79 |
import org.gvsig.fmap.crs.CRSFactory; |
80 | 80 |
import org.gvsig.fmap.dal.exception.ReadException; |
81 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
|
82 | 81 |
import org.gvsig.fmap.geom.primitive.Envelope; |
82 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
83 | 83 |
import org.gvsig.fmap.mapcontext.ViewPort; |
84 | 84 |
import org.gvsig.fmap.mapcontext.exceptions.ConnectionErrorLayerException; |
85 | 85 |
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException; |
... | ... | |
2006 | 2006 |
} |
2007 | 2007 |
|
2008 | 2008 |
private Envelope getEnvelopeFromRectable2D(Rectangle2D rect) { |
2009 |
return new DefaultEnvelope(rect.getMinX(), rect.getMinY(), rect |
|
2009 |
return UtilFunctions.createEnvelope(rect.getMinX(), rect.getMinY(), |
|
2010 |
rect |
|
2010 | 2011 |
.getMaxX(), rect.getMaxY()); |
2011 | 2012 |
} |
2012 | 2013 |
|
... | ... | |
2022 | 2023 |
// y alto 0. |
2023 | 2024 |
if (rAux == null || rAux.getMaximum(0) - rAux.getMinimum(0) == 0 |
2024 | 2025 |
&& rAux.getMaximum(1) - rAux.getMinimum(1) == 0) { |
2025 |
rAux = new DefaultEnvelope(2, new double[] { 0, 0 }, new double[] { |
|
2026 |
100, 100 }); |
|
2026 |
rAux = UtilFunctions.createEnvelope(0, 0, 100, 100); |
|
2027 | 2027 |
} |
2028 | 2028 |
// Si existe reproyecci?n, reproyectar el extent |
2029 | 2029 |
ICoordTrans ct = getCoordTrans(); |
... | ... | |
2034 | 2034 |
.getMaximum(1)); |
2035 | 2035 |
pt1 = ct.convert(pt1, null); |
2036 | 2036 |
pt2 = ct.convert(pt2, null); |
2037 |
rAux = new DefaultEnvelope(2, |
|
2038 |
new double[] { pt1.getX(), pt1.getY() }, new double[] { |
|
2039 |
pt2.getX(), pt2.getY() });// new |
|
2037 |
rAux = UtilFunctions.createEnvelope(pt1.getX(), pt1.getY(), pt2 |
|
2038 |
.getX(), pt2.getY());// new |
|
2040 | 2039 |
// Rectangle2D.Double(); |
2041 | 2040 |
} |
2042 | 2041 |
return rAux; |
Also available in: Unified diff