diff --git a/CityDoctorParent/CityDoctorValidation/pom.xml b/CityDoctorParent/CityDoctorValidation/pom.xml index fade673815cc5e5d6b854a82acc7b919877042c9..b4c53dba1d4f1183b9936631f021dff7cbbccac4 100644 --- a/CityDoctorParent/CityDoctorValidation/pom.xml +++ b/CityDoctorParent/CityDoctorValidation/pom.xml @@ -15,6 +15,10 @@ <groupId>de.hft.stuttgart</groupId> <artifactId>CityDoctorModel</artifactId> </dependency> + <dependency> + <groupId>de.hft.stuttgart</groupId> + <artifactId>CityDoctorEdge</artifactId> + </dependency> <dependency> <groupId>de.hft.stuttgart</groupId> <artifactId>CityDoctorCheckResult</artifactId> @@ -52,6 +56,10 @@ <groupId>org.locationtech.jts</groupId> <artifactId>jts-core</artifactId> </dependency> + <dependency> + <groupId>de.hft.stuttgart</groupId> + <artifactId>citygml4j-quality-ade</artifactId> + </dependency> </dependencies> <build> diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java index c24700dfdf9778d280bc5100698a6b99defbc132..3668db566559acd178cf1e0aea67798fdbe37ccd 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java @@ -241,6 +241,7 @@ public class Checker { ValidationPlan plan = new ValidationPlan(); List<Checking> filter = createFilter(); + Map<String, de.hft.stuttgart.citydoctor2.check.Requirement> reqs = Checks.getAvailableRequirements(); for (Entry<String, RequirementConfiguration> e : config.getRequirements().entrySet()) { RequirementId reqId = mapToRequirement(e.getKey()); if (reqId == null) { @@ -251,13 +252,13 @@ public class Checker { req.setEnabled(e.getValue().isEnabled()); plan.getRequirements().add(req); Map<String, String> parameters = e.getValue().getParameters(); - Map<String, de.hft.stuttgart.citydoctor2.check.Requirement> reqs = Checks.getAvailableRequirements(); if (parameters != null) { for (Entry<String, String> param : parameters.entrySet()) { Parameter p = new Parameter(); - DefaultParameter defaultP = getDefaultParameter(param.getKey(), reqs); + DefaultParameter defaultP = getDefaultParameter(e.getKey(), reqs, param.getKey()); if (defaultP != null) { p.setUom(defaultP.getUnitType().getGmlRepresentation()); + System.out.println(p.getUom()); } p.setName(param.getKey()); p.setValue(param.getValue()); @@ -292,12 +293,12 @@ public class Checker { return plan; } - private DefaultParameter getDefaultParameter(String key, - Map<String, de.hft.stuttgart.citydoctor2.check.Requirement> reqs) { - de.hft.stuttgart.citydoctor2.check.Requirement requirement = reqs.get(key); + private DefaultParameter getDefaultParameter(String reqKey, + Map<String, de.hft.stuttgart.citydoctor2.check.Requirement> reqs, String paramName) { + de.hft.stuttgart.citydoctor2.check.Requirement requirement = reqs.get(reqKey); if (requirement != null) { for (DefaultParameter param : requirement.getDefaultParameter()) { - if (param.getName().equals(key)) { + if (param.getName().equals(paramName)) { return param; } } @@ -741,7 +742,6 @@ public class Checker { // execute schematron first SvrlContentHandler handler = executeSchematronValidationIfAvailable(config, inputFile); CityGmlConsumer con = new StreamCityGmlConsumer(c, xmlReporter, pdfReporter, handler, config, l); - // parse and validate CityGmlParser.streamCityGml(inputFile, config.getParserConfiguration(), con, outputFile); diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml index b830010f740fcf8c80941d7b6a17be9b299c45ad..a9608473d0412f5a6295bbacf86bca6d014932a6 100644 --- a/CityDoctorParent/pom.xml +++ b/CityDoctorParent/pom.xml @@ -60,6 +60,11 @@ <artifactId>CityDoctorGUI</artifactId> <version>${revision}</version> </dependency> + <dependency> + <groupId>de.hft.stuttgart</groupId> + <artifactId>CityDoctorEdge</artifactId> + <version>${revision}</version> + </dependency> <dependency> <groupId>de.hft.stuttgart</groupId> <artifactId>CityDoctorCheckResult</artifactId>