added deep copy for geometries

Author: clausnagel

citydb-model/src/main/java/org/citydb/model/geometry/CompositeSolid.java

@@ -48,6 +48,14 @@ public static CompositeSolid empty() {
         return new CompositeSolid(Collections.emptyList());
     }
 
+    @Override
+    public CompositeSolid copy() {
+        return new CompositeSolid(getSolids().stream()
+                .map(Solid::copy)
+                .toArray(Solid[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.COMPOSITE_SOLID;

citydb-model/src/main/java/org/citydb/model/geometry/CompositeSurface.java

@@ -48,6 +48,14 @@ public static CompositeSurface empty() {
         return new CompositeSurface(Collections.emptyList());
     }
 
+    @Override
+    public CompositeSurface copy() {
+        return new CompositeSurface(getPolygons().stream()
+                .map(Polygon::copy)
+                .toArray(Polygon[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.COMPOSITE_SURFACE;

citydb-model/src/main/java/org/citydb/model/geometry/Coordinate.java

@@ -106,9 +106,15 @@ public int getDimension() {
         return dimension;
     }
 
-    Coordinate force2D() {
+    public Coordinate force2D() {
         z = 0;
         dimension = 2;
         return this;
     }
+
+    public Coordinate copy() {
+        return dimension == 2 ?
+                new Coordinate(x, y) :
+                new Coordinate(x, y, z);
+    }
 }

citydb-model/src/main/java/org/citydb/model/geometry/Geometry.java

@@ -35,6 +35,8 @@ public abstract class Geometry<T extends Geometry<?>> extends Child implements S
     private String srsIdentifier;
     private GeometryDescriptor descriptor;
 
+    public abstract T copy();
+
     public abstract GeometryType getGeometryType();
 
     abstract T self();
@@ -170,4 +172,13 @@ private void update(Coordinate coordinate) {
                 .setSRID(srid)
                 .setSrsIdentifier(srsIdentifier);
     }
+
+    T copyPropertiesFrom(Geometry<T> other) {
+        objectId = other.objectId;
+        srid = other.srid;
+        srsIdentifier = other.srsIdentifier;
+        descriptor = other.descriptor;
+
+        return self();
+    }
 }

citydb-model/src/main/java/org/citydb/model/geometry/LineString.java

@@ -71,6 +71,14 @@ public LineString force2D() {
         return this;
     }
 
+    @Override
+    public LineString copy() {
+        return new LineString(points.stream()
+                .map(Coordinate::copy)
+                .toArray(Coordinate[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.LINE_STRING;

citydb-model/src/main/java/org/citydb/model/geometry/LinearRing.java

@@ -74,8 +74,15 @@ public int getVertexDimension() {
         return points.stream().anyMatch(coordinate -> coordinate.getDimension() == 2) ? 2 : 3;
     }
 
-    LinearRing force2D() {
+    public LinearRing force2D() {
         points.forEach(Coordinate::force2D);
         return this;
     }
+
+    public LinearRing copy() {
+        return new LinearRing(points.stream()
+                .map(Coordinate::copy)
+                .toArray(Coordinate[]::new))
+                .setObjectId(objectId);
+    }
 }

citydb-model/src/main/java/org/citydb/model/geometry/MultiLineString.java

@@ -68,6 +68,14 @@ public MultiLineString force2D() {
         return this;
     }
 
+    @Override
+    public MultiLineString copy() {
+        return new MultiLineString(lineStrings.stream()
+                .map(LineString::copy)
+                .toArray(LineString[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.MULTI_LINE_STRING;

citydb-model/src/main/java/org/citydb/model/geometry/MultiPoint.java

@@ -68,6 +68,14 @@ public MultiPoint force2D() {
         return this;
     }
 
+    @Override
+    public MultiPoint copy() {
+        return new MultiPoint(points.stream()
+                .map(Point::copy)
+                .toArray(Point[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.MULTI_POINT;

citydb-model/src/main/java/org/citydb/model/geometry/MultiSolid.java

@@ -48,6 +48,14 @@ public static MultiSolid empty() {
         return new MultiSolid(Collections.emptyList());
     }
 
+    @Override
+    public MultiSolid copy() {
+        return new MultiSolid(getSolids().stream()
+                .map(Solid::copy)
+                .toArray(Solid[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.MULTI_SOLID;

citydb-model/src/main/java/org/citydb/model/geometry/MultiSurface.java

@@ -48,6 +48,14 @@ public static MultiSurface empty() {
         return new MultiSurface(Collections.emptyList());
     }
 
+    @Override
+    public MultiSurface copy() {
+        return new MultiSurface(getPolygons().stream()
+                .map(Polygon::copy)
+                .toArray(Polygon[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.MULTI_SURFACE;

citydb-model/src/main/java/org/citydb/model/geometry/Point.java

@@ -51,6 +51,12 @@ public Point force2D() {
         return this;
     }
 
+    @Override
+    public Point copy() {
+        return new Point(coordinate.copy())
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.POINT;

citydb-model/src/main/java/org/citydb/model/geometry/Polygon.java

@@ -41,6 +41,13 @@ private Polygon(LinearRing exteriorRing, List<LinearRing> interiorRings, boolean
         this.reversed = reversed;
     }
 
+    private Polygon(LinearRing exteriorRing, LinearRing[] interiorRings, boolean reversed) {
+        Objects.requireNonNull(exteriorRing, "The exterior ring must not be null.");
+        this.exteriorRing = asChild(exteriorRing);
+        this.interiorRings = interiorRings != null ? asChild(Arrays.asList(interiorRings)) : null;
+        this.reversed = reversed;
+    }
+
     public static Polygon of(LinearRing exteriorRing, List<LinearRing> interiorRings, boolean reversed) {
         return new Polygon(exteriorRing, interiorRings, reversed);
     }
@@ -50,23 +57,23 @@ public static Polygon of(LinearRing exteriorRing, List<LinearRing> interiorRings
     }
 
     public static Polygon of(LinearRing exteriorRing, LinearRing[] interiorRings, boolean reversed) {
-        return new Polygon(exteriorRing, interiorRings != null ? Arrays.asList(interiorRings) : null, reversed);
+        return new Polygon(exteriorRing, interiorRings, reversed);
     }
 
     public static Polygon of(LinearRing exteriorRing, LinearRing[] interiorRings) {
-        return new Polygon(exteriorRing, interiorRings != null ? Arrays.asList(interiorRings) : null, false);
+        return new Polygon(exteriorRing, interiorRings, false);
     }
 
     public static Polygon of(LinearRing exteriorRing, boolean reversed) {
-        return new Polygon(exteriorRing, null, reversed);
+        return new Polygon(exteriorRing, (List<LinearRing>) null, reversed);
     }
 
     public static Polygon of(LinearRing exteriorRing) {
-        return new Polygon(exteriorRing, null, false);
+        return new Polygon(exteriorRing, (List<LinearRing>) null, false);
     }
 
     public static Polygon empty() {
-        return new Polygon(LinearRing.empty(), null, false);
+        return new Polygon(LinearRing.empty(), (List<LinearRing>) null, false);
     }
 
     public LinearRing getExteriorRing() {
@@ -121,6 +128,17 @@ public Polygon force2D() {
         return this;
     }
 
+    @Override
+    public Polygon copy() {
+        return new Polygon(exteriorRing.copy(),
+                interiorRings != null ? interiorRings.stream()
+                        .map(LinearRing::copy)
+                        .toArray(LinearRing[]::new) :
+                        null,
+                reversed)
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.POLYGON;

citydb-model/src/main/java/org/citydb/model/geometry/Solid.java

@@ -54,6 +54,12 @@ public int getVertexDimension() {
         return 3;
     }
 
+    @Override
+    public Solid copy() {
+        return new Solid(shell.copy())
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.SOLID;

citydb-model/src/main/java/org/citydb/model/geometry/TriangulatedSurface.java

@@ -48,6 +48,14 @@ public static TriangulatedSurface empty() {
         return new TriangulatedSurface(Collections.emptyList());
     }
 
+    @Override
+    public TriangulatedSurface copy() {
+        return new TriangulatedSurface(getPolygons().stream()
+                .map(Polygon::copy)
+                .toArray(Polygon[]::new))
+                .copyPropertiesFrom(this);
+    }
+
     @Override
     public GeometryType getGeometryType() {
         return GeometryType.TRIANGULATED_SURFACE;