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 2018/10/25 16:13:55 UTC

[sis] branch geoapi-4.0 updated (ab942d8 -> 1768c11)

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.


    from ab942d8  IP review: his contribution (wrapping TransformException in IllegalArgumentException) is not present on Apache SIS. https://svn.apache.org/repos/asf/sis/ip-review/rev/16529/GridGeometry.xhtml
     new 9c0136b  Documentation update.
     new 1768c11  Unit name for "%" should be "percent" rather than "percentage", to fit usage found in netCDF files. We keep "percentage" as an alias however.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/sis/metadata/iso/DefaultIdentifier.java | 23 +++++++++++-----------
 .../org/apache/sis/measure/UnitAliases.properties  |  1 +
 .../org/apache/sis/measure/UnitNames.properties    |  2 +-
 .../org/apache/sis/measure/UnitNames_fr.properties |  2 +-
 .../org/apache/sis/measure/UnitFormatTest.java     |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)


[sis] 02/02: Unit name for "%" should be "percent" rather than "percentage", to fit usage found in netCDF files. We keep "percentage" as an alias however.

Posted by de...@apache.org.
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 1768c11223164e5acd17a0f4833435a5896fc1fe
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Oct 25 18:13:15 2018 +0200

    Unit name for "%" should be "percent" rather than "percentage", to fit usage found in netCDF files. We keep "percentage" as an alias however.
---
 .../src/main/resources/org/apache/sis/measure/UnitAliases.properties    | 1 +
 .../src/main/resources/org/apache/sis/measure/UnitNames.properties      | 2 +-
 .../src/main/resources/org/apache/sis/measure/UnitNames_fr.properties   | 2 +-
 .../src/test/java/org/apache/sis/measure/UnitFormatTest.java            | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitAliases.properties b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitAliases.properties
index 0e4b0ea..3b6bbd9 100644
--- a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitAliases.properties
+++ b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitAliases.properties
@@ -27,6 +27,7 @@ mbar=hPa
 millibar=hPa
 millibars=hPa
 minutes=min
+percentage=%
 radians=rad
 seconds=s
 weeks=wk
diff --git a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties
index fce3a4b..11c36bf 100644
--- a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties
+++ b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames.properties
@@ -58,7 +58,7 @@ Wb=weber
 wk=week
 �rad=microradian
 \u03a9=ohm
-%=percentage
+%=percent
 �=degree
 \u2032=arc-minute
 \u2033=arc-second
diff --git a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties
index 8675609..708a734 100644
--- a/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties
+++ b/core/sis-utility/src/main/resources/org/apache/sis/measure/UnitNames_fr.properties
@@ -30,7 +30,7 @@ s=seconde
 sr=st�radian
 unity=unit�
 wk=semaine
-%=pourcentage
+%=pourcent
 �=degr�e
 \u2032=arc-minute
 \u2033=arc-seconde
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
index ee3073c..fc711b7 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitFormatTest.java
@@ -122,7 +122,7 @@ public final strictfp class UnitFormatTest extends TestCase {
         verify(declared, "GRAM",                "M",            "g",     "gram",                    Units.GRAM);
         verify(declared, "MOLE",                "N",            "mol",   "mole",                    Units.MOLE);
         verify(declared, "UNITY",               "",             "",       null,                     Units.UNITY);
-        verify(declared, "PERCENT",             "",             "%",     "percentage",              Units.PERCENT);
+        verify(declared, "PERCENT",             "",             "%",     "percent",                 Units.PERCENT);
         verify(declared, "PPM",                 "",             "ppm",   "parts per million",       Units.PPM);
         verify(declared, "PSU",                 "",             "psu",   "practical salinity unit", Units.PSU);
         verify(declared, "PIXEL",               "",             "px",    "pixel",                   Units.PIXEL);


[sis] 01/02: Documentation update.

Posted by de...@apache.org.
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 9c0136b5ced68f5e51ab7fef1defafff9d524f5a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Oct 25 18:12:51 2018 +0200

    Documentation update.
---
 .../apache/sis/metadata/iso/DefaultIdentifier.java | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
index c1ca67d..ca3ffeb 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
@@ -53,22 +53,21 @@ import org.apache.sis.xml.Namespaces;
  * {@code org.apache.metadata} hierarchy because of the immutable nature of referencing objects.</p>
  *
  * <div class="section">Text, URN and XML representations</div>
- * The XML representation of {@link DefaultIdentifier} is similar to the {@link ImmutableIdentifier}
- * one except for the {@code "MD_"} prefix. Example:
+ * The XML representation of {@link DefaultIdentifier} is as the following example:
  *
  * {@preformat xml
- *   <gmd:MD_Identifier
- *     <gmd:code>
+ *   <mcc:MD_Identifier
+ *     <mcc:code>
  *       <gco:CharacterString>4326</gco:CharacterString>
- *     </gmd:code>
- *     <gmd:authority>
- *       <gmd:CI_Citation>
- *         <gmd:title>
+ *     </mcc:code>
+ *     <mcc:authority>
+ *       <cit:CI_Citation>
+ *         <cit:title>
  *           <gco:CharacterString>EPSG</gco:CharacterString>
- *         </gmd:title>
- *       </gmd:CI_Citation>
- *     </gmd:authority>
- *   </gmd:MD_Identifier>
+ *         </cit:title>
+ *       </cit:CI_Citation>
+ *     </mcc:authority>
+ *   </mcc:MD_Identifier>
  * }
  *
  * <div class="section">Limitations</div>