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 afc247ae5d9d418ca9626789c1e5ef341894b06d Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Jan 24 12:02:12 2022 +0100 Add a `Citations.WMO` constant for the World Meteorological Organization. --- .../org/apache/sis/metadata/iso/citation/Citations.java | 14 +++++++++++++- .../org/apache/sis/metadata/iso/citation/package-info.java | 2 +- .../java/org/apache/sis/metadata/sql/MetadataFallback.java | 9 ++++++++- .../resources/org/apache/sis/metadata/sql/Citations.sql | 9 +++++++-- 4 files changed, 29 insertions(+), 5 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 09b203b..c3a74c6 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 @@ -75,7 +75,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier; // For javadoc * </ul> * * @author Martin Desruisseaux (IRD, Geomatys) - * @version 1.1 + * @version 1.2 * @since 0.3 * @module */ @@ -294,6 +294,17 @@ public final class Citations extends Static { public static final IdentifierSpace<String> ESRI = new CitationConstant.Authority<>("ArcGIS", "ESRI"); /** + * The authority for identifiers of objects defined by the + * <a href="https://www.wmo.int">World Meteorological Organization</a>. + * The {@linkplain IdentifierSpace#getName() name} of this identifier space is fixed to {@code "WMO"}. + * This citation is used as the authority for some coordinate operations other than EPSG and ESRI ones, + * for example "Rotated latitude/longitude". + * + * @since 1.2 + */ + public static final IdentifierSpace<String> WMO = new CitationConstant.Authority<>("WMO"); + + /** * The authority for identifiers of objects defined by the netCDF specification. * The {@linkplain IdentifierSpace#getName() name} of this identifier space is fixed to {@code "NetCDF"}. * This citation is used as the authority for some map projection method and parameter names @@ -431,6 +442,7 @@ public final class Citations extends Static { (CitationConstant) OGC, (CitationConstant) WMS, // Must be after OGC because it declares the same namespace. (CitationConstant) ESRI, + (CitationConstant) WMO, (CitationConstant) NETCDF, (CitationConstant) GEOTIFF, (CitationConstant) PROJ4, diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java index 28e6bca..9d4e0fb 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java @@ -87,7 +87,7 @@ * @author Touraïvane (IRD) * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) - * @version 1.0 + * @version 1.2 * @since 0.3 * @module */ 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 ae5a986..b094e70 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 @@ -37,7 +37,7 @@ import static java.util.Collections.singleton; * Used when connection to the spatial metadata can not be established. * * @author Martin Desruisseaux (Geomatys) - * @version 1.0 + * @version 1.2 * @since 1.0 * @module */ @@ -149,6 +149,13 @@ final class MetadataFallback extends MetadataSource { presentationForm = PresentationForm.DOCUMENT_DIGITAL; break; } + case "WMO": { + title = "WMO Information System (WIS)"; + code = key; + citedResponsibleParty = "World Meteorological Organization"; + presentationForm = PresentationForm.DOCUMENT_DIGITAL; + break; + } case "IOGP": { // Not in public API (see Citations.IOGP javadoc) title = "IOGP Surveying and Positioning Guidance Note 7"; code = Constants.IOGP; 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 3c010e3..392881c 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 @@ -50,6 +50,7 @@ INSERT INTO metadata."OnlineResource" ("ID", "linkage") VALUES ('PostGIS', 'https://postgis.net/'), ('Proj4', 'https://proj4.org/'), ('SIS', 'https://sis.apache.org/'), + ('WMO', 'https://www.wmo.int/'), ('WMS', 'https://www.ogc.org/standards/wms'); UPDATE metadata."OnlineResource" SET "function" = 'information'; @@ -105,7 +106,8 @@ INSERT INTO metadata."Organisation" ("ID", "name") VALUES ('{org}NATO', 'North Atlantic Treaty Organization'), ('{org}OGC', 'Open Geospatial Consortium'), ('{org}OSGeo', 'The Open Source Geospatial Foundation'), - ('{org}PBI', 'Pitney Bowes Inc.'); + ('{org}PBI', 'Pitney Bowes Inc.'), + ('{org}WMO', 'World Meteorological Organization'); INSERT INTO metadata."Responsibility" ("ID", "party", "role") VALUES ('Apache', '{org}Apache', 'resourceProvider'), @@ -118,7 +120,8 @@ INSERT INTO metadata."Responsibility" ("ID", "party", "role") VALUES ('MapInfo', '{org}PBI', 'principalInvestigator'), ('NATO', '{org}NATO', 'principalInvestigator'), ('OGC', '{org}OGC', 'principalInvestigator'), - ('OSGeo', '{org}OSGeo', 'resourceProvider'); + ('OSGeo', '{org}OSGeo', 'resourceProvider'), + ('WMO', '{org}WMO', 'principalInvestigator'); @@ -219,10 +222,12 @@ INSERT INTO metadata."Citation" ("ID", "onlineResource", "edition", "citedRespon -- INSERT INTO metadata."Identifier" ("ID", "code") VALUES ('OGC', 'OGC'), + ('WMO', 'WMO'), ('IOGP', 'IOGP'); INSERT INTO metadata."Citation" ("ID", "onlineResource", "citedResponsibleParty", "presentationForm", "title") VALUES ('OGC', 'OGCNA', 'OGC', 'documentDigital', 'OGC Naming Authority'), + ('WMO', 'WMO', 'WMO', 'documentDigital', 'WMO Information System (WIS)'), ('IOGP', 'IOGP', 'IOGP', 'documentDigital', 'IOGP Surveying and Positioning Guidance Note 7'); UPDATE metadata."Citation" SET "identifier" = "ID" WHERE "ID"<>'ISBN' AND "ID"<>'ISSN' AND "ID"<>'MGRS';