Revision 222
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/provider/DefaultRasterProvider.java | ||
---|---|---|
51 | 51 |
import org.gvsig.fmap.dal.coverage.store.RasterFileStoreParameters; |
52 | 52 |
import org.gvsig.fmap.dal.coverage.store.RasterStoreParameters; |
53 | 53 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters; |
54 |
import org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters; |
|
55 |
import org.gvsig.fmap.dal.coverage.store.parameter.WMTSStoreParameters; |
|
54 | 56 |
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation; |
55 | 57 |
import org.gvsig.fmap.dal.coverage.store.props.ColorTable; |
56 | 58 |
import org.gvsig.fmap.dal.coverage.store.props.Histogram; |
... | ... | |
239 | 241 |
String idFormat = null; |
240 | 242 |
Class clase = null; |
241 | 243 |
DefaultRasterProvider grf = null; |
244 |
ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager(); |
|
245 |
ExtensionPoint point = extensionPoints.get("RasterReader"); |
|
242 | 246 |
|
243 | 247 |
//Remote services |
244 |
if(param instanceof RemoteStoreParameters) { |
|
245 |
ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager(); |
|
246 |
ExtensionPoint point = extensionPoints.get("RasterReader"); |
|
248 |
if(param instanceof WMSStoreParameters) { |
|
247 | 249 |
Extension ext = point.get("wms"); |
248 | 250 |
if (ext != null) |
249 | 251 |
clase = ext.getExtension(); |
250 |
|
|
252 |
} else if(param instanceof WMTSStoreParameters) { |
|
253 |
Extension ext = point.get("wmts"); |
|
254 |
if (ext != null) |
|
255 |
clase = ext.getExtension(); |
|
251 | 256 |
} else { |
252 | 257 |
//Files |
253 | 258 |
if (((RasterStoreParameters)param).getURI() != null) |
254 | 259 |
idFormat = RasterLocator.getManager().getFileUtils().getExtensionFromFileName(((RasterStoreParameters)param).getURI()); |
255 | 260 |
|
256 |
|
|
257 |
ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager(); |
|
258 |
|
|
259 | 261 |
if (idFormat != null) { |
260 |
ExtensionPoint point = extensionPoints.get("RasterReader"); |
|
261 | 262 |
Extension ext = point.get(idFormat); |
262 | 263 |
if (ext != null) |
263 | 264 |
clase = ext.getExtension(); |
... | ... | |
775 | 776 |
public void setParam(DataStoreParameters param) { |
776 | 777 |
if(param instanceof RasterStoreParameters) |
777 | 778 |
this.name = ((RasterStoreParameters)param).getURI(); |
778 |
if(param instanceof RemoteStoreParameters)
|
|
779 |
this.name = ((RemoteStoreParameters)param).getHost();
|
|
779 |
if(param instanceof WMSStoreParameters)
|
|
780 |
this.name = ((WMSStoreParameters)param).getHost();
|
|
780 | 781 |
this.param = param; |
781 | 782 |
} |
782 | 783 |
|
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultStoreFactory.java | ||
---|---|---|
29 | 29 |
import org.gvsig.fmap.dal.coverage.RasterManager; |
30 | 30 |
import org.gvsig.fmap.dal.coverage.exception.NotSupportedExtensionException; |
31 | 31 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException; |
32 |
import org.gvsig.fmap.dal.coverage.store.RasterStoreParameters;
|
|
33 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters;
|
|
32 |
import org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters;
|
|
33 |
import org.gvsig.fmap.dal.coverage.store.parameter.WMTSStoreParameters;
|
|
34 | 34 |
import org.gvsig.fmap.dal.exception.InitializeException; |
35 | 35 |
import org.gvsig.raster.impl.DefaultRasterManager; |
36 | 36 |
import org.gvsig.raster.impl.provider.DefaultRasterProvider; |
... | ... | |
53 | 53 |
return null; |
54 | 54 |
|
55 | 55 |
//Servicio remoto |
56 |
if(parameters instanceof RemoteStoreParameters) { |
|
57 |
RemoteStoreParameters param = (RemoteStoreParameters)parameters; |
|
56 |
if(parameters instanceof WMSStoreParameters || parameters instanceof WMTSStoreParameters) { |
|
58 | 57 |
//String name = param.getExplorerName(); |
59 | 58 |
DefaultRemoteRasterStore store = new DefaultRemoteRasterStore(); |
60 | 59 |
|
61 | 60 |
DefaultRasterProvider provider; |
62 | 61 |
try { |
63 |
provider = DefaultRasterProvider.singleDatasetInstance((DataStoreParameters)param); |
|
62 |
provider = DefaultRasterProvider.singleDatasetInstance((DataStoreParameters)parameters);
|
|
64 | 63 |
} catch (NotSupportedExtensionException e) { |
65 | 64 |
throw new InitializeException(e); |
66 | 65 |
} catch (RasterDriverException e) { |
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultRemoteRasterStore.java | ||
---|---|---|
35 | 35 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException; |
36 | 36 |
import org.gvsig.fmap.dal.coverage.grid.render.TileListener; |
37 | 37 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
38 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters;
|
|
38 |
import org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters;
|
|
39 | 39 |
import org.gvsig.fmap.dal.coverage.store.props.ColorTable; |
40 | 40 |
import org.gvsig.fmap.dal.coverage.store.props.Histogram; |
41 | 41 |
import org.gvsig.fmap.dal.coverage.store.props.Transparency; |
... | ... | |
80 | 80 |
public RasterDataStore newDataStore() { |
81 | 81 |
DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager(); |
82 | 82 |
try { |
83 |
RemoteStoreParameters params = ((RemoteStoreParameters)getParameters()).clone();
|
|
83 |
WMSStoreParameters params = ((WMSStoreParameters)getParameters()).clone();
|
|
84 | 84 |
DefaultMultiRasterStore store = (DefaultMultiRasterStore)dataman.openStore(params.getDataStoreName(), params); |
85 | 85 |
for (int i = 0; i < store.getProviders().size(); i++) { |
86 | 86 |
store.getProvider(i).setStatus(getProvider(i)); |
... | ... | |
193 | 193 |
@Override |
194 | 194 |
protected Buffer setAreaOfInterest(double ulx, double uly, double lrx, double lry, int bufWidth, int bufHeight) |
195 | 195 |
throws RasterDriverException, InvalidSetViewException, ProcessInterruptedException { |
196 |
if(((RemoteStoreParameters)getParameters()).isSizeFixed())
|
|
196 |
if(((WMSStoreParameters)getParameters()).isSizeFixed())
|
|
197 | 197 |
return super.getWindowRaster(ulx, uly, lrx, lry, bufWidth, bufHeight, true); |
198 | 198 |
else |
199 | 199 |
return getWindowRaster(ulx, uly, lrx, lry, bufWidth, bufHeight, true); |
... | ... | |
206 | 206 |
@Override |
207 | 207 |
protected Buffer setAreaOfInterest(int x, int y, int w, int h) |
208 | 208 |
throws InvalidSetViewException, ProcessInterruptedException, RasterDriverException { |
209 |
if(((RemoteStoreParameters)getParameters()).isSizeFixed())
|
|
209 |
if(((WMSStoreParameters)getParameters()).isSizeFixed())
|
|
210 | 210 |
return super.getWindowRaster(x, y, w, h); |
211 | 211 |
else |
212 | 212 |
return getWindowRaster(x, y, w, h); |
... | ... | |
219 | 219 |
@Override |
220 | 220 |
protected Buffer setAreaOfInterest(int x, int y, int w, int h, int bufWidth, int bufHeight) |
221 | 221 |
throws InvalidSetViewException, ProcessInterruptedException, RasterDriverException { |
222 |
if(((RemoteStoreParameters)getParameters()).isSizeFixed())
|
|
222 |
if(((WMSStoreParameters)getParameters()).isSizeFixed())
|
|
223 | 223 |
return super.getWindowRaster(x, y, w, h, bufWidth, bufHeight); |
224 | 224 |
else |
225 | 225 |
return getWindowRaster(x, y, w, h, bufWidth, bufHeight); |
... | ... | |
609 | 609 |
* @return |
610 | 610 |
*/ |
611 | 611 |
public boolean isFixedSize() { |
612 |
return ((RemoteStoreParameters)getParameters()).isSizeFixed();
|
|
612 |
return ((WMSStoreParameters)getParameters()).isSizeFixed();
|
|
613 | 613 |
} |
614 | 614 |
|
615 | 615 |
} |
Also available in: Unified diff