root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-22 02:20:47 +01:00
Code Issues Projects Releases Activity

Give the flags human readable names

Browse Source
This commit is contained in:
Martin Tůma 2021-07-18 22:32:49 +02:00
parent 7a9d941e60
commit 8bd08b31a3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/map/IMG/netfile.cpp
View File

@ -433,15 +433,15 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
quint16 mask = 0; quint16 mask = 0;
quint32 size; quint32 size;
quint8 s68 = (linkInfo.flags >> 0x12) & 1; bool firstIsShape = (linkInfo.flags >> 0x12) & 1;
quint8 s69 = (linkInfo.flags >> 0x11) & 1; bool singleTopology = (linkInfo.flags >> 0x11) & 1;
quint8 s6a = (linkInfo.flags >> 0x13) & 1; bool hasLevels = (linkInfo.flags >> 0x13) & 1;
if (s69 == 0 || s6a == 1) { if (!singleTopology || hasLevels) {
if (!bs.readVUInt32(size)) if (!bs.readVUInt32(size))
return false; return false;
} }
if (s69 == 0) { if (!singleTopology) {
if (!readAdjCounts(bs, ca, mask)) if (!readAdjCounts(bs, ca, mask))
return false; return false;
} }
@ -449,8 +449,8 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
if (!subdiv->level()) { if (!subdiv->level()) {
NODFile::AdjacencyInfo adj(nod, blockInfo, linkId, linkInfo); NODFile::AdjacencyInfo adj(nod, blockInfo, linkId, linkInfo);
if (s69 == 1) { if (singleTopology) {
if (s68 == 1) { if (firstIsShape) {
if (!readShape(nod, nodHdl, adj, bs, _tp, subdiv, shift, poly)) if (!readShape(nod, nodHdl, adj, bs, _tp, subdiv, shift, poly))
return false; return false;
} else { } else {
@ -461,7 +461,7 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
quint16 mask2 = mask + 0xffff; quint16 mask2 = mask + 0xffff;
for (int i = 0; i <= ca.size(); i++) { for (int i = 0; i <= ca.size(); i++) {
quint16 step = (i < ca.size()) ? ca.at(i) & mask2 : 0xFFFF; quint16 step = (i < ca.size()) ? ca.at(i) & mask2 : 0xFFFF;
bool shape = (i > 0) ? ca.at(i-1) & mask : (s68 == 1); bool shape = (i > 0) ? ca.at(i-1) & mask : firstIsShape;
if (i == lineId) { if (i == lineId) {
if (shape) { if (shape) {
bool check = (i < ca.size()) ? (ca.at(i) & mask) : false; bool check = (i < ca.size()) ? (ca.at(i) & mask) : false;
@ -482,7 +482,9 @@ bool NETFile::link(const SubDiv *subdiv, quint32 shift, Handle &hdl,
} }
} }
} else { } else {
if (!skipAdjShapes(bs, ca, mask, s68 == 1)) Q_ASSERT(hasLevels);
if (!skipAdjShapes(bs, ca, mask, firstIsShape))
return false; return false;
if (!seekToLevel(bs, subdiv->level())) if (!seekToLevel(bs, subdiv->level()))