Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
1745865f
Commit
1745865f
authored
Aug 08, 2024
by
Riegel
Browse files
Code cleaning Ref
#69
parent
5a6f4b46
Changes
163
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/ErrorId.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check
;
import
java.io.Serial
;
import
java.io.Serializable
;
/**
...
...
@@ -27,8 +28,9 @@ import java.io.Serializable;
* @author Matthias Betz
*
*/
public
class
ErrorId
implements
Serializable
{
public
record
ErrorId
(
String
name
)
implements
Serializable
{
@Serial
private
static
final
long
serialVersionUID
=
-
2598466667746276560L
;
public
static
final
ErrorId
DEPENDENCIES_NOT_MET
=
new
ErrorId
(
"Dependencies_not_met"
);
...
...
@@ -65,11 +67,8 @@ public class ErrorId implements Serializable {
public
static
final
ErrorId
GE_P_DEGENERATED_RING
=
new
ErrorId
(
"GE_P_DEGENERATED_POLYGON"
);
public
static
final
ErrorId
SE_POLYGON_WITHOUT_SURFACE
=
new
ErrorId
(
"SE_POLYGON_WITHOUT_SURFACE"
);
private
String
name
;
public
ErrorId
(
String
name
)
{
this
.
name
=
name
;
}
@Override
public
int
hashCode
()
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/GeometrySelfIntersection.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
...
...
@@ -25,13 +26,14 @@ import de.hft.stuttgart.citydoctor2.math.Triangle3d;
public
class
GeometrySelfIntersection
implements
Serializable
{
@Serial
private
static
final
long
serialVersionUID
=
-
6308847898942670140L
;
private
Polygon
p1
;
private
Polygon
p2
;
private
final
Polygon
p1
;
private
final
Polygon
p2
;
private
Triangle3d
t1
;
private
Triangle3d
t2
;
private
final
Triangle3d
t1
;
private
final
Triangle3d
t2
;
public
GeometrySelfIntersection
(
Polygon
p1
,
Polygon
p2
,
Triangle3d
t1
,
Triangle3d
t2
)
{
super
();
...
...
@@ -45,17 +47,10 @@ public class GeometrySelfIntersection implements Serializable {
return
p1
;
}
public
void
setP1
(
Polygon
p1
)
{
this
.
p1
=
p1
;
}
public
Polygon
getP2
()
{
return
p2
;
}
public
void
setP2
(
Polygon
p2
)
{
this
.
p2
=
p2
;
}
public
Triangle3d
getT1
()
{
return
t1
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/HealingID.java
View file @
1745865f
...
...
@@ -18,7 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check
;
public
class
HealingID
{
public
record
HealingID
(
String
idString
)
{
public
static
final
HealingID
S_GEOMETRIC_SIMPLIFIER
=
new
HealingID
(
"S_GEOMETRIC_SIMPLIFIER"
);
public
static
final
HealingID
S_ALL_POLYGONS_WRONG_ORIENTATION
=
new
HealingID
(
"S_ALL_POLYGONS_WRONG_ORIENTATION"
);
...
...
@@ -37,12 +37,6 @@ public class HealingID {
public
static
final
HealingID
P_NON_PLANAR_POLYGON_CPP
=
new
HealingID
(
"P_NON_PLANAR_POLYGON_CPP"
);
public
static
final
HealingID
S_NOT_CLOSED_CPP
=
new
HealingID
(
"S_NOT_CLOSED_CPP"
);
public
static
final
HealingID
SE_POLYGON_WITHOUT_SURFACE
=
new
HealingID
(
"SE_POLYGON_WITHOUT_SURFACE"
);
private
String
idString
;
public
HealingID
(
String
idString
)
{
this
.
idString
=
idString
;
}
@Override
public
String
toString
()
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/QualityAdeErrorVisitor.java
View file @
1745865f
...
...
@@ -91,7 +91,7 @@ import de.hft.stuttgart.quality.model.types.ValidationResult;
public
class
QualityAdeErrorVisitor
implements
ErrorVisitor
{
private
ValidationResult
res
;
private
final
ValidationResult
res
;
public
QualityAdeErrorVisitor
(
ValidationResult
res
)
{
this
.
res
=
res
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Collections
;
...
...
@@ -25,6 +26,7 @@ import java.util.List;
public
class
Requirement
implements
Serializable
{
@Serial
private
static
final
long
serialVersionUID
=
-
590639811553512803L
;
private
static
final
String
DISTANCE_TOLERANCE
=
"distanceTolerance"
;
...
...
@@ -90,8 +92,8 @@ public class Requirement implements Serializable {
}
private
String
id
;
private
RequirementType
type
;
private
final
String
id
;
private
final
RequirementType
type
;
private
List
<
DefaultParameter
>
parameters
;
public
Requirement
(
String
id
,
RequirementType
type
)
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Unit.java
View file @
1745865f
...
...
@@ -31,8 +31,8 @@ public enum Unit {
KWH
(
"kWh"
,
"kWh"
),
METER
(
"m"
,
"m"
),
SQUARE_METER
(
"m²"
,
"m2"
),
CUBIC_METER
(
"m³"
,
"m3"
),
RADIAN
(
Localization
.
getText
(
"Unit.Radian"
),
"rad"
),
NONE
(
""
,
null
),
DEGREE
(
Localization
.
getText
(
"Unit.Degree"
),
"deg"
);
private
String
representation
;
private
String
gmlRep
;
private
final
String
representation
;
private
final
String
gmlRep
;
private
Unit
(
String
rep
,
String
gmlRep
)
{
representation
=
rep
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AllPolygonsWrongOrientationError.java
View file @
1745865f
...
...
@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
/**
* Error when all polygons are oriented wrong.
*
...
...
@@ -36,9 +38,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
*/
public
class
AllPolygonsWrongOrientationError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
2263993313732858840L
;
private
Geometry
geom
;
private
final
Geometry
geom
;
public
AllPolygonsWrongOrientationError
(
Geometry
geom
)
{
this
.
geom
=
geom
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeInvalidError.java
View file @
1745865f
...
...
@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.CityObject
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
public
class
AttributeInvalidError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
346311592089394220L
;
public
static
final
ErrorId
ID
=
new
ErrorId
(
"SE_ATTRIBUTE_INVALID"
);
private
CityObject
co
;
private
String
childId
;
private
String
nameOfAttribute
;
private
final
CityObject
co
;
private
final
String
childId
;
private
final
String
nameOfAttribute
;
public
AttributeInvalidError
(
CityObject
co
,
String
childId
,
String
nameOfAttribute
)
{
this
.
co
=
co
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeMissingError.java
View file @
1745865f
...
...
@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.CityObject
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
public
class
AttributeMissingError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
185026674309965067L
;
public
static
final
ErrorId
ID
=
new
ErrorId
(
"SE_ATTRIBUTE_MISSING"
);
private
CityObject
co
;
private
String
childId
;
private
String
nameOfAttribute
;
private
final
CityObject
co
;
private
final
String
childId
;
private
final
String
nameOfAttribute
;
public
AttributeMissingError
(
CityObject
co
,
String
childId
,
String
nameOfAttribute
)
{
this
.
co
=
co
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/AttributeValueWrongError.java
View file @
1745865f
...
...
@@ -28,15 +28,18 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.CityObject
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
public
class
AttributeValueWrongError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
6106964709204961560L
;
public
static
final
ErrorId
ID
=
new
ErrorId
(
"SE_ATTRIBUTE_WRONG_VALUE"
);
private
CityObject
co
;
private
String
childId
;
private
String
nameOfAttribute
;
private
final
CityObject
co
;
private
final
String
childId
;
private
final
String
nameOfAttribute
;
public
AttributeValueWrongError
(
CityObject
co
,
String
childId
,
String
nameOfAttribute
)
{
this
.
co
=
co
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/ConsecutivePointSameError.java
View file @
1745865f
...
...
@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
import
de.hft.stuttgart.citydoctor2.datastructure.LinearRing
;
import
de.hft.stuttgart.citydoctor2.datastructure.Vertex
;
import
java.io.Serial
;
/**
* When two points are too close to each other and are consecutive in a linear
* ring, this error is created.
...
...
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
*/
public
class
ConsecutivePointSameError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
6355935751554777494L
;
private
LinearRing
lr
;
private
Vertex
p1
;
private
Vertex
p2
;
private
final
LinearRing
lr
;
private
final
Vertex
p1
;
private
final
Vertex
p2
;
public
ConsecutivePointSameError
(
LinearRing
lr
,
Vertex
p1
,
Vertex
p2
)
{
this
.
lr
=
lr
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/DegeneratedRingError.java
View file @
1745865f
...
...
@@ -28,11 +28,14 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
de.hft.stuttgart.citydoctor2.datastructure.LinearRing
;
import
java.io.Serial
;
public
class
DegeneratedRingError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
865493182529055651L
;
private
LinearRing
lr
;
private
final
LinearRing
lr
;
public
DegeneratedRingError
(
LinearRing
lr
)
{
this
.
lr
=
lr
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/DependenciesNotMetError.java
View file @
1745865f
...
...
@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.HealingMethod;
import
de.hft.stuttgart.citydoctor2.check.ModificationListener
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
/**
* When a check checks if it can be executed but one or more dependency has
* found an error this check can also not be executed. This error is created in
...
...
@@ -39,9 +41,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
*/
public
class
DependenciesNotMetError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
851655185949574160L
;
private
CheckId
dependency
;
private
final
CheckId
dependency
;
public
DependenciesNotMetError
(
CheckId
dependency
)
{
this
.
dependency
=
dependency
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/MultipleConnectedComponentsError.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check.error
;
import
java.io.Serial
;
import
java.util.List
;
import
de.hft.stuttgart.citydoctor2.check.CheckError
;
...
...
@@ -40,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
*/
public
class
MultipleConnectedComponentsError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
2152069835068857036L
;
private
Geometry
geom
;
private
List
<
List
<
Polygon
>>
components
;
private
final
Geometry
geom
;
private
final
List
<
List
<
Polygon
>>
components
;
public
MultipleConnectedComponentsError
(
Geometry
geom
,
List
<
List
<
Polygon
>>
components
)
{
this
.
geom
=
geom
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NestedRingError.java
View file @
1745865f
...
...
@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
import
de.hft.stuttgart.citydoctor2.datastructure.LinearRing
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
import
java.io.Serial
;
/**
* If an inner ring is with in the boundaries of another, this error is created.
*
...
...
@@ -37,11 +39,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
*/
public
class
NestedRingError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
3396113374745830193L
;
private
Polygon
p
;
private
LinearRing
innerRing
;
private
LinearRing
withinRing
;
private
final
Polygon
p
;
private
final
LinearRing
innerRing
;
private
final
LinearRing
withinRing
;
public
NestedRingError
(
Polygon
p
,
LinearRing
innerRing
,
LinearRing
withinRing
)
{
this
.
p
=
p
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldEdgeError.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check.error
;
import
java.io.Serial
;
import
java.util.List
;
import
de.hft.stuttgart.citydoctor2.check.CheckError
;
...
...
@@ -39,10 +40,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
*/
public
class
NonManifoldEdgeError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
6742948557014332402L
;
private
List
<
Edge
>
edges
;
private
Geometry
geom
;
private
final
List
<
Edge
>
edges
;
private
final
Geometry
geom
;
public
NonManifoldEdgeError
(
Geometry
geom
,
List
<
Edge
>
edges
)
{
this
.
edges
=
edges
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonManifoldVertexError.java
View file @
1745865f
...
...
@@ -18,6 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.check.error
;
import
java.io.Serial
;
import
java.util.List
;
import
de.hft.stuttgart.citydoctor2.check.CheckError
;
...
...
@@ -41,11 +42,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
*/
public
class
NonManifoldVertexError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
3915669943428175777L
;
private
List
<
List
<
Polygon
>>
components
;
private
Geometry
geom
;
private
Vertex
v
;
private
final
List
<
List
<
Polygon
>>
components
;
private
final
Geometry
geom
;
private
final
Vertex
v
;
public
NonManifoldVertexError
(
Geometry
geom
,
List
<
List
<
Polygon
>>
components
,
Vertex
v
)
{
this
.
geom
=
geom
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonPlanarPolygonDistancePlaneError.java
View file @
1745865f
...
...
@@ -31,6 +31,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
import
de.hft.stuttgart.citydoctor2.math.Plane
;
import
de.hft.stuttgart.citydoctor2.utils.Localization
;
import
java.io.Serial
;
/**
* Error object for planarity errors containing the polygon, the regression
* plane and the distance to the plane.
...
...
@@ -40,12 +42,13 @@ import de.hft.stuttgart.citydoctor2.utils.Localization;
*/
public
class
NonPlanarPolygonDistancePlaneError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
3504364055236383519L
;
private
Polygon
p
;
private
double
distance
;
private
Vertex
v
;
private
Plane
plane
;
private
final
Polygon
p
;
private
final
double
distance
;
private
final
Vertex
v
;
private
final
Plane
plane
;
public
NonPlanarPolygonDistancePlaneError
(
Polygon
p
,
double
distance
,
Vertex
v
,
Plane
plane
)
{
this
.
p
=
p
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NonPlanarPolygonNormalsDeviation.java
View file @
1745865f
...
...
@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
import
java.io.Serial
;
/**
* When the normal of the triangles created from the triangulation of the
* polygon have a too large angle between them, this error is created.
...
...
@@ -37,10 +39,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
*/
public
class
NonPlanarPolygonNormalsDeviation
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
69073161885265794L
;
private
Polygon
p
;
private
double
deviation
;
private
final
Polygon
p
;
private
final
double
deviation
;
public
NonPlanarPolygonNormalsDeviation
(
Polygon
p
,
double
deviation
)
{
this
.
p
=
p
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/NotCeilingError.java
View file @
1745865f
...
...
@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
de.hft.stuttgart.citydoctor2.datastructure.Polygon
;
import
java.io.Serial
;
/**
* If a boundary surface is infact not a ceiling even though it was defined as
* one.
...
...
@@ -38,10 +40,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
*/
public
class
NotCeilingError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
6725904270389419696L
;
private
BoundarySurface
surface
;
private
Polygon
p
;
private
final
BoundarySurface
surface
;
private
final
Polygon
p
;
public
NotCeilingError
(
BoundarySurface
bs
,
Polygon
p
)
{
surface
=
bs
;
...
...
Prev
1
2
3
4
5
6
7
…
9
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment