srtm1 progress
This commit is contained in:
Arndt
parent
95209148b4
commit
561b60c5cb
9 changed files with 289 additions and 166 deletions
|
|
@ -8,6 +8,7 @@ public class ConvertSrtmTile
|
|||
public static int NROWS;
|
||||
public static int NCOLS;
|
||||
|
||||
public static final short SKIPDATA = -32766; // >50 degree skipped pixel
|
||||
public static final short NODATA2 = -32767; // bil-formats nodata
|
||||
public static final short NODATA = Short.MIN_VALUE;
|
||||
|
||||
|
|
@ -17,8 +18,6 @@ public class ConvertSrtmTile
|
|||
|
||||
private static void readBilZip( String filename, int rowOffset, int colOffset, boolean halfCols ) throws Exception
|
||||
{
|
||||
int fileRows = 3601;
|
||||
int fileCols = 3601;
|
||||
ZipInputStream zis = new ZipInputStream( new BufferedInputStream( new FileInputStream( filename ) ) );
|
||||
try
|
||||
{
|
||||
|
|
@ -27,7 +26,7 @@ public class ConvertSrtmTile
|
|||
ZipEntry ze = zis.getNextEntry();
|
||||
if ( ze.getName().endsWith( ".bil" ) )
|
||||
{
|
||||
readBilFromStream( zis, rowOffset, colOffset, fileRows, fileCols, halfCols );
|
||||
readBilFromStream( zis, rowOffset, colOffset, halfCols );
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -38,80 +37,69 @@ public class ConvertSrtmTile
|
|||
}
|
||||
}
|
||||
|
||||
private static void readBilFromStream( InputStream is, int rowOffset, int colOffset, int fileRows, int fileCols, boolean halfCols )
|
||||
private static void readBilFromStream( InputStream is, int rowOffset, int colOffset, boolean halfCols )
|
||||
throws Exception
|
||||
{
|
||||
DataInputStream dis = new DataInputStream( new BufferedInputStream( is ) );
|
||||
for ( int ir = 0; ir < fileRows; ir++ )
|
||||
for ( int ir = 0; ir < 3601; ir++ )
|
||||
{
|
||||
int row = rowOffset + ir;
|
||||
|
||||
short lastVal = 0;
|
||||
boolean fillGap = false;
|
||||
|
||||
for ( int ic = 0; ic < fileCols; ic++ )
|
||||
for ( int ic = 0; ic < 3601; ic++ )
|
||||
{
|
||||
int col = colOffset + ic;
|
||||
short val;
|
||||
|
||||
if ( ( ic % 2 ) == 1 && halfCols )
|
||||
{
|
||||
fillGap = true;
|
||||
if ( getPixel( row, col ) == NODATA )
|
||||
{
|
||||
setPixel( row, col, SKIPDATA );
|
||||
}
|
||||
continue;
|
||||
}
|
||||
else
|
||||
|
||||
int i0 = dis.read();
|
||||
int i1 = dis.read();
|
||||
|
||||
if ( i0 == -1 || i1 == -1 )
|
||||
throw new RuntimeException( "unexcepted end of file reading bil entry!" );
|
||||
|
||||
short val = (short) ( ( i1 << 8 ) | i0 );
|
||||
|
||||
if ( val == NODATA2 )
|
||||
{
|
||||
int i0 = dis.read();
|
||||
int i1 = dis.read();
|
||||
|
||||
if ( i0 == -1 || i1 == -1 )
|
||||
throw new RuntimeException( "unexcepted end of file reading bil entry!" );
|
||||
|
||||
val = (short) ( ( i1 << 8 ) | i0 );
|
||||
|
||||
if ( val == NODATA2 )
|
||||
{
|
||||
val = NODATA;
|
||||
}
|
||||
|
||||
if ( fillGap )
|
||||
{
|
||||
setPixel( row, col - 1, val, lastVal );
|
||||
fillGap = false;
|
||||
}
|
||||
|
||||
if ( row == 18010 ) System.out.print( val + " " );
|
||||
|
||||
setPixel( row, col, val, val );
|
||||
lastVal = val;
|
||||
val = NODATA;
|
||||
}
|
||||
|
||||
setPixel( row, col, val );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void setPixel( int row, int col, short val1, short val2 )
|
||||
|
||||
private static void setPixel( int row, int col, short val )
|
||||
{
|
||||
if ( row >= 0 && row < NROWS && col >= 0 && col < NCOLS )
|
||||
{
|
||||
if ( val1 != NODATA && val2 != NODATA )
|
||||
{
|
||||
int val = val1 + val2;
|
||||
if ( val < -32768 || val > 32767 )
|
||||
throw new IllegalArgumentException( "val1=" + val1 + " val2=" + val2 );
|
||||
|
||||
imagePixels[row * NCOLS + col] = (short) ( val );
|
||||
}
|
||||
imagePixels[row * NCOLS + col] = val;
|
||||
}
|
||||
}
|
||||
|
||||
public static void main( String[] args ) throws Exception
|
||||
private static short getPixel( int row, int col )
|
||||
{
|
||||
doConvert( args[0], Integer.parseInt( args[1] ), Integer.parseInt( args[2] ), args[3], null );
|
||||
if ( row >= 0 && row < NROWS && col >= 0 && col < NCOLS )
|
||||
{
|
||||
return imagePixels[row * NCOLS + col];
|
||||
}
|
||||
return NODATA;
|
||||
}
|
||||
|
||||
public static void doConvert( String inputDir, int lonDegreeStart, int latDegreeStart, String outputFile, SrtmRaster raster90 ) throws Exception
|
||||
|
||||
public static void doConvert( String inputDir, String v1Dir, int lonDegreeStart, int latDegreeStart, String outputFile, SrtmRaster raster90 ) throws Exception
|
||||
{
|
||||
int extraBorder = 10;
|
||||
int datacells = 0;
|
||||
int matchingdatacells = 0;
|
||||
int mismatches = 0;
|
||||
|
||||
NROWS = 5 * 3600 + 1 + 2 * extraBorder;
|
||||
NCOLS = 5 * 3600 + 1 + 2 * extraBorder;
|
||||
|
|
@ -152,59 +140,63 @@ if ( row == 18010 ) System.out.print( val + " " );
|
|||
}
|
||||
}
|
||||
|
||||
if ( raster90 != null )
|
||||
{
|
||||
for ( int row90 = 0; row90 < 6001; row90++ )
|
||||
{
|
||||
int crow = 3 * row90 + extraBorder; // center row of 3x3
|
||||
for ( int col90 = 0; col90 < 6001; col90++ )
|
||||
{
|
||||
int ccol = 3 * col90 + extraBorder; // center col of 3x3
|
||||
boolean halfCol5 = latDegreeStart >= 50 || latDegreeStart < -50;
|
||||
|
||||
for ( int row90 = 0; row90 < 6001; row90++ )
|
||||
{
|
||||
int crow = 3 * row90 + extraBorder; // center row of 3x3
|
||||
for ( int col90 = 0; col90 < 6001; col90++ )
|
||||
{
|
||||
int ccol = 3 * col90 + extraBorder; // center col of 3x3
|
||||
|
||||
// evaluate 3x3 area
|
||||
if ( raster90 != null && (!halfCol5 || (col90 % 2) == 0 ) )
|
||||
{
|
||||
short v90 = raster90.eval_array[row90 * 6001 + col90];
|
||||
|
||||
// evaluate 3x3 area
|
||||
int sum = 0;
|
||||
int nodatas = 0;
|
||||
int datas = 0;
|
||||
int colstep = halfCol5 ? 2 : 1;
|
||||
for ( int row = crow - 1; row <= crow + 1; row++ )
|
||||
{
|
||||
for ( int col = ccol - 1; col <= ccol + 1; col++ )
|
||||
for ( int col = ccol - colstep; col <= ccol + colstep; col += colstep )
|
||||
{
|
||||
short v30 = imagePixels[row * NCOLS + col];
|
||||
sum += v30;
|
||||
if ( v30 == NODATA )
|
||||
{
|
||||
nodatas++;
|
||||
}
|
||||
else if ( v30 != SKIPDATA )
|
||||
{
|
||||
sum += v30;
|
||||
datas++;
|
||||
}
|
||||
}
|
||||
}
|
||||
boolean doReplace = nodatas > 0 || v90 == NODATA;
|
||||
short replaceValue = NODATA;
|
||||
boolean doReplace = nodatas > 0 || v90 == NODATA || datas < 7;
|
||||
if ( !doReplace )
|
||||
{
|
||||
datacells++;
|
||||
int diff = sum - 9 * v90;
|
||||
replaceValue= (short)(diff / 9);
|
||||
doReplace = true;
|
||||
if ( diff < -9 || diff > 9 )
|
||||
int diff = sum - datas * v90;
|
||||
if ( diff < -4 || diff > 4 )
|
||||
{
|
||||
// System.out.println( "replacing due to median missmatch: sum=" + sum + " v90=" + v90 );
|
||||
doReplace = true;
|
||||
mismatches++;
|
||||
}
|
||||
if ( diff > -50 && diff < 50 )
|
||||
|
||||
if ( diff > -50 && diff < 50 && ( row90 % 1200 ) != 0 && ( col90 % 1200 ) != 0 )
|
||||
{
|
||||
matchingdatacells++;
|
||||
diffs[diff+50]++;
|
||||
diffs[diff + 50]++;
|
||||
}
|
||||
}
|
||||
if ( doReplace )
|
||||
{
|
||||
for ( int row = crow - 1; row <= crow + 1; row++ )
|
||||
{
|
||||
for ( int col = ccol - 1; col <= ccol + 1; col++ )
|
||||
for ( int col = ccol - colstep; col <= ccol + colstep; col += colstep )
|
||||
{
|
||||
// imagePixels[row * NCOLS + col] = v90;
|
||||
imagePixels[row * NCOLS + col] = replaceValue;
|
||||
imagePixels[row * NCOLS + col] = v90;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -215,6 +207,7 @@ if ( row == 18010 ) System.out.print( val + " " );
|
|||
SrtmRaster raster = new SrtmRaster();
|
||||
raster.nrows = NROWS;
|
||||
raster.ncols = NCOLS;
|
||||
raster.halfcol = halfCol5;
|
||||
raster.noDataValue = NODATA;
|
||||
raster.cellsize = 1 / 3600.;
|
||||
raster.xllcorner = lonDegreeStart - ( 0.5 + extraBorder ) * raster.cellsize;
|
||||
|
|
@ -235,16 +228,32 @@ if ( row == 18010 ) System.out.print( val + " " );
|
|||
if ( pix2.length != imagePixels.length )
|
||||
throw new RuntimeException( "length mismatch!" );
|
||||
|
||||
for ( int i = 0; i < pix2.length; i++ )
|
||||
// compare decoding result
|
||||
for ( int row = 0; row < NROWS; row++ )
|
||||
{
|
||||
if ( pix2[i] != imagePixels[i] )
|
||||
int colstep = halfCol5 ? 2 : 1;
|
||||
for ( int col = 0; col < NCOLS; col += colstep )
|
||||
{
|
||||
throw new RuntimeException( "content mismatch!" );
|
||||
int idx = row * NCOLS + col;
|
||||
if ( imagePixels[idx] == SKIPDATA )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
short p2 = pix2[idx];
|
||||
if ( p2 > SKIPDATA )
|
||||
{
|
||||
p2 /= 2;
|
||||
}
|
||||
if ( p2 != imagePixels[idx] )
|
||||
{
|
||||
throw new RuntimeException( "content mismatch!" );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for(int i=0; i<100;i++) System.out.println( "diff[" + (i-50) + "] = " + diffs[i] );
|
||||
System.out.println( "datacells=" + datacells + " mismatch%=" + 100.*(datacells-matchingdatacells)/datacells );
|
||||
for(int i=1; i<100;i++) System.out.println( "diff[" + (i-50) + "] = " + diffs[i] );
|
||||
System.out.println( "datacells=" + datacells + " mismatch%=" + (100.*mismatches)/datacells );
|
||||
btools.util.MixCoderDataOutputStream.stats();
|
||||
// test( raster );
|
||||
// raster.calcWeights( 50. );
|
||||
// test( raster );
|
||||
|
|
|
|||
|
|
@ -42,11 +42,6 @@ public class ConvertUrlList
|
|||
int ilon_base = ( srtmLonIdx - 1 ) * 5 - 180;
|
||||
int ilat_base = 150 - srtmLatIdx * 5 - 90;
|
||||
|
||||
if ( ilon_base < 5 || ilon_base > 10 || ilat_base < 45 || ilat_base > 50 )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
SrtmRaster raster90 = null;
|
||||
|
||||
File file90 = new File( new File( args[1] ), filename90 );
|
||||
|
|
@ -56,7 +51,7 @@ public class ConvertUrlList
|
|||
raster90 = new SrtmData( file90 ).getRaster();
|
||||
}
|
||||
|
||||
ConvertSrtmTile.doConvert( args[2], ilon_base, ilat_base, filename30, raster90 );
|
||||
ConvertSrtmTile.doConvert( args[2], args[3], ilon_base, ilat_base, filename30, raster90 );
|
||||
}
|
||||
br.close();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ public class RasterCoder
|
|||
|
||||
dos.writeInt(raster.ncols);
|
||||
dos.writeInt(raster.nrows);
|
||||
dos.writeBoolean(raster.halfcol);
|
||||
dos.writeDouble(raster.xllcorner);
|
||||
dos.writeDouble(raster.yllcorner);
|
||||
dos.writeDouble(raster.cellsize);
|
||||
|
|
@ -37,6 +38,7 @@ public class RasterCoder
|
|||
SrtmRaster raster = new SrtmRaster();
|
||||
raster.ncols = dis.readInt();
|
||||
raster.nrows = dis.readInt();
|
||||
raster.halfcol = dis.readBoolean();
|
||||
raster.xllcorner = dis.readDouble();
|
||||
raster.yllcorner = dis.readDouble();
|
||||
raster.cellsize = dis.readDouble();
|
||||
|
|
@ -59,12 +61,26 @@ public class RasterCoder
|
|||
int nrows = raster.nrows;
|
||||
int ncols = raster.ncols;
|
||||
short[] pixels = raster.eval_array;
|
||||
int colstep = raster.halfcol ? 2 : 1;
|
||||
|
||||
for (int row = 0; row < nrows; row++)
|
||||
{
|
||||
for (int col = 0; col < ncols; col++)
|
||||
short lastval = Short.MIN_VALUE; // nodata
|
||||
for (int col = 0; col < ncols; col += colstep )
|
||||
{
|
||||
mco.writeMixed(pixels[row * ncols + col]);
|
||||
short val = pixels[row * ncols + col];
|
||||
if ( val == -32766 )
|
||||
{
|
||||
val = lastval; // replace remaining (border) skips
|
||||
}
|
||||
else
|
||||
{
|
||||
lastval = val;
|
||||
}
|
||||
|
||||
// remap nodata
|
||||
int code = val == Short.MIN_VALUE ? -1 : ( val < 0 ? val-1 : val );
|
||||
mco.writeMixed( code );
|
||||
}
|
||||
}
|
||||
mco.flush();
|
||||
|
|
@ -76,12 +92,35 @@ public class RasterCoder
|
|||
int nrows = raster.nrows;
|
||||
int ncols = raster.ncols;
|
||||
short[] pixels = raster.eval_array;
|
||||
int colstep = raster.halfcol ? 2 : 1;
|
||||
|
||||
for (int row = 0; row < nrows; row++)
|
||||
{
|
||||
for (int col = 0; col < ncols; col++)
|
||||
for (int col = 0; col < ncols; col += colstep )
|
||||
{
|
||||
pixels[row * ncols + col] = (short) mci.readMixed();
|
||||
int code = mci.readMixed();
|
||||
|
||||
// remap nodata
|
||||
int v30 = code == -1 ? Short.MIN_VALUE : ( code < 0 ? code + 1 : code );
|
||||
if ( v30 > -32766 )
|
||||
{
|
||||
v30 *= 2;
|
||||
}
|
||||
pixels[row * ncols + col] = (short) ( v30 );
|
||||
}
|
||||
if ( raster.halfcol )
|
||||
{
|
||||
for (int col = 1; col < ncols-1; col += colstep )
|
||||
{
|
||||
int l = (int)pixels[row * ncols + col - 1];
|
||||
int r = (int)pixels[row * ncols + col + 1];
|
||||
short v30 = Short.MIN_VALUE; // nodata
|
||||
if ( l > -32766 && r > -32766 )
|
||||
{
|
||||
v30 = (short)((l+r)/2);
|
||||
}
|
||||
pixels[row * ncols + col] = v30;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ public class SrtmData
|
|||
{
|
||||
if ( negative )
|
||||
n = -n;
|
||||
short val = n < -250 ? Short.MIN_VALUE : (short) (n*2);
|
||||
short val = n < -250 ? Short.MIN_VALUE : (short) (n);
|
||||
|
||||
raster.eval_array[row * raster.ncols + col] = val;
|
||||
if ( ++col == raster.ncols )
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ public class SrtmRaster
|
|||
{
|
||||
public int ncols;
|
||||
public int nrows;
|
||||
public boolean halfcol;
|
||||
public double xllcorner;
|
||||
public double yllcorner;
|
||||
public double cellsize;
|
||||
|
|
@ -50,7 +51,7 @@ public class SrtmRaster
|
|||
+ (1.-wrow)*( wcol)*get(row ,col+1)
|
||||
+ ( wrow)*( wcol)*get(row+1,col+1);
|
||||
// System.out.println( "eval=" + eval );
|
||||
return missingData ? Short.MIN_VALUE : (short)(eval*2);
|
||||
return missingData ? Short.MIN_VALUE : (short)(eval*4);
|
||||
}
|
||||
|
||||
private short get( int r, int c )
|
||||
|
|
@ -72,10 +73,7 @@ public class SrtmRaster
|
|||
double drow = (lat - yllcorner)/cellsize;
|
||||
int row = (int)drow;
|
||||
int col = (int)dcol;
|
||||
if ( col < 9 || col >= ncols-9 || row < 9 || row >= nrows-9 )
|
||||
{
|
||||
throw new IllegalArgumentException( "out of boundary range: col=" + col + " row=" + row );
|
||||
}
|
||||
|
||||
double dgx = (dcol-col)*gridSteps;
|
||||
double dgy = (drow-row)*gridSteps;
|
||||
|
||||
|
|
@ -110,6 +108,8 @@ public class SrtmRaster
|
|||
double m = (1.-wlat) * m0 + wlat * m1;
|
||||
return (short)(m * 2);
|
||||
}
|
||||
|
||||
private ReducedMedianFilter rmf = new ReducedMedianFilter( 256 );
|
||||
|
||||
private double getElevation( Weights w, int row, int col )
|
||||
{
|
||||
|
|
@ -122,9 +122,9 @@ public class SrtmRaster
|
|||
int mx = nx / 2; // mean pixels
|
||||
int my = ny / 2;
|
||||
|
||||
System.out.println( "nx="+ nx + " ny=" + ny );
|
||||
|
||||
ReducedMedianFilter rmf = new ReducedMedianFilter( nx * ny );
|
||||
// System.out.println( "nx="+ nx + " ny=" + ny );
|
||||
|
||||
rmf.reset();
|
||||
|
||||
for( int ix = 0; ix < nx; ix ++ )
|
||||
{
|
||||
|
|
@ -134,7 +134,7 @@ public class SrtmRaster
|
|||
rmf.addSample( w.getWeight( ix, iy ), val );
|
||||
}
|
||||
}
|
||||
return missingData ? rmf.calcEdgeReducedMedian( filterCenterFraction ) : 0.;
|
||||
return missingData ? 0. : rmf.calcEdgeReducedMedian( filterCenterFraction );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -190,8 +190,8 @@ public class SrtmRaster
|
|||
private static int gridSteps = 10;
|
||||
private static Weights[][][] allShiftWeights = new Weights[17][][];
|
||||
|
||||
private static double filterCenterFraction = 0.5;
|
||||
private static double filterDiscRadius = 2.9; // in pixels
|
||||
private static double filterCenterFraction = 0.2;
|
||||
private static double filterDiscRadius = 4.999; // in pixels
|
||||
|
||||
static
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue