Revision 42875 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/AbstractGeometry.java

View differences:

AbstractGeometry.java
26 26
import java.awt.Shape;
27 27
import java.awt.geom.AffineTransform;
28 28
import java.awt.geom.Rectangle2D;
29
import java.io.IOException;
30 29

  
31 30
import com.vividsolutions.jts.algorithm.CGAlgorithms;
32 31
import com.vividsolutions.jts.geom.Coordinate;
33
import com.vividsolutions.jts.io.WKBWriter;
34 32
import com.vividsolutions.jts.io.WKTWriter;
35 33
import com.vividsolutions.jts.operation.distance.DistanceOp;
36 34
import com.vividsolutions.jts.operation.overlay.snap.GeometrySnapper;
......
46 44
import org.gvsig.fmap.geom.exception.CreateGeometryException;
47 45
import org.gvsig.fmap.geom.jts.operation.towkb.OGCWKBEncoder;
48 46
import org.gvsig.fmap.geom.jts.operation.towkb.PostGISEWKBEncoder;
49
import org.gvsig.fmap.geom.jts.operation.towkb.WKBEncodingException;
47
import org.gvsig.fmap.geom.jts.operation.towkt.EWKTWriter;
50 48
import org.gvsig.fmap.geom.jts.primitive.Envelope2D;
51 49
import org.gvsig.fmap.geom.jts.primitive.Envelope3D;
52 50
import org.gvsig.fmap.geom.jts.primitive.point.Point3D;
......
59 57
import org.gvsig.fmap.geom.primitive.OrientableSurface;
60 58
import org.gvsig.fmap.geom.primitive.Point;
61 59
import org.gvsig.fmap.geom.type.GeometryType;
62
import org.gvsig.fmap.geom.type.GeometryTypeNotSupportedException;
63 60

  
64 61
/**
65 62
 * @author fdiaz
......
475 472
     */
476 473
    public String convertToWKT() throws GeometryOperationNotSupportedException, GeometryOperationException {
477 474
        int subType = getGeometryType().getSubType();
478
        boolean is3D = subType == 1 || subType == 3;
479 475

  
480
        WKTWriter write = null;
481
        if (is3D)
482
            write = new WKTWriter(3);
483
        else
484
            write = new WKTWriter(2);
476
        EWKTWriter writer = null;
477

  
478
        switch (subType) {
479
        case Geometry.SUBTYPES.GEOM3D:
480
            writer = new EWKTWriter(3, false);
481
            break;
482
        case Geometry.SUBTYPES.GEOM2DM:
483
            writer = new EWKTWriter(3, true);
484
            break;
485
        case Geometry.SUBTYPES.GEOM3DM:
486
            writer = new EWKTWriter(4, true);
487
            break;
488

  
489
        default:
490
            writer = new EWKTWriter(2, false);
491
            break;
492
        }
485 493
        com.vividsolutions.jts.geom.Geometry jts = getJTS();
486
        return write.write(jts);
494
        return writer.write(jts);
487 495
    }
488 496

  
489 497
    /*

Also available in: Unified diff