Revision 472 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/data/DefaultLayerConverter.java

View differences:

DefaultLayerConverter.java
48 48
import org.gvsig.fmap.mapcontext.layers.FLayer;
49 49
import org.gvsig.fmap.mapcontext.layers.operations.SingleLayer;
50 50
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
51
import org.gvsig.view3d.swing.api.MapControl3D;
51 52
import org.gvsig.view3d.swing.impl.DefaultMapControl3D;
52 53
import org.slf4j.Logger;
53 54
import org.slf4j.LoggerFactory;
......
62 63
    private static final Logger LOG = LoggerFactory
63 64
        .getLogger(DefaultLayerConverter.class);
64 65

  
65
    public Layer convertToLayer(MapContext mapContext, FLayer layer)
66
    public Layer convertToLayer(MapControl3D mapControl, FLayer layer)
66 67
        throws DataException {
67 68

  
68 69
        AVList params = new AVListImpl();
69 70

  
70 71
        // Add Layer and MapContext to parameters.
71
        params.setValue(DefaultMapControl3D.GVSIG_MAPCONTEXT, mapContext);
72
        params.setValue(DefaultMapControl3D.GVSIG_MAPCONTROL3D, mapControl);
72 73
        params.setValue(DefaultMapControl3D.GVSIG_LAYER, layer);
73 74

  
74 75
        createRasterTiledImageLayerParams(layer, params);
......
80 81
        // Copy parameters to avoid problems
81 82
        AVList paramsLayer = params.copy();
82 83

  
83
        RasterTiledImageLayer rasterLayer =
84
            new RasterTiledImageLayer(doc.getDocumentElement(), paramsLayer);
84
        DefaultTiledImageLayer rasterLayer =
85
            new DefaultTiledImageLayer(doc.getDocumentElement(), paramsLayer);
85 86
        return rasterLayer;
86 87
    }
87 88

  
88
    public ElevationModel convertToElevationModel(MapContext mapContext,
89
    public ElevationModel convertToElevationModel(MapControl3D mapControl,
89 90
        FLayer layer) {
90 91
        // TODO Auto-generated method stub
91 92
        return null;
......
175 176
        params.setValue(AVKey.DISPLAY_NAME, layer.getName());
176 177
        params.setValue(AVKey.SERVICE_NAME, "Offline");
177 178

  
178
        MapContext mapContext =
179
            (MapContext) params.getValue(DefaultMapControl3D.GVSIG_MAPCONTEXT);
179
        MapControl3D mapControl3D =
180
            (MapControl3D) params.getValue(DefaultMapControl3D.GVSIG_MAPCONTROL3D);
180 181

  
181 182
        Sector sector = null;
182 183
        try {
183
            sector = getSector(layer, mapContext.getProjection());
184
            sector = getSector(layer, mapControl3D.getMapContext().getProjection());
184 185
        } catch (DataException e) {
185 186
            LOG.info("Can't create sector from layer and projection", e);
186 187
            return;
......
228 229
        params.setValue(AVKey.NETWORK_RETRIEVAL_ENABLED, false);
229 230
        params.setValue(AVKey.USE_MIP_MAPS, true);
230 231
        params.setValue(AVKey.USE_TRANSPARENT_TEXTURES, true);
231

  
232
        
232 233
    }
233 234

  
234 235
    private Sector getSector(FLayer layer, IProjection projection)

Also available in: Unified diff