root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-04-28 07:47:44 +02:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2025-04-22 19:14:06 +02:00
parent 7d7d62c786
commit 0da16199f8
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/map/ENC/mapdata.cpp
View File

@ -757,7 +757,7 @@ MapData::Poly *MapData::polyObject(const ISO8211::Record &r,
bool MapData::processRecord(const ISO8211::Record &record, bool MapData::processRecord(const ISO8211::Record &record,
QVector<ISO8211::Record> &fe, RecordMap &vi, RecordMap &vc, RecordMap &ve, QVector<ISO8211::Record> &fe, RecordMap &vi, RecordMap &vc, RecordMap &ve,
RecordMap &vf, uint &comf, uint &somf, uint &huni) uint &comf, uint &huni, uint &somf)
{ {
if (record.size() < 2) if (record.size() < 2)
return false; return false;
@ -786,8 +786,8 @@ bool MapData::processRecord(const ISO8211::Record &record,
ve.insert(rcid, record); ve.insert(rcid, record);
break; break;
case RCNM_VF: case RCNM_VF:
vf.insert(rcid, record); qWarning("Full topology/faces not supported");
break; return false;
default: default:
return false; return false;
} }
@ -810,7 +810,7 @@ bool MapData::processRecord(const ISO8211::Record &record,
MapData::MapData(const QString &path) MapData::MapData(const QString &path)
{ {
RecordMap vi, vc, ve, vf; RecordMap vi, vc, ve;
QVector<ISO8211::Record> fe; QVector<ISO8211::Record> fe;
ISO8211 ddf(path); ISO8211 ddf(path);
ISO8211::Record record; ISO8211::Record record;
@ -824,17 +824,17 @@ MapData::MapData(const QString &path)
if (!ddf.readDDR()) if (!ddf.readDDR())
return; return;
while (ddf.readRecord(record)) while (ddf.readRecord(record))
if (!processRecord(record, fe, vi, vc, ve, vf, comf, somf, huni)) if (!processRecord(record, fe, vi, vc, ve, comf, somf, huni))
qWarning("Invalid S-57 record"); qWarning("Invalid S-57 record");
for (int i = 0; i < fe.size(); i++) { for (int i = 0; i < fe.size(); i++) {
const ISO8211::Record &r = fe.at(i); const ISO8211::Record &r = fe.at(i);
const ISO8211::Field &f = r.at(1); const ISO8211::Field &frid = r.at(1);
if (f.data().at(0).size() < 5) if (frid.data().at(0).size() < 5)
continue; continue;
prim = f.data().at(0).at(2).toUInt(); prim = frid.data().at(0).at(2).toUInt();
objl = f.data().at(0).at(4).toUInt(); objl = frid.data().at(0).at(4).toUInt();
switch (prim) { switch (prim) {
case PRIM_P: case PRIM_P:
@ -850,7 +850,7 @@ MapData::MapData(const QString &path)
pointBounds(point->pos(), min, max); pointBounds(point->pos(), min, max);
_points.Insert(min, max, point); _points.Insert(min, max, point);
} else } else
warning(f, prim); warning(frid, prim);
} }
break; break;
case PRIM_L: case PRIM_L:
@ -858,14 +858,14 @@ MapData::MapData(const QString &path)
rectcBounds(line->bounds(), min, max); rectcBounds(line->bounds(), min, max);
_lines.Insert(min, max, line); _lines.Insert(min, max, line);
} else } else
warning(f, prim); warning(frid, prim);
break; break;
case PRIM_A: case PRIM_A:
if ((poly = polyObject(r, vc, ve, comf, objl, huni))) { if ((poly = polyObject(r, vc, ve, comf, objl, huni))) {
rectcBounds(poly->bounds(), min, max); rectcBounds(poly->bounds(), min, max);
_areas.Insert(min, max, poly); _areas.Insert(min, max, poly);
} else } else
warning(f, prim); warning(frid, prim);
break; break;
} }
} }

2
src/map/ENC/mapdata.h
View File

@ -53,7 +53,7 @@ private:
static bool processRecord(const ISO8211::Record &record, static bool processRecord(const ISO8211::Record &record,
QVector<ISO8211::Record> &fe, RecordMap &vi, RecordMap &vc, RecordMap &ve, QVector<ISO8211::Record> &fe, RecordMap &vi, RecordMap &vc, RecordMap &ve,
RecordMap &vf, uint &comf, uint &somf, uint &huni); uint &comf, uint &somf, uint &huni);
PolygonTree _areas; PolygonTree _areas;
LineTree _lines; LineTree _lines;