Revision 32367 branches/v2_0_0_prep/libraries/org.gvsig.arcims/src/org/gvsig/remoteclient/arcims/ArcImsProtImageHandler.java
ArcImsProtImageHandler.java | ||
---|---|---|
192 | 192 |
* The geographic extent of the current window |
193 | 193 |
*/ |
194 | 194 |
Rectangle2D geoServiceExtent = new Rectangle(); |
195 |
Rectangle2D geoViewExtent = status.getExtent();
|
|
195 |
Rectangle2D geoViewExtent = status.getEnvelopeRect();
|
|
196 | 196 |
|
197 | 197 |
/** |
198 | 198 |
* If the SRS's are different we need a reprojection, using a properly |
... | ... | |
204 | 204 |
|
205 | 205 |
URL url = new URL(this.buildCapabilitiesRequest(status)); |
206 | 206 |
String request = ArcXMLImage.getCustomExtentRequest(srs, status |
207 |
.getExtent(), si.getFeaturecoordsys(), ds, null, "", si
|
|
208 |
.getLayer(0).getId()); |
|
207 |
.getEnvelopeRect(), si.getFeaturecoordsys(), ds, null,
|
|
208 |
"", si.getLayer(0).getId());
|
|
209 | 209 |
|
210 | 210 |
if (status.verbose) { |
211 | 211 |
System.err.println(request); |
... | ... | |
223 | 223 |
throw new ArcImsException("arcims_server_error"); |
224 | 224 |
} |
225 | 225 |
} else { |
226 |
geoServiceExtent = status.getExtent();
|
|
226 |
geoServiceExtent = status.getEnvelopeRect();
|
|
227 | 227 |
} |
228 | 228 |
|
229 | 229 |
/** |
... | ... | |
279 | 279 |
xReal = geoViewExtent.getMinX() + (x * iViewX); |
280 | 280 |
yReal = geoViewExtent.getMaxY() - (y * iViewY); |
281 | 281 |
|
282 |
if (serviceInfo.getScreen_dpi() == -1) {
|
|
283 |
serviceInfo.setScreen_dpi(96);
|
|
282 |
if (getServiceInformation().getScreen_dpi() == -1) {
|
|
283 |
getServiceInformation().setScreen_dpi(96);
|
|
284 | 284 |
} |
285 | 285 |
|
286 | 286 |
// currentScale = serviceInfo.screen_dpi/INCHES*((iX+iY)/2); |
... | ... | |
530 | 530 |
|
531 | 531 |
// Control if not /output/blahblah has been passed |
532 | 532 |
if (!currentImageUrl.startsWith("http://")) { |
533 |
String servlet = status.getServer(); |
|
533 |
String servlet = status.getServerURL();
|
|
534 | 534 |
int ind1 = servlet.indexOf("//"); |
535 | 535 |
int ind = servlet.indexOf("/", ind1 + 2); |
536 | 536 |
currentImageUrl = servlet.substring(0, ind) |
Also available in: Unified diff