diff --git a/.gitignore b/.gitignore index e11adc8..67fb7a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ target/ -*.BAK \ No newline at end of file +*.BAK +.classpath +.project +*.class \ No newline at end of file diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java b/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java index 70e4052..7040004 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/MapCreatorBase.java @@ -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 diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/NodeCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/NodeCutter.java index faf16aa..0eab31a 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/NodeCutter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/NodeCutter.java @@ -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: diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java b/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java index 5b0b388..aef65f9 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java @@ -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 diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/NodeFilter.java b/brouter-map-creator/src/main/java/btools/mapcreator/NodeFilter.java index f04761d..c113c59 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/NodeFilter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/NodeFilter.java @@ -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: diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/NodeIterator.java b/brouter-map-creator/src/main/java/btools/mapcreator/NodeIterator.java index e251755..d1f6115 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/NodeIterator.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/NodeIterator.java @@ -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 diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java index 73dd862..f0f17fa 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmCutter.java @@ -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; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java index 3cd27aa..7529e81 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodeP.java @@ -91,14 +91,11 @@ public class OsmNodeP implements Comparable 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; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodePT.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodePT.java index 41316b2..94e048c 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodePT.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmNodePT.java @@ -5,9 +5,6 @@ */ package btools.mapcreator; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; public class OsmNodePT extends OsmNodeP { diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/OsmParser.java b/brouter-map-creator/src/main/java/btools/mapcreator/OsmParser.java index 7731cad..d5904dd 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/OsmParser.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/OsmParser.java @@ -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; /** diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java index 16963cc..0aa79df 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/PosUnifier.java @@ -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; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RelationData.java b/brouter-map-creator/src/main/java/btools/mapcreator/RelationData.java index 864204f..5d83629 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationData.java @@ -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 diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RelationListener.java b/brouter-map-creator/src/main/java/btools/mapcreator/RelationListener.java index 2789714..6d51486 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationListener.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationListener.java @@ -1,6 +1,5 @@ package btools.mapcreator; -import java.io.File; /** * Callbacklistener for Relations diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/SrtmData.java b/brouter-map-creator/src/main/java/btools/mapcreator/SrtmData.java index fca1b3a..d642e5b 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/SrtmData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/SrtmData.java @@ -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; diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter.java index 05c528a..58a94f8 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter.java @@ -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: diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter5.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter5.java index ea4aea5..c0aa69e 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter5.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayCutter5.java @@ -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: diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayData.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayData.java index 05e691c..23109d8 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayData.java @@ -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 diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayIterator.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayIterator.java index 89fed53..9f0d08e 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayIterator.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayIterator.java @@ -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 diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/MicroCache.java b/brouter-mapaccess/src/main/java/btools/mapaccess/MicroCache.java index eb9911d..65925e5 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/MicroCache.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/MicroCache.java @@ -63,7 +63,7 @@ final class MicroCache int ilon = readShort(); int ilat = readShort(); int bodySize = readInt(); - if ( ilon == Short.MAX_VALUE ) + if ( ilon == Short.MAX_VALUE && ilat == Short.MAX_VALUE ) { int crc = Crc32.crc( ab, 0, aboffset-8 ); if ( crc != readInt() ) diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesList.java b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesList.java index 1ab0752..9c9b96d 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesList.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesList.java @@ -5,7 +5,6 @@ */ package btools.mapaccess; -import java.util.*; final class NodesList { diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmLink.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmLink.java index 70d92bd..178e955 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmLink.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmLink.java @@ -5,7 +5,6 @@ */ package btools.mapaccess; -import java.util.*; public final class OsmLink { diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java index a97856b..2efc7e6 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNode.java @@ -7,10 +7,8 @@ package btools.mapaccess; -public class OsmNode implements OsmPos, Comparable +public class OsmNode implements OsmPos { - private static final long serialVersionUID = -4166565134085275556L; - public static final int EXTERNAL_BITMASK = 0x80; public static final int FIRSTFORWAY_BITMASK = 0x40; public static final int TRANSFERNODE_BITMASK = 0x20; @@ -330,29 +328,6 @@ public class OsmNode implements OsmPos, Comparable } } - /** - * Compares two OsmNodes for position ordering. - * - * @return -1,0,1 depending an comparson result - */ - public int compareTo( Object o ) - { - OsmNode n = (OsmNode)o; - long id1 = getIdFromPos(); - long id2 = n.getIdFromPos(); - if ( id1 < id2 ) return -1; - if ( id1 > id2 ) return 1; - return 0; - } - - /** - * @return if equals in the sense of compareTo == 0 - */ - public boolean equals( Object o ) - { - return compareTo( o ) == 0; - } - // mark the link to the given node as written, // don't want to write the counter-direction // in full details diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmTransferNode.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmTransferNode.java index a4744ba..41f2c3e 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmTransferNode.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmTransferNode.java @@ -5,9 +5,6 @@ */ package btools.mapaccess; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; public final class OsmTransferNode diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java index 431dcf8..2bbbc66 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java @@ -7,17 +7,11 @@ import java.util.Set; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.ProgressDialog; import android.content.DialogInterface; -import android.hardware.Sensor; -import android.hardware.SensorEvent; -import android.hardware.SensorManager; import android.os.Bundle; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.speech.tts.TextToSpeech.OnInitListener; -import android.view.Display; -import android.view.WindowManager; import android.widget.EditText; import btools.router.OsmNodeNamed; @@ -36,8 +30,6 @@ public class BRouterActivity extends Activity implements OnInitListener { private BRouterView mBRouterView; private PowerManager mPowerManager; - private WindowManager mWindowManager; - private Display mDisplay; private WakeLock mWakeLock; /** Called when the activity is first created. */ @@ -49,10 +41,6 @@ public class BRouterActivity extends Activity implements OnInitListener { // Get an instance of the PowerManager mPowerManager = (PowerManager) getSystemService(POWER_SERVICE); - // Get an instance of the WindowManager - mWindowManager = (WindowManager) getSystemService(WINDOW_SERVICE); - mDisplay = mWindowManager.getDefaultDisplay(); - // Create a bright wake lock mWakeLock = mPowerManager.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, getClass() .getName()); @@ -234,7 +222,6 @@ public class BRouterActivity extends Activity implements OnInitListener { private String selectedProfile = null; private String[] availableWaypoints; - private String selectedWaypoint = null; private String[] routingModes; private boolean[] routingModesChecked; @@ -306,11 +293,11 @@ public class BRouterActivity extends Activity implements OnInitListener { private void showNewDialog( int id ) { - if ( dialogIds.contains( new Integer( id ) ) ) + if ( dialogIds.contains( Integer.valueOf( id ) ) ) { removeDialog( id ); } - dialogIds.add( new Integer( id ) ); + dialogIds.add( Integer.valueOf( id ) ); showDialog( id ); } diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java index 230170a..634427a 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java @@ -6,8 +6,6 @@ import java.io.FileReader; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.HashSet; -import java.util.StringTokenizer; import android.app.Service; import android.content.Intent; diff --git a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderLocus.java b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderLocus.java index 21de52c..e41568c 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderLocus.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReaderLocus.java @@ -4,7 +4,6 @@ import java.io.File; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; import btools.router.OsmNodeNamed; /** diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index 7bd3dfc..e736b3a 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -1,15 +1,12 @@ package btools.server; -import java.io.File; import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; -import java.util.TreeSet; import btools.router.OsmNodeNamed; -import btools.router.RoutingEngine; import btools.router.RoutingContext; -import btools.router.OsmTrack; +import btools.router.RoutingEngine; public class BRouter { @@ -70,7 +67,6 @@ public class BRouter maxRunningTime = Integer.parseInt( sMaxRunningTime ) * 1000; } - long startTime = System.currentTimeMillis(); List wplist = new ArrayList(); wplist.add( from ); wplist.add( to ); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 195b62c..9879ca8 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -27,12 +27,10 @@ public class RouteServer extends Thread public ServiceContext serviceContext; public short port = 17777; - private boolean serverStopped = false; private ServerSocket serverSocket = null; public void close() { - serverStopped = true; try { ServerSocket ss = serverSocket; @@ -123,7 +121,6 @@ public class RouteServer extends Thread HashMap params = getUrlParams(url); long maxRunningTime = getMaxRunningTime(); - long startTime = System.currentTimeMillis(); RequestHandler handler; if ( params.containsKey( "lonlats" ) && params.containsKey( "profile" ) ) @@ -230,7 +227,7 @@ public class RouteServer extends Thread value = value.trim(); profileMap.put( key, value ); } - + pr.close(); return profileMap; } diff --git a/brouter-util/src/main/java/btools/util/CompactLongSet.java b/brouter-util/src/main/java/btools/util/CompactLongSet.java index 08dace4..24d56c1 100644 --- a/brouter-util/src/main/java/btools/util/CompactLongSet.java +++ b/brouter-util/src/main/java/btools/util/CompactLongSet.java @@ -13,7 +13,6 @@ public class CompactLongSet private int _maxKeepExponent = 14; // the maximum exponent to keep the invalid arrays protected static final int MAXLISTS = 31; // enough for size Integer.MAX_VALUE - private static boolean earlyDuplicateCheck; public CompactLongSet() { @@ -23,8 +22,6 @@ public class CompactLongSet // allocate key lists al = new long[MAXLISTS][]; al[0] = new long[1]; // make the first array (the transient buffer) - - earlyDuplicateCheck = Boolean.getBoolean( "earlyDuplicateCheck" ); }