Move the DEM sources to the common folder now that we use them in map/data

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/common/dem.h

@@ -6,7 +6,7 @@
 #include <QByteArray>
 #include <QMutex>
 #include "common/hash.h"
-#include "area.h"
+#include "data/area.h"
 
 class Coordinates;
 

src/data/demloader.h

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

src/data/route.cpp

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

src/data/track.cpp

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

src/data/waypoint.cpp

@@ -1,6 +1,6 @@
 #include <QDir>
 #include <QFileInfo>
-#include "dem.h"
+#include "common/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/mapsforge/rastertile.cpp

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