Revision 8699

View differences:

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/pom.xml
194 194
  </dependencies>
195 195
 </dependencyManagement>
196 196

  
197
 <dependencies>
198
   <dependency>
199
     <groupId>org.gvsig</groupId>
200
     <artifactId>org.gvsig.wmts.provider</artifactId>
201
     <version>1.0.0-SNAPSHOT</version>
202
     <scope>runtime</scope>
203
   </dependency>
204
 </dependencies>
197 205
</project>
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
146 146

  
147 147
            ///////////// WMTS
148 148

  
149
            /*
150 149
            dataStore = openWMTSPnoa();
151 150
            String layerName = dataStore.getName();
152 151
            layer = mapContextManager.createLayer(layerName, dataStore);
153 152
            mapContext.getLayers().add(layer);
154
            */
155 153

  
156 154

  
155

  
157 156
            ///////////// WCS
158 157

  
159 158
//            for (int i = 0; i < 4; i++) {
......
310 309
        RasterStore store = null;
311 310
        DataParameters providerParams = null;
312 311
        try {
313
            parameters = manager.createServerExplorerParameters("WMTSRasterServerExplorer");
312
            parameters = manager.createServerExplorerParameters("WMTS");
314 313

  
315 314
            parameters.setDynValue("service", new URL("http://www.ign.es/wmts/pnoa-ma")); //PNOA
316 315
//            parameters.setDynValue("service", new URL("http://v2.suite.opengeo.org/geoserver/gwc/service/wmts")); //opengeo
317 316

  
318 317
            DataServerExplorer serverExplorer =
319
                (DataServerExplorer) manager.openServerExplorer("WMTSRasterServerExplorer", parameters);
318
                (DataServerExplorer) manager.openServerExplorer("WMTS", parameters);
320 319

  
321 320

  
322 321

  
......
327 326
            providerParams = list.get(0); //PNOA
328 327
//            providerParams = list.get(1); //opengeo
329 328
//            providerParams.setDynValue("transparency", false);
330
            store = (RasterStore) manager.openStore("WMTSRaster", providerParams);
329
            store = (RasterStore) manager.openStore("WMTS", providerParams);
331 330
//            for (Iterator iterator = list.iterator(); iterator.hasNext();) {
332 331
//                try {
333 332
//                    providerParams = (DataParameters) iterator.next();
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.tilecache/org.gvsig.raster.tilecache.provider/src/main/java/org/gvsig/raster/tilecache/provider/AbstractTileCacheStructImage.java
64 64
     * @return The appropriate zoom level for the pizelSize
65 65
     */
66 66
    public int getZoomLvlForPixelSize(double pixelSize) {
67
        //FIXME: Elegir el c?digo id?neo
68
        // Este trozo de c?digo selecciona un zoom superior con lo que,
69
        // al hacer la interpolaci?n se generar?n p?xeles m?s grandes
70
        // (y l?neas m?s gruesas)
67 71
        int zoom = 0;
68 72
        Map<Integer, Double> pixelSizePerZoomLevel = tileStruct.getPixelSizePerZoomLevel();
69 73

  
......
79 83
        }
80 84

  
81 85
        return zoom;
86

  
87
        // Este trozo de c?digo selecciona un zoom inferior con lo que,
88
        // al hacer la interpolaci?n se perder?n p?xeles
89
        // repercutiendo en la legibilidad de las leyendas
90
        // (y las l?neas se podr?n ver entrecortadas)
91
        /*
92
        int zoom = 0;
93
        Map<Integer, Double> pixelSizePerZoomLevel = getTileStruct().getPixelSizePerZoomLevel();
94
        for (int i : pixelSizePerZoomLevel.keySet()) {
95
            zoom = i;
96
            double levelPixelSize = pixelSizePerZoomLevel.get(zoom);
97
            if (pixelSize >= levelPixelSize) {
98
                return zoom;
99
            }
100
        }
101
        return zoom;
102
        */
82 103
    }
83 104

  
84 105
    /**

Also available in: Unified diff