Revision 21157

View differences:

branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/data/datastores/vectorial/file/dxf/DXFFeaturesWriter.java
28 28
import org.gvsig.fmap.geom.primitive.Arc2D;
29 29
import org.gvsig.fmap.geom.primitive.Circle2D;
30 30
import org.gvsig.fmap.geom.primitive.Curve2D;
31
import org.gvsig.fmap.geom.primitive.Curve3D;
31
import org.gvsig.fmap.geom.primitive.Curve2DZ;
32 32
import org.gvsig.fmap.geom.primitive.Ellipse2D;
33
import org.gvsig.fmap.geom.primitive.Point2DZ;
33 34
import org.gvsig.fmap.geom.primitive.Surface2D;
34
import org.gvsig.fmap.geom.primitive.Surface3D;
35
import org.gvsig.fmap.geom.primitive.Surface2DZ;
35 36
import org.gvsig.fmap.geom.util.Converter;
36 37
import org.gvsig.fmap.geom.util.UtilFunctions;
37 38

  
......
130 131
	    	// HEIGHTTEXT, ROTATIONTEXT y el resto que puedan hacer
131 132
	    	// falta.
132 133

  
133
	    	if (org.gvsig.fmap.geom.primitive.Point3D.class.isAssignableFrom(geom.getClass())) {
134
	    	if (Point2DZ.class.isAssignableFrom(geom.getClass())) {
134 135
	            dxf3DFile = true;
135 136
	            k=createPoint3D(handle, k, feature);
136 137
	        } else if (org.gvsig.fmap.geom.primitive.Point2D.class.isAssignableFrom(geom.getClass())) {
137 138
	            k=createPoint2D(handle, k, feature);
138
	        } else if (Curve3D.class.isAssignableFrom(geom.getClass())) {
139
	        } else if (Curve2DZ.class.isAssignableFrom(geom.getClass())) {
139 140
	            dxf3DFile = true;
140 141
	            k = createPolyline3D(handle, k, feature);
141 142
	        } else if (Arc2D.class.isAssignableFrom(geom.getClass())) {
......
143 144
	        	k=createArc2D(handle, k, feature);
144 145
	        } else if (Curve2D.class.isAssignableFrom(geom.getClass())) {
145 146
	            k=createLwPolyline2D(handle, k, feature, false);
146
	        } else if (Surface3D.class.isAssignableFrom(geom.getClass())) {
147
	        } else if (Surface2DZ.class.isAssignableFrom(geom.getClass())) {
147 148
	            dxf3DFile = true;
148 149
	            k = createPolyline3D(handle, k, feature);
149 150
	            // k = createPolygon3D(handle, k, geom);
......
352 353
		if (indexText!=-1 && !(feature.get(indexText) == null)){
353 354
			return createText3D(handle,k,feature);
354 355
		}
355
		org.gvsig.fmap.geom.primitive.Point3D point = new org.gvsig.fmap.geom.primitive.Point3D(0, 0, 0);
356
		Point2DZ point = new Point2DZ(0, 0, 0);
356 357
		double[] pointCoords = new double[6];
357 358
		PathIterator pointIt = ((Geometry)feature.getDefaultGeometry()).getPathIterator(null);
358 359
		while (!pointIt.isDone()) {
359 360
			pointIt.currentSegment(pointCoords);
360
			point = new org.gvsig.fmap.geom.primitive.Point3D(pointCoords[0], pointCoords[1], pointCoords[2]);
361
			point = new Point2DZ(pointCoords[0], pointCoords[1], pointCoords[2]);
361 362
			pointIt.next();
362 363
		}
363 364
		Point3D pto = new Point3D(point.getX(), point.getY(), point.getZs()[0]);
......
437 438

  
438 439
//		FPoint3D point = new FPoint3D(0, 0, 0);
439 440
//		double[] pointCoords = new double[6];
440
		org.gvsig.fmap.geom.primitive.Point3D point = (org.gvsig.fmap.geom.primitive.Point3D)((Geometry)feature.getDefaultGeometry()).getInternalShape();
441
		Point2DZ point = (Point2DZ)((Geometry)feature.getDefaultGeometry()).getInternalShape();
441 442
//		while (!pointIt.isDone()) {
442 443
//		pointIt.currentSegment(pointCoords);
443 444
//		point = new FPoint3D(pointCoords[0], pointCoords[1]);

Also available in: Unified diff