Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

extended srtm latitude range

Browse source
This commit is contained in:
Arndt Brenschede 2019-11-03 23:07:23 +01:00
parent f59cbbb5ad
commit 37970e3270
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java
View file

@ -167,10 +167,6 @@ public class PosUnifier extends MapCreatorBase
int srtmLonIdx = ( ilon + 5000000 ) / 5000000; int srtmLonIdx = ( ilon + 5000000 ) / 5000000;
int srtmLatIdx = ( 154999999 - ilat ) / 5000000; int srtmLatIdx = ( 154999999 - ilat ) / 5000000;
if ( srtmLatIdx < 1 || srtmLatIdx > 24 || srtmLonIdx < 1 || srtmLonIdx > 72 )
{
return null;
}
if ( srtmLonIdx == lastSrtmLonIdx && srtmLatIdx == lastSrtmLatIdx ) if ( srtmLonIdx == lastSrtmLonIdx && srtmLatIdx == lastSrtmLatIdx )
{ {
return lastSrtmRaster; return lastSrtmRaster;
@ -178,11 +174,9 @@ public class PosUnifier extends MapCreatorBase
lastSrtmLonIdx = srtmLonIdx; lastSrtmLonIdx = srtmLonIdx;
lastSrtmLatIdx = srtmLatIdx; lastSrtmLatIdx = srtmLatIdx;
StringBuilder sb = new StringBuilder( 16 ); String slonidx = "0" + srtmLonIdx;
sb.append( "srtm_" ); String slatidx = "0" + srtmLatIdx;
sb.append( (char) ( '0' + srtmLonIdx / 10 ) ).append( (char) ( '0' + srtmLonIdx % 10 ) ).append( '_' ); String filename = "srtm_" + slonidx.substring( slonidx.length()-2 ) + "_" + slatidx.substring( slatidx.length()-2 );
sb.append( (char) ( '0' + srtmLatIdx / 10 ) ).append( (char) ( '0' + srtmLatIdx % 10 ) );
String filename = sb.toString();
lastSrtmRaster = srtmmap.get( filename ); lastSrtmRaster = srtmmap.get( filename );
if ( lastSrtmRaster == null && !srtmmap.containsKey( filename ) ) if ( lastSrtmRaster == null && !srtmmap.containsKey( filename ) )