You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/06/13 09:37:42 UTC

[sis] 01/02: Upgrade to EPSG geodetic database 9.6.3.

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 e2d37e3788a3606f17fda4e7f8ed8fc54d17f26b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Jun 12 20:49:19 2019 +0200

    Upgrade to EPSG geodetic database 9.6.3.
---
 .../org/apache/sis/referencing/factory/sql/epsg/package.html   |  8 ++++----
 .../sis/referencing/report/CoordinateReferenceSystems.java     | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
index 53c2f74..dd02498 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
@@ -56,12 +56,12 @@
       No data value should be altered. Steps to follow:
     </p>
     <ol>
-      <li><p>Download the latest SQL scripts for PostgreSQL from <a href="http://www.epsg.org">http://www.epsg.org</a>.</p></li>
+      <li><p>Download the latest SQL scripts for PostgreSQL from <a href="http://www.epsg-registry.org/">http://www.epsg-registry.org/</a>
+          (require registration).</p></li>
 
-      <li><p>Unzip in the directory of your choice (replace "9_4" by the appropriate version number in the ZIP filename),
-          and remember the path to that directory:</p>
+      <li><p>Unzip in the directory of your choice and remember the path to that directory:</p>
 
-        <pre>unzip EPSG-PSQL-export-9.4.zip
+        <pre>unzip EPSG-PSQL-export-<i>&lt;version&gt;</i>.zip
 export EPSG_SCRIPTS=$PWD</pre>
       </li>
 
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index b2da161..32268de 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -480,7 +480,7 @@ public final strictfp class CoordinateReferenceSystems extends AuthorityCodesRep
         properties.setProperty("PRODUCT.URL",     "http://sis.apache.org");
         properties.setProperty("JAVADOC.GEOAPI",  "http://www.geoapi.org/snapshot/javadoc");
         properties.setProperty("FACTORY.NAME",    "EPSG");
-        properties.setProperty("FACTORY.VERSION", "9.3");
+        properties.setProperty("FACTORY.VERSION", "9.6.3");
         properties.setProperty("FACTORY.VERSION.SUFFIX", ", together with other sources");
         properties.setProperty("PRODUCT.VERSION.SUFFIX", " (provided that <a href=\"http://sis.apache.org/epsg.html\">a connection to an EPSG database exists</a>)");
         properties.setProperty("DESCRIPTION", "<p><b>Notation:</b></p>\n" +
@@ -540,9 +540,11 @@ public final strictfp class CoordinateReferenceSystems extends AuthorityCodesRep
         }
         if (crs instanceof GeneralDerivedCRS) {
             final OperationMethod method = ((GeneralDerivedCRS) crs).getConversionFromBase().getMethod();
-            return "<a href=\"CoordinateOperationMethods.html#"
-                   + IdentifiedObjects.getIdentifier(method, Citations.EPSG).getCode()
-                   + "\">" + method.getName().getCode().replace('_', ' ') + "</a>";
+            final Identifier identifier = IdentifiedObjects.getIdentifier(method, Citations.EPSG);
+            if (identifier != null) {
+                return "<a href=\"CoordinateOperationMethods.html#" + identifier.getCode()
+                       + "\">" + method.getName().getCode().replace('_', ' ') + "</a>";
+            }
         }
         if (crs instanceof GeocentricCRS) {
             final CoordinateSystem cs = crs.getCoordinateSystem();