Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -1380,7 +1380,25 @@ public class DefaultMathTransformFactory * No need to check the type of the parsed object, because MathTransformParser * should return only instance of MathTransform. */ - final Object object = p.createFromWKT(text); + final Object object; + try { + object = p.createFromWKT(text); + } catch (FactoryException e) { + /* + * The parsing may fail because a operation parameter is not known to SIS. If this happen, replace + * the generic exception thrown be the parser (which is FactoryException) by a more specific one. + * Note that InvalidGeodeticParameterException is defined only in this sis-referencing module, + * so we could not throw it from the sis-metadata module that contain the parser. + */ + Throwable cause = e.getCause(); + while (cause != null) { + if (cause instanceof ParameterNotFoundException) { + throw new InvalidGeodeticParameterException(e.getMessage(), cause); // More accurate exception. + } + cause = cause.getCause(); + } + throw e; + } parser.set(p); return (MathTransform) object; }
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -163,10 +163,14 @@ public final class MathTransforms extend * Furthermore the returned transform is affine (i.e. implement the {@link LinearTransform} interface) * if the interval between each {@code preimage} and {@code values} element is constant. * + * <p>The current implementation uses linear interpolation. This may be changed in a future SIS version.</p> + * * @param preimage the input values (<var>x</var>) in the function domain, or {@code null}. * @param values the output values (<var>y</var>) in the function range, or {@code null}. * @return the <i>y=f(x)</i> function. * + * @see org.opengis.coverage.InterpolationMethod + * * @since 0.7 */ public static MathTransform1D interpolate(final double[] preimage, final double[] values) { Modified: sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/resources/org/apache/sis/referencing/factory/sql/EPSG_Finish.sql [UTF-8] Mon Apr 25 20:30:40 2016 @@ -19,6 +19,19 @@ UPDATE epsg_coordoperationparamvalue SET +--- +--- Extensions to EPSG dataset 8.9 for helping Apache SIS to find some coordinate operation paths. +--- +--- NTF Paris (EPSG:4807) → NTF (EPSG:4275) → RGF93 (EPSG:4171) +--- +INSERT INTO epsg_coordoperation VALUES (48094, 'NTF (Paris) to RGF93 (1)', 'concatenated operation', + 4807, 4171, NULL, 1, 3694, '?', 1, NULL, NULL, NULL, NULL, NULL, 'Apache SIS', '2016-04-22', NULL, FALSE, FALSE); +INSERT INTO epsg_coordoperationpath VALUES + (48094, 1763, 1), + (48094, 1053, 2); + + + -- -- Additional indexes for the EPSG database. Those indexes are not declared -- in the SQL scripts distributed by EPSG. They are not required for proper Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -1089,6 +1089,25 @@ public final strictfp class GeodeticObje } /** + * Ensures that parsing a WKT with wrong units throws an exception. + */ + @Test + public void testIncompatibleUnits() { + try { + parse(GeographicCRS.class, + "GEOGCS[“NAD83”,\n" + + " DATUM[“North American Datum 1983”,\n" + + " SPHEROID[“GRS 1980”, 6378137.0, 298.257222]],\n" + + " PRIMEM[“Greenwich”, 0],\n" + + " UNIT[“km”, 1000]]"); // Wrong unit + fail("Should not have parsed a CRS with wrong unit of measurement."); + } catch (ParseException e) { + final String message = e.getMessage(); + assertTrue(message, message.contains("km")); + } + } + + /** * Tests the production of a warning messages when the WKT contains unknown elements. * * @throws ParseException if the parsing failed. @@ -1100,7 +1119,7 @@ public final strictfp class GeodeticObje "GEOGCS[“WGS 84”,\n" + " DATUM[“World Geodetic System 1984”,\n" + " SPHEROID[“WGS84”, 6378137.0, 298.257223563, Ext1[“foo”], Ext2[“bla”]]],\n" + - " PRIMEM[“Greenwich”, 0.0, Intruder[“unknown”]],\n" + + " PRIMEM[“Greenwich”, 0.0, Intruder[“unknown”], UNIT[“degree”, 0.01745]],\n" + // Truncated scale factor. " UNIT[“degree”, 0.017453292519943295], Intruder[“foo”]]"); verifyGeographicCRS(0, crs); @@ -1130,12 +1149,14 @@ public final strictfp class GeodeticObje warnings.getUnknownElementLocations("Ext2").toArray()); assertMultilinesEquals("Parsing of “WGS 84” done, but some elements were ignored.\n" + + " • Unexpected scale factor 0.017 for unit of measurement “°”.\n" + " • The text contains unknown elements:\n" + " ‣ “Intruder” in PRIMEM, GEOGCS.\n" + " ‣ “Ext1” in SPHEROID.\n" + " ‣ “Ext2” in SPHEROID.", warnings.toString(Locale.US)); assertMultilinesEquals("La lecture de « WGS 84 » a été faite, mais en ignorant certains éléments.\n" + + " • Le facteur d’échelle 0,017 est inattendu pour l’unité de mesure « ° ».\n" + " • Le texte contient des éléments inconnus :\n" + " ‣ « Intruder » dans PRIMEM, GEOGCS.\n" + " ‣ « Ext1 » dans SPHEROID.\n" + Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -21,6 +21,7 @@ import org.opengis.referencing.crs.Geode import org.opengis.referencing.crs.SingleCRS; import org.opengis.util.FactoryException; import org.apache.sis.referencing.crs.DefaultCompoundCRS; +import org.apache.sis.referencing.crs.DefaultGeographicCRS; import org.apache.sis.referencing.crs.HardCodedCRS; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; @@ -105,6 +106,23 @@ public final strictfp class CRSTest exte } /** + * Tests simple WKT parsing. It is not the purpose of this class to test extensively the WKT parser; + * those tests are rather done by {@link org.apache.sis.io.wkt.GeodeticObjectParserTest}. + * Here we merely test that {@link CRS#fromWKT(String)} is connected to the parser. + * + * @throws FactoryException if an error occurred while parsing the WKT. + */ + @Test + public void testFromWKT() throws FactoryException { + final CoordinateReferenceSystem crs = CRS.fromWKT( + "GEOGCS[\"GCS WGS 1984\"," + + "DATUM[\"WGS 1984\",SPHEROID[\"WGS 1984\",6378137,298.257223563]]," + + "PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]]"); + assertInstanceOf("GEOGCS", DefaultGeographicCRS.class, crs); + assertEquals("GCS WGS 1984", crs.getName().getCode()); + } + + /** * Tests {@link CRS#isHorizontalCRS(CoordinateReferenceSystem)}. */ @Test Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -33,9 +33,10 @@ import static org.apache.sis.referencing /** * Tests the {@link IdentifiedObjects} static methods. - * This test class intentionally declares {@code testLookup()} method without {@link Test} annotation - * because those tests should not be executed only after the EPSG tests. Those tests will be executed - * by {@link CRSTest} instead. + * + * <p><b>Note:</b> this test class intentionally declares {@link #testLookupEPSG()} and {@link #testLookupWMS()} + * methods without {@link Test} annotation because those tests should be executed only after the EPSG tests in + * {@link org.apache.sis.test.suite.ReferencingTestSuite}. Those tests will be executed by {@link CRSTest} instead.</p> * * @author Martin Desruisseaux (Geomatys) * @since 0.4 Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -579,6 +579,12 @@ public final class Errors extends Indexe public static final short MismatchedCRS = 57; /** + * The “{0}” coordinate reference system has {1} dimension{1,choice,1#|2#s}, but the given + * geometry is {2}-dimensional. + */ + public static final short MismatchedDimensionForCRS_3 = 228; + + /** * Mismatched object dimensions: {0}D and {1}D. */ public static final short MismatchedDimension_2 = 58; @@ -901,6 +907,11 @@ public final class Errors extends Indexe public static final short OddArrayLength_1 = 98; /** + * Coordinate is outside the domain of validity. + */ + public static final short OutsideDomainOfValidity = 229; + + /** * No parameter named “{1}” has been found in “{0}”. */ public static final short ParameterNotFound_2 = 147; @@ -1036,6 +1047,11 @@ public final class Errors extends Indexe public static final short UnexpectedParameter_1 = 152; /** + * Unexpected scale factor {1} for unit of measurement “{0}”. + */ + public static final short UnexpectedScaleFactorForUnit_2 = 227; + + /** * Expected “{0}” to reference an instance of ‘{1}’, but found an instance of ‘{2}’. */ public static final short UnexpectedTypeForReference_3 = 200; Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Mon Apr 25 20:30:40 2016 @@ -128,6 +128,7 @@ MismatchedArrayLengths = Mism MismatchedCRS = The coordinate reference system must be the same for all objects. MismatchedDimension_2 = Mismatched object dimensions: {0}D and {1}D. MismatchedDimension_3 = Argument \u2018{0}\u2019 has {2} dimension{2,choice,1#|2#s}, while {1} was expected. +MismatchedDimensionForCRS_3 = The \u201c{0}\u201d coordinate reference system has {1} dimension{1,choice,1#|2#s}, but the given geometry is {2}-dimensional. MismatchedGridGeometry_2 = The grid geometry must be the same for \u201c{0}\u201d and \u201c{1}\u201d. MismatchedMatrixSize_4 = Mismatched matrix sizes: expected {0}\u00d7{1} but got {2}\u00d7{3}. MismatchedParameterDescriptor_1 = Mismatched descriptor for \u201c{0}\u201d parameter. @@ -191,6 +192,7 @@ NullMapKey = Null NullMapValue = Null values are not allowed in this dictionary. NullValueInTable_3 = Unexpected null value in record \u201c{2}\u201d for the column \u201c{1}\u201d in table \u201c{0}\u201d. OddArrayLength_1 = Array length is {0}, while we expected an even length. +OutsideDomainOfValidity = Coordinate is outside the domain of validity. PropertyAlreadyExists_2 = Property \u201c{1}\u201d already exists in \u201c{0}\u201d. ParameterNotFound_2 = No parameter named \u201c{1}\u201d has been found in \u201c{0}\u201d. PropertyNotFound_2 = No property named \u201c{1}\u201d has been found in \u201c{0}\u201d. @@ -218,6 +220,7 @@ UnexpectedEndOfString_1 = More UnexpectedFileFormat_2 = File \u201c{1}\u201d seems to be encoded in an other format than {0}. UnexpectedNumberOfComponents_3 = Expected {1} components in \u201c{0}\u201d but found {2}. UnexpectedParameter_1 = Parameter \u201c{0}\u201d was not expected. +UnexpectedScaleFactorForUnit_2 = Unexpected scale factor {1} for unit of measurement \u201c{0}\u201d. UnexpectedTypeForReference_3 = Expected \u201c{0}\u201d to reference an instance of \u2018{1}\u2019, but found an instance of \u2018{2}\u2019. UnexpectedValueInElement_2 = Unexpected value \u201c{1}\u201d in \u201c{0}\u201d element. UnitlessParameter_1 = Parameter \u201c{0}\u201d has no unit. Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Mon Apr 25 20:30:40 2016 @@ -125,6 +125,7 @@ MismatchedArrayLengths = Les MismatchedCRS = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es doit \u00eatre le m\u00eame pour tous les objets. MismatchedDimension_2 = Les dimensions des objets ({0}D et {1}D) ne concordent pas. MismatchedDimension_3 = L\u2019argument \u2018{0}\u2019 a {2} dimension{2,choice,1#|2#s}, alors qu\u2019on en attendait {1}. +MismatchedDimensionForCRS_3 = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es \u00ab\u202f{0}\u202f\u00bb a {1} dimension{1,choice,1#|2#s}, mais la g\u00e9om\u00e9trie donn\u00e9e en a {2}. MismatchedGridGeometry_2 = La g\u00e9om\u00e9trie de la grille doit \u00eatre la m\u00eame pour \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb. MismatchedMatrixSize_4 = Une matrice de taille de {0}\u00d7{1} \u00e9tait attendue mais la matrice donn\u00e9e est de taille {2}\u00d7{3}. MismatchedParameterDescriptor_1 = Le descripteur du param\u00e8tre \u00ab\u202f{0}\u202f\u00bb ne correspond pas. @@ -187,6 +188,7 @@ NullMapKey = La c NullMapValue = Les valeurs nulles ne sont pas autoris\u00e9es dans ce dictionnaire. NullValueInTable_3 = Dans la table \u00ab\u202f{0}\u202f\u00bb, la colonne \u00ab\u202f{1}\u202f\u00bb de l\u2019enregistrement \u00ab\u202f{2}\u202f\u00bb ne devrait pas contenir de valeur nulle. OddArrayLength_1 = La longueur du tableau est {0}, alors qu\u2019on attendait une longueur paire. +OutsideDomainOfValidity = La coordonn\u00e9e est en dehors du domaine de validit\u00e9. PropertyAlreadyExists_2 = La propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb existe d\u00e9j\u00e0 dans \u00ab\u202f{0}\u202f\u00bb. ParameterNotFound_2 = Aucun param\u00e8tre nomm\u00e9 \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9 dans \u00ab\u202f{0}\u202f\u00bb. PropertyNotFound_2 = Aucune propri\u00e9t\u00e9 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb. @@ -214,6 +216,7 @@ UnexpectedEndOfString_1 = D\u2 UnexpectedNumberOfComponents_3 = Il y a {2} composantes dans \u00ab\u202f{0}\u202f\u00bb alors qu\u2019on en attendait {1}. UnexpectedFileFormat_2 = Le fichier \u00ab\u202f{1}\u202f\u00bb semble \u00eatre encod\u00e9 dans un autre format que {0}. UnexpectedParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb est inattendu. +UnexpectedScaleFactorForUnit_2 = Le facteur d\u2019\u00e9chelle {1} est inattendu pour l\u2019unit\u00e9 de mesure \u00ab\u202f{0}\u202f\u00bb. UnexpectedTypeForReference_3 = L\u2019identifiant \u201c{0}\u201d r\u00e9f\u00e9rence une instance de \u2018{2}\u2019 alors qu\u2019on attendait une instance de \u2018{1}\u2019. UnexpectedValueInElement_2 = La valeur \u00ab\u202f{1}\u202f\u00bb dans l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb est inattendue. UnitlessParameter_1 = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019a pas d\u2019unit\u00e9. Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.java [UTF-8] Mon Apr 25 20:30:40 2016 @@ -57,6 +57,11 @@ public final class Vocabulary extends In } /** + * Accuracy + */ + public static final short Accuracy = 109; + + /** * Aliases */ public static final short Aliases = 74; @@ -207,6 +212,11 @@ public final class Vocabulary extends In public static final short Destination = 14; /** + * Details + */ + public static final short Details = 110; + + /** * Dimensions */ public static final short Dimensions = 15; @@ -377,6 +387,11 @@ public final class Vocabulary extends In public static final short MeanValue = 34; /** + * Methods + */ + public static final short Methods = 111; + + /** * Minimum value */ public static final short MinimumValue = 35; Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary.properties [ISO-8859-1] Mon Apr 25 20:30:40 2016 @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # +Accuracy = Accuracy Aliases = Aliases Angle = Angle AngularDegrees = Degrees @@ -44,6 +45,7 @@ DefaultValue = Default value DerivedFrom_1 = Derived from {0} Description = Description Destination = Destination +Details = Details Dimensions = Dimensions Directory = Directory DittoMark = \u2033 @@ -79,6 +81,7 @@ Mandatory = Mandatory MaximumValue = Maximum value MeanValue = Mean value MinimumValue = Minimum value +Methods = Methods ModifiedJulian = Modified Julian Name = Name None = None Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties?rev=1740892&r1=1740891&r2=1740892&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] (original) +++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Vocabulary_fr.properties [ISO-8859-1] Mon Apr 25 20:30:40 2016 @@ -21,6 +21,7 @@ # U+202F NARROW NO-BREAK SPACE before ; ! and ? # U+00A0 NO-BREAK SPACE before : # +Accuracy = Pr\u00e9cision Aliases = Alias Angle = Angle AngularDegrees = Degr\u00e9s @@ -51,6 +52,7 @@ DefaultValue = Valeur par d\u DerivedFrom_1 = D\u00e9riv\u00e9 de {0} Description = Description Destination = Destination +Details = D\u00e9tails Dimensions = Dimensions Directory = R\u00e9pertoire DittoMark = \u2033 @@ -86,6 +88,7 @@ Mandatory = Requis MaximumValue = Valeur maximale MeanValue = Valeur moyenne MinimumValue = Valeur minimale +Methods = M\u00e9thodes ModifiedJulian = Julien modifi\u00e9 Name = Nom None = Aucun
