Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
6d02b6f9
Commit
6d02b6f9
authored
Apr 16, 2021
by
Matthias Betz
Browse files
fixed an issue with parameter in the validation ADE structure missing the uom tag
parent
8889d349
Pipeline
#2820
passed with stage
in 2 minutes and 24 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorValidation/pom.xml
View file @
6d02b6f9
...
@@ -15,6 +15,10 @@
...
@@ -15,6 +15,10 @@
<groupId>
de.hft.stuttgart
</groupId>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorModel
</artifactId>
<artifactId>
CityDoctorModel
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorEdge
</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorCheckResult
</artifactId>
<artifactId>
CityDoctorCheckResult
</artifactId>
...
@@ -52,6 +56,10 @@
...
@@ -52,6 +56,10 @@
<groupId>
org.locationtech.jts
</groupId>
<groupId>
org.locationtech.jts
</groupId>
<artifactId>
jts-core
</artifactId>
<artifactId>
jts-core
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
citygml4j-quality-ade
</artifactId>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
View file @
6d02b6f9
...
@@ -241,6 +241,7 @@ public class Checker {
...
@@ -241,6 +241,7 @@ public class Checker {
ValidationPlan
plan
=
new
ValidationPlan
();
ValidationPlan
plan
=
new
ValidationPlan
();
List
<
Checking
>
filter
=
createFilter
();
List
<
Checking
>
filter
=
createFilter
();
Map
<
String
,
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
>
reqs
=
Checks
.
getAvailableRequirements
();
for
(
Entry
<
String
,
RequirementConfiguration
>
e
:
config
.
getRequirements
().
entrySet
())
{
for
(
Entry
<
String
,
RequirementConfiguration
>
e
:
config
.
getRequirements
().
entrySet
())
{
RequirementId
reqId
=
mapToRequirement
(
e
.
getKey
());
RequirementId
reqId
=
mapToRequirement
(
e
.
getKey
());
if
(
reqId
==
null
)
{
if
(
reqId
==
null
)
{
...
@@ -251,13 +252,13 @@ public class Checker {
...
@@ -251,13 +252,13 @@ public class Checker {
req
.
setEnabled
(
e
.
getValue
().
isEnabled
());
req
.
setEnabled
(
e
.
getValue
().
isEnabled
());
plan
.
getRequirements
().
add
(
req
);
plan
.
getRequirements
().
add
(
req
);
Map
<
String
,
String
>
parameters
=
e
.
getValue
().
getParameters
();
Map
<
String
,
String
>
parameters
=
e
.
getValue
().
getParameters
();
Map
<
String
,
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
>
reqs
=
Checks
.
getAvailableRequirements
();
if
(
parameters
!=
null
)
{
if
(
parameters
!=
null
)
{
for
(
Entry
<
String
,
String
>
param
:
parameters
.
entrySet
())
{
for
(
Entry
<
String
,
String
>
param
:
parameters
.
entrySet
())
{
Parameter
p
=
new
Parameter
();
Parameter
p
=
new
Parameter
();
DefaultParameter
defaultP
=
getDefaultParameter
(
param
.
getKey
(),
reqs
);
DefaultParameter
defaultP
=
getDefaultParameter
(
e
.
getKey
(),
reqs
,
param
.
getKey
()
);
if
(
defaultP
!=
null
)
{
if
(
defaultP
!=
null
)
{
p
.
setUom
(
defaultP
.
getUnitType
().
getGmlRepresentation
());
p
.
setUom
(
defaultP
.
getUnitType
().
getGmlRepresentation
());
System
.
out
.
println
(
p
.
getUom
());
}
}
p
.
setName
(
param
.
getKey
());
p
.
setName
(
param
.
getKey
());
p
.
setValue
(
param
.
getValue
());
p
.
setValue
(
param
.
getValue
());
...
@@ -292,12 +293,12 @@ public class Checker {
...
@@ -292,12 +293,12 @@ public class Checker {
return
plan
;
return
plan
;
}
}
private
DefaultParameter
getDefaultParameter
(
String
k
ey
,
private
DefaultParameter
getDefaultParameter
(
String
reqK
ey
,
Map
<
String
,
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
>
reqs
)
{
Map
<
String
,
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
>
reqs
,
String
paramName
)
{
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
requirement
=
reqs
.
get
(
k
ey
);
de
.
hft
.
stuttgart
.
citydoctor2
.
check
.
Requirement
requirement
=
reqs
.
get
(
reqK
ey
);
if
(
requirement
!=
null
)
{
if
(
requirement
!=
null
)
{
for
(
DefaultParameter
param
:
requirement
.
getDefaultParameter
())
{
for
(
DefaultParameter
param
:
requirement
.
getDefaultParameter
())
{
if
(
param
.
getName
().
equals
(
key
))
{
if
(
param
.
getName
().
equals
(
paramName
))
{
return
param
;
return
param
;
}
}
}
}
...
@@ -741,7 +742,6 @@ public class Checker {
...
@@ -741,7 +742,6 @@ public class Checker {
// execute schematron first
// execute schematron first
SvrlContentHandler
handler
=
executeSchematronValidationIfAvailable
(
config
,
inputFile
);
SvrlContentHandler
handler
=
executeSchematronValidationIfAvailable
(
config
,
inputFile
);
CityGmlConsumer
con
=
new
StreamCityGmlConsumer
(
c
,
xmlReporter
,
pdfReporter
,
handler
,
config
,
l
);
CityGmlConsumer
con
=
new
StreamCityGmlConsumer
(
c
,
xmlReporter
,
pdfReporter
,
handler
,
config
,
l
);
// parse and validate
// parse and validate
CityGmlParser
.
streamCityGml
(
inputFile
,
config
.
getParserConfiguration
(),
con
,
outputFile
);
CityGmlParser
.
streamCityGml
(
inputFile
,
config
.
getParserConfiguration
(),
con
,
outputFile
);
...
...
CityDoctorParent/pom.xml
View file @
6d02b6f9
...
@@ -60,6 +60,11 @@
...
@@ -60,6 +60,11 @@
<artifactId>
CityDoctorGUI
</artifactId>
<artifactId>
CityDoctorGUI
</artifactId>
<version>
${revision}
</version>
<version>
${revision}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorEdge
</artifactId>
<version>
${revision}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
de.hft.stuttgart
</groupId>
<groupId>
de.hft.stuttgart
</groupId>
<artifactId>
CityDoctorCheckResult
</artifactId>
<artifactId>
CityDoctorCheckResult
</artifactId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment