From 029fd0e63f39547d682ec6f53595bff9a06ca526 Mon Sep 17 00:00:00 2001
From: wyq <yaqiang.wang@gmail.com>
Date: Sun, 7 Apr 2024 10:59:13 +0800
Subject: [PATCH] bugfix for geotiff data reading

---
 .../data/mapdata/geotiff/GeoTiff.java         |   1 +
 meteoinfo-lab/milconfig.xml                   |  14 ++++++--------
 .../pylib/mipylib/dataset/midata$py.class     | Bin 58152 -> 58152 bytes
 meteoinfo-lab/pylib/mipylib/dataset/midata.py |   4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/geotiff/GeoTiff.java b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/geotiff/GeoTiff.java
index 3a69f9f9..8033e3f4 100644
--- a/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/geotiff/GeoTiff.java
+++ b/meteoinfo-data/src/main/java/org/meteoinfo/data/mapdata/geotiff/GeoTiff.java
@@ -1188,6 +1188,7 @@ public class GeoTiff {
                                 for (int w = 0; w < tileWidth; w++) {
                                     hIdx = j * tileWidth + w;
                                     if (hIdx == width) {
+                                        buffer.get(new byte[(tileWidth - w) * 2]);
                                         break;
                                     }
                                     index.set0(vIdx);
diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
index 99b97dad..fdf8e461 100644
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model">
-    <RecentFolder Folder="D:\Temp\working\acidrain"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\io\geotiff">
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\geoshow"/>
@@ -9,26 +8,25 @@
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\hdf"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\awx"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grads"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\netcdf"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\3d_earth"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\geotiff"/>
   </Path>
   <File>
     <OpenedFiles>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\map\geoshow\geoshow_2.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\Line2D_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\netcdf\eccc_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_wolf.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\geotiff\geotiff_dem_4.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\map\geoshow\geoshow_2.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\plot\Line2D_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\io\netcdf\eccc_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\model\obj_wolf.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\io\geotiff\geotiff_dem_4.py"/>
     </RecentFiles>
   </File>
   <Font>
@@ -36,5 +34,5 @@
   </Font>
   <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
   <Figure DoubleBuffering="true"/>
-  <Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
+  <Startup MainFormLocation="-7,0" MainFormSize="1376,799"/>
 </MeteoInfo>
diff --git a/meteoinfo-lab/pylib/mipylib/dataset/midata$py.class b/meteoinfo-lab/pylib/mipylib/dataset/midata$py.class
index d44f1134a5abccb1ff0bea6406a2eec08e9e8acf..7dfbe4f51de45ddb367721951dc7ccb9f8ae075a 100644
GIT binary patch
delta 26
icmZ2+jCsW|<_-K&?AtucVi_6aChw0F-K-t;w*vr-q6%>U

delta 26
icmZ2+jCsW|<_-K&>_&oll8g*;llMo8Zq|<a+W`Q5HVJ6}

diff --git a/meteoinfo-lab/pylib/mipylib/dataset/midata.py b/meteoinfo-lab/pylib/mipylib/dataset/midata.py
index fd5263ec..e6f40aef 100644
--- a/meteoinfo-lab/pylib/mipylib/dataset/midata.py
+++ b/meteoinfo-lab/pylib/mipylib/dataset/midata.py
@@ -724,13 +724,13 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
     
     #Write variable data
     for var in variables:
-        print 'Variable: ' + var.name
+        print('Variable: ' + var.name)
         data = f[str(var.name)].read()
         ncfile.write(var, data)    
         
     #Close netCDF file
     ncfile.close()
-    print 'Convert finished!'
+    print('Convert finished!')
     
 def grads2nc(infn, outfn, big_endian=None, largefile=False):
     """