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

warning stuff

Browse source
This commit is contained in:
unknown 2014-02-15 16:56:45 +01:00
parent 0dc200f983
commit 873a4046b8
29 changed files with 21 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

5
brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java
View file

@ -6,14 +6,13 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashMap;
public abstract class MapCreatorBase implements WayListener, NodeListener, RelationListener

8
brouter-map-creator/src/main/java/btools/mapcreator/NodeCutter.java
View file

@ -1,14 +1,6 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
/**
* NodeCutter does 1 step in map-processing:

9
brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java
View file

@ -1,16 +1,7 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
/**
* Container for node data on the preprocessor level

8
brouter-map-creator/src/main/java/btools/mapcreator/NodeFilter.java
View file

@ -1,16 +1,12 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
import btools.util.DenseLongMap;
import btools.util.TinyDenseLongMap;
/**
* NodeFilter does 1 step in map-processing:

6
brouter-map-creator/src/main/java/btools/mapcreator/NodeIterator.java
View file

@ -1,16 +1,10 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
/**
* Iterate over a singe nodefile or a directory

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

@ -8,14 +8,9 @@
package btools.mapcreator;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.zip.GZIPInputStream;
import btools.expressions.BExpressionContext;

3
brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java
View file

@ -91,14 +91,11 @@ public class OsmNodeP implements Comparable<OsmNodeP>
os2.writeShort( getSElev() );
int nlinks = 0;
// hack: write node-desc as link tag (copy cycleway-bits)
long nodeDescription = getNodeDecsription();
for( OsmLinkP link0 = firstlink; link0 != null; link0 = link0.next )
{
nlinks++;
OsmLinkP link = link0;
OsmNodeP origin = this;
int skipDetailBit = link0.counterLinkWritten() ? SKIPDETAILS_BITMASK : 0;

3
brouter-map-creator/src/main/java/btools/mapcreator/OsmNodePT.java
View file

@ -5,9 +5,6 @@
*/
package btools.mapcreator;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public class OsmNodePT extends OsmNodeP
{

4
brouter-map-creator/src/main/java/btools/mapcreator/OsmParser.java
View file

@ -1,13 +1,9 @@
package btools.mapcreator;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.zip.GZIPInputStream;
/**

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

@ -1,19 +1,13 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.CompactLongSet;
import btools.util.CompactLongMap;
import btools.util.FrozenLongSet;
import btools.util.FrozenLongMap;
/**
* PosUnifier does 3 steps in map-processing:
@ -38,9 +32,6 @@ public class PosUnifier extends MapCreatorBase
private SrtmData lastSrtmData;
private String srtmdir;
private int totalLatSteps = 0;
private int totalLonSteps = 0;
private CompactLongSet borderNids;
@ -130,8 +121,6 @@ public class PosUnifier extends MapCreatorBase
long pid = ((long)lon)<<32 | lat; // id from position
if ( !positionSet.contains( pid ) )
{
totalLonSteps += lonsteps;
totalLatSteps += latsteps;
positionSet.fastAdd( pid );
n.ilon = lon;
n.ilat = lat;

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

@ -1,16 +1,6 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
import btools.util.LongList;
/**
* Container for relation data on the preprocessor level

1
brouter-map-creator/src/main/java/btools/mapcreator/RelationListener.java
View file

@ -1,6 +1,5 @@
package btools.mapcreator;
import java.io.File;
/**
* Callbacklistener for Relations

4
brouter-map-creator/src/main/java/btools/mapcreator/SrtmData.java
View file

@ -29,16 +29,12 @@ public class SrtmData
public short[] eval_array;
private double minlon;
private double maxlon;
private double minlat;
private double maxlat;
public void init()
{
minlon = xllcorner;
maxlon = minlon + cellsize*ncols;
minlat = yllcorner;
maxlat = minlat + cellsize*nrows;
}
private boolean missingData = false;

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

@ -1,16 +1,12 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
import btools.util.CompactLongSet;
import btools.util.DenseLongMap;
import btools.util.TinyDenseLongMap;
/**
* WayCutter does 2 step in map-processing:

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

@ -1,16 +1,10 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
import btools.util.DenseLongMap;
import btools.util.TinyDenseLongMap;
/**
* WayCutter5 does 2 step in map-processing:

9
brouter-map-creator/src/main/java/btools/mapcreator/WayData.java
View file

@ -1,16 +1,9 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
import btools.util.LongList;
/**
* Container for waydata on the preprocessor level

6
brouter-map-creator/src/main/java/btools/mapcreator/WayIterator.java
View file

@ -1,16 +1,10 @@
package btools.mapcreator;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.HashMap;
import btools.util.*;
/**
* Iterate over a singe wayfile or a directory