This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit d8bb1b1bb43ed9e06a4128be3ae6faeb8fa2ad64
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon May 27 10:10:14 2019 +0200
Upgrade metadata edition number from ISO 19115-2:2009 to ISO 19115-2:2019.
---
.../sis/metadata/iso/citation/Citations.java | 4 ++--
.../apache/sis/metadata/sql/MetadataFallback.java | 8 +++----
.../org/apache/sis/metadata/sql/Citations.sql | 28 +++++++++++-----------
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
index aeb5dac..1a2ee0d 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
@@ -94,8 +94,8 @@ public final class Citations extends Static {
* and in the way that SIS support them. The current content is:
*
* <ul>
- * <li>{@linkplain org.opengis.annotation.Specification#ISO_19115 ISO 19115-1:2014(E)}
at index 0.</li>
- * <li>{@linkplain org.opengis.annotation.Specification#ISO_19115_2 ISO 19115-2:2009(E)}
at index 1.</li>
+ * <li>{@linkplain org.opengis.annotation.Specification#ISO_19115 ISO 19115-1:2014}
at index 0.</li>
+ * <li>{@linkplain org.opengis.annotation.Specification#ISO_19115_2 ISO 19115-2:2019}
at index 1.</li>
* </ul>
*
* <div class="section">Main usage</div>
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataFallback.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataFallback.java
index 4a43928..180260f 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataFallback.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataFallback.java
@@ -115,20 +115,20 @@ final class MetadataFallback extends MetadataSource {
switch (key) {
case "ISO 19115-1": {
title = "Geographic Information — Metadata Part 1: Fundamentals";
- edition = "ISO 19115-1:2014(E)";
+ edition = "ISO 19115-1:2014";
code = "19115-1";
codeSpace = "ISO";
- version = "2014(E)";
+ version = "2014";
citedResponsibleParty = "International Organization for Standardization";
presentationForm = PresentationForm.DOCUMENT_DIGITAL;
break;
}
case "ISO 19115-2": {
title = "Geographic Information — Metadata Part 2: Extensions for imagery
and gridded data";
- edition = "ISO 19115-2:2009(E)";
+ edition = "ISO 19115-2:2019";
code = "19115-2";
codeSpace = "ISO";
- version = "2009(E)";
+ version = "2019";
copyFrom = "ISO 19115-1";
presentationForm = PresentationForm.DOCUMENT_DIGITAL;
break;
diff --git a/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql
b/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql
index ee95cb5..8f01acb 100644
--- a/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql
+++ b/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql
@@ -182,8 +182,8 @@ FOREIGN KEY ("authority") REFERENCES metadata."Citation" ("ID") ON UPDATE
RESTRI
-- There is almost a one-to-one relationship between identifiers and citations.
--
INSERT INTO metadata."Identifier" ("ID", "code", "codeSpace", "version") VALUES
- ('ISO 19115-1', '19115-1', 'ISO', '2014(E)'),
- ('ISO 19115-2', '19115-2', 'ISO', '2009(E)'),
+ ('ISO 19115-1', '19115-1', 'ISO', '2014'),
+ ('ISO 19115-2', '19115-2', 'ISO', '2019'),
('IHO S-57', 'S-57', 'IHO', '3.1'),
('WMS', 'WMS', 'OGC', '1.3'),
('EPSG', 'EPSG', 'IOGP', NULL),
@@ -193,18 +193,18 @@ INSERT INTO metadata."Identifier" ("ID", "code", "codeSpace", "version")
VALUES
('SIS', 'SIS', 'Apache', NULL);
INSERT INTO metadata."Citation" ("ID", "onlineResource", "edition", "citedResponsibleParty",
"presentationForm", "alternateTitle" , "title") VALUES
- ('ISBN', 'ISBN', NULL, 'ISBN', NULL, 'ISBN',
'International Standard Book Number'),
- ('ISSN', 'ISSN', NULL, 'ISSN', NULL, 'ISSN',
'International Standard Serial Number'),
- ('ISO 19115-1', NULL, 'ISO 19115-1:2014(E)', 'ISO', 'documentDigital', 'ISO 19115-1',
'Geographic Information — Metadata Part 1: Fundamentals'),
- ('ISO 19115-2', NULL, 'ISO 19115-2:2009(E)', 'ISO', 'documentDigital', 'ISO 19115-2',
'Geographic Information — Metadata Part 2: Extensions for imagery and gridded data'),
- ('IHO S-57', NULL, '3.1', 'IHO', 'documentDigital', 'S-57',
'IHO transfer standard for digital hydrographic data'),
- ('MGRS', NULL, NULL, 'NATO', 'documentDigital', NULL,
'Military Grid Reference System'),
- ('WMS', 'WMS', '1.3', 'OGC', 'documentDigital', 'WMS',
'Web Map Server'),
- ('EPSG', 'EPSG', NULL, 'IOGP', 'tableDigital', 'EPSG Dataset',
'EPSG Geodetic Parameter Dataset'),
- ('ArcGIS', 'ESRI', NULL, 'ESRI', NULL, NULL,
'ArcGIS'),
- ('MapInfo', NULL, NULL, 'MapInfo', NULL, 'MapInfo',
'MapInfo Pro'),
- ('Proj4', 'Proj4', NULL, 'OSGeo', NULL, 'Proj',
'PROJ coordinate transformation software library'),
- ('SIS', 'SIS', NULL, 'Apache', NULL, 'Apache SIS',
'Apache Spatial Information System');
+ ('ISBN', 'ISBN', NULL, 'ISBN', NULL, 'ISBN',
'International Standard Book Number'),
+ ('ISSN', 'ISSN', NULL, 'ISSN', NULL, 'ISSN',
'International Standard Serial Number'),
+ ('ISO 19115-1', NULL, 'ISO 19115-1:2014', 'ISO', 'documentDigital', 'ISO 19115-1',
'Geographic Information — Metadata Part 1: Fundamentals'),
+ ('ISO 19115-2', NULL, 'ISO 19115-2:2019', 'ISO', 'documentDigital', 'ISO 19115-2',
'Geographic Information — Metadata Part 2: Extensions for imagery and gridded data'),
+ ('IHO S-57', NULL, '3.1', 'IHO', 'documentDigital', 'S-57',
'IHO transfer standard for digital hydrographic data'),
+ ('MGRS', NULL, NULL, 'NATO', 'documentDigital', NULL,
'Military Grid Reference System'),
+ ('WMS', 'WMS', '1.3', 'OGC', 'documentDigital', 'WMS',
'Web Map Server'),
+ ('EPSG', 'EPSG', NULL, 'IOGP', 'tableDigital', 'EPSG Dataset',
'EPSG Geodetic Parameter Dataset'),
+ ('ArcGIS', 'ESRI', NULL, 'ESRI', NULL, NULL,
'ArcGIS'),
+ ('MapInfo', NULL, NULL, 'MapInfo', NULL, 'MapInfo',
'MapInfo Pro'),
+ ('Proj4', 'Proj4', NULL, 'OSGeo', NULL, 'Proj',
'PROJ coordinate transformation software library'),
+ ('SIS', 'SIS', NULL, 'Apache', NULL, 'Apache SIS',
'Apache Spatial Information System');
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index 4d0102a..d26da70 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -257,7 +257,7 @@ public final strictfp class DefaultMetadataTest extends TestCase {
assertNull("metadataStandardVersion", metadata.getMetadataStandardVersion());
String name = "ISO 19115-2 Geographic Information - Metadata Part 2 Extensions for
imagery and gridded data";
- String version = "ISO 19115-2:2009(E)";
+ String version = "ISO 19115-2:2019";
metadata.setMetadataStandardName(name);
metadata.setMetadataStandardVersion(version);
assertEquals("metadataStandardName", name, metadata.getMetadataStandardName());
|