warning stuff

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

View file

@ -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() )

View file

@ -5,7 +5,6 @@
*/
package btools.mapaccess;
import java.util.*;
final class NodesList
{

View file

@ -5,7 +5,6 @@
*/
package btools.mapaccess;
import java.util.*;
public final class OsmLink
{

View file

@ -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

View file

@ -5,9 +5,6 @@
*/
package btools.mapaccess;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
public final class OsmTransferNode