sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmarec...@apache.org
Subject svn commit: r1800298 - in /sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff: ImageFileDirectory.java Tags.java
Date Thu, 29 Jun 2017 15:54:13 GMT
Author: rmarechal
Date: Thu Jun 29 15:54:13 2017
New Revision: 1800298

URL: http://svn.apache.org/viewvc?rev=1800298&view=rev
Log:
Add Model Tie Point Geotiff Tag.

Modified:
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
    sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.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=1800298&r1=1800297&r2=1800298&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] Thu Jun 29 15:54:13 2017
@@ -311,6 +311,18 @@ final class ImageFileDirectory {
     private String asciiGeoParameters;
 
     /**
+     * Originally part of Intergraph's GeoTIFF tags, but now used in interchangeable GeoTIFF
files.
+     *
+     * This tag is also known as <strong>'GeoreferenceTag'</strong>.
+     * This tag stores raster->model tiepoint pairs in the order
+     * ModelTiepointTag = (...,I,J,K, X,Y,Z...)
+     * where (I,J,K) is the point at location (I,J) in raster space with pixel-value K, and
(X,Y,Z) is a vector in model space.
+     * In most cases the model space is only two-dimensional, in which case both K and Z
should be set to zero;
+     * this third dimension is provided in anticipation of future support for 3D digital
elevation models and vertical coordinate systems.
+     */
+    private Vector modelTiePoints;
+
+    /**
      * Creates a new image file directory.
      *
      * @param reader  information about the input stream to read, the metadata and the character
encoding.
@@ -649,6 +661,16 @@ final class ImageFileDirectory {
                 break;
             }
 
+            /*
+             * This tag stores raster->model tiepoint pairs in the order
+             * ModelTiepointTag = (...,I,J,K, X,Y,Z...).
+             */
+            case Tags.ModelTiePointTag: {
+                //-- TODO : store into ISO19115 metadata object
+                modelTiePoints = type.readVector(input(), count);
+                break;
+            }
+
             ////////////////////////////////////////////////////////////////////////////////////////////////
             ////                                                                        
               ////
             ////    Metadata for discovery purposes, conditions of use, etc.            
               ////

Modified: sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java?rev=1800298&r1=1800297&r2=1800298&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
[UTF-8] Thu Jun 29 15:54:13 2017
@@ -114,6 +114,7 @@ final class Tags {
     public static final short YCbCrPositioning            = 0x0213;
     public static final short ReferenceBlackWhite         = 0x0214;
     public static final short Copyright           = (short) 0x8298;
+    public static final short ModelTiePointTag    = (short) 0x8482;
 
 
     /////////////////////////////////////////////////////////



Mime
View raw message