sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1785905 [5/5] - in /sis/trunk: ./ application/sis-console/src/main/java/org/apache/sis/console/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ core/sis-metadat...
Date Tue, 07 Mar 2017 23:37:50 GMT
Modified: sis/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue Mar  7 23:37:49
2017
@@ -66,6 +66,8 @@ src.feature.dir      = ${project.root}/c
 test.feature.dir     = ${project.root}/core/sis-feature/src/test/java
 src.referencing.dir  = ${project.root}/core/sis-referencing/src/main/java
 test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
+src.ref-by-id.dir    = ${project.root}/core/sis-referencing-by-identifiers/src/main/java
+test.ref-by-id.dir   = ${project.root}/core/sis-referencing-by-identifiers/src/test/java
 src.metadata.dir     = ${project.root}/core/sis-metadata/src/main/java
 test.metadata.dir    = ${project.root}/core/sis-metadata/src/test/java
 src.utility.dir      = ${project.root}/core/sis-utility/src/main/java

Modified: sis/trunk/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.xml?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.xml Tue Mar  7 23:37:49 2017
@@ -34,6 +34,7 @@
                 <root id="src.storage.dir" name="Storage"/>
                 <root id="src.feature.dir" name="Feature"/>
                 <root id="src.referencing.dir" name="Referencing"/>
+                <root id="src.ref-by-id.dir" name="Referencing by identifiers"/>
                 <root id="src.metadata.dir" name="Metadata"/>
                 <root id="src.utility.dir" name="Utility"/>
                 <root id="src.fra-profile.dir" name="French profile"/>
@@ -49,6 +50,7 @@
                 <root id="test.storage.dir" name="Test Storage"/>
                 <root id="test.feature.dir" name="Test Feature"/>
                 <root id="test.referencing.dir" name="Test Referencing"/>
+                <root id="test.ref-by-id.dir" name="Test Referencing by identifiers"/>
                 <root id="test.metadata.dir" name="Test Metadata"/>
                 <root id="test.utility.dir" name="Test Utility"/>
                 <root id="test.fra-profile.dir" name="Test French profile"/>

Modified: sis/trunk/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/javadoc/stylesheet.css?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/src/main/javadoc/stylesheet.css (original)
+++ sis/trunk/src/main/javadoc/stylesheet.css Tue Mar  7 23:37:49 2017
@@ -168,7 +168,7 @@ div.description div.section {
 
 /*
  * Bullet and ordered lists. Put some space before and after the list.
- * Listes of the "verbose" class also have some space betweem items.
+ * Lists of the "verbose" class also have some space betweem items.
  */
 div.block ul,
 div.block ol {

Modified: sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
[UTF-8] Tue Mar  7 23:37:49 2017
@@ -904,7 +904,7 @@ final class LandsatReader {
          */
         if (datum != null) {
             if (utmZone > 0) {
-                metadata.add(datum.UTM(1, TransverseMercator.Zoner.UTM.centralMeridian(utmZone)));
+                metadata.add(datum.universal(1, TransverseMercator.Zoner.UTM.centralMeridian(utmZone)));
             }
             if (projection != null) {
                 final double sp = projection.parameter(Constants.STANDARD_PARALLEL_1).doubleValue();

Modified: sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
[UTF-8] Tue Mar  7 23:37:49 2017
@@ -295,23 +295,23 @@ public class LandsatReaderTest extends T
                 + "  │   └─Code……………………………………………………………………………………………
LandsatTest\n"
                 + "  ├─Metadata standard (1 of 2)\n"
                 + "  │   ├─Title…………………………………………………………………………………………
Geographic Information — Metadata Part 1: Fundamentals\n"
+                + "  │   ├─Edition……………………………………………………………………………………
ISO 19115-1:2014(E)\n"
+                + "  │   ├─Identifier\n"
+                + "  │   │   └─Code…………………………………………………………………………………
19115-1\n"
                 + "  │   ├─Cited responsible party\n"
                 + "  │   │   ├─Role…………………………………………………………………………………
Principal investigator\n"
                 + "  │   │   └─Party\n"
                 + "  │   │       └─Name………………………………………………………………………
International Organization for Standardization\n"
-                + "  │   ├─Edition……………………………………………………………………………………
ISO 19115-1:2014(E)\n"
-                + "  │   ├─Identifier\n"
-                + "  │   │   └─Code…………………………………………………………………………………
19115-1\n"
                 + "  │   └─Presentation form…………………………………………………………
Document digital\n"
                 + "  └─Metadata standard (2 of 2)\n"
                 + "      ├─Title…………………………………………………………………………………………
Geographic Information — Metadata Part 2: Extensions for imagery and gridded data\n"
+                + "      ├─Edition……………………………………………………………………………………
ISO 19115-2:2009(E)\n"
+                + "      ├─Identifier\n"
+                + "      │   └─Code…………………………………………………………………………………
19115-2\n"
                 + "      ├─Cited responsible party\n"
                 + "      │   ├─Role…………………………………………………………………………………
Principal investigator\n"
                 + "      │   └─Party\n"
                 + "      │       └─Name………………………………………………………………………
International Organization for Standardization\n"
-                + "      ├─Edition……………………………………………………………………………………
ISO 19115-2:2009(E)\n"
-                + "      ├─Identifier\n"
-                + "      │   └─Code…………………………………………………………………………………
19115-2\n"
                 + "      └─Presentation form…………………………………………………………
Document digital\n", text);
     }
 }

Modified: sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
[UTF-8] Tue Mar  7 23:37:49 2017
@@ -43,6 +43,7 @@ import org.apache.sis.util.resources.Err
  *
  * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
+ * @author  Thi Phuong Hao Nguyen (VNSC)
  * @since   0.8
  * @version 0.8
  * @module

Modified: sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
[UTF-8] Tue Mar  7 23:37:49 2017
@@ -44,6 +44,7 @@ import org.apache.sis.measure.Units;
  * @author  Rémi Marechal (Geomatys)
  * @author  Alexis Manin (Geomatys)
  * @author  Johann Sorel (Geomatys)
+ * @author  Thi Phuong Hao Nguyen (VNSC)
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.8
  * @version 0.8

Modified: sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] Tue Mar  7 23:37:49 2017
@@ -158,27 +158,27 @@ public final strictfp class MetadataRead
             "  │   └─Code……………………………………………………………………………………………
NCEP/SST/Global_5x2p5deg/SST_Global_5x2p5deg_20050922_0000.nc\n" +
             "  ├─Metadata standard (1 of 2)\n" +
             "  │   ├─Title…………………………………………………………………………………………
Geographic Information — Metadata Part 1: Fundamentals\n" +
-            "  │   ├─Cited responsible party\n" +
-            "  │   │   ├─Party\n" +
-            "  │   │   │   └─Name………………………………………………………………………
International Organization for Standardization\n" +
-            "  │   │   └─Role…………………………………………………………………………………
Principal investigator\n" +
             "  │   ├─Edition……………………………………………………………………………………
ISO 19115-1:2014(E)\n" +
             "  │   ├─Identifier\n" +
             "  │   │   ├─Code…………………………………………………………………………………
19115-1\n" +
             "  │   │   ├─Code space…………………………………………………………………
ISO\n" +
             "  │   │   └─Version…………………………………………………………………………
2014(E)\n" +
+            "  │   ├─Cited responsible party\n" +
+            "  │   │   ├─Party\n" +
+            "  │   │   │   └─Name………………………………………………………………………
International Organization for Standardization\n" +
+            "  │   │   └─Role…………………………………………………………………………………
Principal investigator\n" +
             "  │   └─Presentation form…………………………………………………………
Document digital\n" +
             "  └─Metadata standard (2 of 2)\n" +
             "      ├─Title…………………………………………………………………………………………
Geographic Information — Metadata Part 2: Extensions for imagery and gridded data\n" +
-            "      ├─Cited responsible party\n" +
-            "      │   ├─Party\n" +
-            "      │   │   └─Name………………………………………………………………………
International Organization for Standardization\n" +
-            "      │   └─Role…………………………………………………………………………………
Principal investigator\n" +
             "      ├─Edition……………………………………………………………………………………
ISO 19115-2:2009(E)\n" +
             "      ├─Identifier\n" +
             "      │   ├─Code…………………………………………………………………………………
19115-2\n" +
             "      │   ├─Code space…………………………………………………………………
ISO\n" +
             "      │   └─Version…………………………………………………………………………
2009(E)\n" +
+            "      ├─Cited responsible party\n" +
+            "      │   ├─Party\n" +
+            "      │   │   └─Name………………………………………………………………………
International Organization for Standardization\n" +
+            "      │   └─Role…………………………………………………………………………………
Principal investigator\n" +
             "      └─Presentation form…………………………………………………………
Document digital\n", text);
     }
 }

Modified: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java?rev=1785905&r1=1785904&r2=1785905&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8]
(original)
+++ sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8]
Tue Mar  7 23:37:49 2017
@@ -19,7 +19,9 @@ package org.apache.sis.index;
 import java.io.Serializable;
 import java.text.ParseException;
 import org.opengis.geometry.DirectPosition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.geometry.DirectPosition2D;
+import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 
@@ -32,7 +34,7 @@ import org.apache.sis.util.resources.Err
  *
  * @author  Chris Mattmann (JPL)
  * @since   0.1
- * @version 0.3
+ * @version 0.8
  * @module
  *
  * @see <a href="http://en.wikipedia.org/wiki/Geohash">Wikipedia: Geohash</a>
@@ -124,11 +126,18 @@ public class GeoHashCoder implements Ser
     private transient char[] buffer;
 
     /**
+     * The coordinate reference system to assign to the decoded direct positions,
+     * or {@code null} if none.
+     */
+    private final CoordinateReferenceSystem crs;
+
+    /**
      * Creates a new geohash coder/decoder initialized to the default precision for {@link
Format#BASE32}.
      */
     public GeoHashCoder() {
         format = Format.BASE32;
         precision = 12;
+        crs = CommonCRS.defaultGeographic();
     }
 
     /**
@@ -164,7 +173,7 @@ public class GeoHashCoder implements Ser
     /**
      * Sets the length of geohashes strings to be encoded by the {@link #encode(DirectPosition)}
method.
      *
-     * @param  precision  he new length of geohashes strings.
+     * @param  precision  the new length of geohashes strings.
      */
     public void setPrecision(final int precision) {
         ArgumentChecks.ensureBetween("precision", 1, 255, precision);
@@ -250,7 +259,7 @@ public class GeoHashCoder implements Ser
     /**
      * Decodes the given geohash into a longitude and a latitude.
      *
-     * @param geohash Geohash string to decode.
+     * @param  geohash  geohash string to decode.
      * @return a new position with the longitude at ordinate 0 and latitude at ordinate 1.
      * @throws ParseException if an error occurred while parsing the given string.
      */
@@ -307,7 +316,7 @@ public class GeoHashCoder implements Ser
                 isEven = !isEven;
             } while ((mask >>>= 1) != 0);
         }
-        return new DirectPosition2D((xmin + xmax) / 2,
-                                    (ymin + ymax) / 2);
+        return new DirectPosition2D(crs, (xmin + xmax) / 2,
+                                         (ymin + ymax) / 2);
     }
 }



Mime
View raw message