src/GUI/optionsdialog.cpp

@@ -727,14 +727,14 @@ QWidget *OptionsDialog::createSystemPage()
 	_enableHTTP2->setChecked(_options.enableHTTP2);
 
 	_pixmapCache = new QSpinBox();
-	_pixmapCache->setMinimum(64);
+	_pixmapCache->setMinimum(16);
-	_pixmapCache->setMaximum(4096);
+	_pixmapCache->setMaximum(2048);
 	_pixmapCache->setSuffix(UNIT_SPACE + tr("MB"));
 	_pixmapCache->setValue(_options.pixmapCache);
 
 	_demCache = new QSpinBox();
 	_demCache->setMinimum(64);
-	_demCache->setMaximum(4096);
+	_demCache->setMaximum(2048);
 	_demCache->setSuffix(UNIT_SPACE + tr("MB"));
 	_demCache->setValue(_options.demCache);
 

src/common/dem.cpp

@@ -65,7 +65,7 @@ QString DEM::Tile::lonStr() const
 	return QString("%1%2").arg(ew).arg(qAbs(_lon), 3, 10, QChar('0'));
 }
 
-QString DEM::Tile::fileName() const
+QString DEM::Tile::baseName() const
 {
 	return QString("%1%2.hgt").arg(latStr(), lonStr());
 }
@@ -75,7 +75,7 @@ DEM::TileCache DEM::_data;
 
 void DEM::setCacheSize(int size)
 {
-	_data.setMaxCost(size);
+	_data.setMaxCost(size * 1024);
 }
 
 void DEM::setDir(const QString &path)
@@ -108,15 +108,15 @@ double DEM::height(const Coordinates &c, const Entry *e)
 
 DEM::Entry *DEM::loadTile(const Tile &tile)
 {
-	QString fileName(tile.fileName());
+	QString bn(tile.baseName());
-	QString path(QDir(_dir).absoluteFilePath(fileName));
+	QString fn(QDir(_dir).absoluteFilePath(bn));
-	QString zipPath(path + ".zip");
+	QString zn(fn + ".zip");
 
-	if (QFileInfo::exists(zipPath)) {
+	if (QFileInfo::exists(zn)) {
-		QZipReader zip(zipPath, QIODevice::ReadOnly);
+		QZipReader zip(zn, QIODevice::ReadOnly);
-		return new Entry(zip.fileData(fileName));
+		return new Entry(zip.fileData(bn));
 	} else {
-		QFile file(path);
+		QFile file(fn);
 		if (!file.open(QIODevice::ReadOnly)) {
 			qWarning("%s: %s", qPrintable(file.fileName()),
 			  qPrintable(file.errorString()));
@@ -138,7 +138,7 @@ double DEM::elevation(const Coordinates &c)
 	if (!e) {
 		e = loadTile(tile);
 		ele = height(c, e);
-		_data.insert(tile, e, e->data().size() / 1024);
+		_data.insert(tile, e, e->data().size());
 	} else
 		ele = height(c, e);
 
@@ -147,15 +147,15 @@ double DEM::elevation(const Coordinates &c)
 
 QList<Area> DEM::tiles()
 {
-	static const QRegularExpression re(
+	static const QRegularExpression re("([NS])([0-9]{2})([EW])([0-9]{3})");
-	  "^([NS])([0-9]{2})([EW])([0-9]{3})(\\.hgt|\\.hgt\\.zip)$");
 	QDir dir(_dir);
 	QFileInfoList files(dir.entryInfoList(QDir::Files | QDir::Readable));
 	QLocale l(QLocale::system());
 	QList<Area> list;
 
 	for (int i = 0; i < files.size(); i++) {
-		QRegularExpressionMatch match(re.match(files.at(i).fileName()));
+		QString basename(files.at(i).baseName());
+		QRegularExpressionMatch match(re.match(basename));
 		if (!match.hasMatch())
 			continue;
 
@@ -167,7 +167,7 @@ QList<Area> DEM::tiles()
 			lon = -lon;
 
 		Area area(RectC(Coordinates(lon, lat + 1), Coordinates(lon + 1, lat)));
-		area.setName(files.at(i).baseName());
+		area.setName(basename);
 		area.setDescription(files.at(i).suffix().toUpper() + ", "
 		  + l.formattedDataSize(files.at(i).size()));
 		area.setStyle(PolygonStyle(QColor(0xFF, 0, 0, 0x40),

src/common/dem.h

@@ -22,7 +22,7 @@ public:
 
 		QString lonStr() const;
 		QString latStr() const;
-		QString fileName() const;
+		QString baseName() const;
 
 		bool operator==(const Tile &other) const
 		{

src/common/demloader.cpp

@@ -110,7 +110,7 @@ QUrl DEMLoader::tileUrl(const DEM::Tile &tile) const
 
 QString DEMLoader::tileFile(const DEM::Tile &tile) const
 {
-	return _dir.absoluteFilePath(tile.fileName());
+	return _dir.absoluteFilePath(tile.baseName());
 }
 
 void DEMLoader::setAuthorization(const Authorization &authorization)