Revision 311

View differences:

org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.io/org.gvsig.raster.base/src/main/java/org/gvsig/fmap/dal/coverage/dataset/io/tile/downloader/WMTSCacheStruct.java
27 27

  
28 28
import org.gvsig.fmap.dal.coverage.dataset.io.wmts.WMTSProvider;
29 29
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
30
import org.gvsig.fmap.dal.coverage.store.parameter.WMTSDataParameters;
30 31
import org.gvsig.raster.cache.tile.Tile;
31 32
import org.gvsig.raster.cache.tile.impl.TileImpl;
32 33
import org.gvsig.raster.cache.tile.provider.CacheStruct;
33 34
import org.gvsig.remoteclient.wmts.WMTSStatus;
34
import org.gvsig.remoteclient.wmts.struct.WMTSBoundingBox;
35 35
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrix;
36 36
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixLimits;
37 37
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixSet;
......
53 53
    	this.provider = provider;
54 54
    	this.tileMatrixSet = tileMatrixSetLink.getTileMatrixSet();
55 55
		this.tileMatrixSetLimits = tileMatrixSetLink.getTileMatrixLimits();
56
		pixelSize = new double[tileMatrixSet.getTileMatrix().size()];
57
		for (int i = 0; i < pixelSize.length; i++) {
58
			WMTSBoundingBox bbox = tileMatrixSet.getBoundingBox();
59
			WMTSTileMatrix tMatrix = (WMTSTileMatrix)tileMatrixSet.getTileMatrix().get(i);
60
			pixelSize[i] = bbox.toRectangle2D().getWidth() / (tMatrix.getMatrixWidth() * tMatrix.getTileWidth());
61
		}
56
		pixelSize = provider.getPixelSizeByLevel();
57
		layerName = provider.getFName();
58
		serverURL = ((WMTSDataParameters)provider.getDataParameters()).getHost();
62 59
    }
63 60

  
64 61
    /*
......
218 215
				getPixelSizeByLevel(level) *  getTileSizeByLevel(level)[1]
219 216
			};
220 217
	}
218
	
219
	/*
220
	 * (non-Javadoc)
221
	 * @see org.gvsig.raster.cache.tile.provider.CacheStruct#getFileSuffix()
222
	 */
223
	public String getFileSuffix() {
224
		return provider.getFileSuffix();
225
	}
221 226
}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.io/org.gvsig.raster.base/src/main/java/org/gvsig/fmap/dal/coverage/dataset/io/tile/downloader/FileTileServer.java
79 79
					TILESIZE, 
80 80
					TILESIZE,
81 81
					provider.getFName(),
82
					provider.getFName(),
83 82
					TileCache.FLATX_STRUCT,
84
					RasterLibrary.pathTileCache);
83
					RasterLibrary.pathTileCache,
84
					getFileSuffix());
85 85
		}
86 86
		return struct;
87 87
	}
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.api/src/main/java/org/gvsig/raster/cache/tile/provider/CacheStruct.java
134 134
	 * @return
135 135
	 */
136 136
	public String getServerURL();
137

  
138
	/**
139
	 * Gets the suffix which represents the image format
140
	 * @return
141
	 */
142
	public String getFileSuffix();
137 143
}
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.api/src/main/java/org/gvsig/raster/cache/tile/TileCacheManager.java
65 65
	 * @param serverURL
66 66
	 * @param strategy
67 67
	 * @param baseDir
68
	 * @param fileSuffix 
68 69
	 * @return
69 70
	 */
70 71
	public CacheStruct createCacheStructure(int typeOfCoords, 
......
74 75
    		int tilePxWidth,
75 76
    		int tilePxHeight,
76 77
    		String layerName,
77
    		String serverURL, 
78 78
    		int strategy,
79
    		String baseDir);
79
    		String baseDir,
80
    		String fileSuffix);
80 81
}
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.impl/src/test/java/org/gvsig/raster/cache/tile/impl/provider/TestCacheStruct.java
55 55
				256, 
56 56
				256,
57 57
				"myLayer",
58
				"http://myserver",
59 58
				strat,
60
				"baseDir");
59
				"baseDir",
60
				"tif");
61 61
		System.out.println("***World***");
62 62
		for (int i = 0; i < levels; i++) {
63 63
			System.out.println("-Level:" + i + " " + 
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.impl/src/main/java/org/gvsig/raster/cache/tile/impl/DefaultTileCacheManager.java
76 76
    		int tilePxWidth,
77 77
    		int tilePxHeight,
78 78
    		String layerName,
79
    		String serverURL, 
80 79
    		int strategy,
81
    		String baseDir) {
80
    		String baseDir,
81
    		String fileSuffix) {
82 82
		return new DefaultCacheStruct(typeOfCoords, 
83 83
				levels, 
84 84
				layerExtent, 
......
86 86
				tilePxWidth, 
87 87
				tilePxHeight, 
88 88
				layerName, 
89
				serverURL,
90 89
				createStrategy(strategy),
91
				baseDir);
90
				baseDir,
91
				fileSuffix);
92 92
	}
93 93
	
94 94
	/**
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.impl/src/main/java/org/gvsig/raster/cache/tile/impl/provider/DefaultCacheStruct.java
38 38
    private TileMatrixSet                 tileMatrixSet  = null;
39 39
    private ArrayList<TileMatrixLimits>   limits         = null;
40 40
    private String                        layerName      = null;
41
	private String                        serverURL      = null;
42 41
	private Rectangle2D                   worldExtent    = null;
42
	private String                        fileSuffix     = null;
43 43
    
44 44
    public DefaultCacheStruct(int typeOfCoords, 
45 45
    		int levels, 
......
48 48
    		int tilePxWidth,
49 49
    		int tilePxHeight,
50 50
    		String layerName,
51
    		String serverURL,
52 51
    		ITileFileSystemStrategy strategy,
53
    		String baseDir) {
52
    		String baseDir,
53
    		String fileSuffix) {
54 54
    	this.layerName = layerName;
55
    	this.serverURL = serverURL;
55
    	this.fileSuffix = fileSuffix;
56 56
    	
57 57
    	//Coordenadas del mundo en geogr?ficas y planas
58 58
    	
......
167 167
	 * @see org.gvsig.raster.cache.tile.provider.CacheStruct#getServerURL()
168 168
	 */
169 169
	public String getServerURL() {
170
		return serverURL;
170
		return layerName;
171 171
	}
172
	
173
	/*
174
	 * (non-Javadoc)
175
	 * @see org.gvsig.raster.cache.tile.provider.CacheStruct#getFileSuffix()
176
	 */
177
	public String getFileSuffix() {
178
		return fileSuffix;
179
	}
172 180

  
173 181
	/*
174 182
	 * (non-Javadoc)
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.impl/src/main/java/org/gvsig/raster/cache/tile/impl/layer/TiledLayerImpl.java
139 139
				MessageDigest md = java.security.MessageDigest.getInstance("MD5");
140 140
				md.update(new String(struct.getServerURL() + 
141 141
						struct.getLayerName() + 
142
						struct.getFileSuffix() +
142 143
						struct.getWorldWidthOfTileMatrixByLevel(maxLevel) + 
143 144
						struct.getWorldHeightOfTileMatrixByLevel(maxLevel) + 
144 145
						struct.getTileSizeByLevel(maxLevel)[0] +
......
148 149
			} catch (NoSuchAlgorithmException e) {
149 150
				idLayer = new String(struct.getServerURL() + 
150 151
						struct.getLayerName() +
152
						struct.getFileSuffix() +
151 153
						struct.getWorldWidthOfTileMatrixByLevel(maxLevel) + 
152 154
						struct.getWorldHeightOfTileMatrixByLevel(maxLevel) + 
153 155
						struct.getTileSizeByLevel(maxLevel)[0] +

Also available in: Unified diff