gpxsee.pro

@@ -24,6 +24,9 @@ greaterThan(QT_MAJOR_VERSION, 5) {
 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
+    src/GUI/crosshairitem.h \
+    src/GUI/motioninfoitem.h \
+    src/GUI/pluginparameters.h \
     src/common/garmin.h \
     src/common/coordinates.h \
     src/common/hash.h \
@@ -43,10 +46,6 @@ HEADERS += src/common/config.h \
     src/common/polygon.h \
     src/common/color.h \
     src/common/csv.h \
-    src/common/dem.h \
-    src/GUI/crosshairitem.h \
-    src/GUI/motioninfoitem.h \
-    src/GUI/pluginparameters.h \
     src/GUI/authenticationwidget.h \
     src/GUI/axislabelitem.h \
     src/GUI/dirselectwidget.h \
@@ -257,6 +256,7 @@ HEADERS += src/common/config.h \
     src/data/oziparsers.h \
     src/data/locparser.h \
     src/data/slfparser.h \
+    src/data/dem.h \
     src/data/demloader.h \
     src/data/area.h \
     src/data/exifparser.h \
@@ -267,6 +267,10 @@ HEADERS += src/common/config.h \
     src/data/geojsonparser.h
 
 SOURCES += src/main.cpp \
+    src/GUI/crosshairitem.cpp \
+    src/GUI/motioninfoitem.cpp \
+    src/GUI/pluginparameters.cpp \
+    src/GUI/settings.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
@@ -277,11 +281,6 @@ SOURCES += src/main.cpp \
     src/common/tifffile.cpp \
     src/common/downloader.cpp \
     src/common/csv.cpp \
-    src/common/dem.cpp \
-    src/GUI/crosshairitem.cpp \
-    src/GUI/motioninfoitem.cpp \
-    src/GUI/pluginparameters.cpp \
-    src/GUI/settings.cpp \
     src/GUI/authenticationwidget.cpp \
     src/GUI/axislabelitem.cpp \
     src/GUI/dirselectwidget.cpp \
@@ -340,6 +339,8 @@ SOURCES += src/main.cpp \
     src/GUI/pngexportdialog.cpp \
     src/GUI/projectioncombobox.cpp \
     src/GUI/passwordedit.cpp \
+    src/data/gpsdumpparser.cpp \
+    src/data/twonavparser.cpp \
     src/map/ENC/atlasdata.cpp \
     src/map/ENC/mapdata.cpp \
     src/map/ENC/rastertile.cpp \
@@ -436,8 +437,6 @@ SOURCES += src/main.cpp \
     src/map/mapsforgemap.cpp \
     src/map/worldfilemap.cpp \
     src/map/hillshading.cpp \
-    src/data/gpsdumpparser.cpp \
-    src/data/twonavparser.cpp \
     src/data/address.cpp \
     src/data/itnparser.cpp \
     src/data/onmoveparsers.cpp \
@@ -458,6 +457,7 @@ SOURCES += src/main.cpp \
     src/data/oziparsers.cpp \
     src/data/locparser.cpp \
     src/data/slfparser.cpp \
+    src/data/dem.cpp \
     src/data/demloader.cpp \
     src/data/exifparser.cpp \
     src/data/cupparser.cpp \

src/GUI/app.cpp

@@ -14,11 +14,11 @@
 #include "common/programpaths.h"
 #include "common/config.h"
 #include "common/downloader.h"
-#include "common/dem.h"
 #include "map/ellipsoid.h"
 #include "map/gcs.h"
 #include "map/conversion.h"
 #include "map/pcs.h"
+#include "data/dem.h"
 #include "data/waypoint.h"
 #include "gui.h"
 #include "mapaction.h"

src/GUI/mapview.cpp

@@ -7,9 +7,9 @@
 #include <QClipboard>
 #include <QOpenGLWidget>
 #include <QGeoPositionInfoSource>
-#include "common/dem.h"
 #include "data/poi.h"
 #include "data/data.h"
+#include "data/dem.h"
 #include "map/map.h"
 #include "map/pcs.h"
 #include "trackitem.h"

src/data/dem.cpp

@@ -91,6 +91,11 @@ QString DEM::Tile::baseName() const
 QString DEM::_dir;
 DEM::TileCache DEM::_data;
 
+QString DEM::fileName(const QString &baseName)
+{
+	return QDir(_dir).absoluteFilePath(baseName);
+}
+
 void DEM::setCacheSize(int size)
 {
 	_data.setMaxCost(size * 1024);
@@ -106,43 +111,41 @@ void DEM::clearCache()
 	_data.clear();
 }
 
-QByteArray *DEM::loadTile(const Tile &tile)
-{
-	QString bn(tile.baseName());
-	QString fn(QDir(_dir).absoluteFilePath(bn));
-	QString zn(fn + ".zip");
-
-	if (QFileInfo::exists(zn)) {
-		QZipReader zip(zn, QIODevice::ReadOnly);
-		return new QByteArray(zip.fileData(bn));
-	} else {
-		QFile file(fn);
-		if (!file.open(QIODevice::ReadOnly)) {
-			qWarning("%s: %s", qPrintable(file.fileName()),
-			  qPrintable(file.errorString()));
-			return new QByteArray();
-		} else
-			return new QByteArray(file.readAll());
-	}
-}
-
 double DEM::elevation(const Coordinates &c)
 {
 	if (_dir.isEmpty())
 		return NAN;
 
 	Tile tile(qFloor(c.lon()), qFloor(c.lat()));
-	QByteArray *ba = _data.object(tile);
-	double ele;
 
+	QByteArray *ba = _data[tile];
 	if (!ba) {
-		ba = loadTile(tile);
-		ele = height(c, ba);
-		_data.insert(tile, ba, ba->size());
-	} else
-		ele = height(c, ba);
+		QString bn(tile.baseName());
+		QString fn(fileName(bn));
+		QString zn(fn + ".zip");
 
+		if (QFileInfo::exists(zn)) {
+			QZipReader zip(zn, QIODevice::ReadOnly);
+			ba = new QByteArray(zip.fileData(bn));
+			double ele = height(c, ba);
+			_data.insert(tile, ba, ba->size());
 			return ele;
+		} else {
+			QFile file(fn);
+			if (!file.open(QIODevice::ReadOnly)) {
+				qWarning("%s: %s", qPrintable(file.fileName()),
+				  qPrintable(file.errorString()));
+				_data.insert(tile, new QByteArray());
+				return NAN;
+			} else {
+				ba = new QByteArray(file.readAll());
+				double ele = height(c, ba);
+				_data.insert(tile, ba, ba->size());
+				return ele;
+			}
+		}
+	} else
+		return height(c, ba);
 }
 
 QList<Area> DEM::tiles()

src/data/dem.h

@@ -6,7 +6,7 @@
 #include <QByteArray>
 #include <QMutex>
 #include "common/hash.h"
-#include "data/area.h"
+#include "area.h"
 
 class Coordinates;
 
@@ -46,7 +46,7 @@ public:
 private:
 	typedef QCache<DEM::Tile, QByteArray> TileCache;
 
-	static QByteArray *loadTile(const Tile &tile);
+	static QString fileName(const QString &baseName);
 
 	static QString _dir;
 	static TileCache _data;

src/data/demloader.h

@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QDir>
 #include "common/downloader.h"
-#include "common/dem.h"
+#include "dem.h"
 
 class RectC;
 

src/data/route.cpp

@@ -1,4 +1,4 @@
-#include "common/dem.h"
+#include "dem.h"
 #include "route.h"
 
 bool Route::_useDEM = false;

src/data/track.cpp

@@ -1,4 +1,4 @@
-#include "common/dem.h"
+#include "dem.h"
 #include "track.h"
 
 

src/data/waypoint.cpp

@@ -1,6 +1,6 @@
 #include <QDir>
 #include <QFileInfo>
-#include "common/dem.h"
+#include "dem.h"
 #include "waypoint.h"
 
 bool Waypoint::_useDEM = false;

src/map/IMG/rastertile.cpp

@@ -1,12 +1,12 @@
 #include <QFont>
 #include <QPainter>
 #include <QCache>
-#include "common/dem.h"
 #include "map/textpathitem.h"
 #include "map/textpointitem.h"
 #include "map/bitmapline.h"
 #include "map/rectd.h"
 #include "map/hillshading.h"
+#include "data/dem.h"
 #include "style.h"
 #include "lblfile.h"
 #include "rastertile.h"

src/map/encatlas.cpp

@@ -9,7 +9,6 @@
 
 using namespace ENC;
 
-#define EPSILON   1e-6
 #define TILE_SIZE 512
 
 Range ENCAtlas::zooms(IntendedUsage usage)
@@ -205,8 +204,7 @@ int ENCAtlas::zoomFit(const QSize &size, const RectC &rect)
 				Transform t(transform(i));
 				QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
 
-				if (size.width() + EPSILON < r.width()
-				  || size.height() + EPSILON < r.height()) {
+				if (size.width() < r.width() || size.height() < r.height()) {
 					updateTransform();
 					return _zoom;
 				}

src/map/encmap.cpp

@@ -12,7 +12,6 @@
 
 using namespace ENC;
 
-#define EPSILON   1e-6
 #define TILE_SIZE 512
 
 static Range zooms(const RectC &bounds)
@@ -205,8 +204,7 @@ int ENCMap::zoomFit(const QSize &size, const RectC &rect)
 		for (int i = _zooms.min() + 1; i <= _zooms.max(); i++) {
 			Transform t(transform(i));
 			QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
-			if (size.width() + EPSILON < r.width()
-			  || size.height() + EPSILON < r.height())
+			if (size.width() < r.width() || size.height() < r.height())
 				break;
 			_zoom = i;
 		}

src/map/imgmap.cpp

@@ -15,7 +15,6 @@
 
 using namespace IMG;
 
-#define EPSILON     1e-6
 #define TILE_SIZE   384
 
 static RectC limitBounds(const RectC &bounds, const Projection &proj)
@@ -113,8 +112,7 @@ int IMGMap::zoomFit(const QSize &size, const RectC &rect)
 		for (int i = zooms.min() + 1; i <= zooms.max(); i++) {
 			Transform t(transform(i));
 			QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
-			if (size.width() + EPSILON < r.width()
-			  || size.height() + EPSILON < r.height())
+			if (size.width() < r.width() || size.height() < r.height())
 				break;
 			_zoom = i;
 		}

src/map/mapsforge/rastertile.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 #include <QPainter>
 #include <QCache>
-#include "common/dem.h"
+#include "data/dem.h"
 #include "map/rectd.h"
 #include "map/hillshading.h"
 #include "rastertile.h"

src/map/mapsforgemap.cpp

@@ -9,8 +9,6 @@
 
 using namespace Mapsforge;
 
-#define EPSILON     1e-6
-
 MapsforgeMap::MapsforgeMap(const QString &fileName, QObject *parent)
   : Map(fileName, parent), _data(fileName), _zoom(0),
   _projection(PCS::pcs(3857)), _tileRatio(1.0)
@@ -53,8 +51,7 @@ int MapsforgeMap::zoomFit(const QSize &size, const RectC &rect)
 		for (int i = _data.zooms().min() + 1; i <= _data.zooms().max(); i++) {
 			Transform t(transform(i));
 			QRectF r(t.proj2img(pr.topLeft()), t.proj2img(pr.bottomRight()));
-			if (size.width() + EPSILON < r.width()
-			  || size.height() + EPSILON < r.height())
+			if (size.width() < r.width() || size.height() < r.height())
 				break;
 			_zoom = i;
 		}