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

Do not make unnecessary checks when loading IMG maps and TrekBuddy atlases

Browse Source
This commit is contained in:
Martin Tůma
2022-06-09 00:38:25 +02:00
parent ca0089e486
commit e7d6c3f76a
7 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/imgmap.cpp
View File

@ -40,11 +40,11 @@ static QList<MapData*> overlays(const QString &fileName)
return list;
}
IMGMap::IMGMap(const QString &fileName, QObject *parent)
IMGMap::IMGMap(const QString &fileName, bool GMAP, QObject *parent)
: Map(fileName, parent), _projection(PCS::pcs(3857)), _tileRatio(1.0),
_valid(false)
{
if (GMAPData::isGMAP(fileName))
if (GMAP)
_data.append(new GMAPData(fileName));
else {
_data.append(new IMGData(fileName));
@ -291,10 +291,18 @@ void IMGMap::setOutputProjection(const Projection &projection)
QPixmapCache::clear();
}
Map* IMGMap::create(const QString &path, const Projection &, bool *isDir)
Map* IMGMap::createIMG(const QString &path, const Projection &, bool *isDir)
{
if (isDir)
*isDir = GMAPData::isGMAP(path);
*isDir = false;
return new IMGMap(path);
return new IMGMap(path, false);
}
Map* IMGMap::createGMAP(const QString &path, const Projection &, bool *isDir)
{
if (isDir)
*isDir = true;
return new IMGMap(path, true);
}