updated citygml4j to 3.2.3

Author: clausnagel

build.gradle

@@ -84,7 +84,7 @@ subprojects {
         options {
             title = "$project.name $project.version"
             header = title
-            overview "$projectDir/build/tmp/javadoc/overview.html"
+            overview = "$projectDir/build/tmp/javadoc/overview.html"
             bottom """
                 <a href="${appIssueTrackerUrl}">Report a bug or suggest an enhancement</a><br>
                 ${project.name} is open source and licensed under the <a target="_blank" href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>

citydb-io-citygml/build.gradle

@@ -1,4 +1,4 @@
-def citygml4j_version = '3.2.3-SNAPSHOT'
+def citygml4j_version = '3.2.3'
 
 dependencies {
     api project(':citydb-logging')

citydb-io-citygml/src/main/java/org/citydb/io/citygml/adapter/appearance/GeoreferencedTextureAdapter.java

@@ -69,7 +69,7 @@ public void build(org.citygml4j.core.model.appearance.GeoreferencedTexture sourc
         }
 
         if (source.getOrientation() != null) {
-            target.setOrientation(source.getOrientation().toRowMajorList());
+            target.setOrientation(source.getOrientation().toRowMajor());
         }
     }
 
@@ -86,7 +86,7 @@ public void serialize(GeoreferencedTexture source, org.citygml4j.core.model.appe
                 target.setReferencePoint(new PointProperty(helper.getPoint(referencePoint, false))));
 
         source.getOrientation().ifPresent(transformationMatrix ->
-                target.setOrientation(TransformationMatrix2x2.ofRowMajorList(transformationMatrix.toRowMajor())));
+                target.setOrientation(TransformationMatrix2x2.ofRowMajor(transformationMatrix.toRowMajor())));
     }
 
     private void processWorldFile(org.citygml4j.core.model.appearance.GeoreferencedTexture source, ExternalFile textureImage, ModelBuilderHelper helper) throws ModelBuildException {
@@ -121,7 +121,7 @@ private void processWorldFile(org.citygml4j.core.model.appearance.GeoreferencedT
                     }
 
                     if (content.size() == 6) {
-                        source.setOrientation(TransformationMatrix2x2.ofRowMajorList(content.subList(0, 4)));
+                        source.setOrientation(TransformationMatrix2x2.ofRowMajor(content.subList(0, 4)));
                         source.setReferencePoint(new PointProperty(
                                 new org.xmlobjects.gml.model.geometry.primitives.Point(
                                         new DirectPosition(content.subList(4, 6)))));

citydb-io-citygml/src/main/java/org/citydb/io/citygml/adapter/appearance/builder/AppearanceHelper.java

@@ -206,7 +206,7 @@ private void addMapping(GeometryReference reference, TexCoordList texCoordList,
         private void addMapping(GeometryReference reference, TexCoordGen texCoordGen, ParameterizedTexture target) {
             if (texCoordGen.getWorldToTexture() != null) {
                 getTargets(reference).forEach(surface ->
-                        target.addWorldToTextureMapping(surface, texCoordGen.getWorldToTexture().toRowMajorList()));
+                        target.addWorldToTextureMapping(surface, texCoordGen.getWorldToTexture().toRowMajor()));
             }
         }
 

citydb-io-citygml/src/main/java/org/citydb/io/citygml/adapter/appearance/serializer/AppearanceHelper.java

@@ -153,7 +153,7 @@ public void addWorldToTextureTargets(Map<Surface<?>, Matrix3x4> mapping, Paramet
             String surfaceId = k.getOrCreateObjectId();
             if (geometries.contains(surfaceId) && targets.add(surfaceId)) {
                 TexCoordGen texCoordGen = new TexCoordGen();
-                texCoordGen.setWorldToTexture(TransformationMatrix3x4.ofRowMajorList(v.toRowMajor()));
+                texCoordGen.setWorldToTexture(TransformationMatrix3x4.ofRowMajor(v.toRowMajor()));
                 target.getTextureParameterizations().add(new TextureAssociationProperty(new TextureAssociation(
                         "#" + surfaceId, new AbstractTextureParameterizationProperty(texCoordGen))));
             }

citydb-io-citygml/src/main/java/org/citydb/io/citygml/adapter/core/AbstractFeatureAdapter.java

@@ -62,9 +62,9 @@ public void visit(ImplicitGeometry implicitGeometry) {
         if (source.getBoundedBy() != null
                 && source.getBoundedBy().isSetEnvelope()) {
             List<Double> coordinates = source.getBoundedBy().getEnvelope().toCoordinateList3D();
-            target.setEnvelope(Envelope.of(
-                            Coordinate.of(coordinates.get(0), coordinates.get(1), coordinates.get(2)),
-                            Coordinate.of(coordinates.get(3), coordinates.get(4), coordinates.get(5)))
+            target.setEnvelope(Envelope.empty()
+                    .include(coordinates.get(0), coordinates.get(1), coordinates.get(2))
+                    .include(coordinates.get(3), coordinates.get(4), coordinates.get(5))
                     .setSrsIdentifier(helper.getInheritedSrsName(source.getBoundedBy().getEnvelope())));
         }
 

citydb-io-citygml/src/main/java/org/citydb/io/citygml/adapter/core/ImplicitGeometryAdapter.java

@@ -43,7 +43,7 @@ public class ImplicitGeometryAdapter implements ModelBuilder<org.citygml4j.core.
     @Override
     public void build(org.citygml4j.core.model.core.ImplicitGeometry source, ImplicitGeometryProperty target, ModelBuilderHelper helper) throws ModelBuildException {
         if (source.getTransformationMatrix() != null) {
-            target.setTransformationMatrix(source.getTransformationMatrix().toRowMajorList());
+            target.setTransformationMatrix(source.getTransformationMatrix().toRowMajor());
         }
 
         if (source.getReferencePoint() != null) {
@@ -66,7 +66,7 @@ public org.citygml4j.core.model.core.ImplicitGeometry createObject(ImplicitGeome
     @Override
     public void serialize(ImplicitGeometryProperty source, org.citygml4j.core.model.core.ImplicitGeometry target, ModelSerializerHelper helper) throws ModelSerializeException {
         source.getTransformationMatrix().ifPresent(transformationMatrix ->
-                target.setTransformationMatrix(TransformationMatrix4x4.ofRowMajorList(
+                target.setTransformationMatrix(TransformationMatrix4x4.ofRowMajor(
                         transformationMatrix.toRowMajor())));
 
         source.getReferencePoint().ifPresent(referencePoint ->

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

@@ -58,7 +58,7 @@ public Coordinate getUpperCorner() {
 
     @Override
     public int getVertexDimension() {
-        return (lowerCorner.getDimension() == 2 || upperCorner.getDimension() == 2) ? 2 : 3;
+        return lowerCorner.getDimension() == 2 || upperCorner.getDimension() == 2 ? 2 : 3;
     }
 
     @Override
@@ -173,36 +173,46 @@ public boolean isOnTile(Coordinate point) {
                 && point.getY() <= upperCorner.getY();
     }
 
-    public Envelope include(Coordinate coordinate) {
-        if (coordinate.getX() < lowerCorner.getX()) {
-            lowerCorner.setX(coordinate.getX());
+    public Envelope include(double x, double y) {
+        if (x < lowerCorner.getX()) {
+            lowerCorner.setX(x);
         }
 
-        if (coordinate.getY() < lowerCorner.getY()) {
-            lowerCorner.setY(coordinate.getY());
+        if (y < lowerCorner.getY()) {
+            lowerCorner.setY(y);
         }
 
-        if (coordinate.getX() > upperCorner.getX()) {
-            upperCorner.setX(coordinate.getX());
+        if (x > upperCorner.getX()) {
+            upperCorner.setX(x);
         }
 
-        if (coordinate.getY() > upperCorner.getY()) {
-            upperCorner.setY(coordinate.getY());
+        if (y > upperCorner.getY()) {
+            upperCorner.setY(y);
         }
 
-        if (coordinate.getDimension() == 3 && getVertexDimension() == 3) {
-            if (coordinate.getZ() < lowerCorner.getZ()) {
-                lowerCorner.setZ(coordinate.getZ());
-            }
+        return this;
+    }
 
-            if (coordinate.getZ() > upperCorner.getZ()) {
-                upperCorner.setZ(coordinate.getZ());
-            }
+    public Envelope include(double x, double y, double z) {
+        include(x, y);
+
+        if (z < lowerCorner.getZ()) {
+            lowerCorner.setZ(z);
+        }
+
+        if (z > upperCorner.getZ()) {
+            upperCorner.setZ(z);
         }
 
         return this;
     }
 
+    public Envelope include(Coordinate coordinate) {
+        return coordinate.getDimension() == 2 ?
+                include(coordinate.getX(), coordinate.getY()) :
+                include(coordinate.getX(), coordinate.getY(), coordinate.getZ());
+    }
+
     public Envelope include(Envelope envelope) {
         return include(envelope.lowerCorner)
                 .include(envelope.upperCorner);

citydb-model/src/main/java/org/citydb/model/util/matrix/Matrix.java

@@ -40,6 +40,13 @@ public Matrix(int rows, int columns) {
         this(new double[rows][columns], rows, columns);
     }
 
+    public Matrix(int rows, int columns, double value) {
+        this(rows, columns);
+        for (int i = 0; i < rows; i++) {
+            Arrays.fill(elements[i], value);
+        }
+    }
+
     public Matrix(Matrix other) {
         this(other.rows, other.columns);
         for (int i = 0; i < rows; ++i) {

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 rootProject.name = 'citydb-tool'
 include 'citydb-cli'