From bd17914eca22c2273923b3c5b8f73ba23c4a5ab5 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Sun, 9 Apr 2017 11:51:02 +0200 Subject: [PATCH] fixed merge problem --- .../src/main/java/btools/mapcreator/NodeData.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) 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 df1c28b..ef80ac6 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/NodeData.java @@ -38,15 +38,9 @@ public class NodeData extends MapCreatorBase dos.writeDiffed( nid, 0 ); dos.writeDiffed( ilon, 1 ); dos.writeDiffed( ilat, 2 ); - if (description != null && description.length > Byte.MAX_VALUE) { - System.err.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); - } else { - int mode = (description == null ? 0 : 1 ) | ( selev == Short.MIN_VALUE ? 0 : 2 ); - dos.writeShort( (byte) mode); - if ( ( mode & 1 ) != 0 ) { dos.write( description.length ); dos.write( description ); } - if ( ( mode & 2 ) != 0 ) dos.writeShort( selev ); - } + int mode = (description == null ? 0 : 1 ) | ( selev == Short.MIN_VALUE ? 0 : 2 ); + dos.writeByte( (byte) mode); + if ( ( mode & 1 ) != 0 ) { dos.writeShort( description.length ); dos.write( description ); } + if ( ( mode & 2 ) != 0 ) dos.writeShort( selev ); } }