Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WKT parser: do not raise warning when parsing a WKT2:2015 TIMECRS whose TIMEUNIT is at the CS level, and not inside #2276

Merged
merged 1 commit into from
Jul 1, 2020
+1,250 −1,194
Merged

WKT parser: do not raise warning when parsing a WKT2:2015 TIMECRS whose TIMEUNIT is at the CS level, and not inside #2276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/iso19111/io.cpp
View file
Original file line number Diff line number Diff line change
@@ -2642,10 +2642,15 @@ WKTParser::Private::buildCS(const WKTNodeNNPtr &node, /* maybe null */
}
} else if (ci_equal(csType, "temporal")) { // WKT2-2015
if (axisCount == 1) {
return DateTimeTemporalCS::create(
csMap,
axisList[0]); // FIXME: there are 3 possible subtypes of
// TemporalCS
if (isNull(
parentNode->GP()->lookForChild(WKTConstants::TIMEUNIT)) &&
isNull(parentNode->GP()->lookForChild(WKTConstants::UNIT))) {
return DateTimeTemporalCS::create(csMap, axisList[0]);
} else {
// Default to TemporalMeasureCS
// TemporalCount could also be possible
return TemporalMeasureCS::create(csMap, axisList[0]);
}
}
} else if (ci_equal(csType, "TemporalDateTime")) { // WKT2-2019
if (axisCount == 1) {
Loading