Skip to content

GitLab

Commit 43660f7f authored by Matthias Betz's avatar Matthias Betz
Browse files

Adding default check for solids 

switching proj4j to newer version not on maven
fixing an issue of polygon association when replacing a polygon in a geometry
parent 5cab90a1
Pipeline #4347 passed with stage
in 2 minutes and 33 seconds
Hide whitespace changes
Inline Side-by-side
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/util/UnfragmentedCheck.java
View file @ 43660f7f
......@@ -57,7 +57,7 @@ public class UnfragmentedCheck {
for (Geometry geom : bs.getGeometries()) {
List<Vector3d> normals = new ArrayList<>();
for (Polygon p : geom.getPolygons()) {
normals.add(p.calculateNormal());
normals.add(p.calculateNormalNormalized());
}
double x = 0;
double y = 0;
......
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamErrorHandler.java
View file @ 43660f7f
......@@ -20,8 +20,8 @@ package de.hft.stuttgart.citydoctor2.reporting;
import java.util.Collection;
import org.osgeo.proj4j.BasicCoordinateTransform;
import org.osgeo.proj4j.ProjCoordinate;
import org.locationtech.proj4j.BasicCoordinateTransform;
import org.locationtech.proj4j.ProjCoordinate;
import de.hft.stuttgart.citydoctor2.check.ErrorReport;
import de.hft.stuttgart.citydoctor2.checkresult.EdgeReport;
......
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfErrorHandler.java
View file @ 43660f7f
......@@ -20,7 +20,7 @@ package de.hft.stuttgart.citydoctor2.reporting.pdf;
import java.util.Collection;
import org.osgeo.proj4j.ProjCoordinate;
import org.locationtech.proj4j.ProjCoordinate;
import de.hft.stuttgart.citydoctor2.check.ErrorReport;
import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
......
CityDoctorParent/non-maven-libs/org/locationtech/proj4j/proj4j/1.1.2/proj4j-1.1.2.pom 0 → 100644
View file @ 43660f7f
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.locationtech.proj4j</groupId>
<artifactId>proj4j</artifactId>
<version>1.1.2</version>
<packaging>bundle</packaging>
<name>Proj4J</name>
<description>Java port of the Proj.4 library for coordinate reprojection</description>
<url>https://github.com/locationtech/proj4j</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>
<developers>
<developer>
<id>echeipesh</id>
<name>Eugene Cheipesh</name>
<url>http://github.com/echeipesh/</url>
</developer>
<developer>
<id>lossyrob</id>
<name>Rob Emanuele</name>
<url>http://github.com/lossyrob/</url>
</developer>
</developers>
<contributors>
<contributor>
<name>Martin Davis</name>
<url>https://github.com/dr-jts</url>
</contributor>
</contributors>
<scm>
<connection>scm:git:https://github.com/locationtech/proj4j.git</connection>
<tag>1.1.2</tag>
<url>https://github.com/locationtech/proj4j.git</url>
</scm>
<properties>
<osgi-version-qualifier>${maven.build.timestamp}</osgi-version-qualifier>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<bundle-symbolicname>org.locationtech.proj4j</bundle-symbolicname>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<debug>true</debug>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<failOnError>true</failOnError>
<failOnWarnings>false</failOnWarnings>
</configuration>
</execution>
</executions>
<inherited>true</inherited>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<_nouses>true</_nouses>
<_snapshot>${osgi-version-qualifier}</_snapshot>
<Bundle-SymbolicName>${bundle-symbolicname}</Bundle-SymbolicName>
<Import-Package />
</instructions>
<niceManifest>true</niceManifest>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>eclipse</id>
<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
<name>Proj4J Repository - Releases</name>
<url>https://repo.eclipse.org/content/repositories/proj4j-releases/</url>
</repository>
<snapshotRepository>
<id>repo.eclipse.org</id>
<name>Proj4J Repository - Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/proj4j-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</profile>
<profile>
<id>central</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>
</profiles>
</project>
CityDoctorParent/non-maven-libs/org/locationtech/proj4j/proj4j/maven-metadata-local.xml 0 → 100644
View file @ 43660f7f
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.locationtech.proj4j</groupId>
<artifactId>proj4j</artifactId>
<versioning>
<release>1.1.2</release>
<versions>
<version>1.1.2</version>
</versions>
<lastUpdated>20210510083458</lastUpdated>
</versioning>
</metadata>
CityDoctorParent/pom.xml
View file @ 43660f7f
......@@ -162,11 +162,10 @@
<artifactId>log4j-slf4j18-impl</artifactId>
<version>2.11.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.osgeo/proj4j -->
<dependency>
<groupId>org.osgeo</groupId>
<groupId>org.locationtech.proj4j</groupId>
<artifactId>proj4j</artifactId>
<version>0.1.0</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
......@@ -176,7 +175,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.16.1</version>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
......
Markdown is supported
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