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

preprocessor speedup using more memory

Browse source
This commit is contained in:
Arndt Brenschede 2019-09-24 08:32:18 +02:00
parent 76e4ef8cab
commit ba34488447
10 changed files with 236 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

17
brouter-map-creator/src/main/java/btools/mapcreator/RelationMerger.java
View file

@ -40,14 +40,14 @@ public class RelationMerger extends MapCreatorBase
new RelationMerger().process( new File( args[0] ), new File( args[1] ), new File( args[2] ), new File( args[3] ), new File( args[4] ), new File( args[5] ) );
}
public void process( File wayFileIn, File wayFileOut, File relationFileIn, File lookupFile, File reportProfile, File checkProfile ) throws Exception
public void init( File relationFileIn, File lookupFile, File reportProfile, File checkProfile ) throws Exception
{
// read lookup + profile for relation access-check
BExpressionMetaData metaReport = new BExpressionMetaData();
BExpressionMetaData metaReport = new BExpressionMetaData();
expctxReport = new BExpressionContextWay( metaReport );
metaReport.readMetaData( lookupFile );
BExpressionMetaData metaCheck = new BExpressionMetaData();
BExpressionMetaData metaCheck = new BExpressionMetaData();
expctxCheck = new BExpressionContextWay( metaCheck );
metaCheck.readMetaData( lookupFile );
@ -106,6 +106,11 @@ public class RelationMerger extends MapCreatorBase
routesets.put( key, routeset );
System.out.println( "marked " + routeset.size() + " routes for key: " + key );
}
}
public void process( File wayFileIn, File wayFileOut, File relationFileIn, File lookupFile, File reportProfile, File checkProfile ) throws Exception
{
init( relationFileIn, lookupFile, reportProfile, checkProfile );
// *** finally process the way-file
wayOutStream = createOutStream( wayFileOut );
@ -151,8 +156,10 @@ public class RelationMerger extends MapCreatorBase
data.description = expctxReport.encode();
}
}
data.writeTo( wayOutStream );
if ( wayOutStream != null )
{
data.writeTo( wayOutStream );
}
}
}