Added support for vector maps projection setting

Removed obsolete "Always show the map" setting

gpxsee.pro

@@ -177,7 +177,8 @@ HEADERS += src/common/config.h \
     src/map/IMG/subdiv.h \
     src/map/IMG/units.h \
     src/map/IMG/style.h \
-    src/map/IMG/netfile.h
+    src/map/IMG/netfile.h \
+    src/GUI/limitedcombobox.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \

src/GUI/gui.cpp

@@ -103,7 +103,6 @@ GUI::GUI()
 	readSettings();
 
 	updateGraphTabs();
-	updateMapView();
 	updateStatusBarInfo();
 }
 
@@ -805,7 +804,7 @@ bool GUI::loadFile(const QString &fileName)
 
 		for (int i = 0; i < _tabs.count(); i++)
 			graphs.append(_tabs.at(i)->loadData(data));
-		if (updateGraphTabs() | updateMapView())
+		if (updateGraphTabs())
 			_splitter->refresh();
 		paths = _mapView->loadData(data);
 
@@ -828,7 +827,6 @@ bool GUI::loadFile(const QString &fileName)
 		updateStatusBarInfo();
 		updateWindowTitle();
 		updateGraphTabs();
-		updateMapView();
 
 		QString error = tr("Error loading data file:") + "\n\n"
 		  + fileName + "\n\n" + data.errorString();
@@ -930,6 +928,7 @@ void GUI::openOptions()
 	SET_VIEW_OPTION(pathAntiAliasing, useAntiAliasing);
 	SET_VIEW_OPTION(useOpenGL, useOpenGL);
 	SET_VIEW_OPTION(sliderColor, setMarkerColor);
+	SET_VIEW_OPTION(projection, setProjection);
 
 	SET_TAB_OPTION(palette, setPalette);
 	SET_TAB_OPTION(graphWidth, setGraphWidth);
@@ -974,8 +973,6 @@ void GUI::openOptions()
 		reloadFile();
 
 	_options = options;
-
-	updateMapView();
 }
 
 void GUI::printFile()
@@ -1230,7 +1227,6 @@ void GUI::closeAll()
 	updateStatusBarInfo();
 	updateWindowTitle();
 	updateGraphTabs();
-	updateMapView();
 }
 
 void GUI::showGraphs(bool show)
@@ -1473,19 +1469,6 @@ bool GUI::updateGraphTabs()
 	return (hidden != _graphTabWidget->isHidden());
 }
 
-bool GUI::updateMapView()
-{
-	bool hidden = _mapView->isHidden();
-
-	if (_options.alwaysShowMap)
-		_mapView->setHidden(false);
-	else
-		_mapView->setHidden(!(_trackCount + _routeCount + _waypointCount
-		  + _areaCount));
-
-	return (hidden != _mapView->isHidden());
-}
-
 void GUI::setTimeType(TimeType type)
 {
 	for (int i = 0; i <_tabs.count(); i++)
@@ -1847,8 +1830,8 @@ void GUI::writeSettings()
 		  _options.separateGraphPage);
 	if (_options.sliderColor != SLIDER_COLOR_DEFAULT)
 		settings.setValue(SLIDER_COLOR_SETTING, _options.sliderColor);
-	if (_options.alwaysShowMap != ALWAYS_SHOW_MAP_DEFAULT)
-		settings.setValue(ALWAYS_SHOW_MAP_SETTING, _options.alwaysShowMap);
+	if (_options.projection != PROJECTION_DEFAULT)
+		settings.setValue(PROJECTION_SETTING, _options.projection);
 #ifdef ENABLE_HIDPI
 	if (_options.hidpiMap != HIDPI_MAP_DEFAULT)
 		settings.setValue(HIDPI_MAP_SETTING, _options.hidpiMap);
@@ -2110,8 +2093,8 @@ void GUI::readSettings()
 	  SEPARATE_GRAPH_PAGE_DEFAULT).toBool();
 	_options.sliderColor = settings.value(SLIDER_COLOR_SETTING,
 	  SLIDER_COLOR_DEFAULT).value<QColor>();
-	_options.alwaysShowMap = settings.value(ALWAYS_SHOW_MAP_SETTING,
-	  ALWAYS_SHOW_MAP_DEFAULT).toBool();
+	_options.projection = settings.value(PROJECTION_SETTING, PROJECTION_DEFAULT)
+	  .toInt();
 #ifdef ENABLE_HIDPI
 	_options.hidpiMap = settings.value(HIDPI_MAP_SETTING, HIDPI_MAP_SETTING)
 	  .toBool();
@@ -2139,6 +2122,7 @@ void GUI::readSettings()
 	_mapView->setDevicePixelRatio(devicePixelRatioF(),
 	  _options.hidpiMap ? devicePixelRatioF() : 1.0);
 #endif // ENABLE_HIDPI
+	_mapView->setProjection(_options.projection);
 
 	for (int i = 0; i < _tabs.count(); i++) {
 		_tabs.at(i)->setPalette(_options.palette);

src/GUI/gui.h

@@ -116,7 +116,6 @@ private:
 	void updateWindowTitle();
 	void updateNavigationActions();
 	bool updateGraphTabs();
-	bool updateMapView();
 
 	TimeType timeType() const;
 	Units units() const;

src/GUI/limitedcombobox.h

@@ -0,0 +1,38 @@
+#ifndef LIMITEDCOMBOBOX_H
+#define LIMITEDCOMBOBOX_H
+
+#include <QComboBox>
+#include <QEvent>
+
+class LimitedComboBox : public QComboBox
+{
+public:
+	LimitedComboBox(int limit, QWidget *parent = 0)
+	  : QComboBox(parent), _limit(limit)
+	{
+		setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+	}
+
+	QSize sizeHint() const
+	{
+		return QSize(qMin(_limit, QComboBox::sizeHint().width()),
+		  QComboBox::sizeHint().height());
+	}
+	QSize minimumSizeHint() const
+	{
+		return QSize(qMin(_limit, QComboBox::minimumSizeHint().width()),
+		  QComboBox::minimumSizeHint().height());
+	}
+
+	bool event(QEvent *e)
+	{
+		if (e->type() == QEvent::Polish)
+			view()->setMinimumWidth(QComboBox::sizeHint().width());
+		return QComboBox::event(e);
+	}
+
+private:
+	int _limit;
+};
+
+#endif // LIMITEDCOMBOBOX_H

src/GUI/mapview.cpp

@@ -7,6 +7,7 @@
 #include "data/poi.h"
 #include "data/data.h"
 #include "map/map.h"
+#include "map/pcs.h"
 #include "opengl.h"
 #include "trackitem.h"
 #include "routeitem.h"
@@ -48,8 +49,10 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent)
 	_coordinates->setVisible(false);
 	_scene->addItem(_coordinates);
 
+	_projection = PCS::pcs(3857);
 	_map = map;
 	_map->load();
+	_map->setProjection(_projection);
 	connect(_map, SIGNAL(loaded()), this, SLOT(reloadMap()));
 
 	_poi = poi;
@@ -312,6 +315,7 @@ void MapView::setMap(Map *map)
 
 	_map = map;
 	_map->load();
+	_map->setProjection(_projection);
 #ifdef ENABLE_HIDPI
 	_map->setDevicePixelRatio(_deviceRatio, _mapRatio);
 #endif // ENABLE_HIDPI
@@ -1012,3 +1016,17 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
 	Q_UNUSED(mapRatio);
 #endif // ENABLE_HIDPI
 }
+
+void MapView::setProjection(int id)
+{
+	Projection projection(PCS::pcs(id));
+	if (!projection.isValid())
+		return;
+
+	_projection = projection;
+
+	Coordinates center = _map->xy2ll(mapToScene(viewport()->rect().center()));
+	_map->setProjection(_projection);
+	rescale();
+	centerOn(_map->ll2xy(center));
+}

src/GUI/mapview.h

@@ -8,11 +8,13 @@
 #include "common/rectc.h"
 #include "common/config.h"
 #include "data/waypoint.h"
+#include "data/polygon.h"
+#include "map/projection.h"
 #include "searchpointer.h"
 #include "units.h"
 #include "format.h"
 #include "palette.h"
-#include "data/polygon.h"
+
 
 class Data;
 class POI;
@@ -80,6 +82,7 @@ public slots:
 	void clearMapCache();
 	void setCoordinatesFormat(CoordinatesFormat format);
 	void setDevicePixelRatio(qreal deviceRatio, qreal mapRatio);
+	void setProjection(int id);
 
 private slots:
 	void updatePOI();
@@ -132,6 +135,7 @@ private:
 	Units _units;
 	CoordinatesFormat _coordinatesFormat;
 	qreal _mapOpacity;
+	Projection _projection;
 
 	bool _showMap, _showTracks, _showRoutes, _showAreas, _showWaypoints,
 	  _showWaypointLabels, _showPOI, _showPOILabels, _showRouteWaypoints,

src/GUI/optionsdialog.cpp

@@ -12,11 +12,14 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QSysInfo>
+#include <QInputDialog>
+#include "map/pcs.h"
 #include "icons.h"
 #include "colorbox.h"
 #include "stylecombobox.h"
 #include "oddspinbox.h"
 #include "percentslider.h"
+#include "limitedcombobox.h"
 #include "optionsdialog.h"
 
 
@@ -36,10 +39,15 @@ static QFrame *line()
 
 QWidget *OptionsDialog::createMapPage()
 {
-	_alwaysShowMap = new QCheckBox(tr("Always show the map"));
-	_alwaysShowMap->setChecked(_options->alwaysShowMap);
-	_alwaysShowMap->setToolTip("<p>" +
-	  tr("Show the map even when no files are loaded.") + "</p>");
+	_projection = new LimitedComboBox(200);
+	QList<PCS::Info> projections(PCS::pcsList());
+	qSort(projections);
+	for (int i = 0; i < projections.size(); i++) {
+		QString text = QString::number(projections.at(i).id()) + " - "
+		  + projections.at(i).name();
+		_projection->addItem(text, QVariant(projections.at(i).id()));
+	}
+	_projection->setCurrentIndex(_projection->findData(_options->projection));
 
 #ifdef ENABLE_HIDPI
 	_hidpi = new QRadioButton(tr("High-resolution"));
@@ -60,14 +68,14 @@ QWidget *OptionsDialog::createMapPage()
 	llo->setFont(f);
 #endif // ENABLE_HIDPI
 
-	QFormLayout *showMapLayout = new QFormLayout();
-	showMapLayout->addWidget(_alwaysShowMap);
+	QFormLayout *vectorLayout = new QFormLayout();
+	vectorLayout->addRow(tr("Projection:"), _projection);
 
-	QWidget *mapTab = new QWidget();
-	QVBoxLayout *mapTabLayout = new QVBoxLayout();
-	mapTabLayout->addLayout(showMapLayout);
-	mapTabLayout->addStretch();
-	mapTab->setLayout(mapTabLayout);
+	QWidget *vectorMapsTab = new QWidget();
+	QVBoxLayout *vectorMapsTabLayout = new QVBoxLayout();
+	vectorMapsTabLayout->addLayout(vectorLayout);
+	vectorMapsTabLayout->addStretch();
+	vectorMapsTab->setLayout(vectorMapsTabLayout);
 
 #ifdef ENABLE_HIDPI
 	QVBoxLayout *hidpiTabLayout = new QVBoxLayout();
@@ -83,7 +91,7 @@ QWidget *OptionsDialog::createMapPage()
 #endif // ENABLE_HIDPI
 
 	QTabWidget *mapPage = new QTabWidget();
-	mapPage->addTab(mapTab, tr("General"));
+	mapPage->addTab(vectorMapsTab, tr("Vector maps"));
 #ifdef ENABLE_HIDPI
 	mapPage->addTab(hidpiTab, tr("HiDPI display mode"));
 #endif // ENABLE_HIDPI
@@ -261,6 +269,7 @@ QWidget *OptionsDialog::createAppearancePage()
 	_backgroundColor = new ColorBox();
 	_backgroundColor->setColor(_options->backgroundColor);
 	_backgroundColor->enableAlphaChannel(false);
+
 	QFormLayout *mapLayout = new QFormLayout();
 	mapLayout->addRow(tr("Background color:"), _backgroundColor);
 	mapLayout->addRow(tr("Map opacity:"), _mapOpacity);
@@ -656,7 +665,7 @@ void OptionsDialog::accept()
 	_options->sliderColor = _sliderColor->color();
 	_options->graphAntiAliasing = _graphAA->isChecked();
 
-	_options->alwaysShowMap = _alwaysShowMap->isChecked();
+	_options->projection = _projection->currentData().toInt();
 #ifdef ENABLE_HIDPI
 	_options->hidpiMap = _hidpi->isChecked();
 #endif // ENABLE_HIDPI

src/GUI/optionsdialog.h

@@ -15,6 +15,7 @@ class QComboBox;
 class QCheckBox;
 class QRadioButton;
 class PercentSlider;
+class LimitedComboBox;
 
 struct Options {
 	// Appearance
@@ -37,7 +38,7 @@ struct Options {
 	int mapOpacity;
 	QColor backgroundColor;
 	// Map
-	bool alwaysShowMap;
+	int projection;
 #ifdef ENABLE_HIDPI
 	bool hidpiMap;
 #endif // ENABLE_HIDPI
@@ -79,11 +80,14 @@ class OptionsDialog : public QDialog
 {
 	Q_OBJECT
 
+public slots:
+	void accept();
+
 public:
 	OptionsDialog(Options *options, QWidget *parent = 0);
 
-public slots:
-	void accept();
+//private slots:
+//	void projectionChanged(int index);
 
 private:
 	QWidget *createMapPage();
@@ -116,7 +120,7 @@ private:
 	ColorBox *_sliderColor;
 	QCheckBox *_graphAA;
 	// Map
-	QCheckBox *_alwaysShowMap;
+	LimitedComboBox *_projection;
 #ifdef ENABLE_HIDPI
 	QRadioButton *_hidpi;
 	QRadioButton *_lodpi;

src/GUI/settings.h

@@ -171,8 +171,8 @@
 #define SEPARATE_GRAPH_PAGE_DEFAULT       false
 #define SLIDER_COLOR_SETTING              "sliderColor"
 #define SLIDER_COLOR_DEFAULT              QColor(Qt::red)
-#define ALWAYS_SHOW_MAP_SETTING           "alwaysShowMap"
-#define ALWAYS_SHOW_MAP_DEFAULT           true
+#define PROJECTION_SETTING                "projection"
+#define PROJECTION_DEFAULT                3857
 #define HIDPI_MAP_SETTING                 "HiDPIMap"
 #define HIDPI_MAP_DEFAULT                 true
 

src/map/imgmap.cpp

@@ -369,3 +369,10 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
 		painter->drawPixmap(mt.xy(), pm);
 	}
 }
+
+void IMGMap::setProjection(const Projection &projection)
+{
+	_projection = projection;
+	updateTransform();
+	QPixmapCache::clear();
+}

src/map/imgmap.h

@@ -31,6 +31,8 @@ public:
 
 	void draw(QPainter *painter, const QRectF &rect, Flags flags);
 
+	void setProjection(const Projection &projection);
+
 	bool isValid() const {return _valid;}
 	QString errorString() const {return _errorString;}
 

src/map/map.cpp

@@ -1,5 +1,6 @@
 #include <QLineF>
 #include "map.h"
+#include "pcs.h"
 
 qreal Map::resolution(const QRectF &rect)
 {

src/map/map.h

@@ -7,8 +7,10 @@
 #include <QFlags>
 #include "common/coordinates.h"
 
+
 class QPainter;
 class RectC;
+class Projection;
 
 class Map : public QObject
 {
@@ -45,6 +47,7 @@ public:
 	virtual void load() {}
 	virtual void unload() {}
 	virtual void setDevicePixelRatio(qreal, qreal) {}
+	virtual void setProjection(const Projection &) {}
 
 	virtual bool isValid() const {return true;}
 	virtual QString errorString() const {return QString();}

src/map/pcs.cpp

@@ -5,13 +5,16 @@
 
 class PCS::Entry {
 public:
-	Entry(int id, int proj, const PCS &pcs) : _id(id), _proj(proj), _pcs(pcs) {}
+	Entry(const QString &name, int id, int proj, const PCS &pcs)
+	  : _name(name), _id(id), _proj(proj), _pcs(pcs) {}
 
+	const QString &name() const {return _name;}
 	int id() const {return _id;}
 	int proj() const {return _proj;}
 	const PCS &pcs() const {return _pcs;}
 
 private:
+	QString _name;
 	int _id, _proj;
 	PCS _pcs;
 };
@@ -21,8 +24,9 @@ QList<PCS::Entry> PCS::_pcss = defaults();
 QList<PCS::Entry> PCS::defaults()
 {
 	QList<PCS::Entry> list;
-	list.append(PCS::Entry(3857, 3856, PCS(&GCS::WGS84(), 1024,
-	  Projection::Setup(0, 0, NAN, 0, 0, NAN, NAN), 9001, 4499)));
+	list.append(PCS::Entry("WGS 84 / Pseudo-Mercator", 3857, 3856,
+	  PCS(&GCS::WGS84(), 1024, Projection::Setup(0, 0, NAN, 0, 0, NAN, NAN),
+	  9001, 4499)));
 	return list;
 }
 
@@ -154,27 +158,28 @@ void PCS::loadList(const QString &path)
 			continue;
 		}
 
-		int id = list[1].trimmed().toInt(&res);
+		QString name(list.at(0).trimmed());
+		int id = list.at(1).trimmed().toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid PCS code", qPrintable(path), ln);
 			continue;
 		}
-		int gcsid = list[2].trimmed().toInt(&res);
+		int gcsid = list.at(2).trimmed().toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid GCS code", qPrintable(path), ln);
 			continue;
 		}
-		int proj = list[3].trimmed().toInt(&res);
+		int proj = list.at(3).trimmed().toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid projection code", qPrintable(path), ln);
 			continue;
 		}
-		int units = list[4].trimmed().toInt(&res);
+		int units = list.at(4).trimmed().toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid linear units code", qPrintable(path), ln);
 			continue;
 		}
-		int transform = list[5].trimmed().toInt(&res);
+		int transform = list.at(5).trimmed().toInt(&res);
 		if (!res) {
 			qWarning("%s:%d: Invalid coordinate transformation code",
 			  qPrintable(path), ln);
@@ -214,10 +219,20 @@ void PCS::loadList(const QString &path)
 		}
 
 		PCS pcs(gcs, transform, setup, units, cs);
-		_pcss.append(Entry(id, proj, pcs));
+		_pcss.append(Entry(name, id, proj, pcs));
 	}
 }
 
+QList<PCS::Info> PCS::pcsList()
+{
+	QList<Info> list;
+
+	for (int i = 0; i < _pcss.size(); i++)
+		list.append(Info(_pcss.at(i).id(), _pcss.at(i).name()));
+
+	return list;
+}
+
 #ifndef QT_NO_DEBUG
 QDebug operator<<(QDebug dbg, const PCS &pcs)
 {

src/map/pcs.h

@@ -11,6 +11,20 @@
 class PCS
 {
 public:
+	class Info {
+	public:
+		Info(int id, const QString &name) : _id(id), _name(name) {}
+
+		int id() const {return _id;}
+		const QString &name() const {return _name;}
+
+		bool operator<(const Info &other) const {return _id < other._id;}
+
+	private:
+		int _id;
+		QString _name;
+	};
+
 	PCS() : _gcs(0) {}
 	PCS(const GCS *gcs, const Projection::Method &method,
 	  const Projection::Setup &setup, const LinearUnits &units,
@@ -34,11 +48,12 @@ public:
 	static void loadList(const QString &path);
 	static const PCS *pcs(int id);
 	static const PCS *pcs(const GCS *gcs, int proj);
+	static QList<Info> pcsList();
 
 private:
 	class Entry;
 
-	static QList<PCS::Entry> defaults();
+	static QList<Entry> defaults();
 
 	const GCS *_gcs;
 	Projection::Method _method;