Revision 8685

View differences:

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/pom.xml
4 4
 <parent>
5 5
  <groupId>org.gvsig</groupId>
6 6
  <artifactId>org.gvsig.desktop</artifactId>
7
  <version>2.0.215</version>
7
  <version>2.0.217</version>
8 8
 </parent>
9 9
 <artifactId>org.gvsig.raster</artifactId>
10 10
 <packaging>pom</packaging>
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.app/org.gvsig.raster.app.mainplugin/src/main/java/org/gvsig/raster/app/mainplugin/AddTestRasterLayerExtension.java
91 91
              mapContext.getLayers().add(layer);
92 92
*/
93 93
            ///////////// GoogleMaps
94

  
94
/*
95 95
            dataStore = openGoogleMaps("roadmap");
96 96
//             dataStore = openGoogleMaps("hybrid");
97 97
             String layerName = dataStore.getName();
98 98
             layer = mapContextManager.createLayer(layerName, dataStore);
99 99

  
100 100
             mapContext.getLayers().add(layer);
101

  
101
*/
102 102
             ///////////// WMS
103 103

  
104
            /*
105 104
            dataStore = openWMSCatastro();
106 105
            String layerName = dataStore.getName();
107 106
            layer = mapContextManager.createLayer(layerName, dataStore);
108 107
            mapContext.getLayers().add(layer);
109
            */
110 108

  
111 109
            ///////////// OSM
112 110

  
......
333 331
//                try {
334 332
//                    providerParams = (DataParameters) iterator.next();
335 333
//                    providerParams.setDynValue("transparency", true);
336
//                    store = (RasterStore) manager.openStore("WMSRaster", providerParams);
334
//                    store = (RasterStore) manager.openStore("WMS", providerParams);
337 335
//                    break;
338 336
//                } catch (Exception e) {
339 337
//                    continue;
......
399 397
        RasterStore store = null;
400 398
        DataParameters providerParams = null;
401 399
        try {
402
            parameters = manager.createServerExplorerParameters("WMSRasterServerExplorer");
400
            parameters = manager.createServerExplorerParameters("WMS");
403 401
            parameters.setDynValue("service", new URL("http://ovc.catastro.meh.es/Cartografia/WMS/ServidorWMS.aspx"));
402
            parameters.setDynValue("override_capabilities", false);
404 403

  
405 404
//            parameters.setDynValue("service", new URL("http://terramapas.icv.gva.es/mapa_topografico_base"));
406 405
//            parameters.setDynValue("service", new URL("http://atlas.gc.ca/cgi-bin/atlaswms_en"));
407 406
            DataServerExplorer serverExplorer =
408
                (DataServerExplorer) manager.openServerExplorer("WMSRasterServerExplorer", parameters);
407
                (DataServerExplorer) manager.openServerExplorer("WMS", parameters);
409 408

  
410

  
411

  
412 409
//            List<String> formats = serverExplorer.getFormats();
413 410

  
414 411
            @SuppressWarnings("unchecked")
415 412
            List<DataParameters> list = serverExplorer.list();
416 413
            providerParams = list.get(1);
417 414
            providerParams.setDynValue("transparency", false);
418
            store = (RasterStore) manager.openStore("WMSRaster", providerParams);
415
            providerParams.setDynValue("override_capabilities", false);
416
            store = (RasterStore) manager.openStore("WMS", providerParams);
419 417
//            for (Iterator iterator = list.iterator(); iterator.hasNext();) {
420 418
//                try {
421 419
//                    providerParams = (DataParameters) iterator.next();
422 420
//                    providerParams.setDynValue("transparency", true);
423
//                    store = (RasterStore) manager.openStore("WMSRaster", providerParams);
421
//                    store = (RasterStore) manager.openStore("WMS", providerParams);
424 422
//                    break;
425 423
//                } catch (Exception e) {
426 424
//                    continue;
......
466 464
            // Prueba para cacheado de tiles tanto en memoria como en disco
467 465
            store.useCache("TileCache", tileParameters);
468 466
            // Prueba para cacheado de tiles solo en memoria
469
            // store.useCache("MemoryTileCache", tileParameters);
467
//             store.useCache("MemoryTileCache", tileParameters);
470 468
        } catch (DataException e) {
471 469
            logger.warn("Can't cache the layer.", e);
472 470
        }
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.fmap.mapcontext.raster/org.gvsig.fmap.mapcontext.raster.impl/src/main/java/org/gvsig/fmap/mapcontext/raster/impl/DefaultRasterLayer.java
498 498
    }
499 499

  
500 500
    public String getTocImageIcon() {
501
        return "layer-icon-raster";
501
        //FIXME: Subir esto a la clase abstracta
502
        return MapContextLocator.getMapContextManager().getIconLayer(this.getDataStore());
502 503
    }
503 504

  
504 505
    @Override
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.legend/org.gvsig.raster.lib.legend.impl/pom.xml
57 57
		</dependency>
58 58
		<dependency>
59 59
		  <groupId>org.gvsig</groupId>
60
		  <artifactId>org.gvsig.raster.lib.legend.impl</artifactId>
61
		  <scope>test</scope>
62
		</dependency>
63
		<dependency>
64
		  <groupId>org.gvsig</groupId>
65 60
		  <artifactId>org.gvsig.raster.lib.legend.spi</artifactId>
66 61
      <scope>compile</scope>
67 62
		</dependency>

Also available in: Unified diff