Skip to content
GitLab
Commit b75c2602 authored by Riegel's avatar Riegel
Browse files

Merge branch 'refs/heads/dev' into dev_zip_files 

# Conflicts:
#	CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LibraryObject.java
#	CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/mapper/citygml3/Citygml3FeatureMapper.java
#	CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
#	CityDoctorParent/Extensions/CityDoctorGUI/pom.xml
#	CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml
#	CityDoctorParent/Extensions/CityDoctorHealer/pom.xml
#	CityDoctorParent/pom.xml
parents 46573e28 ca7fe768
master dev dev_gui_features_zip_loading 3.17.0 archive/dev_gui_features_zip_loading
2 merge requests!28Version 3.17.0 Release,!26Add ZIP-archive support
Pipeline #10991 passed with stage
in 1 minute and 24 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 83 additions and 31 deletions
+83 -31
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/SolidSelfIntCheckTest.java
+ 0
- 1
View file @ b75c2602
...@@ -86,7 +86,6 @@ public class SolidSelfIntCheckTest { ...@@ -86,7 +86,6 @@ public class SolidSelfIntCheckTest {
Checker c = new Checker(config, m); Checker c = new Checker(config, m);
c.runChecks(); c.runChecks();
Building building = m.getBuildings().get(0); Building building = m.getBuildings().get(0);
System.out.println(building.containsAnyError());
/* /*
* The examples have no actual self-intersections, but can contain other actual model defects. * The examples have no actual self-intersections, but can contain other actual model defects.
* If an error is detected, it is thus required to check if the * If an error is detected, it is thus required to check if the
......
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/util/GeometryTestUtils.java
+ 0
- 1
View file @ b75c2602
...@@ -21,7 +21,6 @@ package de.hft.stuttgart.citydoctor2.checks.util; ...@@ -21,7 +21,6 @@ package de.hft.stuttgart.citydoctor2.checks.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.StringJoiner;
import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon; import de.hft.stuttgart.citydoctor2.datastructure.ConcretePolygon;
import de.hft.stuttgart.citydoctor2.datastructure.Geometry; import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
......
CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldVertexSystemTest.java
+ 0
- 1
View file @ b75c2602
...@@ -45,7 +45,6 @@ public class NonManifoldVertexSystemTest { ...@@ -45,7 +45,6 @@ public class NonManifoldVertexSystemTest {
CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml"); CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
Geometry g = c.getBuildings().get(0).getGeometries().get(0); Geometry g = c.getBuildings().get(0).getGeometries().get(0);
CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX); CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX);
System.out.println(cr);
assertEquals(ResultStatus.OK, cr.getResultStatus()); assertEquals(ResultStatus.OK, cr.getResultStatus());
} }
......
CityDoctorParent/Extensions/CityDoctorAutoPro/pom.xml
+ 3
- 1
View file @ b75c2602
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
......
CityDoctorParent/Extensions/CityDoctorGUI/pom.xml
+ 53
- 18
View file @ b75c2602
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
...@@ -45,6 +47,18 @@ ...@@ -45,6 +47,18 @@
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j18-impl</artifactId> <artifactId>log4j-slf4j18-impl</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
...@@ -68,9 +82,11 @@ ...@@ -68,9 +82,11 @@
<goal>wget</goal> <goal>wget</goal>
</goals> </goals>
<configuration> <configuration>
<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-windows-amd64.zip</uri> <uri>
https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-windows-amd64.zip</uri>
<unpack>false</unpack> <unpack>false</unpack>
<outputDirectory>${project.build.directory}/jre/jre-win</outputDirectory> <outputDirectory>
${project.build.directory}/jre/jre-win</outputDirectory>
<outputFileName>win-runtime.zip</outputFileName> <outputFileName>win-runtime.zip</outputFileName>
</configuration> </configuration>
</execution> </execution>
...@@ -81,9 +97,11 @@ ...@@ -81,9 +97,11 @@
<goal>wget</goal> <goal>wget</goal>
</goals> </goals>
<configuration> <configuration>
<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-linux-amd64.tar.gz</uri> <uri>
https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-linux-amd64.tar.gz</uri>
<unpack>false</unpack> <unpack>false</unpack>
<outputDirectory>${project.build.directory}/jre/jre-lin</outputDirectory> <outputDirectory>
${project.build.directory}/jre/jre-lin</outputDirectory>
<outputFileName>lin-runtime.tar.gz</outputFileName> <outputFileName>lin-runtime.tar.gz</outputFileName>
</configuration> </configuration>
</execution> </execution>
...@@ -94,9 +112,11 @@ ...@@ -94,9 +112,11 @@
<goal>wget</goal> <goal>wget</goal>
</goals> </goals>
<configuration> <configuration>
<uri>https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-macos-amd64.zip</uri> <uri>
https://download.bell-sw.com/java/${jre-version}/bellsoft-jre${jre-version}-macos-amd64.zip</uri>
<unpack>false</unpack> <unpack>false</unpack>
<outputDirectory>${project.build.directory}/jre/jre-mac</outputDirectory> <outputDirectory>
${project.build.directory}/jre/jre-mac</outputDirectory>
<outputFileName>mac-runtime.zip</outputFileName> <outputFileName>mac-runtime.zip</outputFileName>
</configuration> </configuration>
</execution> </execution>
...@@ -112,9 +132,16 @@ ...@@ -112,9 +132,16 @@
<phase>install</phase> <phase>install</phase>
<configuration> <configuration>
<target name="unpack"> <target name="unpack">
<untar src="${project.build.directory}/jre/jre-lin/lin-runtime.tar.gz" dest="${project.build.directory}/jre/jre-lin/runtime" compression="gzip"></untar> <untar
<unzip src="${project.build.directory}/jre/jre-win/win-runtime.zip" dest="${project.build.directory}/jre/jre-win/runtime"></unzip> src="${project.build.directory}/jre/jre-lin/lin-runtime.tar.gz"
<unzip src="${project.build.directory}/jre/jre-mac/mac-runtime.zip" dest="${project.build.directory}/jre/jre-mac/runtime"></unzip> dest="${project.build.directory}/jre/jre-lin/runtime"
compression="gzip"></untar>
<unzip
src="${project.build.directory}/jre/jre-win/win-runtime.zip"
dest="${project.build.directory}/jre/jre-win/runtime"></unzip>
<unzip
src="${project.build.directory}/jre/jre-mac/mac-runtime.zip"
dest="${project.build.directory}/jre/jre-mac/runtime"></unzip>
</target> </target>
</configuration> </configuration>
<goals> <goals>
...@@ -136,9 +163,11 @@ ...@@ -136,9 +163,11 @@
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}-no-runtime</finalName> <finalName>
${project.artifactId}-${project.version}-no-runtime</finalName>
<descriptors> <descriptors>
<descriptor>${project.basedir}/src/assembly/no_runtime/assembly.xml</descriptor> <descriptor>
${project.basedir}/src/assembly/no_runtime/assembly.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
...@@ -149,9 +178,11 @@ ...@@ -149,9 +178,11 @@
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}-win</finalName> <finalName>
${project.artifactId}-${project.version}-win</finalName>
<descriptors> <descriptors>
<descriptor>${project.basedir}/src/assembly/win/assembly.xml</descriptor> <descriptor>
${project.basedir}/src/assembly/win/assembly.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
...@@ -162,9 +193,11 @@ ...@@ -162,9 +193,11 @@
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}-lin</finalName> <finalName>
${project.artifactId}-${project.version}-lin</finalName>
<descriptors> <descriptors>
<descriptor>${project.basedir}/src/assembly/lin/assembly.xml</descriptor> <descriptor>
${project.basedir}/src/assembly/lin/assembly.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
...@@ -175,9 +208,11 @@ ...@@ -175,9 +208,11 @@
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>${project.artifactId}-${project.version}-mac</finalName> <finalName>
${project.artifactId}-${project.version}-mac</finalName>
<descriptors> <descriptors>
<descriptor>${project.basedir}/src/assembly/mac/assembly.xml</descriptor> <descriptor>
${project.basedir}/src/assembly/mac/assembly.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
......
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/CityDoctorController.java
+ 1
- 0
View file @ b75c2602
...@@ -276,6 +276,7 @@ public class CityDoctorController { ...@@ -276,6 +276,7 @@ public class CityDoctorController {
buildLand(model); buildLand(model);
buildCityFurniture(model); buildCityFurniture(model);
buildOtherCityObjects(model); buildOtherCityObjects(model);
buildTunnel(model.getTunnels());
} }
private void resetFeatureChunks() { private void resetFeatureChunks() {
......
CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainWindow.fxml
+ 1
- 1
View file @ b75c2602
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane fx:id="mainPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="400.0" minWidth="400.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"> <BorderPane fx:id="mainPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="400.0" minWidth="400.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<center> <center>
<SplitPane fx:id="mainContainer" dividerPositions="0.47069431920649235" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="300.0" prefHeight="600.0" prefWidth="1100.0"> <SplitPane fx:id="mainContainer" dividerPositions="0.47069431920649235" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="300.0" prefHeight="600.0" prefWidth="1100.0">
<items> <items>
......
CityDoctorParent/Extensions/CityDoctorHealer/pom.xml
+ 10
- 4
View file @ b75c2602
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
...@@ -8,6 +10,7 @@ ...@@ -8,6 +10,7 @@
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>CityDoctorHealer</artifactId> <artifactId>CityDoctorHealer</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
...@@ -36,9 +39,12 @@ ...@@ -36,9 +39,12 @@
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<javahClassNames> <javahClassNames>
<javahClassName>de.hft.stuttgart.citydoctor2.connect.edge.CppFeature</javahClassName> <javahClassName>
<javahClassName>de.hft.stuttgart.citydoctor2.CppInitializer</javahClassName> de.hft.stuttgart.citydoctor2.connect.edge.CppFeature</javahClassName>
<javahClassName>de.hft.stuttgart.citydoctor2.connect.edge.CppHealResult</javahClassName> <javahClassName>
de.hft.stuttgart.citydoctor2.CppInitializer</javahClassName>
<javahClassName>
de.hft.stuttgart.citydoctor2.connect.edge.CppHealResult</javahClassName>
</javahClassNames> </javahClassNames>
</configuration> </configuration>
</plugin> </plugin>
......
CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMainBuilding.java
+ 0
- 2
View file @ b75c2602
...@@ -36,7 +36,6 @@ public class HealMainBuilding implements HealingMethod { ...@@ -36,7 +36,6 @@ public class HealMainBuilding implements HealingMethod {
} }
logger.debug("Executing Repair for AttributeMissingError with message Main Building"); logger.debug("Executing Repair for AttributeMissingError with message Main Building");
Building b = (Building) err.getFeature(); Building b = (Building) err.getFeature();
System.out.println("Building: " + b.getGmlId());
BuildingPart largestPart = null; BuildingPart largestPart = null;
double largestArea = 0; double largestArea = 0;
for (BuildingPart part : b.getBuildingParts()) { for (BuildingPart part : b.getBuildingParts()) {
...@@ -58,7 +57,6 @@ public class HealMainBuilding implements HealingMethod { ...@@ -58,7 +57,6 @@ public class HealMainBuilding implements HealingMethod {
// no suitable part found // no suitable part found
return false; return false;
} }
System.out.println("Part: " + largestPart.getGmlId() + " has area: " + largestArea);
b.getBuildingParts().remove(largestPart); b.getBuildingParts().remove(largestPart);
var gmlBuilding = (org.citygml4j.core.model.building.Building) b.getGmlObject(); var gmlBuilding = (org.citygml4j.core.model.building.Building) b.getGmlObject();
BuildingPartProperty buildingPartProp = findBuildingPartProp(largestPart, gmlBuilding); BuildingPartProperty buildingPartProp = findBuildingPartProp(largestPart, gmlBuilding);
......
CityDoctorParent/Extensions/CityDoctorHealerGUI/pom.xml
+ 12
- 1
View file @ b75c2602
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
...@@ -23,6 +26,14 @@ ...@@ -23,6 +26,14 @@
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorAutoPro</artifactId> <artifactId>CityDoctorAutoPro</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
CityDoctorParent/pom.xml
+ 3
- 1
View file @ b75c2602
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"> <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.hft.stuttgart</groupId> <groupId>de.hft.stuttgart</groupId>
<artifactId>CityDoctorParent</artifactId> <artifactId>CityDoctorParent</artifactId>
......
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