Revision 736

View differences:

2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/data/GvSIGLayerDataRaster.java
157 157

  
158 158
        Extent canvasExtent = getExtent(canvas.getSector());
159 159

  
160
        FLyrRaster rasterLayer = (FLyrRaster) this.layer;
161
        RasterDataStore dataStore = rasterLayer.getDataStore();
162
        
160 163
        // Create query. Configure to get the zone request by canvas scaled to
161 164
        // tile size.
162 165
        RasterQuery query = RasterLocator.getManager().createQuery();
......
164 167
        query.setDrawableBands(new int[] { 0 });
165 168
        query.setReadOnly(true);
166 169
        query.storeLastBuffer(true);
167
        query.setAreaOfInterest(canvasExtent, canvas.getWidth(),
168
            canvas.getHeight());
169

  
170
        
170 171
        Buffer adjustedBuffer = null;
171
        FLyrRaster rasterLayer = (FLyrRaster) this.layer;
172
        RasterDataStore dataStore = rasterLayer.getDataStore();
172
        if(rasterLayer.getCoordTrans() != null){
173
            query.setAreaOfInterest(
174
                canvasExtent.convert(rasterLayer.getCoordTrans().getInverted()),
175
                canvas.getWidth(), canvas.getHeight());
176
        } else {
177
            ICoordTrans ct = CRSFactory.getCRS("EPSG:4326").getCT(rasterLayer.getProjection());
178
            if(ct != null) {
179
                canvasExtent = canvasExtent.convert(ct);
180
            }
181
        	query.setAreaOfInterest(canvasExtent, canvas.getWidth(),
182
            	canvas.getHeight());
183
        }
173 184

  
174 185
        try {
175 186
            // For best performance, checks if canvas extent is the same than
2.1/branches/org.gvsig.view3d_vector_and_extrusion_2.3/org.gvsig.view3d/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/layers/DefaultLayerConverter.java
28 28
import java.security.MessageDigest;
29 29
import java.security.NoSuchAlgorithmException;
30 30

  
31
import org.cresques.cts.ICoordTrans;
32 31
import org.cresques.cts.IProjection;
33 32
import org.slf4j.Logger;
34 33
import org.slf4j.LoggerFactory;
......
106 105
            }
107 106
        }
108 107

  
109
        AVList params = new AVListImpl();
110

  
111 108
        //De aqu? hasta el final de m?todo lo que ten?a Andrea
112 109

  
113 110
        LayerProperties3D layerProperties = manager.getLayerProperties(layer, null);

Also available in: Unified diff