bedroomghost/brouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Node description array length to short as per pull request discussion

Browse Source
This commit is contained in:
Mincol 2017-04-05 02:16:57 +02:00
parent 97a0f09064
commit 92701360fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java
View File

@ -29,7 +29,7 @@ public class NodeData extends MapCreatorBase
ilon = (int)dis.readDiffed( 1 ); ilon = (int)dis.readDiffed( 1 );
ilat = (int)dis.readDiffed( 2 ); ilat = (int)dis.readDiffed( 2 );
int mode = dis.readByte(); int mode = dis.readByte();
if ( ( mode & 1 ) != 0 ) { int dlen = dis.read(); description = new byte[dlen]; dis.readFully( description ); } if ( ( mode & 1 ) != 0 ) { int dlen = dis.readShort(); description = new byte[dlen]; dis.readFully( description ); }
if ( ( mode & 2 ) != 0 ) selev = dis.readShort(); if ( ( mode & 2 ) != 0 ) selev = dis.readShort();
} }
@ -43,10 +43,10 @@ public class NodeData extends MapCreatorBase
System.out.printf("Node id (%s): description length (%d) is longer then maximum allowed (%d). The description will NOT be written.", nid, description.length, Byte.MAX_VALUE); System.out.printf("Node id (%s): description length (%d) is longer then maximum allowed (%d). The description will NOT be written.", nid, description.length, Byte.MAX_VALUE);
dos.writeByte((byte) 0); dos.writeByte((byte) 0);
} else { } else {
int mode = (description == null ? 0 : 1) | (selev == Short.MIN_VALUE ? 0 : 2); int mode = (description == null ? 0 : 1 ) | ( selev == Short.MIN_VALUE ? 0 : 2 );
dos.writeByte((byte) mode); dos.writeShort( (byte) mode);
if ((mode & 1) != 0) { dos.write(description.length); dos.write(description); } if ( ( mode & 1 ) != 0 ) { dos.write( description.length ); dos.write( description ); }
if ((mode & 2) != 0) dos.writeShort(selev); if ( ( mode & 2 ) != 0 ) dos.writeShort( selev );
} }
} }
} }