root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Removed unnecessary list copying

Browse Source
This commit is contained in:
Martin Tůma 2024-06-07 19:28:10 +02:00
parent 3e6ad20c05
commit 3d898bd482
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/IMG/mapdata.h
View File

@ -106,10 +106,6 @@ protected:
private: private:
struct Polys { struct Polys {
Polys() {}
Polys(const QList<Poly> &polygons, const QList<Poly> &lines)
: polygons(polygons), lines(lines) {}
QList<Poly> polygons; QList<Poly> polygons;
QList<Poly> lines; QList<Poly> lines;
}; };

48
src/map/IMG/vectortile.cpp
View File

@ -2,7 +2,7 @@
using namespace IMG; using namespace IMG;
static void copyPolys(const RectC &rect, QList<MapData::Poly> *src, static void copyPolys(const RectC &rect, const QList<MapData::Poly> *src,
QList<MapData::Poly> *dst) QList<MapData::Poly> *dst)
{ {
for (int i = 0; i < src->size(); i++) for (int i = 0; i < src->size(); i++)
@ -10,7 +10,7 @@ static void copyPolys(const RectC &rect, QList<MapData::Poly> *src,
dst->append(src->at(i)); dst->append(src->at(i));
} }
static void copyPoints(const RectC &rect, QList<MapData::Point> *src, static void copyPoints(const RectC &rect, const QList<MapData::Point> *src,
QList<MapData::Point> *dst) QList<MapData::Point> *dst)
{ {
for (int j = 0; j < src->size(); j++) for (int j = 0; j < src->size(); j++)
@ -152,7 +152,6 @@ void VectorTile::polys(const RectC &rect, const Zoom &zoom,
MapData::Polys *polys = cache->object(subdiv); MapData::Polys *polys = cache->object(subdiv);
if (!polys) { if (!polys) {
quint32 shift = _tre->shift(subdiv->bits()); quint32 shift = _tre->shift(subdiv->bits());
QList<MapData::Poly> p, l;
if (!rgnHdl) { if (!rgnHdl) {
rgnHdl = new SubFile::Handle(_rgn); rgnHdl = new SubFile::Handle(_rgn);
@ -163,14 +162,16 @@ void VectorTile::polys(const RectC &rect, const Zoom &zoom,
if (!subdiv->initialized() && !_rgn->subdivInit(*rgnHdl, subdiv)) if (!subdiv->initialized() && !_rgn->subdivInit(*rgnHdl, subdiv))
continue; continue;
polys = new MapData::Polys();
_rgn->polyObjects(*rgnHdl, subdiv, RGNFile::Polygon, _lbl, *lblHdl, _rgn->polyObjects(*rgnHdl, subdiv, RGNFile::Polygon, _lbl, *lblHdl,
_net, *netHdl, &p); _net, *netHdl, &polys->polygons);
_rgn->polyObjects(*rgnHdl, subdiv, RGNFile::Line, _lbl, *lblHdl, _rgn->polyObjects(*rgnHdl, subdiv, RGNFile::Line, _lbl, *lblHdl,
_net, *netHdl, &l); _net, *netHdl, &polys->lines);
_rgn->extPolyObjects(*rgnHdl, subdiv, shift, RGNFile::Polygon, _lbl, _rgn->extPolyObjects(*rgnHdl, subdiv, shift, RGNFile::Polygon, _lbl,
*lblHdl, &p); *lblHdl, &polys->polygons);
_rgn->extPolyObjects(*rgnHdl, subdiv, shift, RGNFile::Line, _lbl, _rgn->extPolyObjects(*rgnHdl, subdiv, shift, RGNFile::Line, _lbl,
*lblHdl, &l); *lblHdl, &polys->lines);
if (_net && _net->hasLinks()) { if (_net && _net->hasLinks()) {
if (!nodHdl) if (!nodHdl)
@ -178,15 +179,16 @@ void VectorTile::polys(const RectC &rect, const Zoom &zoom,
if (!nodHdl2) if (!nodHdl2)
nodHdl2 = new SubFile::Handle(_nod); nodHdl2 = new SubFile::Handle(_nod);
_rgn->links(*rgnHdl, subdiv, shift, _net, *netHdl, _nod, *nodHdl, _rgn->links(*rgnHdl, subdiv, shift, _net, *netHdl, _nod, *nodHdl,
*nodHdl2, _lbl, *lblHdl, &l); *nodHdl2, _lbl, *lblHdl, &polys->lines);
} }
copyPolys(rect, &p, polygons); copyPolys(rect, &polys->polygons, polygons);
copyPolys(rect, &l, lines); copyPolys(rect, &polys->lines, lines);
cache->insert(subdiv, new MapData::Polys(p, l));
cache->insert(subdiv, polys);
} else { } else {
copyPolys(rect, &(polys->polygons), polygons); copyPolys(rect, &polys->polygons, polygons);
copyPolys(rect, &(polys->lines), lines); copyPolys(rect, &polys->lines, lines);
} }
} }
@ -226,8 +228,6 @@ void VectorTile::points(const RectC &rect, const Zoom &zoom,
QList<MapData::Point> *pl = cache->object(subdiv); QList<MapData::Point> *pl = cache->object(subdiv);
if (!pl) { if (!pl) {
QList<MapData::Point> p;
if (!rgnHdl) { if (!rgnHdl) {
rgnHdl = new SubFile::Handle(_rgn); rgnHdl = new SubFile::Handle(_rgn);
lblHdl = new SubFile::Handle(_lbl); lblHdl = new SubFile::Handle(_lbl);
@ -236,14 +236,17 @@ void VectorTile::points(const RectC &rect, const Zoom &zoom,
if (!subdiv->initialized() && !_rgn->subdivInit(*rgnHdl, subdiv)) if (!subdiv->initialized() && !_rgn->subdivInit(*rgnHdl, subdiv))
continue; continue;
_rgn->pointObjects(*rgnHdl, subdiv, RGNFile::Point, _lbl, *lblHdl, pl = new QList<MapData::Point>;
&p);
_rgn->pointObjects(*rgnHdl, subdiv, RGNFile::IndexedPoint, _lbl,
*lblHdl, &p);
_rgn->extPointObjects(*rgnHdl, subdiv, _lbl, *lblHdl, &p);
copyPoints(rect, &p, points); _rgn->pointObjects(*rgnHdl, subdiv, RGNFile::Point, _lbl, *lblHdl,
cache->insert(subdiv, new QList<MapData::Point>(p)); pl);
_rgn->pointObjects(*rgnHdl, subdiv, RGNFile::IndexedPoint, _lbl,
*lblHdl, pl);
_rgn->extPointObjects(*rgnHdl, subdiv, _lbl, *lblHdl, pl);
copyPoints(rect, pl, points);
cache->insert(subdiv, pl);
} else } else
copyPoints(rect, pl, points); copyPoints(rect, pl, points);
} }
@ -280,6 +283,7 @@ void VectorTile::elevations(const RectC &rect, const Zoom &zoom,
// the given zoom (we prefer rendering quality rather than speed). For // the given zoom (we prefer rendering quality rather than speed). For
// maps with a single level this has no effect. // maps with a single level this has no effect.
int level = qMax(0, _dem->level(zoom) - 1); int level = qMax(0, _dem->level(zoom) - 1);
QList<const DEMTile*> tiles(_dem->tiles(rect, level)); QList<const DEMTile*> tiles(_dem->tiles(rect, level));
for (int i = 0; i < tiles.size(); i++) { for (int i = 0; i < tiles.size(); i++) {
const DEMTile *tile = tiles.at(i); const DEMTile *tile = tiles.at(i);