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
Expand all
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/UnknownCheckError.java
View file @
1745865f
...
@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.check.HealingMethod;
...
@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.check.HealingMethod;
import
de.hft.stuttgart.citydoctor2.check.ModificationListener
;
import
de.hft.stuttgart.citydoctor2.check.ModificationListener
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
de.hft.stuttgart.citydoctor2.datastructure.GmlElement
;
import
java.io.Serial
;
/**
/**
* This error is created when an unexpected exception is thrown by the code.
* This error is created when an unexpected exception is thrown by the code.
*
*
...
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
...
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
*/
*/
public
class
UnknownCheckError
implements
CheckError
{
public
class
UnknownCheckError
implements
CheckError
{
@Serial
private
static
final
long
serialVersionUID
=
-
6554097632341055596L
;
private
static
final
long
serialVersionUID
=
-
6554097632341055596L
;
private
Checkable
c
;
private
final
Checkable
c
;
private
Exception
e
;
private
final
Exception
e
;
private
CheckId
checkId
;
private
final
CheckId
checkId
;
public
UnknownCheckError
(
Checkable
c
,
Exception
e
,
Check
check
)
{
public
UnknownCheckError
(
Checkable
c
,
Exception
e
,
Check
check
)
{
this
.
c
=
c
;
this
.
c
=
c
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -47,12 +48,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -47,12 +48,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
abstract
class
AbstractBuilding
extends
CityObject
{
public
abstract
class
AbstractBuilding
extends
CityObject
{
@Serial
private
static
final
long
serialVersionUID
=
-
2196414503088741206L
;
private
static
final
long
serialVersionUID
=
-
2196414503088741206L
;
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
AbstractBuilding
.
class
);
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
AbstractBuilding
.
class
);
private
List
<
Installation
>
buildingInstallations
=
new
ArrayList
<>(
2
);
private
final
List
<
Installation
>
buildingInstallations
=
new
ArrayList
<>(
2
);
private
List
<
BoundarySurface
>
boundarySurfaceList
=
new
ArrayList
<>();
private
final
List
<
BoundarySurface
>
boundarySurfaceList
=
new
ArrayList
<>();
private
org
.
citygml4j
.
core
.
model
.
building
.
AbstractBuilding
ab
;
private
org
.
citygml4j
.
core
.
model
.
building
.
AbstractBuilding
ab
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -42,12 +43,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -42,12 +43,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
BoundarySurface
extends
CityObject
{
public
class
BoundarySurface
extends
CityObject
{
@Serial
private
static
final
long
serialVersionUID
=
8793865135393496408L
;
private
static
final
long
serialVersionUID
=
8793865135393496408L
;
private
SurfaceFeatureType
featureType
;
private
SurfaceFeatureType
featureType
;
private
BoundarySurfaceType
type
;
private
BoundarySurfaceType
type
;
private
List
<
Opening
>
openings
=
new
ArrayList
<>(
2
);
private
final
List
<
Opening
>
openings
=
new
ArrayList
<>(
2
);
private
CityObject
parent
;
private
CityObject
parent
;
private
AbstractThematicSurface
gmlObject
;
private
AbstractThematicSurface
gmlObject
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundingBox.java
View file @
1745865f
...
@@ -32,7 +32,7 @@ import de.hft.stuttgart.citydoctor2.utils.BoundingBoxCalculator;
...
@@ -32,7 +32,7 @@ import de.hft.stuttgart.citydoctor2.utils.BoundingBoxCalculator;
*/
*/
public
class
BoundingBox
{
public
class
BoundingBox
{
private
Vector3d
[]
bbox
;
private
final
Vector3d
[]
bbox
;
/**
/**
* Creates an axis aligned bounding box containing all points of all polygons
* Creates an axis aligned bounding box containing all points of all polygons
...
@@ -142,11 +142,7 @@ public class BoundingBox {
...
@@ -142,11 +142,7 @@ public class BoundingBox {
public
double
getLongestSide
()
{
public
double
getLongestSide
()
{
double
width
=
getWidth
();
double
width
=
getWidth
();
double
depth
=
getDepth
();
double
depth
=
getDepth
();
if
(
width
>
depth
)
{
return
Math
.
max
(
width
,
depth
);
return
width
;
}
else
{
return
depth
;
}
}
}
/**
/**
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -47,10 +48,11 @@ public class BridgeConstructiveElement extends CityObject {
...
@@ -47,10 +48,11 @@ public class BridgeConstructiveElement extends CityObject {
private
static
final
String
CANNOT_ADD
=
"Cannot add "
;
private
static
final
String
CANNOT_ADD
=
"Cannot add "
;
@Serial
private
static
final
long
serialVersionUID
=
7353233899458901155L
;
private
static
final
long
serialVersionUID
=
7353233899458901155L
;
private
org
.
citygml4j
.
core
.
model
.
bridge
.
BridgeConstructiveElement
gmlBridgeElement
;
private
final
org
.
citygml4j
.
core
.
model
.
bridge
.
BridgeConstructiveElement
gmlBridgeElement
;
private
List
<
BoundarySurface
>
boundarySurfaceList
=
new
ArrayList
<>();
private
final
List
<
BoundarySurface
>
boundarySurfaceList
=
new
ArrayList
<>();
public
BridgeConstructiveElement
(
org
.
citygml4j
.
core
.
model
.
bridge
.
BridgeConstructiveElement
gmlObject
)
{
public
BridgeConstructiveElement
(
org
.
citygml4j
.
core
.
model
.
bridge
.
BridgeConstructiveElement
gmlObject
)
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java
View file @
1745865f
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -35,9 +36,10 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -35,9 +36,10 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
public
class
Building
extends
AbstractBuilding
{
public
class
Building
extends
AbstractBuilding
{
@Serial
private
static
final
long
serialVersionUID
=
588480113268630052L
;
private
static
final
long
serialVersionUID
=
588480113268630052L
;
private
List
<
BuildingPart
>
buildingParts
=
new
ArrayList
<>(
2
);
private
final
List
<
BuildingPart
>
buildingParts
=
new
ArrayList
<>(
2
);
public
List
<
BuildingPart
>
getBuildingParts
()
{
public
List
<
BuildingPart
>
getBuildingParts
()
{
return
buildingParts
;
return
buildingParts
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingPart.java
View file @
1745865f
...
@@ -21,8 +21,11 @@ package de.hft.stuttgart.citydoctor2.datastructure;
...
@@ -21,8 +21,11 @@ package de.hft.stuttgart.citydoctor2.datastructure;
import
de.hft.stuttgart.citydoctor2.utils.CopyHandler
;
import
de.hft.stuttgart.citydoctor2.utils.CopyHandler
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
java.io.Serial
;
public
class
BuildingPart
extends
AbstractBuilding
{
public
class
BuildingPart
extends
AbstractBuilding
{
@Serial
private
static
final
long
serialVersionUID
=
8200322261958679163L
;
private
static
final
long
serialVersionUID
=
8200322261958679163L
;
private
Building
parent
;
private
Building
parent
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java
View file @
1745865f
...
@@ -53,17 +53,17 @@ import de.hft.stuttgart.quality.model.types.ValidationPlan;
...
@@ -53,17 +53,17 @@ import de.hft.stuttgart.quality.model.types.ValidationPlan;
public
class
CityDoctorModel
{
public
class
CityDoctorModel
{
private
static
final
String
COULD_NOT_FIND_FEATURE
=
"Could not find feature: "
;
private
static
final
String
COULD_NOT_FIND_FEATURE
=
"Could not find feature: "
;
private
List
<
Building
>
buildings
;
private
final
List
<
Building
>
buildings
;
private
List
<
Vegetation
>
vegetation
;
private
final
List
<
Vegetation
>
vegetation
;
private
List
<
BridgeObject
>
bridges
;
private
final
List
<
BridgeObject
>
bridges
;
private
List
<
CityObject
>
land
;
private
final
List
<
CityObject
>
land
;
private
List
<
TransportationObject
>
roads
;
private
final
List
<
TransportationObject
>
roads
;
private
List
<
WaterObject
>
water
;
private
final
List
<
WaterObject
>
water
;
private
CityModel
cModel
;
private
CityModel
cModel
;
private
ParserConfiguration
config
;
private
final
ParserConfiguration
config
;
private
String
fileName
;
private
final
String
fileName
;
private
File
file
;
private
final
File
file
;
private
List
<
CheckError
>
globalErrors
;
private
final
List
<
CheckError
>
globalErrors
;
private
boolean
isValidated
=
false
;
private
boolean
isValidated
=
false
;
private
ValidationPlan
plan
;
private
ValidationPlan
plan
;
private
CityGMLVersion
cityGMLVersion
;
private
CityGMLVersion
cityGMLVersion
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
...
@@ -43,9 +44,10 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -43,9 +44,10 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
abstract
class
CityObject
extends
GmlElement
{
public
abstract
class
CityObject
extends
GmlElement
{
@Serial
private
static
final
long
serialVersionUID
=
651712070755024188L
;
private
static
final
long
serialVersionUID
=
651712070755024188L
;
private
List
<
Geometry
>
geometryList
=
new
ArrayList
<>();
private
final
List
<
Geometry
>
geometryList
=
new
ArrayList
<>();
/**
/**
* Recreates the CityGML4j geometry in this object. The CityGML4j geometry is
* Recreates the CityGML4j geometry in this object. The CityGML4j geometry is
...
@@ -83,23 +85,11 @@ public abstract class CityObject extends GmlElement {
...
@@ -83,23 +85,11 @@ public abstract class CityObject extends GmlElement {
}
}
public
void
removeGeometry
(
Lod
lod
)
{
public
void
removeGeometry
(
Lod
lod
)
{
Iterator
<
Geometry
>
it
=
geometryList
.
iterator
();
geometryList
.
removeIf
(
geom
->
geom
.
getLod
()
==
lod
);
while
(
it
.
hasNext
())
{
Geometry
next
=
it
.
next
();
if
(
next
.
getLod
()
==
lod
)
{
it
.
remove
();
}
}
}
}
public
void
removeGeometry
(
Lod
lod
,
GeometryType
type
)
{
public
void
removeGeometry
(
Lod
lod
,
GeometryType
type
)
{
Iterator
<
Geometry
>
it
=
geometryList
.
iterator
();
geometryList
.
removeIf
(
geom
->
geom
.
getLod
()
==
lod
&&
geom
.
getType
()
==
type
);
while
(
it
.
hasNext
())
{
Geometry
next
=
it
.
next
();
if
(
next
.
getLod
()
==
lod
&&
next
.
getType
()
==
type
)
{
it
.
remove
();
}
}
}
}
public
Geometry
getHighestLodGeometry
()
{
public
Geometry
getHighestLodGeometry
()
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
...
@@ -41,6 +42,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -41,6 +42,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
ConcretePolygon
extends
Polygon
{
public
class
ConcretePolygon
extends
Polygon
{
@Serial
private
static
final
long
serialVersionUID
=
-
2208347892270418372L
;
private
static
final
long
serialVersionUID
=
-
2208347892270418372L
;
private
LinearRing
exterior
;
private
LinearRing
exterior
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Edge.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -33,10 +34,11 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -33,10 +34,11 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
Edge
implements
Serializable
,
Copyable
{
public
class
Edge
implements
Serializable
,
Copyable
{
@Serial
private
static
final
long
serialVersionUID
=
-
504694863498128296L
;
private
static
final
long
serialVersionUID
=
-
504694863498128296L
;
private
List
<
Polygon
>
adjacentPolygons
=
new
ArrayList
<>(
2
);
private
final
List
<
Polygon
>
adjacentPolygons
=
new
ArrayList
<>(
2
);
private
List
<
LinearRing
>
adjacentRings
=
new
ArrayList
<>(
2
);
private
final
List
<
LinearRing
>
adjacentRings
=
new
ArrayList
<>(
2
);
private
Vertex
from
;
private
Vertex
from
;
private
Vertex
to
;
private
Vertex
to
;
...
@@ -78,16 +80,8 @@ public class Edge implements Serializable, Copyable {
...
@@ -78,16 +80,8 @@ public class Edge implements Serializable, Copyable {
}
}
private
boolean
isPointOfEdge
(
Vertex
v0
,
Vertex
edgePoint
)
{
private
boolean
isPointOfEdge
(
Vertex
v0
,
Vertex
edgePoint
)
{
if
(
v0
.
equals
(
edgePoint
))
{
return
v0
.
equals
(
edgePoint
);
return
true
;
}
}
// for (Vertex v : v0.getNeighbors()) {
// if (v.equals(edgePoint)) {
// return true;
// }
// }
return
false
;
}
public
boolean
formedByIgnoreDirection
(
Vertex
v1
,
Vertex
v2
)
{
public
boolean
formedByIgnoreDirection
(
Vertex
v1
,
Vertex
v2
)
{
return
(
v1
==
from
&&
v2
==
to
)
||
(
v1
==
to
&&
v2
==
from
);
return
(
v1
==
from
&&
v2
==
to
)
||
(
v1
==
to
&&
v2
==
from
);
...
@@ -146,14 +140,9 @@ public class Edge implements Serializable, Copyable {
...
@@ -146,14 +140,9 @@ public class Edge implements Serializable, Copyable {
return
false
;
return
false
;
}
}
if
(
to
==
null
)
{
if
(
to
==
null
)
{
if
(
other
.
to
!=
null
)
{
return
other
.
to
==
null
;
return
false
;
}
else
return
to
.
equals
(
other
.
to
);
}
}
}
else
if
(!
to
.
equals
(
other
.
to
))
{
return
false
;
}
return
true
;
}
public
void
addAdjacentPolygon
(
Polygon
p
)
{
public
void
addAdjacentPolygon
(
Polygon
p
)
{
adjacentPolygons
.
add
(
p
);
adjacentPolygons
.
add
(
p
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/FeatureType.java
View file @
1745865f
...
@@ -27,6 +27,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
...
@@ -27,6 +27,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
public
enum
FeatureType
{
public
enum
FeatureType
{
BUILDING
,
TRANSPORTATION
,
VEGETATION
,
BRIDGE
,
LAND
,
WATER
,
BOUNDARY_SURFACE
,
INSTALLATION
,
OPENING
,
BUILDING
,
TRANSPORTATION
,
VEGETATION
,
BRIDGE
,
LAND
,
WATER
,
BOUNDARY_SURFACE
,
INSTALLATION
,
OPENING
,
BUILDING_PART
,
BRIDGE_CONSTRUCTION_ELEMENT
,
BRIDGE_INSTALLATION
;
BUILDING_PART
,
BRIDGE_CONSTRUCTION_ELEMENT
,
BRIDGE_INSTALLATION
}
}
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.HashSet
;
...
@@ -48,16 +49,17 @@ public class Geometry extends GmlElement {
...
@@ -48,16 +49,17 @@ public class Geometry extends GmlElement {
private
static
final
String
FAILED_REMOVING_POLYGON
=
"Removing polygon %s but polygon is not in geometry"
;
private
static
final
String
FAILED_REMOVING_POLYGON
=
"Removing polygon %s but polygon is not in geometry"
;
@Serial
private
static
final
long
serialVersionUID
=
2539031030917731575L
;
private
static
final
long
serialVersionUID
=
2539031030917731575L
;
private
static
Random
r
=
new
Random
();
private
static
final
Random
r
=
new
Random
();
private
GeometryType
type
;
private
GeometryType
type
;
private
Lod
lod
;
private
final
Lod
lod
;
private
CityObject
parent
;
private
CityObject
parent
;
private
List
<
Polygon
>
polygons
=
new
ArrayList
<>(
2
);
private
final
List
<
Polygon
>
polygons
=
new
ArrayList
<>(
2
);
private
List
<
Edge
>
edges
;
private
List
<
Edge
>
edges
;
private
Map
<
SerializablePair
<
Vertex
,
Vertex
>,
Edge
>
edgeMap
;
private
Map
<
SerializablePair
<
Vertex
,
Vertex
>,
Edge
>
edgeMap
;
private
List
<
Vertex
>
vertices
;
private
List
<
Vertex
>
vertices
;
...
@@ -153,7 +155,7 @@ public class Geometry extends GmlElement {
...
@@ -153,7 +155,7 @@ public class Geometry extends GmlElement {
}
}
// only go to size -1 as ring should be closed
// only go to size -1 as ring should be closed
for
(
int
i
=
0
;
i
<
ring
.
getVertices
().
size
()
-
1
;
i
++)
{
for
(
int
i
=
0
;
i
<
ring
.
getVertices
().
size
()
-
1
;
i
++)
{
Vertex
v0
=
ring
.
getVertices
().
get
(
i
+
0
);
Vertex
v0
=
ring
.
getVertices
().
get
(
i
);
Vertex
v1
=
ring
.
getVertices
().
get
(
i
+
1
);
Vertex
v1
=
ring
.
getVertices
().
get
(
i
+
1
);
Edge
tempEdge
=
new
Edge
(
v0
,
v1
);
Edge
tempEdge
=
new
Edge
(
v0
,
v1
);
Edge
e
=
duplicacyMap
.
get
(
tempEdge
);
Edge
e
=
duplicacyMap
.
get
(
tempEdge
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GmlElement.java
View file @
1745865f
...
@@ -22,6 +22,8 @@ import de.hft.stuttgart.citydoctor2.check.Checkable;
...
@@ -22,6 +22,8 @@ import de.hft.stuttgart.citydoctor2.check.Checkable;
import
de.hft.stuttgart.citydoctor2.utils.CopyHandler
;
import
de.hft.stuttgart.citydoctor2.utils.CopyHandler
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
java.io.Serial
;
/**
/**
* A general GML element that has a gml id
* A general GML element that has a gml id
*
*
...
@@ -30,6 +32,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -30,6 +32,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
abstract
class
GmlElement
extends
Checkable
implements
Copyable
{
public
abstract
class
GmlElement
extends
Checkable
implements
Copyable
{
@Serial
private
static
final
long
serialVersionUID
=
-
3242505393303017359L
;
private
static
final
long
serialVersionUID
=
-
3242505393303017359L
;
private
GmlId
gmlId
;
private
GmlId
gmlId
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GmlId.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.concurrent.atomic.AtomicInteger
;
...
@@ -30,14 +31,15 @@ import java.util.concurrent.atomic.AtomicInteger;
...
@@ -30,14 +31,15 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
*/
public
class
GmlId
implements
Serializable
{
public
class
GmlId
implements
Serializable
{
@Serial
private
static
final
long
serialVersionUID
=
4273817255150972966L
;
private
static
final
long
serialVersionUID
=
4273817255150972966L
;
/* prefixes for generation */
/* prefixes for generation */
private
static
final
String
GENERAL_GEN
=
"CityDoctor_%d_%d"
;
private
static
final
String
GENERAL_GEN
=
"CityDoctor_%d_%d"
;
private
static
final
AtomicInteger
ID_COUNTER
=
new
AtomicInteger
();
private
static
final
AtomicInteger
ID_COUNTER
=
new
AtomicInteger
();
private
String
gmlString
;
private
final
String
gmlString
;
private
boolean
generated
;
private
final
boolean
generated
;
public
GmlId
(
String
gmlId
)
{
public
GmlId
(
String
gmlId
)
{
this
(
gmlId
,
false
);
this
(
gmlId
,
false
);
...
@@ -85,14 +87,9 @@ public class GmlId implements Serializable {
...
@@ -85,14 +87,9 @@ public class GmlId implements Serializable {
return
false
;
return
false
;
}
}
if
(
gmlString
==
null
)
{
if
(
gmlString
==
null
)
{
if
(
other
.
gmlString
!=
null
)
{
return
other
.
gmlString
==
null
;
return
false
;
}
else
return
gmlString
.
equals
(
other
.
gmlString
);
}
}
}
else
if
(!
gmlString
.
equals
(
other
.
gmlString
))
{
return
false
;
}
return
true
;
}
/**
/**
* Determines if the GML-ID was generated by CityDoctor or not.
* Determines if the GML-ID was generated by CityDoctor or not.
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -41,6 +42,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -41,6 +42,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
public
class
Installation
extends
CityObject
{
public
class
Installation
extends
CityObject
{
@Serial
private
static
final
long
serialVersionUID
=
1576237433322680191L
;
private
static
final
long
serialVersionUID
=
1576237433322680191L
;
private
List
<
BoundarySurface
>
boundarySurfaces
=
new
ArrayList
<>(
4
);
private
List
<
BoundarySurface
>
boundarySurfaces
=
new
ArrayList
<>(
4
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LandObject.java
View file @
1745865f
...
@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
...
@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
import
de.hft.stuttgart.citydoctor2.utils.CityGmlUtils
;
import
de.hft.stuttgart.citydoctor2.utils.CityGmlUtils
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
de.hft.stuttgart.citydoctor2.utils.Copyable
;
import
java.io.Serial
;
/**
/**
* Represents a land use CityGML object.
* Represents a land use CityGML object.
*
*
...
@@ -37,6 +39,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -37,6 +39,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
LandObject
extends
CityObject
{
public
class
LandObject
extends
CityObject
{
@Serial
private
static
final
long
serialVersionUID
=
1887455662411087326L
;
private
static
final
long
serialVersionUID
=
1887455662411087326L
;
private
LandUse
lu
;
private
LandUse
lu
;
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinearRing.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -38,12 +39,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -38,12 +39,13 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
LinearRing
extends
GmlElement
{
public
class
LinearRing
extends
GmlElement
{
@Serial
private
static
final
long
serialVersionUID
=
-
2488180830514940722L
;
private
static
final
long
serialVersionUID
=
-
2488180830514940722L
;
private
LinearRingType
type
;
private
LinearRingType
type
;
private
Polygon
parent
;
private
Polygon
parent
;
private
List
<
Vertex
>
vertices
=
new
ArrayList
<>();
private
final
List
<
Vertex
>
vertices
=
new
ArrayList
<>();
public
enum
LinearRingType
{
public
enum
LinearRingType
{
EXTERIOR
,
INTERIOR
EXTERIOR
,
INTERIOR
...
@@ -130,7 +132,7 @@ public class LinearRing extends GmlElement {
...
@@ -130,7 +132,7 @@ public class LinearRing extends GmlElement {
public
Vector3d
calculateNormal
()
{
public
Vector3d
calculateNormal
()
{
double
[]
coords
=
new
double
[
3
];
double
[]
coords
=
new
double
[
3
];
for
(
int
i
=
0
;
i
<
vertices
.
size
()
-
1
;
i
++)
{
for
(
int
i
=
0
;
i
<
vertices
.
size
()
-
1
;
i
++)
{
Vertex
current
=
vertices
.
get
(
i
+
0
);
Vertex
current
=
vertices
.
get
(
i
);
Vertex
next
=
vertices
.
get
(
i
+
1
);
Vertex
next
=
vertices
.
get
(
i
+
1
);
coords
[
0
]
+=
(
current
.
getZ
()
+
next
.
getZ
())
*
(
current
.
getY
()
-
next
.
getY
());
coords
[
0
]
+=
(
current
.
getZ
()
+
next
.
getZ
())
*
(
current
.
getY
()
-
next
.
getY
());
coords
[
1
]
+=
(
current
.
getX
()
+
next
.
getX
())
*
(
current
.
getZ
()
-
next
.
getZ
());
coords
[
1
]
+=
(
current
.
getX
()
+
next
.
getX
())
*
(
current
.
getZ
()
-
next
.
getZ
());
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java
View file @
1745865f
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
package
de.hft.stuttgart.citydoctor2.datastructure
;
package
de.hft.stuttgart.citydoctor2.datastructure
;
import
java.io.Serial
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -39,6 +40,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
...
@@ -39,6 +40,7 @@ import de.hft.stuttgart.citydoctor2.utils.Copyable;
*/
*/
public
class
LinkedPolygon
extends
Polygon
{
public
class
LinkedPolygon
extends
Polygon
{
@Serial
private
static
final
long
serialVersionUID
=
-
4897578390280277931L
;
private
static
final
long
serialVersionUID
=
-
4897578390280277931L
;
private
Geometry
parent
;
private
Geometry
parent
;
...
...
Prev
1
2
3
4
5
6
7
8
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