Merge branch 'dev' into 'master'

CityDoctor Version 3.17.3

See merge request !34

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/VertexTest.java

@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
@@ -46,7 +47,7 @@ public class VertexTest {
 	
 	@Test
 	public void testGetAdjacentRings() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -64,7 +65,7 @@ public class VertexTest {
 	
 	@Test(expected = IllegalStateException.class)
 	public void testGetAdjacentRingsGeometryNotContainingVertex() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java

 package de.hft.stuttgart.citydoctor2.datastructure;
 
-import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
+import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.CheckResult;
@@ -33,7 +33,7 @@ public class WaterTest {
         water.addBoundarySurface(bsMock);
         water.addBoundarySurface(bsMock2);
 
-        AbstractCheck c = new AbstractCheck() {
+        CheckableUtilsVisitor c = new CheckableUtilsVisitor() {
         };
         water.accept(c);
 

CityDoctorParent/CityDoctorValidation/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.17.2</version>
+		<version>3.17.3</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java

@@ -264,6 +264,8 @@ public class Checker {
                     DefaultParameter defaultP = getDefaultParameter(e.getKey(), reqs, param.getKey());
                     if (defaultP != null) {
                         p.setUom(defaultP.getUnitType().getGmlRepresentation());
+                    } else {
+                    	p.setUom("");
                     }
                     p.setName(param.getKey());
                     p.setValue(param.getValue());
@@ -280,22 +282,29 @@ public class Checker {
         correct.setEnabled(config.getSchematronFilePath() != null);
         plan.getRequirements().add(new RequirementProperty(missing));
         plan.getRequirements().add(new RequirementProperty(correct));
+        
+        de.hft.stuttgart.quality.model.types.GlobalParameters globParams = new de.hft.stuttgart.quality.model.types.GlobalParameters();
+        plan.setGlobalParameters(new GlobalParametersProperty(globParams));
 
         Parameter numRounding = new Parameter();
         numRounding.setName("numberOfRoundingPlaces");
+        numRounding.setUom("amount");
         numRounding.setValue("" + config.getNumberOfRoundingPlaces());
+        globParams.getParameters().add(new ParameterProperty(numRounding));
+        
         Parameter minVertexDistance = new Parameter();
         minVertexDistance.setName("minVertexDistance");
         minVertexDistance.setUom("m");
         minVertexDistance.setValue("" + config.getMinVertexDistance());
-        Parameter schematronFile = new Parameter();
-        schematronFile.setName("schematronFile");
-        schematronFile.setValue(config.getSchematronFilePath());
-        de.hft.stuttgart.quality.model.types.GlobalParameters globParams = new de.hft.stuttgart.quality.model.types.GlobalParameters();
-        plan.setGlobalParameters(new GlobalParametersProperty(globParams));
-        globParams.getParameters().add(new ParameterProperty(numRounding));
         globParams.getParameters().add(new ParameterProperty(minVertexDistance));
-        globParams.getParameters().add(new ParameterProperty(schematronFile));
+        
+        if (config.getSchematronFilePath() != null) {
+            Parameter schematronFile = new Parameter();
+            schematronFile.setName("schematronFile");
+            schematronFile.setUom("path");
+            schematronFile.setValue(config.getSchematronFilePath());
+            globParams.getParameters().add(new ParameterProperty(schematronFile));
+        }
         return plan;
     }
 
@@ -620,6 +629,9 @@ public class Checker {
     private void checkCityModel(CityDoctorModel model, ProgressListener l) {
         Stream<CityObject> features = model.createFeatureStream();
         float featureSum = model.getNumberOfFeatures();
+        // clear global errors
+        model.getGlobalErrors().clear();
+        
         // stupid lamda with final variable restrictions
         int[] currentFeature = new int[1];
         features.forEach(co -> {
@@ -887,9 +899,6 @@ public class Checker {
      * @param co          the city object to be checked
      */
     public void checkFeature(XmlStreamReporter xmlReporter, PdfStreamReporter pdfReporter, CityObject co) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(Localization.getText("Checker.checkFeature"), co);
-        }
         executeChecksForCityObject(co);
         if (xmlReporter != null) {
             xmlReporter.report(co);

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java

@@ -29,11 +29,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
-import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
-import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractFeatureProperty;
 import org.citygml4j.core.model.core.CityModel;
 import org.citygml4j.core.util.geometry.GeometryFactory;
@@ -42,9 +37,12 @@ import org.xmlobjects.gml.model.base.Reference;
 import de.hft.stuttgart.citydoctor2.check.error.SchematronError;
 import de.hft.stuttgart.citydoctor2.checks.SvrlContentHandler;
 import de.hft.stuttgart.citydoctor2.checks.util.FeatureCheckedListener;
+import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
 import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Building;
+import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
+import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
 import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
 import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
 import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
@@ -64,8 +62,6 @@ import de.hft.stuttgart.quality.model.types.ValidationPlan;
 
 public class StreamCityGmlConsumer implements CityGmlConsumer {
 
-	private static final Logger logger = LogManager.getLogger(StreamCityGmlConsumer.class);
-
 	private final Checker c;
 	private final XmlStreamReporter xmlReporter;
 	private final PdfStreamReporter pdfReporter;
@@ -82,7 +78,7 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 	private final FeatureStatistics waterStatistics;
 	private final Validation val;
 	private final FeatureCheckedListener l;
-
+	
 	public StreamCityGmlConsumer(Checker c, XmlStreamReporter xmlReporter, PdfStreamReporter pdfReporter,
 			SvrlContentHandler handler, ValidationConfiguration config, FeatureCheckedListener l) {
 		this.c = c;
@@ -116,10 +112,6 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 
 	@Override
 	public void accept(CityObject co) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(Localization.getText("Checker.checkFeature"), co);
-		}
-
 		// check without reporters, nothing will be put into the reports like that
 		// this will also clear old check results if any (though in stream mode there
 		// won't be any)

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/AllPolygonsWrongOrientationCheck.java

@@ -35,6 +35,7 @@ import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.math.Ray;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
@@ -76,6 +77,10 @@ public class AllPolygonsWrongOrientationCheck extends Check {
 			return;
 		}
 		boolean isOutwardOriented = geometryIsOutwardOrientedJava(g);
+		// invert outward direction for inward facing geometries
+		if (g.getOrientation() == Orientation.INWARD) {
+			isOutwardOriented = !isOutwardOriented;
+		}
 		CheckResult cr;
 		if (isOutwardOriented) {
 			cr = new CheckResult(this, ResultStatus.OK, null);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/DegeneratedPolygonCheckTest.java

@@ -41,6 +41,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 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.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.quality.model.enums.RequirementId;
 
@@ -48,7 +49,7 @@ public class DegeneratedPolygonCheckTest {
 
 	@Test
 	public void testDegeneratedPolygon() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		ConcretePolygon polygon = new ConcretePolygon();
 		geom.getPolygons().add(polygon);
 		polygon.setParent(geom);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/DuplicatePointsCheckTest.java

@@ -34,6 +34,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -90,7 +91,7 @@ public class DuplicatePointsCheckTest {
 	
 	@Test
 	public void testCheckSelfInt() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(1, 1, 1);
 		Vertex v1 = new Vertex(2, 2, 2);
 		Vertex v2 = new Vertex(3, 3, 3);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/FaceOutCheckTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -40,7 +41,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 public class FaceOutCheckTest {
 
 	private Geometry createBadGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Vertex v0 = createVertex(0, 0, 0, geom);
 		Vertex v1 = createVertex(10, 0, 0, geom);
@@ -62,7 +63,7 @@ public class FaceOutCheckTest {
 	}
 	
 	private Geometry createGoodGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Vertex v0 = createVertex(0, 0, 0, geom);
 		Vertex v1 = createVertex(10, 0, 0, geom);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/HoleOutsideCheckTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -43,7 +44,7 @@ public class HoleOutsideCheckTest {
 
 	@Test
 	public void testHoleOutside() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -79,7 +80,7 @@ public class HoleOutsideCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/InteriorDisconnectedCheckTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -44,7 +45,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon1() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -89,7 +90,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -145,7 +146,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testBadPolygon3() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -213,7 +214,7 @@ public class InteriorDisconnectedCheckTest {
 	 */
 	@Test
 	public void testGoodPolygon3() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -274,7 +275,7 @@ public class InteriorDisconnectedCheckTest {
 	
 	@Test
 	public void testGoodPolygon2() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/ManifoldVertexCheckTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -41,7 +42,7 @@ public class ManifoldVertexCheckTest {
 
 	@Test
 	public void testNonManifoldVertex() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Vertex v12 = createVertex(10, 10, 3, geom);
 		Vertex v13 = createVertex(10, 10, 0, geom);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/NestedRingsCheckTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -43,7 +44,7 @@ public class NestedRingsCheckTest {
 
 	@Test
 	public void testNestedRings() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -90,7 +91,7 @@ public class NestedRingsCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheckTest.java

@@ -29,6 +29,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -38,7 +39,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 public class NullAreaCheckTest {
 	
 	private LinearRing setupValidGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);
@@ -62,7 +63,7 @@ public class NullAreaCheckTest {
 	}
 	
 	private LinearRing setupErrorGeometry() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon p = new ConcretePolygon();
 		geom.addPolygon(p);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheckTest.java

@@ -31,6 +31,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -41,7 +42,7 @@ public class PlanarCheckTest {
 
 	@Test
 	public void testCheckPolygonOK() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(0, 0, 0);
 		Vertex v1 = new Vertex(0, 0, 1);
 		Vertex v2 = new Vertex(1, 0, 1);
@@ -62,7 +63,7 @@ public class PlanarCheckTest {
 	
 	@Test
 	public void testCheckPolygonDistanceERROR() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Vertex v0 = new Vertex(0, 0, 0);
 		Vertex v1 = new Vertex(0, 0.06, 1);
 		Vertex v2 = new Vertex(1, 1, 1);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/PolygonSameOrientationCheckTest.java

@@ -34,6 +34,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -44,7 +45,7 @@ public class PolygonSameOrientationCheckTest {
 
 	@Test
 	public void testSameOrientation() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Vertex v0 = GeometryTestUtils.createVertex(0, 0, 0, geom);
 		Vertex v1 = GeometryTestUtils.createVertex(6, 0, 0, geom);
@@ -76,7 +77,7 @@ public class PolygonSameOrientationCheckTest {
 	
 	@Test
 	public void testGoodPoly() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 
 		Vertex v0 = GeometryTestUtils.createVertex(0, 0, 0, geom);
 		Vertex v1 = GeometryTestUtils.createVertex(6, 0, 0, geom);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/PolygonSelfIntCheckTest.java

@@ -33,6 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 /**
  * 
@@ -45,7 +46,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void testPolygonInteriorIntersectExterior() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -95,7 +96,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void testPolygonGood() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -143,7 +144,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void test2InteriorRingsIntersecting() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -211,7 +212,7 @@ public class PolygonSelfIntCheckTest {
 	
 	@Test
 	public void test2InteriorRingsNotIntersecting() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/RingSelfIntCheckTest.java

@@ -38,6 +38,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 
 /**
@@ -49,7 +50,7 @@ public class RingSelfIntCheckTest {
 
 	@Test
 	public void testIntersect() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -88,7 +89,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testNonIntersect() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -121,7 +122,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testTouching() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
@@ -159,7 +160,7 @@ public class RingSelfIntCheckTest {
 	
 	@Test
 	public void testNotTouching() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/semantics/IsWallCheckTest.java

@@ -38,6 +38,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing.LinearRingType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 
 /**
@@ -64,7 +65,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -97,7 +98,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -129,7 +130,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);
@@ -162,7 +163,7 @@ public class IsWallCheckTest {
 		Polygon p = new ConcretePolygon();
 		p.setExteriorRing(lr);
 		
-		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		geom.addPolygon(p);
 		
 		BoundarySurface bs = new BoundarySurface(null);

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/semantics/PolygonWithoutSurfaceCheckTest.java

@@ -20,12 +20,13 @@ import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GeometryType;
 import de.hft.stuttgart.citydoctor2.datastructure.Lod;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
+import de.hft.stuttgart.citydoctor2.datastructure.Geometry.Orientation;
 
 public class PolygonWithoutSurfaceCheckTest {
 
 	@Test
 	public void testPolygonWithoutSurface() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		geom.addPolygon(poly);
 		PolygonWithoutSurfaceCheck check = new PolygonWithoutSurfaceCheck();
@@ -44,7 +45,7 @@ public class PolygonWithoutSurfaceCheckTest {
 	
 	@Test
 	public void testPolygonWithSurface() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD2, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		BoundarySurface bs = new BoundarySurface(null);
 		bs.addGeometry(geom);
@@ -61,7 +62,7 @@ public class PolygonWithoutSurfaceCheckTest {
 	
 	@Test
 	public void testPolygonWithWrongLod() {
-		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1);
+		Geometry geom = new Geometry(GeometryType.SOLID, Lod.LOD1, Orientation.OUTWARD);
 		Polygon poly = new ConcretePolygon();
 		BoundarySurface bs = new BoundarySurface(null);
 		bs.addGeometry(geom);