Revision 1356

View differences:

org.gvsig.raster.osm/trunk/org.gvsig.raster.osm/org.gvsig.raster.osm.app.osmclient/src/main/java/org/gvsig/raster/osm/app/osmclient/OSMClientExtension.java
23 23

  
24 24
import java.io.File;
25 25
import java.io.IOException;
26
import java.sql.ResultSet;
27

  
28 26
import javax.swing.JOptionPane;
29

  
30
import org.cresques.cts.IProjection;
31
import org.gvsig.about.AboutManager;
32
import org.gvsig.about.AboutParticipant;
33 27
import org.gvsig.andami.IconThemeHelper;
34 28
import org.gvsig.andami.plugins.Extension;
35
import org.gvsig.app.ApplicationLocator;
36
import org.gvsig.app.ApplicationManager;
37 29
import org.gvsig.app.extension.AddLayer;
38
import org.gvsig.fmap.crs.CRSFactory;
39 30
import org.gvsig.fmap.dal.DataParameters;
31
import org.gvsig.fmap.dal.DataStoreParameters;
40 32
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
33
import org.gvsig.fmap.dal.exception.InitializeException;
41 34
import org.gvsig.fmap.mapcontext.MapContextLocator;
42 35
import org.gvsig.fmap.mapcontext.MapContextManager;
43 36
import org.gvsig.fmap.mapcontext.layers.FLayer;
......
45 38
import org.gvsig.raster.osm.app.osmclient.layer.FLyrOSM;
46 39
import org.gvsig.raster.osm.io.OSMDataParameters;
47 40
import org.gvsig.tools.util.Factory;
48
import org.slf4j.Logger;
49
import org.slf4j.LoggerFactory;
50 41

  
51 42
/**
52 43
 * Extension for adding open street map support to gvSIG.
53 44
 * @author Nacho Brodin (nachobrodin@gmail.com)
54 45
 */
55 46
public class OSMClientExtension extends Extension {
56
	private Logger              log           = LoggerFactory.getLogger(OSMClientExtension.class);
47
//	private Logger              log           = LoggerFactory.getLogger(OSMClientExtension.class);
57 48
	private String              fileCheck     = System.getProperty("user.home") + File.separator + "gvSIG" + File.separator + "osm_epsg_error";
58 49
	private String              epsgCode      = "3857";
59 50
	
......
80 71

  
81 72
        @Override
82 73
        public FLayer create(Object... os) {
83
            DataParameters parameters = (DataParameters) os[0];
84
            if( parameters instanceof OSMDataParameters ) {
85
                return new FLyrOSM();
74
            try {
75
                DataStoreParameters parameters = (DataStoreParameters) os[0];
76
                if (parameters instanceof OSMDataParameters) {
77
                        FLyrOSM layer = new FLyrOSM();
78
                        layer.setParameters(parameters);
79
                        return layer;
80
                }
81
                if (parameters instanceof TileDataParameters) {
82
                    DataParameters p = ((TileDataParameters) parameters).getDataParameters();
83
                    if (p instanceof OSMDataParameters) {
84
                        FLyrOSM layer = new FLyrOSM();
85
                        layer.setParameters(parameters);
86
                        return layer;
87
                    }
88
                }
89
            } catch (InitializeException ex) {
90
                logger.warn("Can't initialize OSMLayer", ex);
86 91
            }
87
			if(parameters instanceof TileDataParameters) {
88
				DataParameters p = ((TileDataParameters) parameters).getDataParameters();
89
				if(p instanceof OSMDataParameters) {
90
					return new FLyrOSM();
91
				}
92
			}
93 92
            return null;
94
        }        
93
        }
95 94
    }
96 95
    
97 96
    
......
124 123
			String query = "SELECT usr_code FROM USR WHERE usr_code='" + epsgCode + "'";
125 124
			ResultSet result = es.idr.teledeteccion.connection.Query.select(query, conn.getConnection());
126 125

  
127
			//Si no existe en c?digo se inserta para que la proyecci?n est? disponible
126
			//Si no existe en c�digo se inserta para que la proyecci�n est� disponible
128 127

  
129 128
			if(result == null || !result.next()) { 
130 129
				String sentence = "INSERT INTO USR VALUES(" + epsgCode + ", " + wkt + ",'WGS 84 / Pseudo-Mercator','Usuario2','Popular_Visualisation_Datum')";

Also available in: Unified diff