Revision 2604
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java | ||
---|---|---|
142 | 142 |
|
143 | 143 |
private static final GeometryManager geomManager = GeometryLocator.getGeometryManager(); |
144 | 144 |
private static final Logger logger = LoggerFactory.getLogger(FLyrWMS.class); |
145 |
private boolean mustTileDraw = false; |
|
146 |
private boolean mustTilePrint = true; |
|
145 |
private boolean mustSplitRequest = false; |
|
147 | 146 |
private final int maxTileDrawWidth = 1023; |
148 | 147 |
private final int maxTileDrawHeight = 1023; |
149 | 148 |
private final int maxTilePrintWidth = 1023; |
... | ... | |
291 | 290 |
|
292 | 291 |
if (isWithinScale(scale)) { |
293 | 292 |
|
294 |
if(mustTileDraw) {
|
|
293 |
if(mustSplitRequest) {
|
|
295 | 294 |
Point2D p = viewPort.getOffset(); |
296 | 295 |
Rectangle r = new Rectangle((int) p.getX(), (int) p.getY(), viewPort.getImageWidth(), viewPort.getImageHeight()); |
297 | 296 |
Tiling tiles = new Tiling(maxTileDrawWidth, maxTileDrawHeight, r); |
... | ... | |
430 | 429 |
taskStatus.setAutoremove(true); |
431 | 430 |
|
432 | 431 |
if (isVisible() && isWithinScale(scale)){ |
433 |
if (!mustTilePrint) {
|
|
432 |
if (!mustSplitRequest) {
|
|
434 | 433 |
draw(null, g, viewPort, cancel,scale); |
435 | 434 |
} else { |
436 | 435 |
Tiling tiles = new Tiling(maxTilePrintWidth, maxTilePrintHeight, g.getClipBounds()); |
... | ... | |
636 | 635 |
} |
637 | 636 |
|
638 | 637 |
public boolean isTiled() { |
639 |
return mustTileDraw;
|
|
638 |
return mustSplitRequest;
|
|
640 | 639 |
} |
640 |
|
|
641 |
private void splitRequestCalculation(int width, int height) { |
|
642 |
mustSplitRequest = (!getDataStore().isTiled() && (width > 1023 || height > 1023)); |
|
643 |
} |
|
641 | 644 |
|
642 | 645 |
public ComposedLayer newComposedLayer() { |
643 | 646 |
Preferences prefs = Preferences.userRoot().node("gvsig.wms"); |
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSConnector.java | ||
---|---|---|
40 | 40 |
import java.util.Vector; |
41 | 41 |
import java.util.prefs.Preferences; |
42 | 42 |
|
43 |
import javax.management.RuntimeErrorException; |
|
43 | 44 |
import javax.net.ssl.HttpsURLConnection; |
44 | 45 |
import javax.net.ssl.SSLContext; |
45 | 46 |
import javax.net.ssl.TrustManager; |
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSProvider.java | ||
---|---|---|
56 | 56 |
import org.gvsig.fmap.dal.coverage.exception.QueryException; |
57 | 57 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException; |
58 | 58 |
import org.gvsig.fmap.dal.coverage.exception.RemoteServiceException; |
59 |
import org.gvsig.fmap.dal.coverage.exception.RmfSerializerException; |
|
59 | 60 |
import org.gvsig.fmap.dal.coverage.store.RasterQuery; |
60 | 61 |
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation; |
61 | 62 |
import org.gvsig.fmap.dal.coverage.store.props.HistogramComputer; |
... | ... | |
225 | 226 |
p.setWidth(w); |
226 | 227 |
p.setHeight(h); |
227 | 228 |
p.setExtent(bBox); |
229 |
if(p.getSRSCode() != null) { |
|
230 |
try { |
|
231 |
IProjection proj = CRSFactory.getCRS(p.getSRSCode()); |
|
232 |
setProjection(proj, false); |
|
233 |
} catch (Exception e) { |
|
234 |
} |
|
235 |
} |
|
228 | 236 |
WMSStatus wmsStatus = loadWMSStatus(bBox); |
229 | 237 |
|
230 | 238 |
lastRequest = downloadFile(wmsStatus, ext.getULX(), ext.getULY(), ext.getLRX(), ext.getLRY(), w, h); |
... | ... | |
609 | 617 |
wmsStatus.setExtent(bBox); |
610 | 618 |
wmsStatus.setHeight(p.getHeight()); |
611 | 619 |
wmsStatus.setWidth(p.getWidth()); |
612 |
IProjection proj = (IProjection)p.getSRS();
|
|
620 |
IProjection proj = getProjection();
|
|
613 | 621 |
if(proj != null) |
614 | 622 |
wmsStatus.setProjected(proj.isProjected()); |
615 | 623 |
return wmsStatus; |
Also available in: Unified diff