.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.35.{build}
+version: 13.34.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.35
+VERSION = 13.34
 
 
 QT += core \

pkg/windows/gpxsee64.nsi

@@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.35"
+!define VERSION "13.34"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/map/IMG/demtree.cpp

@@ -111,13 +111,3 @@ double DEMTree::elevation(const Coordinates &c) const
 
 	return ele;
 }
-
-MatrixD DEMTree::elevation(const MatrixC &m) const
-{
-	MatrixD ret(m.h(), m.w());
-
-	for (int i = 0; i < m.size(); i++)
-		ret.at(i) = elevation(m.at(i));
-
-	return ret;
-}

src/map/IMG/demtree.h

@@ -2,7 +2,6 @@
 #define IMG_DEMTREE_H
 
 #include "common/rtree.h"
-#include "map/matrix.h"
 #include "mapdata.h"
 
 namespace IMG {
@@ -12,7 +11,6 @@ public:
 	DEMTree(const QList<MapData::Elevation> &tiles);
 
 	double elevation(const Coordinates &c) const;
-	MatrixD elevation(const MatrixC &m) const;
 
 private:
 	typedef RTree<const MapData::Elevation*, double, 2> Tree;

src/map/IMG/rastertile.cpp

@@ -483,18 +483,22 @@ MatrixD RasterTile::elevation(int extend) const
 
 	if (_data->hasDEM()) {
 		RectC rect;
+		QList<MapData::Elevation> tiles;
+
 		for (int i = 0; i < ll.size(); i++)
 			rect = rect.united(ll.at(i));
-		/* Extra margin for always including the next DEM tile on the map tile
-		   edges (the DEM tile resolution is usally 0.5-15% of the map tile) */
+		// Extra margin for always including the next DEM tile on the map tile
+		// edges (the DEM tile resolution is usally 0.5-15% of the map tile)
 		double factor = 6 - (_zoom - 24) * 1.7;
-		RectC br(rect.adjusted(0, 0, rect.width() / factor, -rect.height()
-		  / factor));
+		_data->elevations(_file, rect.adjusted(0, 0, rect.width() / factor,
+		  -rect.height() / factor), _zoom, &tiles);
 
-		QList<MapData::Elevation> tiles;
-		_data->elevations(_file, br, _zoom, &tiles);
+		DEMTree tree(tiles);
+		MatrixD m(ll.h(), ll.w());
+		for (int i = 0; i < ll.size(); i++)
+			m.at(i) = tree.elevation(ll.at(i));
 
-		return DEMTree(tiles).elevation(ll);
+		return m;
 	} else
 		return DEM::elevation(ll);
 }