From 43d506f021ef5b13081969093980c01dc3dc12d4 Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Mon, 15 Mar 2021 13:38:13 +0100 Subject: [PATCH] update to version 0.1.2 adjusting to different xsd location and namespace --- citygml4j-quality-ade/pom.xml | 2 +- .../stuttgart/quality/QualityADEContext.java | 2 +- .../stuttgart/quality/QualityADEModule.java | 4 +- .../quality/model/jaxb/package-info.java | 4 +- .../src/main/resources/qualityAde.xsd | 4 +- .../stuttgart/quality/QualityAdeTests.java | 2 +- ...impleSolid_AllPolygonsWrongOrientation.gml | 2 +- .../SimpleSolid_Error_QualityADE.gml | 2 +- .../resources/SimpleSolid_HoleOutside.gml | 2 +- .../resources/SimpleSolid_InnerRingNested.gml | 2 +- .../SimpleSolid_InteriorDisconnected.gml | 2 +- .../SimpleSolid_IntersectingRings.gml | 2 +- ...impleSolid_MultipleConnectedComponents.gml | 2 +- .../resources/SimpleSolid_NonManifoldEdge.gml | 2 +- .../SimpleSolid_NonManifoldVertex.gml | 2 +- ...pleSolid_NonPlanarPolygonDistancePlane.gml | 2 +- ...Solid_NonPlanarPolygonNormalsDeviation.gml | 2 +- .../SimpleSolid_OrientationRingsSame.gml | 2 +- .../SimpleSolid_PolygonWrongOrientation.gml | 2 +- .../resources/SimpleSolid_RingNotClosed.gml | 2 +- .../SimpleSolid_RingSelfIntersection.gml | 2 +- .../resources/SimpleSolid_SolidNotClosed.gml | 2 +- .../SimpleSolid_SolidSelfIntersection.gml | 2 +- .../resources/SimpleSolid_TooFewPoints.gml | 2 +- .../resources/SimpleSolid_TooFewPolygons.gml | 2 +- public/0.1.2/qualityAde.xsd | 505 ++++++++++++++++++ 26 files changed, 533 insertions(+), 28 deletions(-) create mode 100644 public/0.1.2/qualityAde.xsd diff --git a/citygml4j-quality-ade/pom.xml b/citygml4j-quality-ade/pom.xml index e1b6881..1474e69 100644 --- a/citygml4j-quality-ade/pom.xml +++ b/citygml4j-quality-ade/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.hft.stuttgart citygml4j-quality-ade - 0.1.1 + 0.1.2 UTF-8 diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEContext.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEContext.java index ee927de..aef857c 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEContext.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEContext.java @@ -28,7 +28,7 @@ import de.hft.stuttgart.quality.marshaller.QualityAdeUnmarshaller; public class QualityADEContext implements ADEContext { - private final List modules = Collections.singletonList(QualityADEModule.V0_1_1); + private final List modules = Collections.singletonList(QualityADEModule.V0_1_2); @Override public List getADEModules() { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEModule.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEModule.java index b9dbfff..3b1f54f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEModule.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/QualityADEModule.java @@ -32,9 +32,9 @@ import de.hft.stuttgart.quality.model.Validation; public class QualityADEModule extends ADEModule { - public static final String NAMESPACE_URI = "https://transfer.hft-stuttgart.de/pages/qualityade/0.1.1"; + public static final String NAMESPACE_URI = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2"; - public static final QualityADEModule V0_1_1 = new QualityADEModule(); + public static final QualityADEModule V0_1_2 = new QualityADEModule(); private HashMap> features; private HashSet featureProperties; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java index 5f97e8e..075985f 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java @@ -13,6 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@javax.xml.bind.annotation.XmlSchema(namespace = "https://transfer.hft-stuttgart.de/pages/qualityade/0.1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { - @javax.xml.bind.annotation.XmlNs(namespaceURI = "https://transfer.hft-stuttgart.de/pages/qualityade/0.1.1", prefix = "qual") }) +@javax.xml.bind.annotation.XmlSchema(namespace = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = { + @javax.xml.bind.annotation.XmlNs(namespaceURI = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2", prefix = "qual") }) package de.hft.stuttgart.quality.model.jaxb; diff --git a/citygml4j-quality-ade/src/main/resources/qualityAde.xsd b/citygml4j-quality-ade/src/main/resources/qualityAde.xsd index 8234ba0..b104238 100644 --- a/citygml4j-quality-ade/src/main/resources/qualityAde.xsd +++ b/citygml4j-quality-ade/src/main/resources/qualityAde.xsd @@ -1,7 +1,7 @@ - + + + + + + + + + + \ No newline at end of file -- GitLab