Revision 483
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/gui/panel/WMTSParamsPanel.java | ||
|---|---|---|
| 717 | 717 |
if(p instanceof WMTSDataParameters) |
| 718 | 718 |
par = (WMTSDataParameters) p; |
| 719 | 719 |
} |
| 720 |
par.setHost(explorer.getHost());
|
|
| 720 |
par.setURI(explorer.getHost());
|
|
| 721 | 721 |
par.setImageFormat(getSelectedImageFormat()); |
| 722 | 722 |
par.setInfoFormat(getSelectedInfoFormat()); |
| 723 | 723 |
par.setSRS(getSelectedSRS()); |
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/layer/FLyrWMTS.java | ||
|---|---|---|
| 314 | 314 |
try {
|
| 315 | 315 |
info.put("name", getName());
|
| 316 | 316 |
info.put("selectedLayer", layerName);
|
| 317 |
info.put("host", par.getHost());
|
|
| 317 |
info.put("host", par.getURI());
|
|
| 318 | 318 |
info.put("srs", par.getSRSCode());
|
| 319 | 319 |
info.put("imageformat", par.getImageFormat());
|
| 320 | 320 |
info.put("infoformat", par.getInfoFormat());
|
| ... | ... | |
| 553 | 553 |
this.setDataStore(dStore); |
| 554 | 554 |
|
| 555 | 555 |
if(params instanceof WMTSDataParameters) {
|
| 556 |
this.setName(((WMTSDataParameters) params).getHost());
|
|
| 556 |
this.setName(((WMTSDataParameters) params).getURI());
|
|
| 557 | 557 |
} |
| 558 | 558 |
|
| 559 | 559 |
if(params instanceof TileDataParameters) {
|
| 560 | 560 |
DataParameters p = ((TileDataParameters) params).getDataParameters(); |
| 561 | 561 |
if(p instanceof WMTSDataParameters) {
|
| 562 |
this.setName(((WMTSDataParameters) p).getHost());
|
|
| 562 |
this.setName(((WMTSDataParameters) p).getURI());
|
|
| 563 | 563 |
} |
| 564 | 564 |
} |
| 565 | 565 |
|
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/downloader/WMTSCacheStruct.java | ||
|---|---|---|
| 58 | 58 |
this.tileMatrixSetLimits = tileMatrixSetLink.getTileMatrixLimits(); |
| 59 | 59 |
pixelSize = provider.getPixelSizeByLevel(); |
| 60 | 60 |
layerName = provider.getFName(); |
| 61 |
serverURL = ((WMTSDataParameters)provider.getDataParameters()).getHost();
|
|
| 61 |
serverURL = ((WMTSDataParameters)provider.getDataParameters()).getURI();
|
|
| 62 | 62 |
} |
| 63 | 63 |
|
| 64 | 64 |
/* |
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSServerExplorer.java | ||
|---|---|---|
| 95 | 95 |
wmtsParams = (WMTSDataParameters) manager |
| 96 | 96 |
.createStoreParameters(this.getDataStoreProviderName()); |
| 97 | 97 |
|
| 98 |
wmtsParams.setHost(parameters.getHost());
|
|
| 98 |
wmtsParams.setURI(parameters.getHost());
|
|
| 99 | 99 |
|
| 100 | 100 |
if(WMTSProvider.TILED) {
|
| 101 | 101 |
TileDataParameters tileParams = (TileDataParameters) manager |
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSProvider.java | ||
|---|---|---|
| 229 | 229 |
super(params); |
| 230 | 230 |
if(params instanceof String) {
|
| 231 | 231 |
WMTSDataParameters p = new WMTSDataParameters(); |
| 232 |
p.setHost((String)params);
|
|
| 232 |
p.setURI((String)params);
|
|
| 233 | 233 |
super.init(p, null, ToolsLocator.getDynObjectManager() |
| 234 | 234 |
.createDynObject( |
| 235 | 235 |
MetadataLocator.getMetadataManager().getDefinition( |
| ... | ... | |
| 256 | 256 |
WMTSDataParameters p = (WMTSDataParameters)parameters; |
| 257 | 257 |
URL url = null; |
| 258 | 258 |
try {
|
| 259 |
url = new URL(p.getHost());
|
|
| 259 |
url = new URL(p.getURI());
|
|
| 260 | 260 |
} catch (Exception e) {
|
| 261 | 261 |
throw new WMTSException("Malformed URL",e);
|
| 262 | 262 |
} |
| ... | ... | |
| 1291 | 1291 |
@Override |
| 1292 | 1292 |
public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
|
| 1293 | 1293 |
if(param instanceof WMTSDataParameters) |
| 1294 |
this.name = ((WMTSDataParameters)param).getHost();
|
|
| 1294 |
this.name = ((WMTSDataParameters)param).getURI();
|
|
| 1295 | 1295 |
this.param = param; |
| 1296 | 1296 |
this.storeServices = storeServices; |
| 1297 | 1297 |
} |
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSDataParameters.java | ||
|---|---|---|
| 49 | 49 |
private static final String FIELD_INFO_FORMAT = "infoformat"; |
| 50 | 50 |
private static final String FIELD_LAYER = "layer"; |
| 51 | 51 |
private static final String FIELD_STYLE = "style"; |
| 52 |
private static final String FIELD_HOST = "host"; |
|
| 53 | 52 |
private static final String FIELD_NAME = "name"; |
| 54 | 53 |
private static final String FIELD_SRSSTR = "srsstr"; |
| 55 | 54 |
private static final String FIELD_OVERRIDE = "override"; |
| ... | ... | |
| 114 | 113 |
field.setType(DataTypes.STRING); |
| 115 | 114 |
field.setMandatory(false); |
| 116 | 115 |
|
| 117 |
field = dynClass.addDynField(FIELD_HOST); |
|
| 118 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
|
| 119 |
field.setDescription("Host");
|
|
| 120 |
field.setType(DataTypes.STRING); |
|
| 121 |
field.setMandatory(false); |
|
| 122 |
|
|
| 123 | 116 |
field = dynClass.addDynField(FIELD_NAME); |
| 124 | 117 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
| 125 | 118 |
field.setDescription("Name");
|
| ... | ... | |
| 231 | 224 |
return (WMTSLayer) this.getDynValue(FIELD_LAYER); |
| 232 | 225 |
} |
| 233 | 226 |
|
| 234 |
/* |
|
| 235 |
* (non-Javadoc) |
|
| 236 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#getHost() |
|
| 237 |
*/ |
|
| 238 |
public String getHost() {
|
|
| 239 |
return (String) this.getDynValue(FIELD_HOST); |
|
| 240 |
} |
|
| 241 |
|
|
| 242 |
/* |
|
| 243 |
* (non-Javadoc) |
|
| 244 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#setHost(java.lang.String) |
|
| 245 |
*/ |
|
| 246 |
public void setHost(String host) {
|
|
| 247 |
this.setDynValue(FIELD_HOST, host); |
|
| 248 |
} |
|
| 249 |
|
|
| 250 | 227 |
/** |
| 251 | 228 |
* Devuelve el SRS. |
| 252 | 229 |
* @return SRS. |
| ... | ... | |
| 443 | 420 |
} |
| 444 | 421 |
|
| 445 | 422 |
public boolean isValid() {
|
| 446 |
return (this.getHost() != null);
|
|
| 423 |
return (this.getURI() != null);
|
|
| 447 | 424 |
} |
| 448 | 425 |
|
| 449 | 426 |
protected DelegatedDynObject getDelegatedDynObject() {
|
| ... | ... | |
| 461 | 438 |
p.setHeight(getHeight()); |
| 462 | 439 |
p.setWidth(getWidth()); |
| 463 | 440 |
p.setExtent(getExtent()); |
| 464 |
p.setHost(getHost());
|
|
| 441 |
p.setURI(getURI());
|
|
| 465 | 442 |
p.setName(getName()); |
| 466 | 443 |
p.setOverrideHost(isOverridingHost()); |
| 467 | 444 |
p.setSRS(getSRS()); |
| 468 | 445 |
p.setSRS(getSRSCode()); |
| 469 |
p.setHost(getHost()); |
|
| 470 | 446 |
p.setCancellable(getCancellable()); |
| 471 | 447 |
return p; |
| 472 | 448 |
} |
| org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/resources/TemplateRasterProvider.java | ||
|---|---|---|
| 72 | 72 |
private boolean open = false; |
| 73 | 73 |
|
| 74 | 74 |
public static void register() {
|
| 75 |
ExtensionPointManager extensionPoints = ToolsLocator.getExtensionPointManager(); |
|
| 76 |
ExtensionPoint point = extensionPoints.get("RasterReader");
|
|
| 77 |
addFormatsToRegistry(point, NetCDFProvider.class); |
|
| 78 |
|
|
| 79 |
point = extensionPoints.get("DefaultDriver");
|
|
| 80 |
point.append("reader", "", NetCDFProvider.class);
|
|
| 81 |
|
|
| 82 | 75 |
DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager(); |
| 83 | 76 |
if (dataman != null && !dataman.getStoreProviders().contains(NAME)) {
|
| 84 | 77 |
dataman.registerStoreProvider(NAME, |
| ... | ... | |
| 92 | 85 |
|
| 93 | 86 |
dataman.registerStoreFactory(NAME, DefaultStoreFactory.class); |
| 94 | 87 |
} |
| 95 |
|
|
| 88 |
|
|
| 96 | 89 |
/** |
| 97 |
* Adds the list format to the extension point |
|
| 98 |
* @param point |
|
| 99 |
*/ |
|
| 100 |
public static void addFormatsToRegistry(ExtensionPoint point, Class<?> c) {
|
|
| 101 |
for (int i = 0; i < formatList.length; i++) {
|
|
| 102 |
point.append(formatList[i], "", c); |
|
| 103 |
} |
|
| 104 |
} |
|
| 105 |
|
|
| 106 |
/** |
|
| 107 | 90 |
* Returns true if the extension is supported and false if doesn't |
| 108 | 91 |
* @param ext |
| 109 | 92 |
* @return |
| org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSServerExplorer.java | ||
|---|---|---|
| 93 | 93 |
} catch (ProviderNotRegisteredException e) {
|
| 94 | 94 |
e.printStackTrace(); |
| 95 | 95 |
} |
| 96 |
params.setHost(parameters.getHost());
|
|
| 96 |
params.setURI(parameters.getHost());
|
|
| 97 | 97 |
return params; |
| 98 | 98 |
} |
| 99 | 99 |
|
| org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSProvider.java | ||
|---|---|---|
| 68 | 68 |
import org.gvsig.raster.impl.store.properties.RemoteDataStoreStatistics; |
| 69 | 69 |
import org.gvsig.remoteclient.wcs.WCSStatus; |
| 70 | 70 |
import org.gvsig.tools.ToolsLocator; |
| 71 |
import org.gvsig.tools.extensionpoint.ExtensionPoint; |
|
| 72 |
import org.gvsig.tools.extensionpoint.ExtensionPointManager; |
|
| 73 | 71 |
/** |
| 74 | 72 |
* Clase que representa al driver de acceso a datos de wcs. |
| 75 | 73 |
* |
| ... | ... | |
| 114 | 112 |
super(params); |
| 115 | 113 |
if(params instanceof String) {
|
| 116 | 114 |
WCSDataParameters p = new WCSDataParameters(); |
| 117 |
p.setHost((String)params);
|
|
| 115 |
p.setURI((String)params);
|
|
| 118 | 116 |
super.init(p, null, ToolsLocator.getDynObjectManager() |
| 119 | 117 |
.createDynObject( |
| 120 | 118 |
MetadataLocator.getMetadataManager().getDefinition( |
| ... | ... | |
| 141 | 139 |
WCSDataParameters p = (WCSDataParameters)parameters; |
| 142 | 140 |
URL url = null; |
| 143 | 141 |
try {
|
| 144 |
url = new URL(p.getHost());
|
|
| 142 |
url = new URL(p.getURI());
|
|
| 145 | 143 |
} catch (Exception e) {
|
| 146 | 144 |
throw new RemoteServiceException("Malformed URL",e);
|
| 147 | 145 |
} |
| ... | ... | |
| 956 | 954 |
*/ |
| 957 | 955 |
public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
|
| 958 | 956 |
if(param instanceof WCSDataParameters) |
| 959 |
this.name = ((WCSDataParameters)param).getHost();
|
|
| 957 |
this.name = ((WCSDataParameters)param).getURI();
|
|
| 960 | 958 |
this.param = param; |
| 961 | 959 |
} |
| 962 | 960 |
|
| org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSDataParameters.java | ||
|---|---|---|
| 50 | 50 |
private static final String FIELD_PARAM = "parameter"; |
| 51 | 51 |
private static final String FIELD_SRS = "srs"; |
| 52 | 52 |
private static final String FIELD_FORMAT = "format"; |
| 53 |
private static final String FIELD_HOST = "host"; |
|
| 54 | 53 |
private static final String FIELD_NAME = "name"; |
| 55 | 54 |
private static final String FIELD_SRSSTR = "srsstr"; |
| 56 | 55 |
private static final String FIELD_EXTENT = "extent"; |
| ... | ... | |
| 111 | 110 |
field.setType(DataTypes.STRING); |
| 112 | 111 |
field.setMandatory(true); |
| 113 | 112 |
|
| 114 |
field = dynClass.addDynField(FIELD_HOST); |
|
| 115 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
|
| 116 |
field.setDescription("Host");
|
|
| 117 |
field.setType(DataTypes.STRING); |
|
| 118 |
field.setMandatory(true); |
|
| 119 |
|
|
| 120 | 113 |
field = dynClass.addDynField(FIELD_NAME); |
| 121 | 114 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
| 122 | 115 |
field.setDescription("Name");
|
| ... | ... | |
| 220 | 213 |
public void setFormat(String format) {
|
| 221 | 214 |
this.setDynValue(FIELD_FORMAT, format); |
| 222 | 215 |
} |
| 223 |
|
|
| 224 |
/* |
|
| 225 |
* (non-Javadoc) |
|
| 226 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#getHost() |
|
| 227 |
*/ |
|
| 228 |
public String getHost() {
|
|
| 229 |
return (String) this.getDynValue(FIELD_HOST); |
|
| 230 |
} |
|
| 231 |
|
|
| 232 |
/* |
|
| 233 |
* (non-Javadoc) |
|
| 234 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#setHost(java.lang.String) |
|
| 235 |
*/ |
|
| 236 |
public void setHost(String host) {
|
|
| 237 |
this.setDynValue(FIELD_HOST, host); |
|
| 238 |
} |
|
| 239 | 216 |
|
| 240 | 217 |
/** |
| 241 | 218 |
* Devuelve el SRS. |
| ... | ... | |
| 396 | 373 |
} |
| 397 | 374 |
|
| 398 | 375 |
public boolean isValid() {
|
| 399 |
return (this.getHost() != null);
|
|
| 376 |
return (this.getURI() != null);
|
|
| 400 | 377 |
} |
| 401 | 378 |
|
| 402 | 379 |
protected DelegatedDynObject getDelegatedDynObject() {
|
| ... | ... | |
| 414 | 391 |
p.setHeight(getHeight()); |
| 415 | 392 |
p.setWidth(getWidth()); |
| 416 | 393 |
p.setExtent(getExtent()); |
| 417 |
p.setHost(getHost()); |
|
| 418 | 394 |
p.setCoverageName(getCoverageName()); |
| 419 | 395 |
p.setOverrideHost(isOverridingHost()); |
| 420 | 396 |
p.setSRS(getSRS()); |
| 421 | 397 |
p.setSRS(getSRSCode()); |
| 422 |
p.setHost(getHost());
|
|
| 398 |
p.setURI(getURI());
|
|
| 423 | 399 |
p.setCancellable(getCancellable()); |
| 424 | 400 |
p.setOnlineResources((Hashtable<String, String>)this.getDynValue(FIELD_ONLINERESOURC)); |
| 425 | 401 |
p.setTime(getTime()); |
| org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/layer/FLyrWCS.java | ||
|---|---|---|
| 514 | 514 |
try {
|
| 515 | 515 |
info.put("name", getName());
|
| 516 | 516 |
info.put("selectedLayers", getParameters().getCoverageName());
|
| 517 |
info.put("host", getParameters().getHost());
|
|
| 517 |
info.put("host", getParameters().getURI());
|
|
| 518 | 518 |
info.put("crs", getParameters().getSRSCode());
|
| 519 | 519 |
info.put("format", getParameters().getFormat());
|
| 520 | 520 |
info.put("time", getParameters().getTime());
|
| ... | ... | |
| 678 | 678 |
try {
|
| 679 | 679 |
DataStore dStore = dataman.openStore(params.getDataStoreName(), params); |
| 680 | 680 |
this.setDataStore(dStore); |
| 681 |
this.setName(params.getHost());
|
|
| 681 |
this.setName(params.getURI());
|
|
| 682 | 682 |
} catch (ValidateDataParametersException e) {
|
| 683 | 683 |
throw new InitializeException(e); |
| 684 | 684 |
} catch (ProviderNotRegisteredException e) {
|
| org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/gui/panel/WCSParamsPanel.java | ||
|---|---|---|
| 105 | 105 |
FLyrWCS layer = new FLyrWCS(); |
| 106 | 106 |
WCSDataParameters par = (WCSDataParameters)explorer.getStoreParameters(); |
| 107 | 107 |
|
| 108 |
par.setHost(explorer.getHost().toString());
|
|
| 108 |
par.setURI(explorer.getHost().toString());
|
|
| 109 | 109 |
par.setSRS(getSRS()); |
| 110 | 110 |
par.setFormat(getFormat()); |
| 111 | 111 |
par.setCoverageName(getLayerPanel().getSelectedCoverageName()); |
| org.gvsig.raster.app/trunk/org.gvsig.raster.app/org.gvsig.raster.app.tools/src/main/java/org/gvsig/raster/app/extension/tool/clip/ui/panel/ClippingSelectionPanel.java | ||
|---|---|---|
| 30 | 30 |
import org.gvsig.fmap.dal.DataParameters; |
| 31 | 31 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 32 | 32 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters; |
| 33 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters; |
|
| 34 | 33 |
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters; |
| 35 | 34 |
import org.gvsig.gui.beans.table.TableContainer; |
| 36 | 35 |
import org.gvsig.gui.beans.table.exceptions.NotInitializeException; |
| ... | ... | |
| 99 | 98 |
String fName = null; |
| 100 | 99 |
if(par instanceof RasterDataParameters) |
| 101 | 100 |
fName = ((RasterDataParameters)dataStore.getDataStore(i).getParameters()).getURI(); |
| 102 |
if(par instanceof RemoteStoreParameters) |
|
| 103 |
fName = ((RemoteStoreParameters)dataStore.getDataStore(i).getParameters()).getHost(); |
|
| 104 | 101 |
if(par instanceof TileDataParameters) |
| 105 | 102 |
fName = ((TileDataParameters)dataStore.getDataStore(i).getParameters()).getName(); |
| 106 | 103 |
cont = loadBandsTable(dataStore.getDataStore(i), fName, cont); |
| org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/src/main/java/org/gvsig/raster/fmap/layers/DefaultFLyrRaster.java | ||
|---|---|---|
| 78 | 78 |
import org.gvsig.fmap.dal.coverage.store.RasterQuery; |
| 79 | 79 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters; |
| 80 | 80 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterFileStoreParameters; |
| 81 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters; |
|
| 82 | 81 |
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters; |
| 83 | 82 |
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation; |
| 84 | 83 |
import org.gvsig.fmap.dal.coverage.store.props.ColorTable; |
| ... | ... | |
| 311 | 310 |
if(uri == null) {
|
| 312 | 311 |
if(params instanceof RasterDataParameters) |
| 313 | 312 |
uri = ((RasterDataParameters)p).getURI(); |
| 314 |
if(params instanceof RemoteStoreParameters) |
|
| 315 |
uri = ((RemoteStoreParameters)p).getHost(); |
|
| 316 | 313 |
} |
| 317 | 314 |
test = uri.indexOf("ecwp:");
|
| 318 | 315 |
} |
| org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.api/src/main/java/org/gvsig/fmap/dal/coverage/store/parameter/RemoteStoreParameters.java | ||
|---|---|---|
| 30 | 30 |
public interface RemoteStoreParameters extends DataStoreParameters {
|
| 31 | 31 |
|
| 32 | 32 |
/** |
| 33 |
* Gets the host URI |
|
| 34 |
* @return |
|
| 35 |
*/ |
|
| 36 |
public String getHost(); |
|
| 37 |
|
|
| 38 |
/** |
|
| 39 |
* Sets the host URI |
|
| 40 |
* @param host |
|
| 41 |
*/ |
|
| 42 |
public void setHost(String host); |
|
| 43 |
|
|
| 44 |
/** |
|
| 45 | 33 |
* Sets the number of alpha band |
| 46 | 34 |
* @param alphaBand |
| 47 | 35 |
*/ |
| 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 | ||
|---|---|---|
| 169 | 169 |
public DefaultRasterProvider(DataStoreParameters params, |
| 170 | 170 |
DataStoreProviderServices storeServices, DynObject metadata) {
|
| 171 | 171 |
super(params, storeServices, metadata); |
| 172 |
if(((RemoteStoreParameters)params).getHost() != null) {
|
|
| 173 |
File f = new File(((RemoteStoreParameters)params).getHost());
|
|
| 172 |
if(((RasterDataParameters)params).getURI() != null) {
|
|
| 173 |
File f = new File(((RasterDataParameters)params).getURI());
|
|
| 174 | 174 |
if(f.exists()) |
| 175 | 175 |
setFileSize(f.length()); |
| 176 |
if(params instanceof RemoteStoreParameters) |
|
| 177 |
name = translateFileName(((RasterDataParameters)params).getURI()); |
|
| 176 | 178 |
} |
| 177 | 179 |
|
| 178 |
if(((RemoteStoreParameters)params).getHost() != null) |
|
| 179 |
name = translateFileName(((RemoteStoreParameters)params).getHost()); |
|
| 180 |
|
|
| 181 | 180 |
ownTransformation = new AffineTransform(); |
| 182 | 181 |
externalTransformation = new AffineTransform(); |
| 183 | 182 |
} |
| org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.io/src/main/java/org/gvsig/raster/cache/io/TileProvider.java | ||
|---|---|---|
| 49 | 49 |
import org.gvsig.fmap.dal.coverage.exception.ProcessInterruptedException; |
| 50 | 50 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException; |
| 51 | 51 |
import org.gvsig.fmap.dal.coverage.exception.RemoteServiceException; |
| 52 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters; |
|
| 52 | 53 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters; |
| 53 | 54 |
import org.gvsig.fmap.dal.coverage.store.props.ColorTable; |
| 54 | 55 |
import org.gvsig.fmap.dal.coverage.store.props.Transparency; |
| ... | ... | |
| 83 | 84 |
import org.gvsig.raster.impl.store.DefaultStoreFactory; |
| 84 | 85 |
import org.gvsig.raster.impl.store.properties.DataStoreColorInterpretation; |
| 85 | 86 |
import org.gvsig.tools.ToolsLocator; |
| 86 |
import org.gvsig.tools.extensionpoint.ExtensionPoint; |
|
| 87 |
import org.gvsig.tools.extensionpoint.ExtensionPointManager; |
|
| 88 | 87 |
import org.gvsig.tools.locator.LocatorException; |
| 89 | 88 |
|
| 90 | 89 |
/** |
| ... | ... | |
| 809 | 808 |
@Override |
| 810 | 809 |
public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
|
| 811 | 810 |
if(param instanceof RemoteStoreParameters) |
| 812 |
this.name = ((RemoteStoreParameters)param).getHost();
|
|
| 811 |
this.name = ((RasterDataParameters)param).getURI();
|
|
| 813 | 812 |
this.param = param; |
| 814 | 813 |
this.storeServices = storeServices; |
| 815 | 814 |
} |
| org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.io/src/main/java/org/gvsig/raster/cache/io/TileDataParametersImpl.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
import org.gvsig.fmap.dal.DataParameters; |
| 26 | 26 |
import org.gvsig.fmap.dal.DataTypes; |
| 27 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters; |
|
| 27 | 28 |
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters; |
| 28 | 29 |
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters; |
| 29 | 30 |
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters; |
| ... | ... | |
| 159 | 160 |
DataParameters p = getDataParameters(); |
| 160 | 161 |
if(p != null) {
|
| 161 | 162 |
if(p instanceof RemoteStoreParameters) |
| 162 |
return ((RemoteStoreParameters)p).getHost();
|
|
| 163 |
return ((RasterDataParameters)p).getURI();
|
|
| 163 | 164 |
if(p instanceof FilesystemStoreParameters) |
| 164 | 165 |
return ((FilesystemStoreParameters)p).getFile().getAbsolutePath(); |
| 165 | 166 |
} |
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/gui/panel/WMSParamsPanel.java | ||
|---|---|---|
| 1366 | 1366 |
par.setFixedSize(getFixedSize()); |
| 1367 | 1367 |
par.setQueryable(explorer.isQueryable()); |
| 1368 | 1368 |
par.setName(node.getTitle()); |
| 1369 |
par.setHost(explorer.getHost());
|
|
| 1369 |
par.setURI(explorer.getHost());
|
|
| 1370 | 1370 |
|
| 1371 | 1371 |
FLyrWMS layer = new FLyrWMS(); |
| 1372 | 1372 |
try {
|
| ... | ... | |
| 1473 | 1473 |
par.setFixedSize(getFixedSize()); |
| 1474 | 1474 |
par.setQueryable(node.isQueryable()); |
| 1475 | 1475 |
par.setName(node.getTitle()); |
| 1476 |
par.setHost(explorer.getHost());
|
|
| 1476 |
par.setURI(explorer.getHost());
|
|
| 1477 | 1477 |
|
| 1478 | 1478 |
FLyrWMS layer = new FLyrWMS(); |
| 1479 | 1479 |
try {
|
| ... | ... | |
| 1514 | 1514 |
par.setFixedSize(getFixedSize()); |
| 1515 | 1515 |
par.setQueryable(explorer.isQueryable()); |
| 1516 | 1516 |
par.setName(getLayerName()); |
| 1517 |
par.setHost(explorer.getHost());
|
|
| 1517 |
par.setURI(explorer.getHost());
|
|
| 1518 | 1518 |
|
| 1519 | 1519 |
FLyrWMS layer = new FLyrWMS(); |
| 1520 | 1520 |
try {
|
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/gui/wizard/WMSWizard.java | ||
|---|---|---|
| 810 | 810 |
par.setOnlineResources(getOnlineResources()); |
| 811 | 811 |
par.setFixedSize(getFixedSize()); |
| 812 | 812 |
par.setQueryable(node.isQueryable()); |
| 813 |
par.setHost(getHost().getPath());
|
|
| 813 |
par.setURI(getHost().getPath());
|
|
| 814 | 814 |
|
| 815 | 815 |
FLyrWMS layer = new FLyrWMS(); |
| 816 | 816 |
try {
|
| ... | ... | |
| 851 | 851 |
par.setOnlineResources(getOnlineResources()); |
| 852 | 852 |
par.setFixedSize(getFixedSize()); |
| 853 | 853 |
par.setQueryable(isQueryable()); |
| 854 |
par.setHost(getHost().getPath());
|
|
| 854 |
par.setURI(getHost().getPath());
|
|
| 855 | 855 |
|
| 856 | 856 |
FLyrWMS layer = new FLyrWMS(); |
| 857 | 857 |
try {
|
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/wmc/WebMapContext.java | ||
|---|---|---|
| 43 | 43 |
import org.gvsig.app.ApplicationLocator; |
| 44 | 44 |
import org.gvsig.app.project.documents.view.DefaultViewDocument; |
| 45 | 45 |
import org.gvsig.fmap.crs.CRSFactory; |
| 46 |
import org.gvsig.fmap.dal.coverage.RasterLocator; |
|
| 47 | 46 |
import org.gvsig.fmap.dal.coverage.exception.ImportMapContextException; |
| 48 | 47 |
import org.gvsig.fmap.mapcontext.exceptions.UnsupportedVersionLayerException; |
| 49 | 48 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| ... | ... | |
| 544 | 543 |
String serverTitle = parser.getAttributeValue("", WebMapContextTags.TITLE.toLowerCase());
|
| 545 | 544 |
parser.nextTag(); |
| 546 | 545 |
if (parser.getName().compareTo(WebMapContextTags.ONLINE_RESOURCE) == 0) {
|
| 547 |
layer.getParameters().setHost(parser.getAttributeValue("", WebMapContextTags.XLINK_HREF));
|
|
| 546 |
layer.getParameters().setURI(parser.getAttributeValue("", WebMapContextTags.XLINK_HREF));
|
|
| 548 | 547 |
if (serverTitles == null) {
|
| 549 | 548 |
serverTitles = new Hashtable(); |
| 550 | 549 |
} |
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java | ||
|---|---|---|
| 235 | 235 |
this.fullEnvelope = (Envelope) state.get("fullExtent");
|
| 236 | 236 |
|
| 237 | 237 |
// Host |
| 238 |
getParameters().setHost((String)state.get("host"));
|
|
| 238 |
getParameters().setURI((String)state.get("host"));
|
|
| 239 | 239 |
|
| 240 | 240 |
// Part of the query that is not the host, or the |
| 241 | 241 |
// layer names, or other not listed bellow |
| ... | ... | |
| 290 | 290 |
state.set("fullEnvelope", this.fullEnvelope);
|
| 291 | 291 |
|
| 292 | 292 |
// Host |
| 293 |
state.set("host", getParameters().getHost());
|
|
| 293 |
state.set("host", getParameters().getURI());
|
|
| 294 | 294 |
|
| 295 | 295 |
// Part of the query that is not the host, or the |
| 296 | 296 |
// layer names, or other not listed bellow |
| ... | ... | |
| 587 | 587 |
} |
| 588 | 588 |
info.put("name", getName());
|
| 589 | 589 |
info.put("selectedLayers", layers);
|
| 590 |
info.put("host", getParameters().getHost());
|
|
| 590 |
info.put("host", getParameters().getURI());
|
|
| 591 | 591 |
info.put("srs", getParameters().getSRSCode());
|
| 592 | 592 |
info.put("format", getParameters().getFormat());
|
| 593 | 593 |
info.put("wmsTransparency", new Boolean(getParameters().isWmsTransparent()));
|
| ... | ... | |
| 636 | 636 |
|
| 637 | 637 |
// <OnlineResource> |
| 638 | 638 |
xmlAttrs.put(WebMapContextTags.XLINK_TYPE, "simple"); |
| 639 |
xmlAttrs.put(WebMapContextTags.XLINK_HREF, getParameters().getHost().toString());
|
|
| 639 |
xmlAttrs.put(WebMapContextTags.XLINK_HREF, getParameters().getURI().toString());
|
|
| 640 | 640 |
xml.writeTag(WebMapContextTags.ONLINE_RESOURCE, xmlAttrs); |
| 641 | 641 |
xmlAttrs.clear(); |
| 642 | 642 |
// </OnlineResource> |
| ... | ... | |
| 840 | 840 |
return false; |
| 841 | 841 |
} |
| 842 | 842 |
aLayer = (FLyrWMS)layer; |
| 843 |
if (!getParameters().getHost().equals(aLayer.getParameters().getHost())) {
|
|
| 843 |
if (!getParameters().getURI().equals(aLayer.getParameters().getURI())) {
|
|
| 844 | 844 |
return false; |
| 845 | 845 |
} |
| 846 | 846 |
if (!params.getFormat().equals(aLayer.getParameters().getFormat())) {
|
| ... | ... | |
| 1153 | 1153 |
try {
|
| 1154 | 1154 |
DataStore dStore = dataman.openStore(params.getDataStoreName(), params); |
| 1155 | 1155 |
this.setDataStore(dStore); |
| 1156 |
this.setName(params.getHost());
|
|
| 1156 |
this.setName(params.getURI());
|
|
| 1157 | 1157 |
} catch (ValidateDataParametersException e) {
|
| 1158 | 1158 |
throw new InitializeException(e); |
| 1159 | 1159 |
} catch (ProviderNotRegisteredException e) {
|
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSServerExplorer.java | ||
|---|---|---|
| 100 | 100 |
} catch (ProviderNotRegisteredException e) {
|
| 101 | 101 |
e.printStackTrace(); |
| 102 | 102 |
} |
| 103 |
params.setHost(parameters.getHost());
|
|
| 103 |
params.setURI(parameters.getHost());
|
|
| 104 | 104 |
return params; |
| 105 | 105 |
} |
| 106 | 106 |
|
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSProvider.java | ||
|---|---|---|
| 69 | 69 |
import org.gvsig.remoteclient.utils.Utilities; |
| 70 | 70 |
import org.gvsig.remoteclient.wms.WMSStatus; |
| 71 | 71 |
import org.gvsig.tools.ToolsLocator; |
| 72 |
import org.gvsig.tools.extensionpoint.ExtensionPoint; |
|
| 73 |
import org.gvsig.tools.extensionpoint.ExtensionPointManager; |
|
| 74 | 72 |
/** |
| 75 | 73 |
* Clase que representa al driver de acceso a datos de wms. |
| 76 | 74 |
* |
| ... | ... | |
| 132 | 130 |
super(params); |
| 133 | 131 |
if(params instanceof String) {
|
| 134 | 132 |
WMSDataParameters p = new WMSDataParameters(); |
| 135 |
p.setHost((String)params);
|
|
| 133 |
p.setURI((String)params);
|
|
| 136 | 134 |
super.init(p, null, ToolsLocator.getDynObjectManager() |
| 137 | 135 |
.createDynObject( |
| 138 | 136 |
MetadataLocator.getMetadataManager().getDefinition( |
| ... | ... | |
| 159 | 157 |
WMSDataParameters p = (WMSDataParameters)parameters; |
| 160 | 158 |
URL url = null; |
| 161 | 159 |
try {
|
| 162 |
url = new URL(p.getHost());
|
|
| 160 |
url = new URL(p.getURI());
|
|
| 163 | 161 |
} catch (Exception e) {
|
| 164 | 162 |
throw new RemoteServiceException("Malformed URL",e);
|
| 165 | 163 |
} |
| ... | ... | |
| 921 | 919 |
*/ |
| 922 | 920 |
public void setParam(DataStoreProviderServices storeServices, DataStoreParameters param) {
|
| 923 | 921 |
if(param instanceof WMSDataParameters) |
| 924 |
this.name = ((WMSDataParameters)param).getHost();
|
|
| 922 |
this.name = ((WMSDataParameters)param).getURI();
|
|
| 925 | 923 |
this.param = param; |
| 926 | 924 |
} |
| 927 | 925 |
|
| org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSDataParameters.java | ||
|---|---|---|
| 50 | 50 |
private static final String FIELD_FORMAT = "format"; |
| 51 | 51 |
private static final String FIELD_INFOFORMAT = "infoformat"; |
| 52 | 52 |
private static final String FIELD_LAYERQUERY = "layer_query"; |
| 53 |
private static final String FIELD_HOST = "host"; |
|
| 54 | 53 |
private static final String FIELD_NAME = "name"; |
| 55 | 54 |
private static final String FIELD_SRSSTR = "srsstr"; |
| 56 | 55 |
private static final String FIELD_TRANSPARENCY = "transparency"; |
| ... | ... | |
| 116 | 115 |
field.setType(DataTypes.STRING); |
| 117 | 116 |
field.setMandatory(false); |
| 118 | 117 |
|
| 119 |
field = dynClass.addDynField(FIELD_HOST); |
|
| 120 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
|
| 121 |
field.setDescription("Host");
|
|
| 122 |
field.setType(DataTypes.STRING); |
|
| 123 |
field.setMandatory(true); |
|
| 124 |
|
|
| 125 | 118 |
field = dynClass.addDynField(FIELD_NAME); |
| 126 | 119 |
field.setTheTypeOfAvailableValues(DynField.ANY); |
| 127 | 120 |
field.setDescription("Name");
|
| ... | ... | |
| 261 | 254 |
this.setDynValue(FIELD_LAYERQUERY, layerQuery); |
| 262 | 255 |
} |
| 263 | 256 |
|
| 264 |
/* |
|
| 265 |
* (non-Javadoc) |
|
| 266 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#getHost() |
|
| 267 |
*/ |
|
| 268 |
public String getHost() {
|
|
| 269 |
return (String) this.getDynValue(FIELD_HOST); |
|
| 270 |
} |
|
| 271 |
|
|
| 272 |
/* |
|
| 273 |
* (non-Javadoc) |
|
| 274 |
* @see org.gvsig.fmap.dal.coverage.store.parameter.WMSStoreParameters#setHost(java.lang.String) |
|
| 275 |
*/ |
|
| 276 |
public void setHost(String host) {
|
|
| 277 |
this.setDynValue(FIELD_HOST, host); |
|
| 278 |
} |
|
| 279 |
|
|
| 280 | 257 |
/** |
| 281 | 258 |
* Devuelve el SRS. |
| 282 | 259 |
* @return SRS. |
| ... | ... | |
| 600 | 577 |
} |
| 601 | 578 |
|
| 602 | 579 |
public boolean isValid() {
|
| 603 |
return (this.getHost() != null);
|
|
| 580 |
return (this.getURI() != null);
|
|
| 604 | 581 |
} |
| 605 | 582 |
|
| 606 | 583 |
protected DelegatedDynObject getDelegatedDynObject() {
|
| ... | ... | |
| 619 | 596 |
p.setHeight(getHeight()); |
| 620 | 597 |
p.setWidth(getWidth()); |
| 621 | 598 |
p.setExtent(getExtent()); |
| 622 |
p.setHost(getHost());
|
|
| 599 |
p.setURI(getURI());
|
|
| 623 | 600 |
p.setInfoLayerQuery(getInfoLayerQuery()); |
| 624 | 601 |
p.setLayerQuery(getLayerQuery()); |
| 625 | 602 |
p.setName(getName()); |
| ... | ... | |
| 631 | 608 |
p.setStyles(getStyles()); |
| 632 | 609 |
p.setWmsTransparency(isWmsTransparent()); |
| 633 | 610 |
p.setDimensions(getDimensions()); |
| 634 |
p.setHost(getHost()); |
|
| 635 | 611 |
p.setCancellable(getCancellable()); |
| 636 | 612 |
return p; |
| 637 | 613 |
} |
Also available in: Unified diff