src/map/IMG/nodfile.cpp

@@ -6,8 +6,6 @@ using namespace IMG;
 
 #define ARRAY_SIZE(array) \
   (sizeof(array) / sizeof(array[0]))
-#define DELTA(val, llBits, maxBits) \
-  (((int)((val) << (32 - (llBits))) >> (32 - (llBits))) << (32 - (maxBits)))
 
 static const struct
 {
@@ -168,7 +166,6 @@ bool NODFile::linkInfo(Handle &hdl, const BlockInfo &blockInfo, quint32 linkId,
 	if (!(linkInfo.flags & 0x100)) {
 		if (!bs.read(s1, linkInfo.linkOffset))
 			return false;
-		linkInfo.nodeOffset = 0xFFFFFFFF;
 	} else {
 		if (!bs.read(s1 - s2, linkInfo.linkOffset))
 			return false;
@@ -183,47 +180,50 @@ bool NODFile::linkInfo(Handle &hdl, const BlockInfo &blockInfo, quint32 linkId,
 	return true;
 }
 
-bool NODFile::nodeInfo(Handle &hdl, AdjacencyInfo &adj) const
+bool NODFile::nodeInfo(Handle &hdl, const BlockInfo &blockInfo,
+  quint32 nodeOffset, NodeInfo &nodeInfo) const
 {
-	quint32 infoOffset = (adj.nodeOffset << _nodeShift) + _block.offset;
-	if (infoOffset > _block.offset + _block.size
-	  || infoOffset < adj.blockInfo.offset)
+	quint32 infoOffset = (nodeOffset << _nodeShift) + _block.offset;
+	if (infoOffset > _block.offset + _block.size || infoOffset < blockInfo.offset)
 		return false;
 	if (!seek(hdl, infoOffset))
 		return false;
 
 	BitStream1 bs(*this, hdl, _block.offset + _block.size - infoOffset);
 
-	if (!bs.read(8, adj.nodeInfo.flags))
+	if (!bs.read(8, nodeInfo.flags))
 		return false;
 
-	if ((adj.nodeInfo.flags & 7) >= ARRAY_SIZE(LLBITS))
+	if ((nodeInfo.flags & 7) >= ARRAY_SIZE(LLBITS))
 		return false;
-	quint8 lonBits = LLBITS[adj.nodeInfo.flags & 7].lon;
-	quint8 latBits = LLBITS[adj.nodeInfo.flags & 7].lat;
+	quint8 lonBits = LLBITS[nodeInfo.flags & 7].lon;
+	quint8 latBits = LLBITS[nodeInfo.flags & 7].lat;
 	quint8 maxBits = ((_flags >> 10) & 7) | 0x18;
 
 	quint32 lon, lat;
 	if (!(bs.read(lonBits, lon) && bs.read(latBits, lat)))
 		return false;
 
+	quint8 lonShift = 0x20 - lonBits;
+	quint8 latShift = 0x20 - latBits;
+	quint8 shift = 0x20 - maxBits;
 	QPoint pos(
-	  adj.blockInfo.hdr.nodeLonBase + DELTA(lon, lonBits, maxBits),
-	  adj.blockInfo.hdr.nodeLatBase + DELTA(lat, latBits, maxBits));
-	adj.nodeInfo.bytes = ((lonBits + latBits) >> 3) + 1;
+	  (((int)(lon << lonShift) >> lonShift) << shift) + blockInfo.hdr.nodeLonBase,
+	  (((int)(lat << latShift) >> latShift) << shift) + blockInfo.hdr.nodeLatBase);
+	nodeInfo.bytes = ((lonBits + latBits) >> 3) + 1;
 
-	if ((maxBits < 0x1c) && (adj.nodeInfo.flags & 8)) {
+	if ((maxBits < 0x1c) && (nodeInfo.flags & 8)) {
 		quint8 extraBits = 0x1c - maxBits;
 		quint32 extraLon, extraLat;
 
 		if (!(bs.read(extraBits, extraLon) && bs.read(extraBits, extraLat)))
 			return false;
 		pos.setX(pos.x() | extraLon << 4); pos.setY(pos.y() | extraLat << 4);
-		adj.nodeInfo.bytes++;
+		nodeInfo.bytes++;
 	}
 	// TODO?: check and adjust (shift) coordinates
 
-	adj.nodeInfo.pos = pos;
+	nodeInfo.pos = pos;
 
 	return true;
 }
@@ -480,14 +480,14 @@ bool NODFile::relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const
 	return true;
 }
 
-int NODFile::nextNode(Handle &hdl, AdjacencyInfo &adj) const
+int NODFile::nextNode(Handle &hdl, AdjacencyInfo &adjInfo) const
 {
-	if (adj.nodeOffset == 0xFFFFFFFF)
+	if (adjInfo.nodeOffset == 0xFFFFFFFF)
 		return 1;
 
-	if (!nodeInfo(hdl, adj))
+	if (!nodeInfo(hdl, adjInfo.blockInfo, adjInfo.nodeOffset, adjInfo.nodeInfo))
 		return -1;
-	if (!adjacencyInfo(hdl, adj))
+	if (!adjacencyInfo(hdl, adjInfo))
 		return -1;
 
 	return 0;

src/map/IMG/nodfile.h

@@ -78,14 +78,13 @@ public:
 	  LinkInfo &linkInfo) const;
 	bool linkType(Handle &hdl, const BlockInfo &blockInfo, quint8 linkId,
 	  quint32 &type) const;
-	int nextNode(Handle &hdl, AdjacencyInfo &adj) const;
+	int nextNode(Handle &hdl, AdjacencyInfo &adjInfo) const;
 
 private:
+	bool nodeInfo(Handle &hdl, const BlockInfo &blockInfo, quint32 nodeOffset,
+	  NodeInfo &nodeInfo) const;
 	bool nodeOffset(Handle &hdl, const BlockInfo &blockInfo, quint8 nodeId,
 	  quint32 &nodeOffset) const;
-	bool nodeBlock(Handle &hdl, quint32 nodeOffset, BlockInfo &blockInfo) const;
-	bool readBlock(Handle &hdl, quint32 blockOffset, BlockInfo &blockInfo) const;
-	bool nodeInfo(Handle &hdl, AdjacencyInfo &adj) const;
 	bool absAdjInfo(Handle &hdl, AdjacencyInfo &adj) const;
 	bool relAdjInfo(Handle &hdl, AdjacencyInfo &adj) const;
 	bool adjacencyInfo(Handle &hdl, AdjacencyInfo &adj) const
@@ -93,6 +92,8 @@ private:
 		return (adj.nodeInfo.flags & 0x20) ? absAdjInfo(hdl, adj)
 		  : relAdjInfo(hdl, adj);
 	}
+	bool nodeBlock(Handle &hdl, quint32 nodeOffset, BlockInfo &blockInfo) const;
+	bool readBlock(Handle &hdl, quint32 blockOffset, BlockInfo &blockInfo) const;
 
 	Section _block, _index;
 	quint32 _flags, _indexFlags;