Revision 42313
| 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/aggregate/MultiPoint3DM.java | ||
|---|---|---|
| 31 | 31 |
import org.gvsig.fmap.geom.aggregate.MultiPolygon; |
| 32 | 32 |
import org.gvsig.fmap.geom.jts.gputils.DefaultGeneralPathX; |
| 33 | 33 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line3DM; |
| 34 |
import org.gvsig.fmap.geom.jts.primitive.point.Point3D; |
|
| 34 | 35 |
import org.gvsig.fmap.geom.jts.primitive.point.Point3DM; |
| 35 | 36 |
import org.gvsig.fmap.geom.jts.primitive.surface.polygon.Polygon3DM; |
| 36 | 37 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
| 37 | 38 |
import org.gvsig.fmap.geom.primitive.Line; |
| 39 |
import org.gvsig.fmap.geom.primitive.Point; |
|
| 38 | 40 |
import org.gvsig.fmap.geom.primitive.Polygon; |
| 39 | 41 |
import org.gvsig.fmap.geom.primitive.Primitive; |
| 40 | 42 |
|
| ... | ... | |
| 129 | 131 |
return primitive; |
| 130 | 132 |
} |
| 131 | 133 |
|
| 134 |
if(primitive instanceof Point){
|
|
| 135 |
Point point = (Point)primitive; |
|
| 136 |
if(point instanceof Point3D){
|
|
| 137 |
return new Point3DM(point.getX(), point.getY(), ((Point3DM)point).getZ(), 0); |
|
| 138 |
} |
|
| 139 |
return new Point3DM(point.getX(), point.getY(), 0, 0); |
|
| 140 |
} |
|
| 141 |
|
|
| 132 | 142 |
if(primitive.getGeometryType().getSubType() == Geometry.SUBTYPES.GEOM3DM){
|
| 133 | 143 |
try {
|
| 134 | 144 |
return primitive.toPoints(); |
| 135 | 145 |
} catch (GeometryException e) {
|
| 136 |
String message = "Can't convert primitive to lines";
|
|
| 146 |
String message = "Can't convert primitive to points";
|
|
| 137 | 147 |
logger.warn(message); |
| 138 | 148 |
throw new RuntimeException(message); |
| 139 | 149 |
} |
| 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/aggregate/MultiPoint2D.java | ||
|---|---|---|
| 35 | 35 |
import org.gvsig.fmap.geom.jts.primitive.surface.polygon.Polygon2D; |
| 36 | 36 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
| 37 | 37 |
import org.gvsig.fmap.geom.primitive.Line; |
| 38 |
import org.gvsig.fmap.geom.primitive.Point; |
|
| 38 | 39 |
import org.gvsig.fmap.geom.primitive.Polygon; |
| 39 | 40 |
import org.gvsig.fmap.geom.primitive.Primitive; |
| 40 | 41 |
|
| ... | ... | |
| 129 | 130 |
return primitive; |
| 130 | 131 |
} |
| 131 | 132 |
|
| 133 |
if(primitive instanceof Point){
|
|
| 134 |
Point point = (Point)primitive; |
|
| 135 |
return new Point2D(point.getX(), point.getY()); |
|
| 136 |
} |
|
| 137 |
|
|
| 132 | 138 |
if(primitive.getGeometryType().getSubType() == Geometry.SUBTYPES.GEOM2D){
|
| 133 | 139 |
try {
|
| 134 | 140 |
return primitive.toPoints(); |
| 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/aggregate/MultiPoint3D.java | ||
|---|---|---|
| 31 | 31 |
import org.gvsig.fmap.geom.aggregate.MultiPolygon; |
| 32 | 32 |
import org.gvsig.fmap.geom.jts.gputils.DefaultGeneralPathX; |
| 33 | 33 |
import org.gvsig.fmap.geom.jts.primitive.curve.line.Line3D; |
| 34 |
import org.gvsig.fmap.geom.jts.primitive.point.Point2D; |
|
| 34 | 35 |
import org.gvsig.fmap.geom.jts.primitive.point.Point3D; |
| 36 |
import org.gvsig.fmap.geom.jts.primitive.point.Point3DM; |
|
| 35 | 37 |
import org.gvsig.fmap.geom.jts.primitive.surface.polygon.Polygon3D; |
| 36 | 38 |
import org.gvsig.fmap.geom.primitive.GeneralPathX; |
| 37 | 39 |
import org.gvsig.fmap.geom.primitive.Line; |
| 40 |
import org.gvsig.fmap.geom.primitive.Point; |
|
| 38 | 41 |
import org.gvsig.fmap.geom.primitive.Polygon; |
| 39 | 42 |
import org.gvsig.fmap.geom.primitive.Primitive; |
| 40 | 43 |
|
| ... | ... | |
| 129 | 132 |
return primitive; |
| 130 | 133 |
} |
| 131 | 134 |
|
| 135 |
if(primitive instanceof Point){
|
|
| 136 |
Point point = (Point)primitive; |
|
| 137 |
if(point instanceof Point3DM){
|
|
| 138 |
return new Point3D(point.getX(), point.getY(), ((Point3DM)point).getZ()); |
|
| 139 |
} |
|
| 140 |
return new Point3D(point.getX(), point.getY(), 0); |
|
| 141 |
} |
|
| 142 |
|
|
| 132 | 143 |
if(primitive.getGeometryType().getSubType() == Geometry.SUBTYPES.GEOM3D){
|
| 133 | 144 |
try {
|
| 134 | 145 |
return primitive.toPoints(); |
| 135 | 146 |
} catch (GeometryException e) {
|
| 136 |
String message = "Can't convert primitive to lines";
|
|
| 147 |
String message = "Can't convert primitive to points";
|
|
| 137 | 148 |
logger.warn(message); |
| 138 | 149 |
throw new RuntimeException(message); |
| 139 | 150 |
} |
Also available in: Unified diff