sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1684640 - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/referencing/cs/
Date Wed, 10 Jun 2015 11:06:47 GMT
Author: desruisseaux
Date: Wed Jun 10 11:06:47 2015
New Revision: 1684640

URL: http://svn.apache.org/r1684640
Log:
Documentation: add the (presumed) publication years in reference to ISO 19162 chapter, in
case those numbers change in future publications.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/CharEncoding.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/CharEncoding.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/CharEncoding.java?rev=1684640&r1=1684639&r2=1684640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/CharEncoding.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/CharEncoding.java
[UTF-8] Wed Jun 10 11:06:47 2015
@@ -111,7 +111,7 @@ public abstract class CharEncoding imple
         if (a != null && !a.isEmpty() && a.length() <= 2) {
             switch (a.charAt(0)) {
                 /*
-                 * ISO 19162 §7.5.3 recommendations:
+                 * ISO 19162:2015 §7.5.3 recommendations:
                  *
                  *   a) For PolarCS using Greek letter θ for direction, the letter ‘U’
should be used in WKT.
                  *   b) For SphericalCS using φ and θ, the letter ‘U’ and ‘V’ respectively
should be used in WKT.
@@ -122,7 +122,7 @@ public abstract class CharEncoding imple
                     break;
                 }
                 /*
-                 * ISO 19162 §7.5.3 requirement (ii) and recommendation (b):
+                 * ISO 19162:2015 §7.5.3 requirement (ii) and recommendation (b):
                  *
                  *  ii) Greek letters φ and λ for geodetic latitude and longitude must
be replaced by Latin char.
                  *   b) For SphericalCS using φ and θ, the letter ‘U’ and ‘V’ respectively
should be used in WKT.

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1684640&r1=1684639&r2=1684640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
[UTF-8] Wed Jun 10 11:06:47 2015
@@ -411,8 +411,8 @@ final class GeodeticObjectParser extends
         String name = CharSequences.trimWhitespaces(element.pullString("name"));
         if (isGeographic) {
             /*
-             * The longitude and latitude axis names are explicitly fixed by ISO 19111 to
"Geodetic longitude"
-             * and "Geodetic latitude". But ISO 19162 §7.5.3(ii) said that the "Geodetic"
part in those names
+             * The longitude and latitude axis names are explicitly fixed by ISO 19111:2007
to "Geodetic longitude"
+             * and "Geodetic latitude". But ISO 19162:2015 §7.5.3(ii) said that the "Geodetic"
part in those names
              * shall be omitted at WKT formatting time. SIS's DefaultCoordinateSystemAxis.formatTo(Formatter)
              * method performs this removal, so we apply the reverse operation here.
              */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1684640&r1=1684639&r2=1684640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
[UTF-8] Wed Jun 10 11:06:47 2015
@@ -802,7 +802,7 @@ public class DefaultCoordinateSystemAxis
             }
             if (name != null && !isInternal) {
                 if (name.equalsIgnoreCase(AxisNames.GEODETIC_LATITUDE)) {
-                    name = AxisNames.LATITUDE;    // ISO 19162 §7.5.3(ii)
+                    name = AxisNames.LATITUDE;    // ISO 19162:2015 §7.5.3(ii)
                 } else if (name.equalsIgnoreCase(AxisNames.GEODETIC_LONGITUDE)) {
                     name = AxisNames.LONGITUDE;
                 }
@@ -811,7 +811,7 @@ public class DefaultCoordinateSystemAxis
             }
         }
         /*
-         * ISO 19162 §7.5.3 suggests to put abbreviation in parentheses, e.g. "Easting (x)".
+         * ISO 19162:2015 §7.5.3 suggests to put abbreviation in parentheses, e.g. "Easting
(x)".
          * The specification also suggests to write only the abbreviation (e.g. "(X)") in
the
          * special case of Geocentric axis, and disallows Greek letters.
          */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1684640&r1=1684639&r2=1684640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
[UTF-8] Wed Jun 10 11:06:47 2015
@@ -37,7 +37,7 @@ import org.apache.sis.io.wkt.Formatter;
  * This class does not know whether the meridian is relative to Greenwich or any other reference
meridian.
  * The reference meridian shall be inferred from the geodetic datum of the {@code GeographicCRS}
instance
  * that contains (through its coordinate system) the axes having those directions. This is
consistent with
- * ISO 19162 §7.5.4(iv) - WKT 2 formatting.
+ * ISO 19162:2015 §7.5.4(iv) - WKT 2 formatting.
  *
  * <div class="section">Immutability and thread safety</div>
  * This final class is immutable and thus inherently thread-safe.



Mime
View raw message