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

Better process_pbf_planet.sh script

Browse source
This commit is contained in:
Phyks (Lucas Verney) 2018-11-08 19:35:33 +01:00
parent 15cb0f267e
commit dfb77f15eb
5 changed files with 41 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,8 @@ public class PosUnifier extends MapCreatorBase
private CompactLongSet positionSet;
private HashMap<String, SrtmRaster> srtmmap;
private int lastStrmLonIdx;
private int lastStrmLatIdx;
private int lastSrtmLonIdx;
private int lastSrtmLatIdx;
private SrtmRaster lastSrtmRaster;
private String srtmdir;
@ -40,7 +40,7 @@ public class PosUnifier extends MapCreatorBase
System.out.println( "*** PosUnifier: Unify position values and enhance elevation" );
if ( args.length != 5 )
{
System.out.println( "usage: java PosUnifier <node-tiles-in> <node-tiles-out> <bordernids-in> <bordernodes-out> <strm-data-dir>" );
System.out.println( "usage: java PosUnifier <node-tiles-in> <node-tiles-out> <bordernids-in> <bordernodes-out> <srtm-data-dir>" );
return;
}
new PosUnifier().process( new File( args[0] ), new File( args[1] ), new File( args[2] ), new File( args[3] ), args[4] );
@ -145,12 +145,12 @@ public class PosUnifier extends MapCreatorBase
{
return null;
}
if ( srtmLonIdx == lastStrmLonIdx && srtmLatIdx == lastStrmLatIdx )
if ( srtmLonIdx == lastSrtmLonIdx && srtmLatIdx == lastSrtmLatIdx )
{
return lastSrtmRaster;
}
lastStrmLonIdx = srtmLonIdx;
lastStrmLatIdx = srtmLatIdx;
lastSrtmLonIdx = srtmLonIdx;
lastSrtmLatIdx = srtmLatIdx;
StringBuilder sb = new StringBuilder( 16 );
sb.append( "srtm_" );
@ -201,8 +201,8 @@ public class PosUnifier extends MapCreatorBase
private void resetSrtm()
{
srtmmap = new HashMap<String, SrtmRaster>();
lastStrmLonIdx = -1;
lastStrmLatIdx = -1;
lastSrtmLonIdx = -1;
lastSrtmLatIdx = -1;
lastSrtmRaster = null;
}