Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
3f3c1884
Commit
3f3c1884
authored
Jun 24, 2022
by
Matthias Betz
Browse files
change to citygml4j 3.0.0 rc4
change to quality ade 0.1.4
parent
92f3e523
Pipeline
#6596
failed with stage
in 17 seconds
Changes
106
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/ValidationConfigurationTest.java
View file @
3f3c1884
...
...
@@ -18,14 +18,18 @@
*/
package
de.hft.stuttgart.citydoctor2.check
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
java.io.FileNotFoundException
;
import
org.junit.Test
;
import
de.hft.stuttgart.citydoctor2.datastructure.FeatureType
;
import
de.hft.stuttgart.quality.model.
jaxb
.RequirementId
;
import
de.hft.stuttgart.quality.model.
enums
.RequirementId
;
public
class
ValidationConfigurationTest
{
...
...
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/DegeneratedPolygonCheckTest.java
View file @
3f3c1884
...
...
@@ -42,7 +42,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
import
de.hft.stuttgart.citydoctor2.datastructure.Lod
;
import
de.hft.stuttgart.citydoctor2.datastructure.Vertex
;
import
de.hft.stuttgart.citydoctor2.parser.ParserConfiguration
;
import
de.hft.stuttgart.quality.model.
jaxb
.RequirementId
;
import
de.hft.stuttgart.quality.model.
enums
.RequirementId
;
public
class
DegeneratedPolygonCheckTest
{
...
...
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldEdgeSystemTest.java
View file @
3f3c1884
...
...
@@ -34,7 +34,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
import
de.hft.stuttgart.citydoctor2.datastructure.Geometry
;
import
de.hft.stuttgart.citydoctor2.parser.CityGmlParseException
;
import
de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException
;
import
de.hft.stuttgart.quality.model.
jaxb
.RequirementId
;
import
de.hft.stuttgart.quality.model.
enums
.RequirementId
;
/**
*
...
...
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/PlanarTest.java
View file @
3f3c1884
...
...
@@ -37,7 +37,7 @@ import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
import
de.hft.stuttgart.citydoctor2.parser.CityGmlParser
;
import
de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException
;
import
de.hft.stuttgart.citydoctor2.parser.ParserConfiguration
;
import
de.hft.stuttgart.quality.model.
jaxb
.RequirementId
;
import
de.hft.stuttgart.quality.model.
enums
.RequirementId
;
/**
*
...
...
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/TestUtil.java
View file @
3f3c1884
...
...
@@ -42,6 +42,7 @@ public class TestUtil {
public
static
CityDoctorModel
loadAndCheckCityModel
(
String
path
)
throws
CityGmlParseException
,
IOException
,
InvalidGmlFileException
{
ValidationConfiguration
valConfig
=
ValidationConfiguration
.
loadStandardValidationConfig
();
valConfig
.
setSchematronFilePathInGlobalParameters
(
null
);
CityDoctorModel
m
=
CityGmlParser
.
parseCityGmlFile
(
path
,
valConfig
.
getParserConfiguration
());
Checker
c
=
new
Checker
(
valConfig
,
m
);
c
.
runChecks
();
...
...
CityDoctorParent/pom.xml
View file @
3f3c1884
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorParent
</artifactId>
<version>
3.1
0.3
</version>
<version>
3.1
1.0
</version>
<packaging>
pom
</packaging>
<name>
CityDoctorParent
</name>
...
...
@@ -89,22 +89,20 @@
<artifactId>
hibernate-core
</artifactId>
<version>
5.4.3.Final
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.citygml4j/citygml4j -->
<dependency>
<groupId>
org.citygml4j
</groupId>
<artifactId>
citygml4j
</artifactId>
<version>
2.11.2
</version>
<artifactId>
citygml4j
-core
</artifactId>
<version>
3.0.0-rc.4
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.citygml4j.ade/energy-ade-citygml4j -->
<dependency>
<groupId>
org.citygml4j
.ade
</groupId>
<artifactId>
energy-ade-
citygml4j
</artifactId>
<version>
1
.0.0
</version>
<groupId>
org.citygml4j
</groupId>
<artifactId>
citygml4j
-xml
</artifactId>
<version>
3
.0.0
-rc.4
</version>
</dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
citygml4j-quality-ade
</artifactId>
<version>
0
.1.
3
</version>
<version>
3
.1.
4
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/fop -->
<dependency>
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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