Revision 18219 trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/MapContext3D.java
| MapContext3D.java | ||
|---|---|---|
| 18 | 18 |
import com.iver.ai2.gvsig3d.cacheservices.VectorCacheService; |
| 19 | 19 |
import com.iver.ai2.gvsig3d.map3d.layers.FLayers3D; |
| 20 | 20 |
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps; |
| 21 |
import com.iver.ai2.gvsig3d.utils.UtilCoord; |
|
| 22 | 21 |
import com.iver.andami.PluginServices; |
| 23 | 22 |
import com.iver.cit.gvsig.AddLayer; |
| 24 | 23 |
import com.iver.cit.gvsig.exceptions.expansionfile.ExpansionFileReadException; |
| ... | ... | |
| 41 | 40 |
import com.iver.cit.gvsig.fmap.rendering.LegendChangedEvent; |
| 42 | 41 |
import com.iver.utiles.XMLEntity; |
| 43 | 42 |
|
| 44 |
import es.upv.ai2.libjosg.Node;
|
|
| 45 |
import es.upv.ai2.libjosg.Vec3;
|
|
| 46 |
import es.upv.ai2.libjosg.planets.Planet;
|
|
| 47 |
import es.upv.ai2.libjosg.planets.PlanetViewer;
|
|
| 48 |
import es.upv.ai2.libjosg.planets.RequestLayerListener;
|
|
| 49 |
import es.upv.ai2.libjosg.planets.TileCreatedListener;
|
|
| 50 |
import es.upv.ai2.libjosg.planets.TileEvent;
|
|
| 51 |
import es.upv.ai2.libjosg.viewer.Camera;
|
|
| 52 |
import es.upv.ai2.libjosg.viewer.IViewerContainer;
|
|
| 43 |
import es.upv.ai2.osgvp.Node;
|
|
| 44 |
import es.upv.ai2.osgvp.Vec3;
|
|
| 45 |
import es.upv.ai2.osgvp.planets.Planet;
|
|
| 46 |
import es.upv.ai2.osgvp.planets.PlanetViewer;
|
|
| 47 |
import es.upv.ai2.osgvp.planets.RequestLayerListener;
|
|
| 48 |
import es.upv.ai2.osgvp.planets.TileCreatedListener;
|
|
| 49 |
import es.upv.ai2.osgvp.planets.TileEvent;
|
|
| 50 |
import es.upv.ai2.osgvp.viewer.Camera;
|
|
| 51 |
import es.upv.ai2.osgvp.viewer.IViewerContainer;
|
|
| 53 | 52 |
|
| 54 | 53 |
public class MapContext3D extends MapContext implements TileCreatedListener, |
| 55 | 54 |
RequestLayerListener, LayerListener, LegendListener {
|
| ... | ... | |
| 894 | 893 |
TileNum tileNum = new TileNum(evt.getLevel(), tileIndices); |
| 895 | 894 |
String tileFileName; |
| 896 | 895 |
|
| 897 |
double minX = Math.toDegrees(evt.getMinX());
|
|
| 898 |
double minY = Math.toDegrees(evt.getMinY());
|
|
| 899 |
double width = Math.toDegrees(evt.getMaxX() - evt.getMinX());
|
|
| 900 |
double height = Math.toDegrees(evt.getMaxY() - evt.getMinY());
|
|
| 896 |
double minX = evt.getMinX();
|
|
| 897 |
double minY = evt.getMinY();
|
|
| 898 |
double width = evt.getMaxX() - evt.getMinX();
|
|
| 899 |
double height = evt.getMaxY() - evt.getMinY();
|
|
| 901 | 900 |
|
| 902 | 901 |
Rectangle2D extent = new Rectangle2D.Double(minX, minY, width, |
| 903 | 902 |
height); |
| 904 |
if (cacheService.intersectsLayer(tileNum)) { // extent test
|
|
| 903 |
if (cacheService.intersectsLayer(extent)) { // extent test
|
|
| 905 | 904 |
// if (cacheService.intersectsLayer(extent)) { // extent test
|
| 906 | 905 |
// System.out.println("Extent del evento del tilenum "
|
| 907 | 906 |
// + tileNum + minX + " " + minY + " " + width + " " |
| 908 | 907 |
// + height); |
| 909 | 908 |
try {
|
| 910 |
tileFileName = cacheService.getTileAsFName(tileNum); |
|
| 911 |
// tileFileName = |
|
| 912 |
// cacheService.getTileAsFName(tileNum,extent); |
|
| 913 |
System.err.println("tile num " + tileNum);
|
|
| 914 |
System.err.println("nombre fichero " + tileFileName);
|
|
| 909 |
//tileFileName = cacheService.getTileAsFName(tileNum); |
|
| 910 |
tileFileName = cacheService.getTileAsFName(tileNum,extent); |
|
| 911 |
//System.err.println("tile num " + tileNum);
|
|
| 912 |
//System.err.println("nombre fichero " + tileFileName);
|
|
| 915 | 913 |
} catch (Exception e) {
|
| 916 | 914 |
return; |
| 917 | 915 |
} |
| ... | ... | |
| 984 | 982 |
TileNum tileNum = new TileNum(evt.getLevel(), tileIndices); |
| 985 | 983 |
|
| 986 | 984 |
String tileFileName; |
| 987 |
double minX = Math.toDegrees(evt.getMinX());
|
|
| 988 |
double minY = Math.toDegrees(evt.getMinY());
|
|
| 989 |
double width = Math.toDegrees(evt.getMaxX() - evt.getMinX());
|
|
| 990 |
double height = Math.toDegrees(evt.getMaxY() - evt.getMinY());
|
|
| 985 |
double minX = evt.getMinX();
|
|
| 986 |
double minY = evt.getMinY();
|
|
| 987 |
double width = evt.getMaxX() - evt.getMinX();
|
|
| 988 |
double height = evt.getMaxY() - evt.getMinY();
|
|
| 991 | 989 |
|
| 992 | 990 |
Rectangle2D extent = new Rectangle2D.Double(minX, minY, width, height); |
| 993 |
if (cacheService.intersectsLayer(tileNum)) { // extent test
|
|
| 991 |
if (cacheService.intersectsLayer(extent)) { // extent test
|
|
| 994 | 992 |
// if (cacheService.intersectsLayer(extent)) {
|
| 995 | 993 |
// System.out.println("Extetn del evento " + minX + " " + minY + " "
|
| 996 | 994 |
// + width + " " + height); |
| 997 | 995 |
try {
|
| 998 | 996 |
// tileFileName = cacheService.getTileAsFName(tileNum,extent); |
| 999 |
tileFileName = cacheService.getTileAsFName(tileNum); |
|
| 997 |
tileFileName = cacheService.getTileAsFName(tileNum, extent);
|
|
| 1000 | 998 |
} catch (Exception e) {
|
| 1001 | 999 |
return; |
| 1002 | 1000 |
} |
| ... | ... | |
| 1057 | 1055 |
TileNum tileNum = new TileNum(evt.getLevel(), tileIndices); |
| 1058 | 1056 |
|
| 1059 | 1057 |
String tileFileName; |
| 1060 |
double minX = Math.toDegrees(evt.getMinX());
|
|
| 1061 |
double minY = Math.toDegrees(evt.getMinY());
|
|
| 1062 |
double width = Math.toDegrees(evt.getMaxX() - evt.getMinX());
|
|
| 1063 |
double height = Math.toDegrees(evt.getMaxY() - evt.getMinY());
|
|
| 1058 |
double minX = evt.getMinX();
|
|
| 1059 |
double minY = evt.getMinY();
|
|
| 1060 |
double width = evt.getMaxX() - evt.getMinX();
|
|
| 1061 |
double height = evt.getMaxY() - evt.getMinY();
|
|
| 1064 | 1062 |
|
| 1065 | 1063 |
Rectangle2D extent = new Rectangle2D.Double(minX, minY, width, height); |
| 1066 |
if (cacheService.intersectsLayer(tileNum)) { // extent test
|
|
| 1064 |
if (cacheService.intersectsLayer(extent)) { // extent test
|
|
| 1067 | 1065 |
// if (cacheService.intersectsLayer(extent)) {
|
| 1068 |
// System.out.println("Extent del evento del tilenum " + tileNum
|
|
| 1069 |
// + minX + " " + minY + " " + width + " " + height); |
|
| 1070 | 1066 |
try {
|
| 1071 |
// tileFileName = cacheService.getTileAsFName(tileNum,extent);
|
|
| 1072 |
tileFileName = cacheService.getTileAsFName(tileNum); |
|
| 1067 |
tileFileName = cacheService.getTileAsFName(tileNum,extent); |
|
| 1068 |
//tileFileName = cacheService.getTileAsFName(tileNum);
|
|
| 1073 | 1069 |
// System.err.println("tile num " + tileNum);
|
| 1074 | 1070 |
// System.err.println("nombre fichero " + tileFileName);
|
| 1075 | 1071 |
} catch (Exception e) {
|
Also available in: Unified diff