Skip to content
GitLab
Commit 8b6cdd3b authored by Luna Riegel's avatar Luna Riegel
Browse files

Merge branch 'dev_embedded_geodb' into 'dev' 

!Geodatabase implementation

See merge request !36
parents 2fe401b3 e2cce980
Pipeline #12243 passed with stage
in 2 minutes and 14 seconds
Hide whitespace changes
Inline Side-by-side
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealSameOrientationErrorTest.java
View file @ 8b6cdd3b
......@@ -26,11 +26,11 @@ public class HealSameOrientationErrorTest {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Assert.assertTrue(geom.containsError(CheckId.C_GE_P_ORIENTATION_RINGS_SAME));
Healer healer = new Healer(c);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
Assert.assertFalse(geom.containsError(CheckId.C_GE_P_ORIENTATION_RINGS_SAME));
}
......
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealSolidNotClosedErrorTest.java
View file @ 8b6cdd3b
......@@ -439,7 +439,7 @@ public class HealSolidNotClosedErrorTest {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
geom.updateVertices();
for (Vertex v : geom.getVertices()) {
v.setX(v.getX() - 10);
......@@ -449,7 +449,7 @@ public class HealSolidNotClosedErrorTest {
Healer healer = new Healer(c);
//healer.setNumberOfIterations(2);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
Assert.assertFalse(geom.containsError(CheckId.C_GE_S_NOT_CLOSED));
}
......
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/HealTooFewPointsTest.java
View file @ 8b6cdd3b
......@@ -27,11 +27,11 @@ public class HealTooFewPointsTest {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
assertTrue(geom.containsError(CheckId.C_GE_R_TOO_FEW_POINTS));
Healer healer = new Healer(c);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
assertFalse(geom.containsError(CheckId.C_GE_R_TOO_FEW_POINTS));
}
......
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/TestHealer.java
View file @ 8b6cdd3b
......@@ -45,7 +45,7 @@ public class TestHealer {
c.runChecks();
Building b = null;
for (Building building : model.getBuildings()) {
for (Building building : model.getBuildings().toList()) {
if (building.getGmlId().getGmlString().equals("DEBE08YYF0004KZs")) {
b = building;
break;
......@@ -125,8 +125,8 @@ public class TestHealer {
c.runChecks();
Healer healer = new Healer(c);
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
healer.healCityObject(model.getBuildings().get(0));
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -151,11 +151,11 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.setNumberOfIterations(33);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -171,10 +171,10 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -190,11 +190,11 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.setNumberOfIterations(83);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -210,11 +210,11 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.setNumberOfIterations(165);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -241,7 +241,7 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Building b = model.getBuildings().get(0);
Building b = model.getBuildings().toList().get(0);
Healer healer = new Healer(c);
healer.healCityObject(b);
c.runChecks();
......@@ -261,11 +261,11 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.setNumberOfIterations(45);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......@@ -297,10 +297,10 @@ public class TestHealer {
Checker c = new Checker(config, model);
c.runChecks();
Geometry geom = model.getBuildings().get(0).getGeometries().get(0);
Geometry geom = model.getBuildings().toList().get(0).getGeometries().get(0);
Healer healer = new Healer(c);
healer.setNumberOfIterations(100);
healer.healCityObject(model.getBuildings().get(0));
healer.healCityObject(model.getBuildings().toList().get(0));
c.runChecks();
assertFalse(geom.containsAnyError());
......
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/TestUtil.java
View file @ 8b6cdd3b
......@@ -38,15 +38,15 @@ public class TestUtil {
if (gmlId == null) {
return null;
}
Polygon result = getPolygonById(gmlId, model.getBuildings());
Polygon result = getPolygonById(gmlId, model.getBuildings().toList());
if (result != null) {
return result;
}
result = getPolygonById(gmlId, model.getVegetation());
result = getPolygonById(gmlId, model.getVegetation().toList());
if (result != null) {
return result;
}
return getPolygonById(gmlId, model.getTransportation());
return getPolygonById(gmlId, model.getTransportation().toList());
}
private static Polygon getPolygonById(String gmlId, List<? extends CityObject> features) {
......@@ -85,17 +85,17 @@ public class TestUtil {
if (featureId == null) {
return null;
}
for (CityObject co : model.getBuildings()) {
for (CityObject co : model.getBuildings().toList()) {
if (featureId.equals(co.getGmlId().getGmlString())) {
return co;
}
}
for (CityObject co : model.getTransportation()) {
for (CityObject co : model.getTransportation().toList()) {
if (featureId.equals(co.getGmlId().getGmlString())) {
return co;
}
}
for (CityObject co : model.getVegetation()) {
for (CityObject co : model.getVegetation().toList()) {
if (featureId.equals(co.getGmlId().getGmlString())) {
return co;
}
......
CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
View file @ 8b6cdd3b
......@@ -7,7 +7,7 @@
<parent>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId>
<version>3.17.3</version>
<version>3.18.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>CityDoctorHealerGUI</artifactId>
......
CityDoctorParent/Extensions/CityDoctorHealerGUI/src/main/java/de/hft/stuttgart/citydoctor2/healer/gui/HealerController.java
View file @ 8b6cdd3b
......@@ -674,9 +674,7 @@ public class HealerController {
// triangle area is too small, ignore
return;
}
for (Building b : model.getBuildings()) {
MeshGenerator.replaceGeometryWithMeshedGeometry(b, area);
}
model.getBuildings().forEach(building -> MeshGenerator.replaceGeometryWithMeshedGeometry(building, area));
} catch (NumberFormatException e) {
// no real number was inserted, do nothing
}
......
CityDoctorParent/Extensions/CityDoctorHealerGenetic/pom.xml
View file @ 8b6cdd3b
......@@ -4,7 +4,7 @@
<parent>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId>
<version>3.17.3</version>
<version>3.18.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>CityDoctorHealerGenetic</artifactId>
......
CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/main/java/de/hft/stuttgart/citydoctor2/healer/genetic/gui/GeneticsGUI.java
View file @ 8b6cdd3b
......@@ -329,7 +329,7 @@ public class GeneticsGUI extends View {
parserConfig);
currentChecker = new Checker(model1);
currentChecker.runChecks();
Building building = model1.getBuildings().get(0);
Building building = model1.getBuildings().toList().getFirst();
currentGeometry = building.getGeometries().get(0);
currentFeature = building;
showCurrentGeometry();
......
CityDoctorParent/pom.xml
View file @ 8b6cdd3b
......@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId>
<version>3.17.3</version>
<version>3.18.0</version>
<packaging>pom</packaging>
<name>CityDoctorParent</name>
<properties>
......@@ -242,6 +242,21 @@
<artifactId>earcut4j</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>7.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
......@@ -267,6 +282,17 @@
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j18-impl</artifactId>
<version>2.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<!--CityDoctor2 Core Modules-->
......@@ -277,10 +303,10 @@
<!--CityDoctor2 Extension Modules-->
<module>Extensions/CityDoctorGUI</module>
<module>Extensions/CityDoctorAutoPro</module>
<module>Extensions/CityDoctorHealer</module>
<module>Extensions/CityDoctorHealerGenetic</module>
<module>Extensions/CityDoctorHealerGUI</module>
<!-- <module>Extensions/CityDoctorAutoPro</module>-->
<!-- <module>Extensions/CityDoctorHealer</module>-->
<!-- <module>Extensions/CityDoctorHealerGenetic</module>-->
<!-- <module>Extensions/CityDoctorHealerGUI</module>-->
</modules>
</project>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal