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 d1d9870de231924750c4a525467e8311eea8f440
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Aug 16 15:08:42 2022 +0200
MapInfo producer "Pitney Bowes Inc." renamed "Precisely".
Remove test for MapInfo code space because it changes often.
---
.../org/apache/sis/metadata/sql/Citations.sql | 22 ++++++++--------
.../sis/metadata/iso/citation/CitationsTest.java | 29 +++++++++++-----------
2 files changed, 25 insertions(+), 26 deletions(-)
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 69a3fc4cce..37e4ab38d8 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
@@ -103,10 +103,10 @@ INSERT INTO metadata."Organisation" ("ID", "name") VALUES
('{org}ISBN', 'International ISBN Agency'),
('{org}ISSN', 'The International Centre for the registration of serial
publications'),
('{org}ISO', 'International Organization for Standardization'),
+ ('{org}MIF', 'Precisely'),
('{org}NATO', 'North Atlantic Treaty Organization'),
('{org}OGC', 'Open Geospatial Consortium'),
('{org}OSGeo', 'The Open Source Geospatial Foundation'),
- ('{org}PBI', 'Pitney Bowes Inc.'),
('{org}WMO', 'World Meteorological Organization');
INSERT INTO metadata."Responsibility" ("ID", "party", "role") VALUES
@@ -117,7 +117,7 @@ INSERT INTO metadata."Responsibility" ("ID", "party",
"role") VALUES
('ISBN', '{org}ISBN', 'principalInvestigator'),
('ISSN', '{org}ISSN', 'principalInvestigator'),
('ISO', '{org}ISO', 'principalInvestigator'),
- ('MapInfo', '{org}PBI', 'principalInvestigator'),
+ ('MapInfo', '{org}MIF', 'principalInvestigator'),
('NATO', '{org}NATO', 'principalInvestigator'),
('OGC', '{org}OGC', 'principalInvestigator'),
('OSGeo', '{org}OSGeo', 'resourceProvider'),
@@ -185,15 +185,15 @@ 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'),
- ('ISO 19115-2', '19115-2', 'ISO', '2019'),
- ('IHO S-57', 'S-57', 'IHO', '3.1'),
- ('WMS', 'WMS', 'OGC', '1.3'),
- ('EPSG', 'EPSG', 'IOGP', NULL),
- ('ArcGIS', 'ArcGIS', 'ESRI', NULL),
- ('MapInfo', 'MapInfo', 'Pitney Bowes', NULL),
- ('PROJ', 'PROJ', 'OSGeo', NULL),
- ('SIS', 'SIS', 'Apache', NULL);
+ ('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),
+ ('ArcGIS', 'ArcGIS', 'ESRI', NULL),
+ ('MapInfo', 'MapInfo', 'Precisely', NULL),
+ ('PROJ', 'PROJ', 'OSGeo', NULL),
+ ('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'),
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
index aa1b2df284..dabbd9c224 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -120,21 +120,20 @@ public final strictfp class CitationsTest extends
TestCase {
*/
@Test
public void testGetIdentifier() {
- assertEquals("Apache:SIS", getIdentifier(SIS));
- assertEquals("OGC", getIdentifier(OGC));
- assertEquals("IOGP", getIdentifier(IOGP));
- assertEquals("EPSG", getIdentifier(EPSG));
- assertEquals("ESRI:ArcGIS", getIdentifier(ESRI));
- assertEquals("NetCDF", getIdentifier(NETCDF));
- assertEquals("GeoTIFF", getIdentifier(GEOTIFF));
- assertEquals("Pitney Bowes:MapInfo", getIdentifier(MAP_INFO));
- assertEquals("ISBN", getIdentifier(ISBN));
- assertEquals("ISSN", getIdentifier(ISSN));
- assertEquals("OSGeo:PROJ", getIdentifier(PROJ4));
// Not a valid Unicode identifier.
- assertEquals("IHO:S-57", getIdentifier(S57));
// Not a valid Unicode identifier.
- assertEquals("ISO:19115-1", getIdentifier(ISO_19115.get(0)));
// The ':' separator is not usual in ISO references
- assertEquals("ISO:19115-2", getIdentifier(ISO_19115.get(1)));
// and could be changed in future SIS versions.
- assertEquals("OGC:WMS", getIdentifier(WMS));
+ assertEquals("Apache:SIS", getIdentifier(SIS));
+ assertEquals("OGC", getIdentifier(OGC));
+ assertEquals("IOGP", getIdentifier(IOGP));
+ assertEquals("EPSG", getIdentifier(EPSG));
+ assertEquals("ESRI:ArcGIS", getIdentifier(ESRI));
+ assertEquals("NetCDF", getIdentifier(NETCDF));
+ assertEquals("GeoTIFF", getIdentifier(GEOTIFF));
+ assertEquals("ISBN", getIdentifier(ISBN));
+ assertEquals("ISSN", getIdentifier(ISSN));
+ assertEquals("OSGeo:PROJ", getIdentifier(PROJ4)); // Not
a valid Unicode identifier.
+ assertEquals("IHO:S-57", getIdentifier(S57)); // Not
a valid Unicode identifier.
+ assertEquals("ISO:19115-1", getIdentifier(ISO_19115.get(0))); // The
':' separator is not usual in ISO references
+ assertEquals("ISO:19115-2", getIdentifier(ISO_19115.get(1))); // and
could be changed in future SIS versions.
+ assertEquals("OGC:WMS", getIdentifier(WMS));
}
/**
