Revision 2289

View differences:

org.gvsig.raster.tilecache/branches/org.gvsig.raster.tilecache_dataaccess_refactoring/org.gvsig.raster.tilecache.io/src/main/java/org/gvsig/raster/tilecache/io/TileProvider.java
39 39
import org.gvsig.fmap.dal.coverage.store.props.ColorTable;
40 40
import org.gvsig.fmap.dal.coverage.store.props.Transparency;
41 41
import org.gvsig.fmap.dal.coverage.util.MathUtils;
42
import org.gvsig.fmap.dal.coverage.util.RasterUtils;
43 42
import org.gvsig.fmap.dal.exception.InitializeException;
44 43
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
45 44
import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
......
89 88
	private boolean                     open                     = false;
90 89
	private Extent                      viewRequest              = null;
91 90
	private TiledLayer                  tiledLayer               = null;
92
	private RasterUtils                 util                     = RasterLocator.getManager().getRasterUtils();
93 91
	private MathUtils                   math                     = RasterLocator.getManager().getMathUtils();
94 92
	private TileServer                  secondLevelTileServer    = null;
95 93
	 
......
395 393
		level = adjustLevel(level);
396 394
		double pixelSize = provider.getTileServer().getStruct().getPixelSizeByLevel(level);
397 395
		
396
		/*Rectangle2D worldExtent = provider.getTileServer().getStruct().getWorldExtent();
397
		int nTiles = provider.getTileServer().getStruct().getLayerWidthOfTileMatrixByLevel(level);
398
		int[] nPixelsByTile = provider.getTileServer().getStruct().getTileSizeByLevel(level);
399
		
400
		double sizeWCByTile = worldExtent.getWidth() / (double)nTiles;
401
		double pixelSize = sizeWCByTile / (double)nPixelsByTile[0];*/
402
		
398 403
		double ulx = viewCenter.getX() - ((w / 2) * pixelSize);
399 404
		double uly = viewCenter.getY() - ((h / 2) * pixelSize);
400 405
		double lrx = ulx + (w * pixelSize);
......
546 551
	 * @return
547 552
	 * @throws TileBuildException 
548 553
	 */
549
	private List<Tile> getTileList(Extent ex, BandList bandList, int bufWidth, int bufHeight) throws TileBuildException {
554
	private List<Tile> getTileList(SpiRasterQuery q) throws TileBuildException {
550 555
		TileServer tileServer = provider.getTileServer();
551 556
		CacheStruct struct = tileServer.getStruct();
552 557
		tileServer.setFileSuffix(getFileSuffix());
553 558
		
554 559
		createTiledLayer(); //Creates a new layer when the file type changes
555 560
		
556
		Extent adjustedExtent = util.intersection(provider.getExtent(), ex);
557
		double newBufWidth = (adjustedExtent.width() * bufWidth) / ex.width();
558
		double pixelSizeRequest = adjustedExtent.width() / newBufWidth; 
561
		double pixelSizeRequest = q.getRequestBoundingBox().width() / q.getBufWidth();
559 562
		
560 563
		List<Tile> tileList = struct.getTileList(
561
				adjustedExtent.getUL(), 
562
				adjustedExtent.getLR(), 
563
				pixelSizeRequest);
564
		
564
					q.getAdjustedRequestBoundingBox().getUL(), 
565
					q.getAdjustedRequestBoundingBox().getLR(), 
566
					pixelSizeRequest);
567

  
565 568
		for (int i = 0; i < tileList.size(); i++) {
566 569
			loadTileTimeParameters(tileList.get(i));
567 570
		}
568 571
		
569 572
		for (int i = 0; i < tileList.size(); i++) {
570
			tileList.get(i).setDownloaderParams("BandList", bandList.clone());
573
			tileList.get(i).setDownloaderParams("BandList", q.getBandList().clone());
571 574
		}
572 575
		return tileList;
573 576
	}
......
628 631
	public void loadBuffer(SpiRasterQuery q) 
629 632
			throws ProcessInterruptedException, RasterDriverException {
630 633
		try {
631
			List<Tile> tileList = getTileList(
632
					q.getAdjustedRequestBoundingBox(), 
633
					q.getBandList(), 
634
					q.getBufWidth(), 
635
					q.getBufHeight());
634
			List<Tile> tileList = getTileList(q);
636 635
			if(q.requestIsTiled())
637 636
				tiledLayer.getTiles(tileList, q.getTileListener(), q.getTaskStatus());
638 637
			else {
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/pom.xml
3 3
	<modelVersion>4.0.0</modelVersion>
4 4
	<artifactId>org.gvsig.raster.postgis</artifactId>
5 5
	<packaging>pom</packaging>
6
	<version>2.1.0-SNAPSHOT</version>
6
	<version>2.2.0-SNAPSHOT</version>
7 7
	<name>Plugin list for PostGIS raster in gvSIG</name>
8 8
	<description>Plugin list for PostGIS raster in gvSIG</description>
9 9
	<inceptionYear>2011</inceptionYear>
......
45 45
    		<dependency>
46 46
				<groupId>org.gvsig</groupId>
47 47
				<artifactId>org.gvsig.raster.postgis.swing.api</artifactId>
48
				<version>2.1.0-SNAPSHOT</version>
48
				<version>2.2.0-SNAPSHOT</version>
49 49
			</dependency>
50 50
       		<dependency>
51 51
				<groupId>org.gvsig</groupId>
52 52
				<artifactId>org.gvsig.raster.fmap</artifactId>
53
            	<version>2.1.0-SNAPSHOT</version>
53
            	<version>2.2.0-SNAPSHOT</version>
54 54
			</dependency>
55 55
	    	<dependency>
56 56
				<groupId>org.gvsig</groupId>
......
65 65
			<dependency>
66 66
				<groupId>org.gvsig</groupId>
67 67
				<artifactId>org.gvsig.raster.lib.api</artifactId>
68
				<version>2.1.0-SNAPSHOT</version>
68
				<version>2.2.0-SNAPSHOT</version>
69 69
			</dependency>
70 70
	        <dependency>
71 71
	            <groupId>org.gvsig</groupId>
72 72
	            <artifactId>org.gvsig.raster.lib.impl</artifactId>
73
	            <version>2.1.0-SNAPSHOT</version>
73
	            <version>2.2.0-SNAPSHOT</version>
74 74
	        </dependency>
75 75
	        <dependency>
76 76
				<groupId>org.gvsig</groupId>
77 77
				<artifactId>org.gvsig.raster.gdal.io</artifactId>
78
				<version>2.1.0-SNAPSHOT</version>
78
				<version>2.2.0-SNAPSHOT</version>
79 79
			</dependency>
80 80
	        <dependency>
81 81
				<groupId>org.gvsig</groupId>
......
92 92
		    <dependency>
93 93
	            <groupId>org.gvsig</groupId>
94 94
	            <artifactId>org.gvsig.raster.postgis.swing.impl</artifactId>
95
	            <version>2.1.0-SNAPSHOT</version>
95
	            <version>2.2.0-SNAPSHOT</version>
96 96
	        </dependency>
97 97
	        <dependency>
98 98
	            <groupId>org.gvsig</groupId>
99 99
	            <artifactId>org.gvsig.raster.postgis.io</artifactId>
100
	            <version>2.1.0-SNAPSHOT</version>
100
	            <version>2.2.0-SNAPSHOT</version>
101 101
	        </dependency>
102 102
	        <dependency>
103 103
				<groupId>org.gvsig</groupId>
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.app.postgisrasterclient/pom.xml
9 9
	<parent>
10 10
      <groupId>org.gvsig</groupId>
11 11
      <artifactId>org.gvsig.raster.postgis</artifactId>
12
      <version>2.1.0-SNAPSHOT</version>
12
      <version>2.2.0-SNAPSHOT</version>
13 13
    </parent>
14 14
	
15 15
	<scm>
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.io/pom.xml
7 7
	<parent>
8 8
		<groupId>org.gvsig</groupId>
9 9
		<artifactId>org.gvsig.raster.postgis</artifactId>
10
		<version>2.1.0-SNAPSHOT</version>
10
		<version>2.2.0-SNAPSHOT</version>
11 11
	</parent>
12 12
	<dependencies>
13 13
		<dependency>
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.io/src/main/java/org/gvsig/raster/postgis/io/downloader/TileDownloaderForPostGISRaster.java
1
/* gvSIG. Geographic Information System of the Valencian Government
2
 *
3
 * Copyright (C) 2007-2008 Infrastructures and Transports Department
4
 * of the Valencian Government (CIT)
5
 *
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 2
9
 * of the License, or (at your option) any later version.
10
 *
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
15
 *
16
 * You should have received a copy of the GNU General Public License
17
 * along with this program; if not, write to the Free Software
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19
 * MA  02110-1301, USA.
20
 *
21
 */
22 1
package org.gvsig.raster.postgis.io.downloader;
23 2

  
3
import org.gvsig.fmap.dal.coverage.store.RasterDataStore;
24 4
import org.gvsig.raster.cache.tile.provider.CacheStruct;
25 5
import org.gvsig.raster.impl.provider.tile.TileDownloaderForFiles;
26
import org.gvsig.raster.postgis.io.PostGISRasterProvider;
27 6

  
28 7
/** 
29 8
 * Tile getter for postGIS raster
......
31 10
 */
32 11
public class TileDownloaderForPostGISRaster extends TileDownloaderForFiles {
33 12
	
34
	public TileDownloaderForPostGISRaster(PostGISRasterProvider prov,
13
	public TileDownloaderForPostGISRaster(RasterDataStore store,
35 14
			CacheStruct struct,
36 15
			int tilePxWidth,
37 16
			int tilePxHeight) {
38
		super(prov, struct, tilePxWidth, tilePxHeight, "tif");
17
		super(store, struct, tilePxWidth, tilePxHeight, "tif");
39 18
	}
40 19
	
41 20
}
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.io/src/main/java/org/gvsig/raster/postgis/io/downloader/PostGISRasterTileServer.java
24 24
import org.cresques.cts.IProjection;
25 25
import org.gvsig.fmap.dal.coverage.RasterLibrary;
26 26
import org.gvsig.fmap.dal.coverage.datastruct.Extent;
27
import org.gvsig.fmap.dal.coverage.store.RasterDataStore;
27 28
import org.gvsig.raster.cache.tile.TileCacheLibrary;
28 29
import org.gvsig.raster.cache.tile.TileCacheLocator;
29 30
import org.gvsig.raster.cache.tile.TileCacheManager;
......
40 41
public class PostGISRasterTileServer implements TileServer {
41 42
	private CacheStruct                struct               = null;
42 43
	private Downloader                 downloader           = null;
43
	private PostGISRasterProvider      provider             = null;
44
	private RasterDataStore            store             = null;
44 45
	private boolean                    externalStruct       = false;
45 46
	
46
	public PostGISRasterTileServer(PostGISRasterProvider prov) {
47
		this.provider = prov;
47
	public PostGISRasterTileServer(RasterDataStore store) {
48
		this.store = store;
48 49
	}
49 50
	
50 51
	public Downloader getDownloader() {
......
52 53
		boolean firstLoad = (downloader == null);
53 54
		
54 55
		if(firstLoad || externalStruct) {
55
			downloader = new TileDownloaderForFiles(provider, getStruct(), 
56
			downloader = new TileDownloaderForFiles(store, getStruct(), 
56 57
					getStruct().getTileSizeByLevel(0)[0], 
57 58
					getStruct().getTileSizeByLevel(0)[1], 
58 59
					getFileSuffix());
......
63 64
		//If the tile size has changed. 
64 65
		if(((TileDownloaderForFiles)downloader).getTileSize()[0] != TileCacheLibrary.DEFAULT_TILEWIDTH ||
65 66
		   ((TileDownloaderForFiles)downloader).getTileSize()[1] != TileCacheLibrary.DEFAULT_TILEHEIGHT) {
66
			downloader = new TileDownloaderForFiles(provider, getStruct(), 
67
			downloader = new TileDownloaderForFiles(store, getStruct(), 
67 68
					TileCacheLibrary.DEFAULT_TILEWIDTH, 
68 69
					TileCacheLibrary.DEFAULT_TILEHEIGHT, 
69 70
					getFileSuffix());
......
76 77
			TileCacheManager  manager = TileCacheLocator.getManager();
77 78
			
78 79
			int coordinates = CacheStruct.FLAT;
79
			if(provider.getProjection() != null)
80
				coordinates = (provider.getProjection() != null && provider.getProjection().isProjected()) ? CacheStruct.FLAT : CacheStruct.GEOGRAFIC;
80
			if(store.getProjection() != null)
81
				coordinates = (store.getProjection() != null && store.getProjection().isProjected()) ? CacheStruct.FLAT : CacheStruct.GEOGRAFIC;
81 82
			else {
82
				Extent e = provider.getExtent();
83
				Extent e = store.getExtent();
83 84
				if(e.getULX() >= -180 && e.getULX() <= 180 && e.getLRX() >= -180 && e.getLRX() <= 180 && 
84 85
					e.getULY() >= -90 && e.getULY() <= 90 && e.getLRY() >= -90 && e.getLRY() <= 90) {
85 86
					coordinates = CacheStruct.GEOGRAFIC;
......
87 88
			}
88 89
			
89 90
			String epsg = null;
90
			IProjection proj = provider.getProjection();
91
			IProjection proj = store.getProjection();
91 92
			if(proj != null)
92 93
				epsg = proj.getAbrev();
93 94
			
94 95
			struct = manager.createCacheStructure(coordinates, 
95 96
					TileCacheLibrary.DEFAULT_LEVELS, 
96
					provider.getExtent().toRectangle2D(), 
97
					store.getExtent().toRectangle2D(), 
97 98
					Double.POSITIVE_INFINITY,//provider.getCellSize(), 
98 99
					TileCacheLibrary.DEFAULT_TILEWIDTH, 
99 100
					TileCacheLibrary.DEFAULT_TILEWIDTH,
100
					provider.getDataParameters().getURI(),
101
					provider.getURIOfFirstProvider().replaceAll("\\.", "_"),
101
					((PostGISRasterProvider)store.getProvider()).getDataParameters().getURI(),
102
					((PostGISRasterProvider)store.getProvider()).getURIOfFirstProvider().replaceAll("\\.", "_"),
102 103
					TileCacheLibrary.DEFAULT_STRUCTURE,
103 104
					RasterLibrary.pathTileCache,
104 105
					getFileSuffix(),
......
112 113
		if(struct != null) {
113 114
			this.struct = struct;
114 115
			if(struct.getTileSizeByLevel(0) != null) {
115
				downloader = new TileDownloaderForFiles(provider, 
116
				downloader = new TileDownloaderForFiles(store, 
116 117
						struct, 
117 118
						struct.getTileSizeByLevel(0)[0], 
118 119
						struct.getTileSizeByLevel(0)[1], 
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.swing/org.gvsig.raster.postgis.swing.impl/pom.xml
7 7
	<parent>
8 8
		<groupId>org.gvsig</groupId>
9 9
		<artifactId>org.gvsig.raster.postgis.swing</artifactId>
10
		<version>2.1.0-SNAPSHOT</version>
10
		<version>2.2.0-SNAPSHOT</version>
11 11
	</parent>
12 12
	<dependencies>
13 13
		<dependency>
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.swing/org.gvsig.raster.postgis.swing.api/pom.xml
7 7
	<parent>
8 8
		<groupId>org.gvsig</groupId>
9 9
		<artifactId>org.gvsig.raster.postgis.swing</artifactId>
10
		<version>2.1.0-SNAPSHOT</version>
10
		<version>2.2.0-SNAPSHOT</version>
11 11
	</parent>
12 12
	<dependencies>
13 13
		<dependency>
org.gvsig.raster.postgis/branches/org.gvsig.raster.postgis_dataaccess_refactoring/org.gvsig.raster.postgis.swing/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.postgis</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14 14
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSProvider.java
70 70
import org.gvsig.raster.cache.tile.provider.TileServer;
71 71
import org.gvsig.raster.impl.DefaultRasterManager;
72 72
import org.gvsig.raster.impl.buffer.DefaultRasterQuery;
73
import org.gvsig.raster.impl.buffer.SpiRasterQuery;
73 74
import org.gvsig.raster.impl.datastruct.BandListImpl;
74 75
import org.gvsig.raster.impl.datastruct.DatasetBandImpl;
75 76
import org.gvsig.raster.impl.datastruct.ExtentImpl;
76
import org.gvsig.raster.impl.provider.DefaultRasterProvider;
77
import org.gvsig.raster.impl.provider.AbstractRasterProvider;
77 78
import org.gvsig.raster.impl.provider.MemoryTileMatrixBuffer;
78 79
import org.gvsig.raster.impl.provider.RasterProvider;
79 80
import org.gvsig.raster.impl.provider.RemoteRasterProvider;
......
84 85
import org.gvsig.raster.impl.store.properties.RemoteStoreHistogram;
85 86
import org.gvsig.raster.util.DefaultProviderServices;
86 87
import org.gvsig.raster.wmts.io.downloader.WMTSTileServer;
87
import org.gvsig.raster.wmts.ogc.WMTSClient;
88
import org.gvsig.raster.wmts.ogc.WMTSOGCLocator;
89
import org.gvsig.raster.wmts.ogc.WMTSStatus;
90
import org.gvsig.raster.wmts.ogc.exception.DownloadException;
91
import org.gvsig.raster.wmts.ogc.exception.ServerErrorException;
92
import org.gvsig.raster.wmts.ogc.exception.WMTSException;
93
import org.gvsig.raster.wmts.ogc.struct.WMTSBoundingBox;
94
import org.gvsig.raster.wmts.ogc.struct.WMTSLayer;
95
import org.gvsig.raster.wmts.ogc.struct.WMTSTile;
96
import org.gvsig.raster.wmts.ogc.struct.WMTSTileMatrix;
97
import org.gvsig.raster.wmts.ogc.struct.WMTSTileMatrixLimits;
98
import org.gvsig.raster.wmts.ogc.struct.WMTSTileMatrixSet;
99
import org.gvsig.raster.wmts.ogc.struct.WMTSTileMatrixSetLink;
88
import org.gvsig.remoteclient.exceptions.ServerErrorException;
89
import org.gvsig.remoteclient.wmts.WMTSClient;
90
import org.gvsig.remoteclient.wmts.WMTSStatus;
91
import org.gvsig.remoteclient.wmts.exception.DownloadException;
92
import org.gvsig.remoteclient.wmts.exception.WMTSException;
93
import org.gvsig.remoteclient.wmts.struct.WMTSBoundingBox;
94
import org.gvsig.remoteclient.wmts.struct.WMTSLayer;
95
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrix;
96
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixLimits;
97
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixSet;
98
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixSetLink;
100 99
import org.gvsig.tools.ToolsLocator;
101 100
import org.gvsig.tools.task.TaskStatus;
102 101
import org.slf4j.Logger;
......
106 105
 *
107 106
 * @author Nacho Brodin (nachobrodin@gmail.com)
108 107
 */
109
public class WMTSProvider extends DefaultRasterProvider implements RemoteRasterProvider, TiledRasterProvider {
108
public class WMTSProvider extends AbstractRasterProvider implements RemoteRasterProvider, TiledRasterProvider {
110 109
	public static String                NAME                     = "Wmts Store";
111 110
	public static String                DESCRIPTION              = "Wmts Raster file";
112 111
	public static final String          METADATA_DEFINITION_NAME = "WmtsStore";
......
755 754
		return level;
756 755
	}
757 756
	
758
	public org.gvsig.raster.cache.tile.Tile getTile(DefaultRasterQuery q) throws TileGettingException {
757
	public org.gvsig.raster.cache.tile.Tile getTile(SpiRasterQuery q) throws TileGettingException {
759 758
		//q.getResolutionLevel(), q.getTileCol(), q.getTileRow(), q.getBBox(), q.getCacheStruct()!
760 759
		
761 760
		CacheStruct str = getTileServer().getStruct();
......
805 804
		}
806 805
	}
807 806
	
807
	@Override
808
	public void loadBuffer(SpiRasterQuery q) 
809
			throws ProcessInterruptedException, RasterDriverException {
810
		
811
	}
812
	
808 813
	public void getWindow(Extent ex, int bufWidth, int bufHeight, 
809 814
			BandList bandList, TileListener listener, TaskStatus taskStatus) throws ProcessInterruptedException, RasterDriverException {
810 815
		Rectangle2D r = ex.toRectangle2D();//new Rectangle2D.Double(Math.min(minX, maxX), Math.min(minY, maxY), Math.abs(maxX - minX), Math.abs(maxY - minY));
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.io/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.wmts</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	
14 14
	<dependencies>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.swing/pom.xml
10 10
	<parent>
11 11
		<groupId>org.gvsig</groupId>
12 12
		<artifactId>org.gvsig.raster.wmts</artifactId>
13
		<version>2.1.0-SNAPSHOT</version>
13
		<version>2.2.0-SNAPSHOT</version>
14 14
	</parent>
15 15
	<dependencies>
16 16
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.swing/org.gvsig.raster.wmts.swing.api/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.wmts.swing</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14 14
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.swing/org.gvsig.raster.wmts.swing.impl/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.wmts.swing</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14 14
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.app.wmtsclient/pom.xml
10 10
	<parent>
11 11
		<groupId>org.gvsig</groupId>
12 12
		<artifactId>org.gvsig.raster.wmts</artifactId>
13
		<version>2.1.0-SNAPSHOT</version>
13
		<version>2.2.0-SNAPSHOT</version>
14 14
	</parent>
15 15
	
16 16
	<dependencies>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.ogc/org.gvsig.raster.wmts.ogc.impl/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.wmts.ogc</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14 14
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.ogc/pom.xml
10 10
	<parent>
11 11
		<groupId>org.gvsig</groupId>
12 12
		<artifactId>org.gvsig.raster.wmts</artifactId>
13
		<version>2.1.0-SNAPSHOT</version>
13
		<version>2.2.0-SNAPSHOT</version>
14 14
	</parent>
15 15
	<dependencies>
16 16
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/org.gvsig.raster.wmts.ogc/org.gvsig.raster.wmts.ogc.api/pom.xml
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.raster.wmts.ogc</artifactId>
11
		<version>2.1.0-SNAPSHOT</version>
11
		<version>2.2.0-SNAPSHOT</version>
12 12
	</parent>
13 13
	<dependencies>
14 14
		<dependency>
org.gvsig.raster.wmts/branches/org.gvsig.raster.wmts_dataaccess_refactoring/pom.xml
3 3
	<modelVersion>4.0.0</modelVersion>
4 4
	<artifactId>org.gvsig.raster.wmts</artifactId>
5 5
	<packaging>pom</packaging>
6
	<version>2.1.0-SNAPSHOT</version>
6
	<version>2.2.0-SNAPSHOT</version>
7 7
	<name>org.gvsig.raster.wmts</name>
8 8
	<description>WMTS client</description>
9 9
	<inceptionYear>2011</inceptionYear>
......
25 25
			<dependency>
26 26
				<groupId>org.gvsig</groupId>
27 27
				<artifactId>org.gvsig.raster.wmts.swing.api</artifactId>
28
				<version>2.1.0-SNAPSHOT</version>
28
				<version>2.2.0-SNAPSHOT</version>
29 29
			</dependency>
30 30
			<dependency>
31 31
				<groupId>org.gvsig</groupId>
32 32
				<artifactId>org.gvsig.raster.wmts.ogc.api</artifactId>
33
				<version>2.1.0-SNAPSHOT</version>
33
				<version>2.2.0-SNAPSHOT</version>
34 34
			</dependency>
35 35
			<dependency>
36 36
				<groupId>org.gvsig</groupId>
37 37
				<artifactId>org.gvsig.raster.wmts.ogc.impl</artifactId>
38
				<version>2.1.0-SNAPSHOT</version>
38
				<version>2.2.0-SNAPSHOT</version>
39 39
			</dependency>
40 40
			<dependency>
41 41
				<groupId>org.gvsig</groupId>
......
45 45
			<dependency>
46 46
				<groupId>org.gvsig</groupId>
47 47
				<artifactId>org.gvsig.raster.lib.api</artifactId>
48
				<version>2.1.0-SNAPSHOT</version>
48
				<version>2.2.0-SNAPSHOT</version>
49 49
			</dependency>
50 50
			<dependency>
51 51
				<groupId>org.gvsig</groupId>
52 52
				<artifactId>org.gvsig.raster.swing.api</artifactId>
53
				<version>2.1.0-SNAPSHOT</version>
53
				<version>2.2.0-SNAPSHOT</version>
54 54
			</dependency>
55 55
	        <dependency>
56 56
	            <groupId>org.gvsig</groupId>
57 57
	            <artifactId>org.gvsig.raster.lib.impl</artifactId>
58
	            <version>2.1.0-SNAPSHOT</version>
58
	            <version>2.2.0-SNAPSHOT</version>
59 59
	        </dependency>
60 60
			<dependency>
61 61
	            <groupId>org.gvsig</groupId>
62 62
	            <artifactId>org.gvsig.raster.wmts.io</artifactId>
63
	            <version>2.1.0-SNAPSHOT</version>
63
	            <version>2.2.0-SNAPSHOT</version>
64 64
	        </dependency>
65 65
			<dependency>
66 66
				<groupId>org.gvsig</groupId>
67 67
				<artifactId>org.gvsig.raster.fmap</artifactId>
68
				<version>2.1.0-SNAPSHOT</version>
68
				<version>2.2.0-SNAPSHOT</version>
69 69
			</dependency>
70 70
		</dependencies>
71 71
	</dependencyManagement>
org.gvsig.raster.tools/branches/org.gvsig.raster.tools_dataaccess_refactoring/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/multiresolution/ResolutionLevelListener.java
56 56
	private static final Logger logger  = LoggerFactory.getLogger(ResolutionLevelListener.class);
57 57
	private Image               izoomin = null;
58 58

  
59
	/*
60
	 * (non-Javadoc)
61
	 * @see org.gvsig.fmap.mapcontrol.tools.ResolutionLevelListenerImpl#point(org.gvsig.fmap.mapcontrol.tools.Events.PointEvent)
62
	 */
63 59
	@SuppressWarnings("deprecation")
64 60
	public void point(PointEvent event) throws BehaviorException {
65 61
		//Selects active window

Also available in: Unified diff