From 7b16c17e4d86b8992efc4adaa7f99e99de9af5cd Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Mon, 12 Aug 2024 11:23:42 +0200
Subject: [PATCH] Code cleaning. Ref #69
---
.../de/hft/stuttgart/citydoctor2/check/Requirement.java | 9 +++------
.../stuttgart/citydoctor2/datastructure/TinObject.java | 2 ++
.../citydoctor2/datastructure/TransportationObject.java | 6 +-----
.../hft/stuttgart/citydoctor2/math/ProjectionAxis.java | 2 +-
.../java/de/hft/stuttgart/citydoctor2/math/Vector3d.java | 8 +++-----
.../citydoctor2/parser/ParserConfiguration.java | 4 ++--
.../citydoctor2/checks/util/SelfIntersectionUtil.java | 2 +-
7 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java
index c9608b8..d9e4ff5 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java
@@ -128,12 +128,9 @@ public class Requirement implements Serializable {
return false;
Requirement other = (Requirement) obj;
if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
+ return other.id == null;
+ } else return id.equals(other.id);
+ }
@Override
public String toString() {
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
index e2b57f0..03f5f1a 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java
@@ -18,6 +18,7 @@
*/
package de.hft.stuttgart.citydoctor2.datastructure;
+import java.io.Serial;
import java.util.ArrayList;
import java.util.List;
@@ -38,6 +39,7 @@ public class TinObject extends CityObject {
private static final Logger logger = LogManager.getLogger(TinObject.class);
+ @Serial
private static final long serialVersionUID = 1910744427384724422L;
private final TINRelief gmlRelief;
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationObject.java
index 0670026..d3020ea 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationObject.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationObject.java
@@ -236,11 +236,7 @@ public class TransportationObject extends CityObject {
@Override
public void unsetGmlGeometries() {
switch (type) {
- case ROAD:
- case TRACK:
- case RAILWAY:
- case SQUARE:
- case TRANSPORTATION_COMPLEX:
+ case ROAD, TRACK, RAILWAY, SQUARE,TRANSPORTATION_COMPLEX:
AbstractTransportationSpace tc = (AbstractTransportationSpace) ato;
tc.getDeprecatedProperties().setLod1MultiSurface(null);
tc.setLod2MultiSurface(null);
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/ProjectionAxis.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/ProjectionAxis.java
index 2963166..15e0494 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/ProjectionAxis.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/ProjectionAxis.java
@@ -134,7 +134,7 @@ public class ProjectionAxis {
double x = (d - b * y - c * z) / a;
return new Vertex(x, y, z);
} else {
- throw new IllegalStateException("Unknown axis: " + axis);
+ throw new IllegalStateException("Unknown axis: " + Arrays.toString(axis));
}
}
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
index 200c350..ab5f495 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/math/Vector3d.java
@@ -240,11 +240,9 @@ public class Vector3d implements Serializable {
@Override
public String toString() {
final int maxLen = 5;
- StringBuilder builder = new StringBuilder();
- builder.append("Vector3d [coords=");
- builder.append(coords != null ? Arrays.toString(Arrays.copyOf(coords, Math.min(coords.length, maxLen))) : null);
- builder.append("]");
- return builder.toString();
+ return "Vector3d [coords=" +
+ (coords != null ? Arrays.toString(Arrays.copyOf(coords, Math.min(coords.length, maxLen))) : null) +
+ "]";
}
@Override
diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
index 3420d4b..3d88acf 100644
--- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
+++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/ParserConfiguration.java
@@ -91,8 +91,8 @@ public class ParserConfiguration implements Serializable {
}
private void createCoordinateTransforms() {
- CoordinateReferenceSystem tgtCrs = null;
- CoordinateReferenceSystem crs = null;
+ CoordinateReferenceSystem tgtCrs ;
+ CoordinateReferenceSystem crs;
synchronized (CRS_FACTORY) {
tgtCrs = CRS_FACTORY.createFromParameters("Target", targetTransformString);
crs = CRS_FACTORY.createFromParameters("Original", originalTransformString);
diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
index 8a35ccf..27ab75e 100644
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/SelfIntersectionUtil.java
@@ -412,7 +412,7 @@ public class SelfIntersectionUtil {
Triangle3d t2 = p2.getTriangles().get(p2Index);
if (t1.doesIntersect(t2)) {
logger.trace("{} intersects {}", t1, t2);
- logger.trace("{} intersects {}", t1.getPartOf().getOriginal().getGmlId(),
+ logger.trace("GML-ID: {} intersects {}", t1.getPartOf().getOriginal().getGmlId(),
t2.getPartOf().getOriginal().getGmlId());
return new GeometrySelfIntersection(t1.getPartOf().getOriginal(), t2.getPartOf().getOriginal(), t1,
t2);
--
GitLab