Do not depend on the file extension when loading the maps

src/map/aqmmap.cpp

@@ -424,6 +424,14 @@ void AQMMap::drawTile(QPainter *painter, QPixmap &pixmap, QPointF &tp)
 	painter->drawPixmap(tp, pixmap);
 }
 
+Map *AQMMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new AQMMap(path);
+}
+
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const AQMMap::File &file)
 {

src/map/aqmmap.h

@@ -39,6 +39,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	struct File {
 		QByteArray name;

src/map/atlas.cpp

@@ -293,19 +293,10 @@ void Atlas::unload()
 		_maps.at(i)->unload();
 }
 
-bool Atlas::isAtlas(const QString &path)
+Map *Atlas::create(const QString &path, const Projection &, bool *isDir)
 {
-	QFileInfo fi(path);
+	if (isDir)
-	QString suffix = fi.suffix().toLower();
+		*isDir = true;
 
-	if (suffix == "tar") {
+	return new Atlas(path);
-		Tar tar(path);
-		if (!tar.open())
-			return false;
-		QString tbaFileName = fi.completeBaseName() + ".tba";
-		return tar.contains(tbaFileName);
-	} else if (suffix == "tba")
-		return true;
-
-	return false;
 }

src/map/atlas.h

@@ -34,7 +34,7 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
-	static bool isAtlas(const QString &path);
+	static Map *create(const QString &path, const Projection &, bool *isDir);
 
 private:
 	struct Zoom {

src/map/bsbmap.cpp

@@ -461,3 +461,11 @@ void BSBMap::unload()
 	delete _img;
 	_img = 0;
 }
+
+Map *BSBMap::create(const QString &path, const Projection &, bool *isMap)
+{
+	if (isMap)
+		*isMap = false;
+
+	return new BSBMap(path);
+}

src/map/bsbmap.h

@@ -32,6 +32,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isMap);
+
 private:
 	bool parseBSB(const QByteArray &line);
 	bool parseKNP(const QByteArray &line, QString &datum, QString &proj,

src/map/geotiffmap.cpp

@@ -74,3 +74,11 @@ void GeoTIFFMap::unload()
 	delete _img;
 	_img = 0;
 }
+
+Map *GeoTIFFMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new GeoTIFFMap(path);
+}

src/map/geotiffmap.h

@@ -28,6 +28,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	Projection _projection;
 	Transform _transform;

src/map/imgmap.cpp

@@ -222,3 +222,11 @@ void IMGMap::setOutputProjection(const Projection &projection)
 	updateTransform();
 	QPixmapCache::clear();
 }
+
+Map* IMGMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = GMAPData::isGMAP(path);
+
+	return new IMGMap(path);
+}

src/map/imgmap.h

@@ -41,6 +41,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map* create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	Transform transform(int zoom) const;
 	void updateTransform();

src/map/jnxmap.cpp

@@ -63,9 +63,12 @@ bool JNXMap::readTiles()
 	  && readValue(levels)))
 		return false;
 
+	if (version < 3 || version > 4)
+		return false;
+
 	_bounds = RectC(Coordinates(ic2dc(lon1), ic2dc(lat1)),
 	  Coordinates(ic2dc(lon2), ic2dc(lat2)));
-	if (!levels || !_bounds.isValid())
+	if (!levels || levels > 32 || !_bounds.isValid())
 		return false;
 
 	if (!_file.seek(version > 3 ? 0x34 : 0x30))
@@ -304,3 +307,11 @@ void JNXMap::setInputProjection(const Projection &projection)
 		}
 	}
 }
+
+Map *JNXMap::create(const QString &path, const Projection &proj, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new JNXMap(path, proj);
+}

src/map/jnxmap.h

@@ -42,6 +42,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &proj, bool *isDir);
+
 private:
 	struct Tile {
 		qint32 top, right, bottom, left;

src/map/kmzmap.cpp

@@ -513,3 +513,11 @@ void KMZMap::draw(QPainter *painter, const QRectF &rect, int mapIndex,
 	map.draw(painter, pr, flags);
 	painter->restore();
 }
+
+Map *KMZMap::create(const QString &path, const Projection &proj, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new KMZMap(path, proj);
+}

src/map/kmzmap.h

@@ -39,6 +39,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &proj, bool *isDir);
+
 private:
 	class Overlay {
 	public:

src/map/maplist.cpp

@@ -1,7 +1,6 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QApplication>
-#include "IMG/gmapdata.h"
 #include "atlas.h"
 #include "ozimap.h"
 #include "jnxmap.h"
@@ -21,54 +20,67 @@
 #include "maplist.h"
 
 
+MapList::ParserMap MapList::parsers()
+{
+	MapList::ParserMap map;
+
+	map.insert("tar", &Atlas::create);
+	map.insert("tar", &OziMap::create);
+	map.insert("tba", &Atlas::create);
+	map.insert("xml", &MapSource::create);
+	map.insert("xml", &IMGMap::create);
+	map.insert("img", &IMGMap::create);
+	map.insert("jnx", &JNXMap::create);
+	map.insert("tif", &GeoTIFFMap::create);
+	map.insert("tiff", &GeoTIFFMap::create);
+	map.insert("mbtiles", &MBTilesMap::create);
+	map.insert("rmap", &RMap::create);
+	map.insert("rtmap", &RMap::create);
+	map.insert("map", &MapsforgeMap::create);
+	map.insert("map", &OziMap::create);
+	map.insert("kap", &BSBMap::create);
+	map.insert("kmz", &KMZMap::create);
+	map.insert("aqm", &AQMMap::create);
+	map.insert("sqlitedb", &SqliteMap::create);
+	map.insert("wld", &WorldFileMap::create);
+	map.insert("jgw", &WorldFileMap::create);
+	map.insert("gfw", &WorldFileMap::create);
+	map.insert("pgw", &WorldFileMap::create);
+	map.insert("tfw", &WorldFileMap::create);
+	map.insert("qct", &QCTMap::create);
+
+	return map;
+}
+
+MapList::ParserMap MapList::_parsers = parsers();
+
 Map *MapList::loadFile(const QString &path, const Projection &proj, bool *isDir)
 {
+	ParserMap::iterator it;
 	QFileInfo fi(path);
-	QString suffix = fi.suffix().toLower();
+	QString suffix(fi.suffix().toLower());
 	Map *map = 0;
 
-	if (Atlas::isAtlas(path)) {
+	if ((it = _parsers.find(suffix)) != _parsers.end()) {
-		if (isDir)
+		while (it != _parsers.end() && it.key() == suffix) {
-			*isDir = true;
+			delete map;
-		map = new Atlas(path);
+			map = it.value()(path, proj, isDir);
-	} else if (suffix == "xml") {
+			if (map->isValid())
-		if (MapSource::isMap(path)) {
+				break;
-			map = MapSource::loadMap(path);
+
-		} else if (IMG::GMAPData::isGMAP(path)) {
+			++it;
-			map = new IMGMap(path);
+		}
-			if (isDir)
+	} else {
-				*isDir = true;
+		for (it = _parsers.begin(); it != _parsers.end(); it++) {
+			map = it.value()(path, proj, isDir);
+			if (map->isValid())
+				break;
+			else {
+				delete map;
+				map = 0;
+			}
+		}
 	}
-	} else if (suffix == "jnx")
-		map = new JNXMap(path, proj);
-	else if (suffix == "tif" || suffix == "tiff")
-		map = new GeoTIFFMap(path);
-	else if (suffix == "mbtiles")
-		map = new MBTilesMap(path);
-	else if (suffix == "rmap" || suffix == "rtmap")
-		map = new RMap(path);
-	else if (suffix == "img")
-		map = new IMGMap(path);
-	else if (suffix == "map") {
-		if (Mapsforge::MapData::isMapsforge(path))
-			map = new MapsforgeMap(path);
-		else
-			map = new OziMap(path);
-	} else if (suffix == "tar")
-		map = new OziMap(path);
-	else if (suffix == "kap")
-		map = new BSBMap(path);
-	else if (suffix == "kmz")
-		map = new KMZMap(path, proj);
-	else if (suffix == "aqm")
-		map = new AQMMap(path);
-	else if (suffix == "sqlitedb")
-		map = new SqliteMap(path);
-	else if (suffix == "wld" || suffix == "jgw" || suffix == "gfw"
-	  || suffix == "pgw" || suffix == "tfw")
-		map = new WorldFileMap(path, proj);
-	else if (suffix == "qct")
-		map = new QCTMap(path);
 
 	return map ? map : new InvalidMap(path, "Unknown file format");
 }
@@ -140,15 +152,20 @@ QString MapList::formats()
 	  + qApp->translate("MapList", "GeoTIFF images") + " (*.tif *.tiff);;"
 	  + qApp->translate("MapList", "World-file georeferenced images")
 	    + " (*.wld *.jgw *.gfw *.pgw *.tfw);;"
-	  + qApp->translate("MapList", "Online map sources") + " (*.xml)";
+	  + qApp->translate("MapList", "Online map sources") + " (*.xml);;"
+	  + qApp->translate("MapList", "All files") + " (*)";
 }
 
 QStringList MapList::filter()
 {
 	QStringList filter;
-	filter << "*.aqm" << "*.gfw" << "*.gmap" << "*.gmapi" << "*.img" << "*.jgw"
+	QString last;
-	  << "*.jnx" << "*.kap" << "*.kmz" << "*.map" << "*.mbtiles" << "*.pgw"
+
-	  << "*.qct" << "*.rmap" << "*.rtmap" << "*.sqlitedb" << "*.tar" << "*.tba"
+	for (ParserMap::iterator it = _parsers.begin(); it != _parsers.end(); it++) {
-	  << "*.tfw" << "*.tif" << "*.tiff" << "*.wld" << "*.xml";
+		if (it.key() != last)
+			filter << "*." + it.key();
+		last = it.key();
+	}
+
 	return filter;
 }

src/map/maplist.h

@@ -15,10 +15,16 @@ public:
 	static QStringList filter();
 
 private:
+	typedef Map*(*ParserCb)(const QString &, const Projection &, bool *isDir);
+	typedef QMultiMap<QString, ParserCb> ParserMap;
+
 	static Map *loadFile(const QString &path, const Projection &proj,
 	  bool *isDir = 0);
 	static TreeNode<Map*> loadDir(const QString &path, const Projection &proj,
 	  TreeNode<Map *> *parent = 0);
+
+	static ParserMap parsers();
+	static ParserMap _parsers;
 };
 
 #endif // MAPLIST_H

src/map/mapsforge/mapdata.cpp

@@ -382,7 +382,7 @@ bool MapData::readHeader()
 	return true;
 }
 
-MapData::MapData(const QString &fileName) : _file(fileName)
+MapData::MapData(const QString &fileName) : _file(fileName), _valid(false)
 {
 	if (!_file.open(QFile::ReadOnly | QIODevice::Unbuffered)) {
 		_errorString = _file.errorString();
@@ -682,19 +682,6 @@ bool MapData::readPoints(const VectorTile *tile, int zoom, QList<Point> *list)
 	return true;
 }
 
-bool MapData::isMapsforge(const QString &path)
-{
-	QFile file(path);
-	char magic[sizeof(MAGIC) - 1];
-
-	if (!file.open(QFile::ReadOnly))
-		return false;
-	if (file.read(magic, sizeof(magic)) < (qint64)sizeof(magic))
-		return false;
-
-	return !memcmp(magic, MAGIC, sizeof(magic));
-}
-
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const Mapsforge::MapData::Tag &tag)
 {

src/map/mapsforge/mapdata.h

@@ -81,8 +81,6 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
-	static bool isMapsforge(const QString &path);
-
 private:
 	struct SubFileInfo {
 		quint8 base;

src/map/mapsforgemap.cpp

@@ -23,8 +23,10 @@ MapsforgeMap::MapsforgeMap(const QString &fileName, QObject *parent)
   : Map(fileName, parent), _data(fileName), _zoom(0),
   _projection(PCS::pcs(3857)), _tileRatio(1.0)
 {
+	if (_data.isValid()) {
 		_zoom = _data.zooms().min();
 		updateTransform();
+	}
 }
 
 void MapsforgeMap::load()
@@ -233,3 +235,11 @@ void MapsforgeMap::setOutputProjection(const Projection &projection)
 	updateTransform();
 	QPixmapCache::clear();
 }
+
+Map *MapsforgeMap::create(const QString &path, const Projection &, bool *isMap)
+{
+	if (isMap)
+		*isMap = false;
+
+	return new MapsforgeMap(path);
+}

src/map/mapsforgemap.h

@@ -71,6 +71,8 @@ public:
 	bool isValid() const {return _data.isValid();}
 	QString errorString() const {return _data.errorString();}
 
+	static Map *create(const QString &path, const Projection &, bool *isMap);
+
 private slots:
 	void jobFinished(MapsforgeMapJob *job);
 

src/map/mapsource.cpp

@@ -206,26 +206,16 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
 	}
 }
 
-bool MapSource::isMap(const QString &path)
+Map *MapSource::create(const QString &path, const Projection &proj, bool *isDir)
-{
-	QFile file(path);
-
-	if (!file.open(QFile::ReadOnly | QFile::Text))
-		return false;
-
-	QXmlStreamReader reader(&file);
-	if (reader.readNextStartElement() && reader.name() == QLatin1String("map"))
-		return true;
-
-	return false;
-}
-
-Map *MapSource::loadMap(const QString &path)
 {
+	Q_UNUSED(proj);
 	Config config;
 	QFile file(path);
 
 
+	if (isDir)
+		*isDir = false;
+
 	if (!file.open(QFile::ReadOnly | QFile::Text))
 		return new InvalidMap(path, file.errorString());
 

src/map/mapsource.h

@@ -10,12 +10,12 @@
 
 class Map;
 class QXmlStreamReader;
+class Projection;
 
 class MapSource
 {
 public:
-	static Map *loadMap(const QString &path);
+	static Map *create(const QString &path, const Projection &proj, bool *isDir);
-	static bool isMap(const QString &path);
 
 private:
 	enum Type {

src/map/mbtilesmap.cpp

@@ -332,3 +332,11 @@ Coordinates MBTilesMap::xy2ll(const QPointF &p)
 	return OSM::m2ll(QPointF(p.x() * scale, -p.y() * scale)
 	  * coordinatesRatio());
 }
+
+Map *MBTilesMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new MBTilesMap(path);
+}

src/map/mbtilesmap.h

@@ -34,6 +34,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	qreal tileSize() const;
 	qreal coordinatesRatio() const;

src/map/ozimap.cpp

@@ -379,3 +379,11 @@ void OziMap::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	if (_img)
 		_img->setDevicePixelRatio(_mapRatio);
 }
+
+Map *OziMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = true;
+
+	return new OziMap(path);
+}

src/map/ozimap.h

@@ -47,6 +47,8 @@ public:
 	QPointF pp2xy(const PointD &p) const
 	  {return _transform.proj2img(p) / _mapRatio;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	struct ImageInfo {
 		QSize size;

src/map/qctmap.cpp

@@ -485,3 +485,11 @@ void QCTMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		}
 	}
 }
+
+Map *QCTMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new QCTMap(path);
+}

src/map/qctmap.h

@@ -30,6 +30,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	bool readName(QDataStream &stream);
 	bool readSize(QDataStream &stream);

src/map/rmap.cpp

@@ -458,3 +458,11 @@ void RMap::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	Q_UNUSED(deviceRatio);
 	_mapRatio = mapRatio;
 }
+
+Map *RMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new RMap(path);
+}

src/map/rmap.h

@@ -34,6 +34,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	struct Header {
 		quint32 type;

src/map/sqlitemap.cpp

@@ -271,3 +271,11 @@ Coordinates SqliteMap::xy2ll(const QPointF &p)
 	qreal scale = OSM::zoom2scale(_zoom, _tileSize);
 	return OSM::m2ll(QPointF(p.x() * scale, -p.y() * scale) * _mapRatio);
 }
+
+Map *SqliteMap::create(const QString &path, const Projection &, bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new SqliteMap(path);
+}

src/map/sqlitemap.h

@@ -32,6 +32,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &, bool *isDir);
+
 private:
 	int limitZoom(int zoom) const;
 	qreal tileSize() const;

src/map/worldfilemap.cpp

@@ -121,3 +121,12 @@ void WorldFileMap::setInputProjection(const Projection &projection)
 
 	_projection = projection;
 }
+
+Map *WorldFileMap::create(const QString &path, const Projection &proj,
+  bool *isDir)
+{
+	if (isDir)
+		*isDir = false;
+
+	return new WorldFileMap(path, proj);
+}

src/map/worldfilemap.h

@@ -12,7 +12,8 @@ class WorldFileMap : public Map
 	Q_OBJECT
 
 public:
-	WorldFileMap(const QString &fileName, const Projection &proj, QObject *parent = 0);
+	WorldFileMap(const QString &fileName, const Projection &proj,
+	  QObject *parent = 0);
 	~WorldFileMap();
 
 	QRectF bounds();
@@ -29,6 +30,8 @@ public:
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 
+	static Map *create(const QString &path, const Projection &proj, bool *isDir);
+
 private:
 	Projection _projection;
 	Transform _transform;