/ - Diff - gvSIG data provider for OpenStreetMap (raster) - gvSIG

Revision 1366

org.gvsig.raster.osm/tags/org.gvsig.raster.osm-2.2.245/org.gvsig.raster.osm.app.osmclient/buildNumber.properties
	1	#Tue Jun 11 10:53:44 CEST 2024
	2	buildNumber=298
0	3

     public class TestProjection {
     	public static void main(String[] args) {
     		int zoom = 1;
     		double lat = -85d;
     		double lon = -180d;
     		System.out.println("http://tile.openstreetmap.org/" + getTileNumber(lat, lon, zoom) + ".png");
+    	}
     	public static String getTileNumber(final double lat, final double lon, final int zoom) {
     		int xtile = (int)Math.floor( (lon + 180) / 360 * (1<<zoom) ) ;
     		int ytile = (int)Math.floor( (1 - Math.log(Math.tan(Math.toRadians(lat)) + 1 / Math.cos(Math.toRadians(lat))) / Math.PI) / 2 * (1<<zoom) ) ;
     		return("" + zoom + "/" + xtile + "/" + ytile);
+    	}
+    }

     <html>
     	<head>
     	<style type="text/css">
     	BODY { background-image: url(logo.png); background-repeat: no-repeat; background-position: 100% 0% }
     	</style>
     	</head>
     	<body>
     		<h2>Soporte Open Street Map para gvSIG</h2>
     		<p><b>Nacho Brodin (nachobrodin@gmail.com)</b> ha incorporado el soporte para <b>OSM</b> en gvSIG</p>
     		<p>Licencia datos:</p>
     		<ul>
     			CC-BY-SA-2.0 ? Contribuidores de OpenStreetMap
     		</ul>
     	</body>
     </html>

     error_creating_the_view=Error creando una vista nueva. Pruebe creando una manualmente.
     error_creating_parameters=Error creando los par\u00e1metros
     server_not_selected=No hay un servidor seleccionado
     error_loading_epsg=Error cargando el EPSG:3785 desde el plugin de OSM.\n Comprueba que la extensi\u00f3n JCRS est\u00e1 instalada y funcionando. \n Esta proyecci\u00f3n no estar\u00e1 disponible aunque la \n carga de tiles deber\u00eda funcionar correctamente.
     dont_remind_me_anymore=No me lo recuerdes m\u00e1s
     ok=OK
     _crs_warning=La proyecci\u00f3n de la vista no es la adecuada para cargar capas de este servicio.

     error_creating_the_view=Error creating a new view
     error_creating_parameters=Error creating the parameters
     server_not_selected=There is not a server selected
     error_loading_epsg=Error loading EPSG:3785 in database from OSM plug-in.\n Checks if JCRS plug-in is installed and running. \nThis projection is not available.
     dont_remind_me_anymore=Don't remind me anymore
     ok=OK
     _crs_warning=The projection of the view is not appropriate to load layers of this service.

     #Fri Jun 30 15:01:55 CEST 2017
     Stamen_Terrain=Stamen Terrain*http\://tile.stamen.com/terrain*17*jpg
     OSM_France=OSM France*http\://a.tile.openstreetmap.fr/osmfr*18*png
     Carto_Dark_(Map_tiles_by_Carto)=Carto Dark (Map tiles by Carto)*http\://a.basemaps.cartocdn.com/dark_all/*18*png
     Hillshading=Hillshading*http\://c.tiles.wmflabs.org/hillshading/*18*png
     Open_Sea_Map=Open Sea Map*http\://tiles.openseamap.org/seamark/*18*png
     Stamen_Watercolor=Stamen Watercolor*http\://tile.stamen.com/watercolor*17*jpg
     Carto_Light_(Map_tiles_by_Carto)=Carto Light (Map tiles by Carto)*http\://a.basemaps.cartocdn.com/light_all/*18*png
     Stamen_Toner=Stamen Toner*http\://tile.stamen.com/toner*17*png
     HOT_Style=HOT Style*http\://a.tile.openstreetmap.fr/hot/*18*png
     Open_Railway_Map=Open Railway Map*http\://a.tiles.openrailwaymap.org/standard/*17*png
     Mapnik=Mapnik*http\://tile.openstreetmap.org/*18*png
     OSM_Black_&_White=OSM Black & White*http\://tiles.wmflabs.org/bw-mapnik/*18*png

     <?xml version="1.0" encoding="ISO-8859-1"?>
     <plugin-config>
     	<depends plugin-name="org.gvsig.raster.tilecache.app" />
     	<libraries library-dir="lib"/>
     	<resourceBundle name="text"/>
     	<extensions>
     		<extension class-name="org.gvsig.raster.osm.app.osmclient.OSMClientExtension"
     			description="M?dulo de OpenStreetMap."
     			active="true"
     			priority="1">
     		</extension>
     	</extensions>
     </plugin-config>

     <assembly>
       <id>gvsig-plugin-package</id>
       <formats>
         <format>zip</format>
       </formats>
       <baseDirectory>${project.artifactId}</baseDirectory>
       <includeBaseDirectory>true</includeBaseDirectory>
       <files>
         <file>
           <source>target/${project.artifactId}-${project.version}.jar</source>
           <outputDirectory>lib</outputDirectory>
         </file>
         <file>
           <source>target/package.info</source>
         </file>
       </files>
       <fileSets>
         <fileSet>
           <directory>src/main/resources-plugin</directory>
           <outputDirectory>.</outputDirectory>
         </fileSet>
       </fileSets>
       <dependencySets>
         <dependencySet>
           <useProjectArtifact>false</useProjectArtifact>
     	  <useTransitiveDependencies>false</useTransitiveDependencies>
           <outputDirectory>lib</outputDirectory>
           <includes>
     				<include>org.gvsig:org.gvsig.raster.osm.io:jar</include>
     				<include>org.gvsig:org.gvsig.raster.osm.swing.api:jar</include>
     				<include>org.gvsig:org.gvsig.raster.osm.swing.impl:jar</include>
     	  </includes>
     	</dependencySet>
       </dependencySets>
     </assembly>

     /* OSM layers for gvSIG.
      * Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2012 Nacho Brodin
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     package org.gvsig.raster.osm.app.osmclient.layer;
     import java.awt.Dimension;
     import java.awt.Graphics2D;
     import java.awt.Image;
     import java.awt.Point;
     import java.awt.geom.Point2D;
     import java.awt.image.BufferedImage;
     import java.lang.ref.WeakReference;
     import java.net.URI;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.List;
     import javax.print.attribute.PrintRequestAttributeSet;
     import org.cresques.cts.ICoordTrans;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataParameters;
     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.coverage.RasterLocator;
     import org.gvsig.fmap.dal.coverage.RasterManager;
     import org.gvsig.fmap.dal.coverage.datastruct.Extent;
     import org.gvsig.fmap.dal.coverage.datastruct.NoData;
     import org.gvsig.fmap.dal.coverage.datastruct.ViewPortData;
     import org.gvsig.fmap.dal.coverage.exception.FilePaletteException;
     import org.gvsig.fmap.dal.coverage.exception.InfoByPointException;
     import org.gvsig.fmap.dal.coverage.exception.ProcessInterruptedException;
     import org.gvsig.fmap.dal.coverage.exception.QueryException;
     import org.gvsig.fmap.dal.coverage.grid.RasterFilter;
     import org.gvsig.fmap.dal.coverage.store.RasterDataStore;
     import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters;
     import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
     import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
     import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.GeometryManager;
     import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.fmap.mapcontext.ViewPort;
     import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontext.layers.operations.IHasImageLegend;
     import org.gvsig.fmap.mapcontext.rendering.legend.ILegend;
     import org.gvsig.raster.fmap.layers.DefaultFLyrRaster;
     import org.gvsig.raster.fmap.layers.IRasterLayerActions;
     import org.gvsig.raster.fmap.layers.NotAvailableStateException;
     import org.gvsig.raster.osm.io.OSMDataParameters;
     import org.gvsig.raster.swing.RasterSwingLibrary;
     import org.gvsig.raster.util.CancelTaskImpl;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynObjectSet;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.task.SimpleTaskStatus;
     import org.gvsig.tools.task.TaskStatusManager;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * Open Street Map layer class.
      * @author Nacho Brodin (nachobrodin@gmail.com)
      */
     public class FLyrOSM extends DefaultFLyrRaster implements IHasImageLegend {
     	private static final GeometryManager geomManager               = GeometryLocator.getGeometryManager();
     	private static final Logger          logger                    = LoggerFactory.getLogger(FLyrOSM.class);
     	private List<WeakReference<Thread>>	 disableUpdateDrawVersion;
     	private boolean						 firstLoad                 = false;
     	private RasterManager                rManager                  = RasterLocator.getManager();
     	private boolean                      deleteCache               = false;
     	public static void registerPersistent() {
     		PersistenceManager manager = ToolsLocator.getPersistenceManager();
     		DynStruct definition = manager.getDefinition("FLyrOSM_Persistent");
     		if( definition == null ) {
     			if (manager.getDefinition(DefaultFLyrRaster.class) == null) {
     				DefaultFLyrRaster.registerPersistence();
+    			}
     			definition = manager.addDefinition(
     					FLyrOSM.class,
     					"FLyrOSM_Persistent",
     					"FLyrOSM Persistent Definition",
     					null,
     					null
     			);
     			definition.extend(PersistenceManager.PERSISTENCE_NAMESPACE, DefaultFLyrRaster.PERSISTENT_NAME);
+    		}
+    	}
     	public FLyrOSM() {
     		super();
     		this.updateDrawVersion();
     		try {
     			enableAwake();
     		} catch (NotAvailableStateException e) {
     			logger.error("Fallo el estado de open. Closed=" + isClosed() + " Awake=" + isAwake(), this, e);
+    		}
+    	}
     	public static DataStore createDataStore(URI host) throws InitializeException {
     		DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager();
     		RasterDataParameters params = null;
     		try {
     			params = (RasterDataParameters)dataman.createStoreParameters("OSM Raster");
     		} catch (InitializeException e) {
     			RasterSwingLibrary.messageBoxInfo("error_creating_parameters", PluginServices.getMDIManager().getActiveWindow(), e);
     		} catch (ProviderNotRegisteredException e) {
     			RasterSwingLibrary.messageBoxInfo("error_creating_parameters", PluginServices.getMDIManager().getActiveWindow(), e);
+    		}
     		params.setURI(host);
     		try {
     			return dataman.openStore(params.getDataStoreName(), params);
     		} catch (ValidateDataParametersException e) {
     			throw new InitializeException(e);
     		} catch (ProviderNotRegisteredException e) {
     			throw new InitializeException(e);
+    		}
+    	}
     	public void setDataStore(DataStore dataStore) throws LoadLayerException {
     		this.dataStore = (RasterDataStore) dataStore;
     		try {
     			enableOpen();
     		} catch (NotAvailableStateException e) {
     			logger.error("Fallo el estado de open. Closed=" + isClosed() + " Awake=" + isAwake(), this, e);
+    		}
     		setProjection(this.dataStore.getProjection());
     		//setFullExtent(this.dataStore.getExtent().toRectangle2D());
+    	}
     	@SuppressWarnings("deprecation")
     	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
     			 org.gvsig.tools.task.Cancellable cancel, double scale) throws ReadException {
     		TaskStatusManager manager = ToolsLocator.getTaskStatusManager();
     		SimpleTaskStatus taskStatus = new RasterTaskStatus("Drawing " + getName() + "...", cancel);
     		manager.add(taskStatus);
     		taskStatus.setAutoremove(true);
     		//Solo el zoom normal recalcula el nivel dependiendo de la escala. El zoom por niveles asigna
     		//?l el nivel de zoom por lo que no habr? que recalcularlo.
     		if(recalcLevel) {
     			double pixelSize = viewPort.getExtent().getWidth() / (double)viewPort.getImageWidth();
     			zoomLevel = dataStore.getNearestLevel(pixelSize);
+    		}
     		recalcLevel = true;
     		if(!firstLoad) {
     			try {
     				initFilters();
     				try {
     					if(!isOpen())
     						enableOpen();
     				} catch (NotAvailableStateException e) {
     					throw new ReadException("Fallo el estado de open. Closed=" + isClosed() + " Awake=" + isAwake(), e);
+    				}
     			} catch (FilePaletteException e) {
     				throw new ReadException(e.getMessage(), e);
+    			}
     			firstLoad = true;
+    		}
     		enableStopped();
     		if (isWithinScale(scale)) {
     			if (!viewPort.getAdjustedExtent().intersects(getFullEnvelope()))
     				return;
     			Envelope adjustedExtent = viewPort.getAdjustedEnvelope();
     			Extent ext = rManager.getDataStructFactory().createExtent(
     					adjustedExtent.getLowerCorner().getX(),
     					adjustedExtent.getUpperCorner().getY(),
     					adjustedExtent.getUpperCorner().getX(),
     					adjustedExtent.getLowerCorner().getY());
     			Dimension imgSz = viewPort.getImageSize();
     			ViewPortData vp2 = rManager.getDataStructFactory().createViewPortData(viewPort.getProjection(), ext, imgSz );
     			vp2.setMat(viewPort.getAffineTransform());
     			vp2.setDPI((int)viewPort.getDPI());
     			try {
     				OSMDataParameters par = getOSMParameters(getDataStore().getParameters());
     				par.setWidth((int)viewPort.getImageSize().getWidth());
     				par.setHeight((int)viewPort.getImageSize().getHeight());
     				getRender().drawTiledService(g, vp2, viewPort.getImageSize(), taskStatus);
     			} catch (ProcessInterruptedException e) {
     				throw new ReadException("Problems drawing this layer: " + e.getMessage(), e);
     			} catch (QueryException e) {
     				throw new ReadException("Problems drawing this layer: " + e.getMessage(), e);
     			} finally {
     				taskStatus.terminate();
+    			}
+    		}
     		disableStopped();
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#print(java.awt.Graphics2D,
     	 * 		com.iver.cit.gvsig.fmap.ViewPort,
     	 * 		com.iver.cit.gvsig.fmap.operations.Cancellable)
     	 */
     	@SuppressWarnings("deprecation")
     	public void print(Graphics2D g, ViewPort viewPort,  org.gvsig.tools.task.Cancellable cancel,
     			double scale, PrintRequestAttributeSet properties) throws ReadException {
+    	}
     	@SuppressWarnings("deprecation")
     	public void _print(Graphics2D g, ViewPort viewPort,  org.gvsig.tools.task.Cancellable cancel,
     			double scale) throws ReadException {
     		draw(null, g, viewPort, cancel,scale);
+    	}
     	public HashMap<String, Object> getProperties() {
     		HashMap<String, Object> info = new HashMap<String, Object>();
     		OSMDataParameters par = getOSMParameters(getDataStore().getParameters());
     		String layerName = getName();
     		try {
     			info.put("selectedLayer", layerName);
     			info.put("host", par.getURI());
     			info.put("srs", dataStore.getProjection().getAbrev());
     			return info;
     		} catch (Exception e) {
     			e.printStackTrace();
+    		}
     		return null;
+    	}
     	public String getTocImageIcon() {
     		return "icon-layer-osm";
+    	}
     	public boolean isActionEnabled(int action) {
     		switch (action) {
     		case IRasterLayerActions.ZOOM_PIXEL_RESOLUTION:
     		case IRasterLayerActions.FLYRASTER_BAR_TOOLS:
     		case IRasterLayerActions.BANDS_FILE_LIST:
     		case IRasterLayerActions.GEOLOCATION:
     		case IRasterLayerActions.PANSHARPENING:
     		case IRasterLayerActions.SAVE_COLORINTERP:
     		case IRasterLayerActions.SAVEAS:
     		case IRasterLayerActions.BANDS_RGB:
     		case IRasterLayerActions.CLIPPING:
     		case IRasterLayerActions.ENHANCED:
     		case IRasterLayerActions.STATS:
     		case IRasterLayerActions.NODATA:
     		case IRasterLayerActions.HISTOGRAM:
     			return false;
     		case IRasterLayerActions.COLOR_TABLE:
     		case IRasterLayerActions.REMOTE_ACTIONS:
     			return true;
+    		}
     		return super.isActionEnabled(action);
+    	}
     	public ILegend getLegend() {
     		return null;
+    	}
     	public boolean isRemote() {
     		return true;
+    	}
     	public boolean overviewsSupport() {
     		return false;
+    	}
     	protected void updateDrawVersion() {
     		if (this.disableUpdateDrawVersion != null){
     			Thread curThread = Thread.currentThread();
     			Thread aThread;
     			Iterator<WeakReference<Thread>> iter = this.disableUpdateDrawVersion.iterator();
     			while (iter.hasNext()){
     				aThread = (Thread) ((WeakReference<?>)iter.next()).get();
     				if (aThread == null){
     					iter.remove();
     				} else if(aThread.equals(curThread)){
     					return;
+    				}
+    			}
+    		}
     		super.updateDrawVersion();
+    	}
     	protected void disableUpdateDrawVersion() {
     		if (this.disableUpdateDrawVersion == null) {
     			this.disableUpdateDrawVersion = new ArrayList<WeakReference<Thread>>();
+    		}
     		this.disableUpdateDrawVersion.add(new WeakReference<Thread>(Thread.currentThread()));
+    	}
     	protected void enableUpdateDrawVersion() {
     		if (this.disableUpdateDrawVersion == null) {
     			return;
+    		}
     		Thread curThread = Thread.currentThread();
     		Thread aThread;
     		Iterator<WeakReference<Thread>> iter = this.disableUpdateDrawVersion.iterator();
     		while (iter.hasNext()) {
     			aThread = (Thread) ((WeakReference<?>)iter.next()).get();
     			if (aThread == null) {
     				iter.remove();
     			} else if(aThread.equals(curThread)) {
     				iter.remove();
     				break;
+    			}
+    		}
+    	}
     	/*private Rectangle2D.Double getRectable2DFromEnvelope(Envelope env) {
     		return new Rectangle2D.Double(env.getMinimum(0), env.getMinimum(1), env
     				.getLength(0), env.getLength(1));
+    	}
     	private Envelope getEnvelopeFromRectable2D(Rectangle2D rect) {
     		try {
     			return geomManager.createEnvelope(rect.getMinX(), rect.getMinY(),
     					rect.getMaxX(), rect.getMaxY(),
     					SUBTYPES.GEOM2D);
     		} catch (CreateEnvelopeException e) {
     			logger.error("Error creating the envelope", e);
+    		}
     		return null;
     	}*/
     	@Override
     	public String getFileFormat() {
     		return "OSM";
+    	}
     	/**
     	 * Devuelve el envelope en la proyeccion de la vista
     	 */
     	public Envelope getFullEnvelope() {
     		Extent e1 = getDataStore().getExtent();
     		Envelope rAux = null;
     		try {
     			rAux = geomManager.createEnvelope(e1.getMin().getX(), e1.getMin().getY(), e1.getMax().getX(), e1.getMax().getY(), SUBTYPES.GEOM2D);
     		} catch (CreateEnvelopeException exc) {
     			logger.error("Error creating the envelope", exc);
+    		}
     		// Esto es para cuando se crea una capa nueva con el fullExtent de ancho
     		// y alto 0.
     		if (rAux == null || rAux.getMaximum(0) - rAux.getMinimum(0) == 0
     				&& rAux.getMaximum(1) - rAux.getMinimum(1) == 0) {
     			try {
     				rAux = geomManager.createEnvelope(0, 0, 100, 100, SUBTYPES.GEOM2D);
     			} catch (CreateEnvelopeException e) {
     				logger.error("Error creating the envelope", e);
+    			}
+    		}
     		// Si existe reproyecci?n, reproyectar el extent
     		ICoordTrans ct = getCoordTrans();
     		if (ct != null) {
     			Point2D pt1 = new Point2D.Double(rAux.getMinimum(0), rAux
     					.getMinimum(1));
     			Point2D pt2 = new Point2D.Double(rAux.getMaximum(0), rAux
     					.getMaximum(1));
     			pt1 = ct.convert(pt1, null);
     			pt2 = ct.convert(pt2, null);
     			try {
     				rAux = geomManager.createEnvelope(pt1.getX(), pt1.getY(), pt2
     						.getX(), pt2.getY(), SUBTYPES.GEOM2D);
     			} catch (CreateEnvelopeException e) {
     				logger.error("Error creating the envelope", e);
     			}// new
     			// Rectangle2D.Double();
+    		}
     		return rAux;
+    	}
     	public Extent getFullRasterExtent() {
     		Envelope env = getFullEnvelope();
     		double minx = env.getMinimum(0);
     		double miny = env.getMinimum(1);
     		double maxx = env.getMaximum(0);
     		double maxy = env.getMaximum(1);
     		Point2D ul = new Point2D.Double(minx, maxy);
     		Point2D ur = new Point2D.Double(maxx, maxy);
     		Point2D ll = new Point2D.Double(minx, miny);
     		Point2D lr = new Point2D.Double(maxx, miny);
     		return rManager.getDataStructFactory().createExtent(ul, lr, ur, ll);
+    	}
         @SuppressWarnings("deprecation")
     	public DynObjectSet getInfo(Point p, double tolerance, org.gvsig.tools.task.Cancellable cancel)
     		throws LoadLayerException, DataException {
     		return null;
+    	}
         @SuppressWarnings("deprecation")
     	public DynObjectSet getInfo(Point p, double tolerance, org.gvsig.tools.task.Cancellable cancel, boolean fast)
         throws LoadLayerException, DataException {
         	Point2D pReal = getMapContext().getViewPort().toMapPoint(p);
         	@SuppressWarnings("unused")
     		String fInfo = null;
         	try {
         		fInfo = getDataStore().getInfoByPoint(pReal.getX(), pReal.getY(), new CancelTaskImpl(cancel));
         	} catch (InfoByPointException e) {
         		throw new LoadLayerException("Error in getInfoByPoint", e);
+        	}
         	return null;
         	//return new DynObjectSetWMTSInfo(fInfo, type);
+        }
         /**
          * Sets the data store parameters
          * @param params
          * @throws InitializeException
          */
         public void setParameters(DataStoreParameters params) throws InitializeException {
     		if(params instanceof TileDataParameters) {
     			((TileDataParameters)params).deleteCache(deleteCache);
+    		}
         	DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager();
     		try {
     			DataStore dStore = dataman.openStore(params.getDataStoreName(), params);
     			this.setDataStore(dStore);
     			if(params instanceof OSMDataParameters) {
     				this.setName(((OSMDataParameters) params).getURI().getPath());
+    			}
     			if(params instanceof TileDataParameters) {
     				DataParameters p = ((TileDataParameters) params).getDataParameters();
     				if(p instanceof OSMDataParameters) {
     					this.setName(((OSMDataParameters) p).getURI().getPath());
+    				}
+    			}
     		} catch (ValidateDataParametersException e) {
     			throw new InitializeException(e);
     		} catch (ProviderNotRegisteredException e) {
     			throw new InitializeException(e);
     		} catch (InitializeException e) {
     			throw new InitializeException(e);
     		} catch (LoadLayerException e) {
     			throw new InitializeException(e);
+    		}
+        }
         /**
          * Gets <code>WMTSDataParameters</code>
          * @param parameters
          * @return
          */
         private OSMDataParameters getOSMParameters(DataStoreParameters parameters) {
         	OSMDataParameters params = null;
         	if(parameters instanceof OSMDataParameters) {
     			params = (OSMDataParameters) parameters;
+    		}
     		if(parameters instanceof TileDataParameters) {
     			DataParameters p = ((TileDataParameters) parameters).getDataParameters();
     			if(p instanceof OSMDataParameters) {
     				params = (OSMDataParameters) p;
+    			}
+    		}
     		return params;
+        }
     	public Image getImageLegend() {
     		return null;
+    	}
     	public String getPathImage() {
     		return null;
+    	}
     	public FLayer cloneLayer() throws Exception {
     		RasterDataStore  ds = dataStore.cloneDataStore();
     		FLyrOSM newLayer = new FLyrOSM();
     		newLayer.setName(getName());
     		newLayer.setOpenRasterStore(ds);
     		newLayer.firstLoad = firstLoad;
     		List<RasterFilter> filters = getRender().getFilterList().getStatusCloned();
     		//Hacemos una copia de las bandas a renderizar
     		ColorInterpretation ci = getRender().getRenderColorInterpretation();
     		if(ci != null) {
     			newLayer.getRender().setRenderColorInterpretation(ci.cloneColorInterpretation());
+    		}
     		//Asignamos el entorno
     		if(newLayer.getRender().getFilterList() == null)
     			newLayer.getRender().setFilterList(RasterLocator.getManager().createEmptyFilterList(getRender().getFilterList().getInitDataType()));
     		newLayer.getRender().getFilterList().setEnv(getRender().getFilterList().getEnv());
     		newLayer.getRender().getFilterList().setStatus(filters);
     		// Asignamos los valores noData del original
     		NoData nd = (NoData)getNoDataValue().clone();
     		newLayer.setNoDataValue(nd);
     		newLayer.enableOpen();
     		return newLayer;
+    	}
     	/**
     	 * Assigns the flag to delete this layer from the cache
     	 * @param selected
     	 */
     	public void deleteCache(boolean deleteCache) {
     		this.deleteCache = deleteCache;
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     package org.gvsig.raster.osm.app.osmclient;
     import java.awt.Component;
     import java.awt.GridBagConstraints;
     import java.awt.GridBagLayout;
     import java.awt.Insets;
     import java.awt.event.MouseEvent;
     import java.awt.event.MouseListener;
     import java.beans.PropertyVetoException;
     import java.io.File;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.net.MalformedURLException;
     import java.net.URISyntaxException;
     import java.net.URL;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import org.cresques.cts.IProjection;
     import org.gvsig.andami.Launcher;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.PluginsLocator;
     import org.gvsig.andami.ui.mdiManager.IWindow;
     import org.gvsig.app.ApplicationLocator;
     import org.gvsig.app.ApplicationManager;
     import org.gvsig.app.gui.WizardPanel;
     import org.gvsig.app.gui.wizards.WizardListener;
     import org.gvsig.app.gui.wizards.WizardListenerSupport;
     import org.gvsig.app.project.ProjectManager;
     import org.gvsig.app.project.documents.view.ViewDocument;
     import org.gvsig.app.project.documents.view.ViewManager;
     import org.gvsig.app.project.documents.view.gui.AbstractViewPanel;
     import org.gvsig.app.project.documents.view.gui.IView;
     import org.gvsig.fmap.crs.CRSFactory;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataParameters;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.coverage.RasterLocator;
     import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
     import org.gvsig.fmap.dal.coverage.util.FileUtils;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
     import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
     import org.gvsig.fmap.mapcontext.MapContext;
     import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
     import org.gvsig.raster.osm.app.osmclient.layer.FLyrOSM;
     import org.gvsig.raster.osm.io.OSMDataParameters;
     import org.gvsig.raster.osm.io.OSMProvider;
     import org.gvsig.raster.osm.swing.AddOSMLayerPanel;
     import org.gvsig.raster.osm.swing.OSMSwingLocator;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * Wizard panel to add a new OSM raster layer
      * @author Nacho Brodin (nachobrodin@gmail.com)
      */
     public class AddOSMLayerWizard extends WizardPanel implements MouseListener {
     	private static final long           serialVersionUID      = 1L;
     	private static final String         TAB_NAME              = "OSM";
     	private static Logger               logger                = LoggerFactory.getLogger(AddOSMLayerWizard.class.getName());
     	private AddOSMLayerPanel            apiUI                 = null;
     	private WizardListenerSupport       listenerSupport       = null;
     	public AddOSMLayerWizard() {
     		super();
+    	}
     	/**
     	 * This method initializes this
+    	 *
     	 * @return void
     	 */
     	private void initialize() {
     		setTabName(PluginServices.getText(this, TAB_NAME));
     		setLayout(new GridBagLayout());
     		GridBagConstraints gridBagConstraints = new GridBagConstraints();
     		gridBagConstraints.fill = GridBagConstraints.BOTH;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.weighty = 1.0;
     		gridBagConstraints.insets = new Insets(6, 6, 6, 6);
     		boolean showCrsWarning = false;
     		IProjection osmProjection = CRSFactory.getCRS("EPSG:3857");
             if(getMapCtrl()!=null && !(getMapCtrl().getProjection().equals(osmProjection))){
                 showCrsWarning = true;
+            }
     		apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()),showCrsWarning);
     		//Copying osmservers.properties
     		if(!new File(apiUI.getPropertiesFilePath()).exists()) {
     			File pluginFolder = PluginsLocator.getManager().getPluginsFolder();
     			File f = new File(pluginFolder.getAbsolutePath() +
     							File.separator +
     							"org.gvsig.raster.osm.app.osmclient" +
     							File.separator +
     							apiUI.getPropertiesFileName());
     			FileUtils utils = RasterLocator.getManager().getFileUtils();
     			try {
     				utils.copyFile(f.getAbsolutePath(), Launcher.getAppHomeDir() + File.separator);
     				apiUI = OSMSwingLocator.getSwingManager().createAddOSMLayerPanel(new File(Launcher.getAppHomeDir()),showCrsWarning);
     			} catch (FileNotFoundException e) {
     				logger.info("File not found copying osmservers.properties", e);
     			} catch (IOException e) {
     				logger.info("Error copying osmservers.properties", e);
+    			}
+    		}
     		apiUI.addMouseListener(this);
     		JPanel mainPanel = (JPanel)apiUI.getComponent();
     		add(mainPanel, gridBagConstraints);
+    	}
     	private WizardListenerSupport getWizardListenerSupport() {
     		if(listenerSupport == null)
     			listenerSupport = new WizardListenerSupport();
     		return listenerSupport;
+    	}
     	/**
     	 * This method checks for the options selected within the configuration
     	 * dialog are correct.
+    	 *
     	 * @return true if you're done, false if not.
     	 */
     	public boolean areSettingsValid() {
     		return apiUI.areSettingsValid();
+    	}
     	public void addWizardListener(WizardListener listener) {
     		getWizardListenerSupport().addWizardListener(listener);
     		getWizardListenerSupport().callStateChanged(false);
+    	}
     	public void removeWizardListener(WizardListener listener) {
     		getWizardListenerSupport().removeWizardListener(listener);
+    	}
     	@Override
     	public void close() {
+    	}
     	@Override
     	public void execute() {
     		if(!apiUI.areSettingsValid()) {
     			messageBoxInfo("server_not_selected", PluginServices.getMDIManager().getActiveWindow(), null);
     			return;
+    		}
     		try {
     			TileDataParameters tileParams = createDataParameters();
     			//Getting the MapContext
     			MapContext mapContext = getMapContext();
     			if(mapContext == null) {
     				mapContext = createViewWindow();
+    			}
     			//Adding the layer
     			FLyrOSM layer = buildLayer(tileParams);
     			addLayerToMapContext(mapContext, layer);
     		} catch (InitializeException e) {
     			messageBoxInfo("error_creating_parameters", PluginServices.getMDIManager().getActiveWindow(), e);
     		} catch (ProviderNotRegisteredException e) {
     			messageBoxInfo("error_creating_parameters", PluginServices.getMDIManager().getActiveWindow(), e);
     		} catch (LoadLayerException e) {
     			messageBoxInfo("error_creating_the_view", PluginServices.getMDIManager().getActiveWindow(), e);
+    		}
+    	}
     	/**
     	 * Create the parameters to the provider
     	 * @return
     	 * @throws InitializeException
     	 * @throws ProviderNotRegisteredException
     	 */
     	private TileDataParameters createDataParameters() throws InitializeException, ProviderNotRegisteredException {
     		DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager();
     		OSMDataParameters parameters = (OSMDataParameters)dataman.createStoreParameters(OSMProvider.NAME);
     		URL selectedURL = null;
     		try {
     		    selectedURL = apiUI.getSelectedURL();
     		} catch (MalformedURLException e) {
     		    throw new InitializeException(e);
+    		}
     		try {
     		    parameters.setURI(selectedURL.toURI());
             } catch (URISyntaxException e1) {
                 logger.warn("Can't convert URI from "+selectedURL.toString(), e1);
                 throw new InitializeException(e1);
+            }
     		parameters.setTileSuffix(apiUI.getSelectedFormat());
     		parameters.setOSMLayerName(apiUI.getSelectedName());
     		try {
     			parameters.setNumberOfLevels(new Integer(apiUI.getSelectedLevel()));
     		} catch (NumberFormatException e) {
+    		}
     		TileDataParameters tileParams = (TileDataParameters) dataman.createStoreParameters("Tile Store");
     		tileParams.setDataParameters((DataParameters)parameters);
     		return tileParams;
+    	}
     	/**
     	 * Adds the layer to the MapContext selected
     	 * @param mapContext
     	 * @param layer
     	 */
     	private void addLayerToMapContext(MapContext mapContext, FLyrOSM layer) {
     		mapContext.beginAtomicEvent();
     		layer.setVisible(true);
     		mapContext.getLayers().addLayer(layer);
     		mapContext.callLegendChanged();
     		mapContext.endAtomicEvent();
+    	}
     	/**
     	 * Builds the OSM layer
     	 * @param tileParams
     	 * @return
     	 */
     	private FLyrOSM buildLayer(TileDataParameters tileParams) {
     		FLyrOSM layer = new FLyrOSM();
     		layer.deleteCache(false);  //Esto es parametrizable
     		try {
     			layer.setParameters(tileParams);
     			layer.setName(apiUI.getSelectedName());
     		} catch (InitializeException e) {
     			messageBoxInfo("error_initializing_layer", PluginServices.getMDIManager().getActiveWindow(), e);
+    		}
     		return layer;
+    	}
     	/**
     	 * Gets the active view or the first view opened if there is not
     	 * any with the focus
     	 * @return
     	 */
     	public MapContext getMapContext() {
     		IWindow window = PluginServices.getMDIManager().getFocusWindow();
     		if(window instanceof AbstractViewPanel) {
     			return ((AbstractViewPanel)window).getMapControl().getMapContext();
+    		}
     		IWindow[] w = PluginServices.getMDIManager().getAllWindows();
     		for (int i = 0; i < w.length; i++) {
     			if (w[i] instanceof org.gvsig.app.project.documents.view.gui.AbstractViewPanel) {
     				return ((AbstractViewPanel)w[i]).getMapControl().getMapContext();
+    			}
+    		}
     		return null;
+    	}
     	private void messageBoxInfo(String msg, Object parentWindow, Exception exception) {
     		LoggerFactory.getLogger(getClass()).debug(msg, exception);
     		String string = PluginServices.getText(parentWindow, "accept");
     		Object[] options = {string};
     		JOptionPane.showOptionDialog((Component)/*PluginServices.getMainFrame()*/parentWindow,
     					"<html>" + PluginServices.getText(parentWindow, msg).replaceAll("\n", "<br>") + "</html>",
     					PluginServices.getText(parentWindow, "confirmacion"),
     					JOptionPane.OK_OPTION,
     					JOptionPane.INFORMATION_MESSAGE,
     					null,
     					options,
     					string);
+    	}
     	/**
          * Create the view in the project. Add the blocks layer
          * to the view, and register the tool for get info of the
          * blocks.
          */
         @SuppressWarnings("deprecation")
     	private MapContext createViewWindow() throws LoadLayerException {
         	ApplicationManager application = ApplicationLocator.getManager();
         	ProjectManager projectManager = application.getProjectManager();
         	// 1. Create a new view and set the name.
         	ViewManager viewManager = (ViewManager) projectManager.getDocumentManagers(ViewManager.TYPENAME);
         	ViewDocument view = (ViewDocument) viewManager.createDocument();
         	view.setName("OpenStreetMap View");
         	// 4. Add the view to the current project.
         	projectManager.getCurrentProject().add(view);
         	// 5. Force to show the view's window.
         	IView viewWindow = (IView) viewManager.getMainWindow(view);
         	application.getUIManager().addWindow(viewWindow, GridBagConstraints.CENTER);
         	try {
     			application.getUIManager().setMaximum((IWindow) viewWindow, true);
     		} catch (PropertyVetoException e) {
+    		}
     		if(viewWindow != null) {
     			IProjection proj = CRSFactory.getCRS("EPSG:3857");
     			if(proj != null)
     				viewWindow.getMapControl().setProjection(proj);
     			return viewWindow.getMapControl().getMapContext();
+    		}
     		return null;
+        }
     	@Override
     	public DataStoreParameters[] getParameters() {
     		return null;
+    	}
     	@Override
     	public void initWizard() {
     	    initialize();
+    	}
     	public void mouseClicked(MouseEvent e) {
+    	}
     	public void mouseEntered(MouseEvent e) {
+    	}
     	public void mouseExited(MouseEvent e) {
+    	}
     	public void mousePressed(MouseEvent e) {
     		getWizardListenerSupport().callStateChanged(true);
+    	}
     	public void mouseReleased(MouseEvent e) {
+    	}
+    }

     /* OSM layers for gvSIG.
      * Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2012 Nacho Brodin
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     package org.gvsig.raster.osm.app.osmclient;
     /**
      * Fixed parameters for a Open Street Map server. These parameters
      * are known for each server added.
+     *
      * @author Nacho Brodin (nachobrodin@gmail.com)
      */
     public class OSMServer {
     	private String serverURL  = null;
     	private int    levels     = 0;
     	private String name       = null;
     	private String suffix     = null;
     	/**
     	 * Constructor
     	 * @param server
     	 * 			The server URL
     	 * @param levels
     	 * 			The number of resolution levels
     	 * @param name
     	 * 			Layer's name
     	 * @param suffix
     	 * 			The suffix of the image file.
+    	 *
     	 */
     	public OSMServer(String server, int levels, String name, String suffix) {
     		this.serverURL = server;
     		this.levels = levels;
     		this.name = name;
     		this.suffix = suffix;
+    	}
     	/**
     	 * Gets the server URL
     	 * @return
     	 */
     	public String getServerURL() {
     		return serverURL;
+    	}
     	/**
     	 * Gets the number of resolution levels
     	 * @return
     	 */
     	public int getLevels() {
     		return levels;
+    	}
     	/**
     	 * Gets the layer's name
     	 * @return
     	 */
     	public String getName() {
     		return name;
+    	}
     	/**
     	 * Gets the suffix of the image file.
     	 * This suffix depends on the kind of the image (tif, png, jpg,...)
     	 * @return
     	 */
     	public String getSuffix() {
     		return suffix;
+    	}
     	public String toString() {
     		return name;
+    	}
+    }

     /* OSM layers for gvSIG.
      * Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2012 Nacho Brodin
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     package org.gvsig.raster.osm.app.osmclient;
     import java.io.File;
     import java.io.IOException;
     import javax.swing.JOptionPane;
     import org.gvsig.andami.IconThemeHelper;
     import org.gvsig.andami.plugins.Extension;
     import org.gvsig.app.extension.AddLayer;
     import org.gvsig.fmap.dal.DataParameters;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.mapcontext.MapContextLocator;
     import org.gvsig.fmap.mapcontext.MapContextManager;
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.i18n.Messages;
     import org.gvsig.raster.osm.app.osmclient.layer.FLyrOSM;
     import org.gvsig.raster.osm.io.OSMDataParameters;
     import org.gvsig.tools.util.Factory;
     /**
      * Extension for adding open street map support to gvSIG.
      * @author Nacho Brodin (nachobrodin@gmail.com)
      */
     public class OSMClientExtension extends Extension {
     //	private Logger              log           = LoggerFactory.getLogger(OSMClientExtension.class);
     	private String              fileCheck     = System.getProperty("user.home") + File.separator + "gvSIG" + File.separator + "osm_epsg_error";
     	private String              epsgCode      = "3857";
     	public void initialize() {
     		/*
     		 	#Thu May 23 15:49:23 CEST 2013
     			Map_Quest=Map Quest*http\://oatile1.mqcdn.com/tiles/1.0.0/map*20*png
     			Stamen=Stamen*http\://a.tile.stamen.com/terrain*17*jpg
     			Open_Cycle_Map=Open Cycle Map*http\://tile.opencyclemap.org/cycle/*16*png
     			Stamen_Toner=Stamen Toner*http\://tile.stamen.com/toner*17*jpg
     			Map_Quest_Open_Aerial=Map Quest Open Aerial*http\://otile1.mqcdn.com/tiles/1.0.0/sat*20*jpg
     			Mapnik=Mapnik*http\://tile.openstreetmap.org/*18*png
     			Stamen_Water_Color=Stamen Water Color*http\://tile.stamen.com/watercolor*17*jpg
     		 */
     		IconThemeHelper.registerIcon(null, "icon-layer-osm", this);
+    	}
         private static class OSMLayerFactory implements Factory<FLayer> {
             @Override
             public String getName() {
                 return FLyrOSM.class.getName();
+            }
             @Override
             public FLayer create(Object... os) {
                 try {
                     DataStoreParameters parameters = (DataStoreParameters) os[0];
                     if (parameters instanceof OSMDataParameters) {
                             FLyrOSM layer = new FLyrOSM();
                             layer.setParameters(parameters);
                             return layer;
+                    }
                     if (parameters instanceof TileDataParameters) {
                         DataParameters p = ((TileDataParameters) parameters).getDataParameters();
                         if (p instanceof OSMDataParameters) {
                             FLyrOSM layer = new FLyrOSM();
                             layer.setParameters(parameters);
                             return layer;
+                        }
+                    }
                 } catch (InitializeException ex) {
                     logger.warn("Can't initialize OSMLayer", ex);
+                }
                 return null;
+            }
+        }
     	public void postInitialize() {
     		FLyrOSM.registerPersistent();
     //		addAboutInfo();
             MapContextManager mapContextManager = MapContextLocator.getMapContextManager();
             mapContextManager.registerLayer(new OSMLayerFactory());
     		AddLayer.addWizard(AddOSMLayerWizard.class);
     		// loadEpsgCodeInJCRSUserDatabase();
+    	}
     	/*
     	private void loadEpsgCodeInJCRSUserDatabase() {
     		IProjection proj = null;
     		try {
     			proj = CRSFactory.getCRS("EPSG:" + epsgCode);
     		} catch(Exception e) {
+    		}
     		if(proj != null)
     			return;
     		String wkt = "'PROJCS[\"WGS 84 / Pseudo-Mercator\",GEOGCS[\"Popular Visualisation CRS\",DATUM[\"D_Popular_Visualisation_Datum\",SPHEROID[\"Popular_Visualisation_Sphere\",6378137,0]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]],PROJECTION[\"Mercator\"],PARAMETER[\"central_meridian\",0],PARAMETER[\"scale_factor\",1],PARAMETER[\"false_easting\",0],PARAMETER[\"false_northing\",0],UNIT[\"Meter\",1]]'";
     		try {
     			es.idr.teledeteccion.connection.EpsgConnection conn = new es.idr.teledeteccion.connection.EpsgConnection();
     			conn.setConnectionUsr();
     			String query = "SELECT usr_code FROM USR WHERE usr_code='" + epsgCode + "'";
     			ResultSet result = es.idr.teledeteccion.connection.Query.select(query, conn.getConnection());
     			//Si no existe en c�digo se inserta para que la proyecci�n est� disponible
     			if(result == null || !result.next()) {
     				String sentence = "INSERT INTO USR VALUES(" + epsgCode + ", " + wkt + ",'WGS 84 / Pseudo-Mercator','Usuario2','Popular_Visualisation_Datum')";
     				conn.update(sentence);
     				conn.shutdown();
+    			}
     		} catch (Throwable e) {
     			File f = new File(fileCheck);
     			if(!f.exists())
     				messageErrorEpsg("error_loading_epsg", f);
     			log.info("Error accediendo a JCRS", e);
     			return;
+    		}
+    	}
     	*/
     	public void messageErrorEpsg(String msg, File f) {
     		String string1 = Messages.getText("dont_remind_me_anymore");
     		String string2 = Messages.getText("ok");
     		Object[] options = {string1, string2};
     		int n = JOptionPane.showOptionDialog(null,
     					"<html>" + Messages.getText(msg).replaceAll("\n", "<br>") + "</html>",
     					Messages.getText("confirmacion"),
     					JOptionPane.YES_NO_OPTION,
     					JOptionPane.QUESTION_MESSAGE,
     					null,
     					options,
     					string1);
     		if (n == 0) {
     			try {
     				f.createNewFile();
     			} catch (IOException e) {
+    			}
+    		}
+    	}
     	public void execute(String actionCommand) {
+    	}
     	public boolean isEnabled() {
     		return true;
+    	}
     	public boolean isVisible() {
     		return true;
+    	}
     //	private void addAboutInfo() {
     //        ApplicationManager application = ApplicationLocator.getManager();
     //
     //        AboutManager about = application.getAbout();
     //        about.addDeveloper("Nacho Brodin", getClass().getClassLoader()
     //            .getResource("about/osm-about.html"), 2);
     //
     //        AboutParticipant participant = about.getDeveloper("Nacho Brodin");
     //        participant.addContribution(
     //            "OSM",
     //            "Open Street Map client for gvSIG",
     //            2012,1,1,
     //            2012,1,15
     //        );
     //    }
+    }

     <?xml version="1.0" encoding="ISO-8859-1"?>
     <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     	<modelVersion>4.0.0</modelVersion>
     	<artifactId>org.gvsig.raster.osm.app.osmclient</artifactId>
     	<packaging>jar</packaging>
             <name>${artifactId}</name>
     	<description>Access for OpenStreetMap raster tiles in gvSIG 2.1</description>
     	<parent>
     		<groupId>org.gvsig</groupId>
     		<artifactId>org.gvsig.raster.osm</artifactId>
     		<version>2.2.245</version>
     	</parent>
     	<dependencies>
         <dependency>
     			<groupId>org.gvsig</groupId>
     			<artifactId>org.gvsig.raster.app.common</artifactId>
     			<scope>compile</scope>
     		</dependency>
         <dependency>
           <groupId>org.gvsig</groupId>
           <artifactId>org.gvsig.raster.lib.api</artifactId>
           <scope>compile</scope>
         </dependency>
     		 <dependency>
             <groupId>org.gvsig</groupId>
             <artifactId>org.gvsig.ui</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.gvsig</groupId>
             <artifactId>org.gvsig.raster.osm.swing.api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.gvsig</groupId>
             <artifactId>org.gvsig.raster.osm.swing.impl</artifactId>
             <scope>runtime</scope>
         </dependency>
     		<dependency>
             <groupId>org.gvsig</groupId>

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff