aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-11-28 12:10:08 +0100
committerGitHub <noreply@github.com>2019-11-28 12:10:08 +0100
commit2a5a2ea57ea85c0b0a40ec628214cfd71939b186 (patch)
tree6a8d4812dc02180e5aa2857d82537097cb7eb668 /src
parentbb9b925876bddf7d64f0689015763c23f84af753 (diff)
parenta50ebaa5241d710297b1e8d900e1b8936ec551ba (diff)
downloadPROJ-2a5a2ea57ea85c0b0a40ec628214cfd71939b186.tar.gz
PROJ-2a5a2ea57ea85c0b0a40ec628214cfd71939b186.zip
Merge pull request #1754 from Geomatys/master
EPSG codes for YEAR and SECOND are interchanged
Diffstat (limited to 'src')
-rw-r--r--src/iso19111/static.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp
index 0ed08c95..da399288 100644
--- a/src/iso19111/static.cpp
+++ b/src/iso19111/static.cpp
@@ -343,12 +343,12 @@ const UnitOfMeasure UnitOfMeasure::MICRORADIAN("microradian", 1e-6,
/** \brief Second, unit of measure of type TIME (SI unit). */
const UnitOfMeasure UnitOfMeasure::SECOND("second", 1.0,
UnitOfMeasure::Type::TIME,
- Identifier::EPSG, "1029");
+ Identifier::EPSG, "1040");
/** \brief Year, unit of measure of type TIME */
const UnitOfMeasure UnitOfMeasure::YEAR("year", 31556925.445,
UnitOfMeasure::Type::TIME,
- Identifier::EPSG, "1040");
+ Identifier::EPSG, "1029");
/** \brief Metre per year, unit of measure of type LINEAR. */
const UnitOfMeasure UnitOfMeasure::METRE_PER_YEAR("metres per year",