Revision 313 2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/map3d/MapContext3DImpl.java

View differences:

MapContext3DImpl.java
83 83
import org.gvsig.osgvp.exceptions.image.ImageConversionException;
84 84
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
85 85
import org.gvsig.osgvp.exceptions.node.NodeException;
86
import org.gvsig.osgvp.symbology.FireMarker;
86 87
import org.gvsig.osgvp.symbology.SimpleMarker;
87 88
import org.gvsig.osgvp.terrain.Extent;
88 89
import org.gvsig.osgvp.terrain.HeightfieldLayer;
......
1099 1100
								envelope.getLowerCorner().getY());
1100 1101

  
1101 1102
				query.setTileParameters(rde.getTileLevel(), rde.getTileX(),
1102
						rde.getTileY(), extent, null);
1103
						rde.getTileY(), extent, cacheStruct);
1103 1104

  
1104 1105
				// query.setAreaOfInterest(extent, 512, 512);
1105 1106

  
......
1265 1266
	private UpdateDataEvent loadVectorData(FLayer layer, Envelope envelope,
1266 1267
			RequestDataEvent rde) {
1267 1268

  
1268
		Node n = null;
1269 1269
		System.out.println("vector data");
1270 1270
		UpdateDataEvent ude = new UpdateDataEvent();
1271 1271
		ude.copyDataFromRequest(rde);
......
1288 1288

  
1289 1289
		// OSG Layers
1290 1290
		DataStore ds = ((SingleLayer) layer).getDataStore();
1291
		Node n = null;
1291 1292

  
1292 1293
		if (ds.getProviderName() == "OSG") {
1293 1294
			try {
......
1299 1300
			System.out.println("OSG Layer added");
1300 1301

  
1301 1302
		}
1302

  
1303
		// Vectorial layers
1303 1304
		else {
1304

  
1305
			// HACK: TODO create a SymbolFactory
1305 1306
			SimpleMarker sm = null;
1307

  
1306 1308
			try {
1307 1309
				sm = new SimpleMarker();
1308 1310
			} catch (NodeException e) {
1309 1311
				// TODO Auto-generated catch block
1310 1312
				e.printStackTrace();
1311 1313
			}
1312

  
1314
			sm.setPointSize((float) sy.getSize());
1315
			Color color = sy.getColor();
1316
			sm.setColor(color);
1313 1317
			n = sm.buildSceneGraph(sy.getGeometry());
1314

  
1318
			//n = sm.buildSceneGraph(sy.getGeometry());
1315 1319
		}
1316 1320

  
1317
		// Recorro la capa con DAL
1318
		// layerId
1319
		// Node n= l(layer);
1320

  
1321
		// if (n==null) ude.setFailData();
1322 1321
		ude.setVectorData(n);
1323 1322

  
1324 1323
		return ude;

Also available in: Unified diff