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

separated build-in vars from BExpressionContext

Browse source
This commit is contained in:
Arndt 2015-04-03 12:51:26 +02:00
parent 53c3df66f5
commit 3ed62bb2b3
13 changed files with 280 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

18
brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java
View file

@ -13,6 +13,8 @@ import java.io.File;
import java.io.FileOutputStream;
import btools.expressions.BExpressionContext;
import btools.expressions.BExpressionContextNode;
import btools.expressions.BExpressionContextWay;
import btools.expressions.BExpressionMetaData;
public class OsmCutter extends MapCreatorBase
@ -46,11 +48,11 @@ public class OsmCutter extends MapCreatorBase
);
}
private BExpressionContext _expctxWay;
private BExpressionContext _expctxNode;
private BExpressionContextWay _expctxWay;
private BExpressionContextNode _expctxNode;
private BExpressionContext _expctxWayStat;
private BExpressionContext _expctxNodeStat;
private BExpressionContextWay _expctxWayStat;
private BExpressionContextNode _expctxNodeStat;
public void process (File lookupFile, File outTileDir, File wayFile, File relFile, File profileFile, File mapFile ) throws Exception
{
@ -61,14 +63,14 @@ public class OsmCutter extends MapCreatorBase
BExpressionMetaData meta = new BExpressionMetaData();
_expctxWay = new BExpressionContext("way", meta );
_expctxNode = new BExpressionContext("node", meta );
_expctxWay = new BExpressionContextWay( meta );
_expctxNode = new BExpressionContextNode( meta );
meta.readMetaData( lookupFile );
_expctxWay.parseFile( profileFile, "global" );
_expctxWayStat = new BExpressionContext("way", null );
_expctxNodeStat = new BExpressionContext("node", null );
_expctxWayStat = new BExpressionContextWay( null );
_expctxNodeStat = new BExpressionContextNode( null );
this.outTileDir = outTileDir;
if ( !outTileDir.isDirectory() ) throw new RuntimeException( "out tile directory " + outTileDir + " does not exist" );

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

@ -6,7 +6,7 @@ import java.io.EOFException;
import java.io.File;
import java.util.HashMap;
import btools.expressions.BExpressionContext;
import btools.expressions.BExpressionContextWay;
import btools.expressions.BExpressionMetaData;
import btools.util.CompactLongSet;
import btools.util.FrozenLongSet;
@ -22,8 +22,8 @@ public class RelationMerger extends MapCreatorBase
{
private HashMap<String,CompactLongSet> routesets;
private CompactLongSet routesetall;
private BExpressionContext expctxReport;
private BExpressionContext expctxCheck;
private BExpressionContextWay expctxReport;
private BExpressionContextWay expctxCheck;
// private BExpressionContext expctxStat;
private DataOutputStream wayOutStream;
@ -44,11 +44,11 @@ public class RelationMerger extends MapCreatorBase
{
// read lookup + profile for relation access-check
BExpressionMetaData metaReport = new BExpressionMetaData();
expctxReport = new BExpressionContext("way", metaReport );
expctxReport = new BExpressionContextWay( metaReport );
metaReport.readMetaData( lookupFile );
BExpressionMetaData metaCheck = new BExpressionMetaData();
expctxCheck = new BExpressionContext("way", metaCheck );
expctxCheck = new BExpressionContextWay( metaCheck );
metaCheck.readMetaData( lookupFile );
expctxReport.parseFile( reportProfile, "global" );

11
brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java
View file

@ -7,7 +7,8 @@ import java.io.RandomAccessFile;
import java.util.Collections;
import java.util.List;
import btools.expressions.BExpressionContext;
import btools.expressions.BExpressionContextNode;
import btools.expressions.BExpressionContextWay;
import btools.expressions.BExpressionMetaData;
import btools.util.ByteArrayUnifier;
import btools.util.ByteDataWriter;
@ -46,8 +47,8 @@ public class WayLinker extends MapCreatorBase
private long creationTimeStamp;
private BExpressionContext expctxWay;
private BExpressionContext expctxNode;
private BExpressionContextWay expctxWay;
private BExpressionContextNode expctxNode;
private ByteArrayUnifier abUnifier;
@ -83,8 +84,8 @@ public class WayLinker extends MapCreatorBase
BExpressionMetaData meta = new BExpressionMetaData();
// read lookup + profile for lookup-version + access-filter
expctxWay = new BExpressionContext("way", meta);
expctxNode = new BExpressionContext("node", meta);
expctxWay = new BExpressionContextWay( meta);
expctxNode = new BExpressionContextNode( meta);
meta.readMetaData( lookupFile );
lookupVersion = meta.lookupVersion;