sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1832917 - in /sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff: GridGeometry.java ImageFileDirectory.java Localization.java
Date Tue, 05 Jun 2018 08:46:28 GMT
Author: desruisseaux
Date: Tue Jun  5 08:46:28 2018
New Revision: 1832917

URL: http://svn.apache.org/viewvc?rev=1832917&view=rev
Log:
Renamed GridGeometry as Localization for avoiding confusion with GridGeometry in sis-raster.

Added:
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Localization.java
      - copied, changed from r1832916, sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java
Removed:
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java
Modified:
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java?rev=1832917&r1=1832916&r2=1832917&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
[UTF-8] Tue Jun  5 08:46:28 2018
@@ -1162,7 +1162,7 @@ final class ImageFileDirectory {
          * the translation terms now.
          */
         if (gridToCRS != null && !completeMatrixSpecified) {
-            if (!GridGeometry.setTranslationTerms(gridToCRS, modelTiePoints)) {
+            if (!Localization.setTranslationTerms(gridToCRS, modelTiePoints)) {
                 throw missingTag(Tags.ModelTiePoints);
             }
         }
@@ -1254,7 +1254,7 @@ final class ImageFileDirectory {
         }
         try {
             if (!isGeorectified) {
-                metadata.addGeolocation(new GridGeometry(filename(), crs, modelTiePoints));
+                metadata.addGeolocation(new Localization(filename(), crs, modelTiePoints));
             }
         } catch (TransformException e) {
             reader.owner.warning(null, e);

Copied: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Localization.java
(from r1832916, sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Localization.java?p2=sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Localization.java&p1=sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java&r1=1832916&r2=1832917&rev=1832917&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometry.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Localization.java
[UTF-8] Tue Jun  5 08:46:28 2018
@@ -79,7 +79,7 @@ import org.apache.sis.math.Vector;
  * @module
  */
 @SuppressWarnings("serial")
-final class GridGeometry extends AbstractCoordinateOperation implements GeolocationInformation
{
+final class Localization extends AbstractCoordinateOperation implements GeolocationInformation
{
     /**
      * Number of floating point values in each (I,J,K,X,Y,Z) record.
      */
@@ -94,7 +94,7 @@ final class GridGeometry extends Abstrac
     /**
      * Creates a new transformation from the information found by {@link ImageFileDirectory}.
      */
-    GridGeometry(final String name, final CoordinateReferenceSystem crs, final Vector modelTiePoints)
+    Localization(final String name, final CoordinateReferenceSystem crs, final Vector modelTiePoints)
             throws FactoryException, TransformException
     {
         super(Collections.singletonMap(NAME_KEY, name), null, crs, null, localizationGrid(modelTiePoints,
null));



Mime
View raw message