From b6b64065fb45ba307473ce78099ee4c1d3adf8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 17 Jul 2024 01:57:10 +0200 Subject: [PATCH] Prefer the map DEM for track/waypoints elevation if present --- gpxsee.pro | 12 ++++++------ src/GUI/app.cpp | 4 ++-- src/GUI/cadencegraph.cpp | 3 ++- src/GUI/cadencegraph.h | 2 +- src/GUI/elevationgraph.cpp | 6 +++--- src/GUI/elevationgraph.h | 2 +- src/GUI/gearratiograph.cpp | 3 ++- src/GUI/gearratiograph.h | 2 +- src/GUI/graphtab.h | 3 ++- src/GUI/gui.cpp | 6 +++--- src/GUI/heartrategraph.cpp | 3 ++- src/GUI/heartrategraph.h | 2 +- src/GUI/powergraph.cpp | 3 ++- src/GUI/powergraph.h | 2 +- src/GUI/speedgraph.cpp | 3 ++- src/GUI/speedgraph.h | 2 +- src/GUI/temperaturegraph.cpp | 3 ++- src/GUI/temperaturegraph.h | 2 +- src/GUI/waypointitem.cpp | 10 ++++++++-- src/GUI/waypointitem.h | 4 +++- src/data/route.cpp | 16 +++++++--------- src/data/route.h | 6 ++++-- src/data/track.cpp | 16 +++++++--------- src/data/track.h | 5 +++-- src/data/waypoint.cpp | 14 +++++--------- src/data/waypoint.h | 4 +++- src/map/IMG/rastertile.cpp | 2 +- src/{common => map}/dem.cpp | 2 +- src/{common => map}/dem.h | 0 src/{common => map}/demloader.cpp | 0 src/{common => map}/demloader.h | 0 src/{common => map}/downloader.cpp | 0 src/{common => map}/downloader.h | 0 src/map/map.cpp | 2 +- src/map/mapsforge/rastertile.cpp | 2 +- src/map/mapsource.h | 2 +- src/map/onlinemap.cpp | 2 +- src/map/tileloader.h | 2 +- src/map/wms.h | 2 +- src/map/wmts.h | 2 +- 40 files changed, 84 insertions(+), 72 deletions(-) rename src/{common => map}/dem.cpp (99%) rename src/{common => map}/dem.h (100%) rename src/{common => map}/demloader.cpp (100%) rename src/{common => map}/demloader.h (100%) rename src/{common => map}/downloader.cpp (100%) rename src/{common => map}/downloader.h (100%) diff --git a/gpxsee.pro b/gpxsee.pro index d593b996..9714b33c 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -39,12 +39,9 @@ HEADERS += src/common/config.h \ src/common/greatcircle.h \ src/common/programpaths.h \ src/common/tifffile.h \ - src/common/downloader.h \ src/common/polygon.h \ src/common/color.h \ src/common/csv.h \ - src/common/dem.h \ - src/common/demloader.h \ src/GUI/crosshairitem.h \ src/GUI/motioninfoitem.h \ src/GUI/pluginparameters.h \ @@ -122,6 +119,8 @@ HEADERS += src/common/config.h \ src/data/gpsdumpparser.h \ src/data/style.h \ src/data/twonavparser.h \ + src/map/downloader.h \ + src/map/demloader.h \ src/map/ENC/attributes.h \ src/map/ENC/mapdata.h \ src/map/ENC/atlasdata.h \ @@ -196,6 +195,7 @@ HEADERS += src/common/config.h \ src/map/sqlitemap.h \ src/map/utm.h \ src/map/map.h \ + src/map/dem.h \ src/map/maplist.h \ src/map/onlinemap.h \ src/map/tile.h \ @@ -281,10 +281,7 @@ SOURCES += src/main.cpp \ src/common/greatcircle.cpp \ src/common/programpaths.cpp \ src/common/tifffile.cpp \ - src/common/downloader.cpp \ src/common/csv.cpp \ - src/common/dem.cpp \ - src/common/demloader.cpp \ src/GUI/crosshairitem.cpp \ src/GUI/motioninfoitem.cpp \ src/GUI/pluginparameters.cpp \ @@ -347,6 +344,8 @@ SOURCES += src/main.cpp \ src/GUI/pngexportdialog.cpp \ src/GUI/projectioncombobox.cpp \ src/GUI/passwordedit.cpp \ + src/map/downloader.cpp \ + src/map/demloader.cpp \ src/map/ENC/atlasdata.cpp \ src/map/ENC/mapdata.cpp \ src/map/ENC/rastertile.cpp \ @@ -436,6 +435,7 @@ SOURCES += src/main.cpp \ src/map/geocentric.cpp \ src/map/jnxmap.cpp \ src/map/map.cpp \ + src/map/dem.cpp \ src/map/geotiffmap.cpp \ src/map/image.cpp \ src/map/mbtilesmap.cpp \ diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp index 502fb777..90463471 100644 --- a/src/GUI/app.cpp +++ b/src/GUI/app.cpp @@ -13,8 +13,8 @@ #endif // Q_OS_ANDROID #include "common/programpaths.h" #include "common/config.h" -#include "common/downloader.h" -#include "common/dem.h" +#include "map/downloader.h" +#include "map/dem.h" #include "map/ellipsoid.h" #include "map/gcs.h" #include "map/conversion.h" diff --git a/src/GUI/cadencegraph.cpp b/src/GUI/cadencegraph.cpp index e754f0de..fdc69cf6 100644 --- a/src/GUI/cadencegraph.cpp +++ b/src/GUI/cadencegraph.cpp @@ -39,8 +39,9 @@ void CadenceGraph::setInfo() clearInfo(); } -QList CadenceGraph::loadData(const Data &data) +QList CadenceGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/cadencegraph.h b/src/GUI/cadencegraph.h index 5a1b9854..cfc55536 100644 --- a/src/GUI/cadencegraph.h +++ b/src/GUI/cadencegraph.h @@ -14,7 +14,7 @@ public: ~CadenceGraph(); QString label() const {return tr("Cadence");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void showTracks(bool show); diff --git a/src/GUI/elevationgraph.cpp b/src/GUI/elevationgraph.cpp index 46d6ebf6..2eeb8316 100644 --- a/src/GUI/elevationgraph.cpp +++ b/src/GUI/elevationgraph.cpp @@ -118,14 +118,14 @@ GraphItem *ElevationGraph::loadGraph(const Graph &graph, PathType type, return gi; } -QList ElevationGraph::loadData(const Data &data) +QList ElevationGraph::loadData(const Data &data, Map *map) { QList graphs; GraphItem *primary, *secondary; for (int i = 0; i < data.tracks().count(); i++) { QColor color(_palette.nextColor()); - const GraphPair &gp = data.tracks().at(i).elevation(); + const GraphPair &gp = data.tracks().at(i).elevation(map); primary = loadGraph(gp.primary(), TrackPath, color, true); secondary = primary @@ -137,7 +137,7 @@ QList ElevationGraph::loadData(const Data &data) } for (int i = 0; i < data.routes().count(); i++) { QColor color(_palette.nextColor()); - const GraphPair &gp = data.routes().at(i).elevation(); + const GraphPair &gp = data.routes().at(i).elevation(map); primary = loadGraph(gp.primary(), RoutePath, color, true); secondary = primary diff --git a/src/GUI/elevationgraph.h b/src/GUI/elevationgraph.h index 46fe090e..f4e7253d 100644 --- a/src/GUI/elevationgraph.h +++ b/src/GUI/elevationgraph.h @@ -14,7 +14,7 @@ public: ~ElevationGraph(); QString label() const {return tr("Elevation");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void setUnits(enum Units units); void showTracks(bool show); diff --git a/src/GUI/gearratiograph.cpp b/src/GUI/gearratiograph.cpp index 62e0ba1a..4e731ebd 100644 --- a/src/GUI/gearratiograph.cpp +++ b/src/GUI/gearratiograph.cpp @@ -43,8 +43,9 @@ void GearRatioGraph::setInfo() clearInfo(); } -QList GearRatioGraph::loadData(const Data &data) +QList GearRatioGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/gearratiograph.h b/src/GUI/gearratiograph.h index 94ac340e..6b79bd75 100644 --- a/src/GUI/gearratiograph.h +++ b/src/GUI/gearratiograph.h @@ -15,7 +15,7 @@ public: ~GearRatioGraph(); QString label() const {return tr("Gear ratio");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void showTracks(bool show); diff --git a/src/GUI/graphtab.h b/src/GUI/graphtab.h index 422e3372..eaecc881 100644 --- a/src/GUI/graphtab.h +++ b/src/GUI/graphtab.h @@ -7,6 +7,7 @@ #include "units.h" #include "timetype.h" +class Map; class Data; class GraphItem; @@ -24,7 +25,7 @@ public: virtual ~GraphTab() {} virtual QString label() const = 0; - virtual QList loadData(const Data &data) = 0; + virtual QList loadData(const Data &data, Map *map) = 0; virtual void clear() {GraphView::clear();} virtual void setUnits(enum Units units) {GraphView::setUnits(units);} virtual void setGraphType(GraphType type) {GraphView::setGraphType(type);} diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index c5388393..1208cded 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -29,10 +29,10 @@ #include #include "common/config.h" #include "common/programpaths.h" -#include "common/downloader.h" -#include "common/demloader.h" #include "data/data.h" #include "data/poi.h" +#include "map/downloader.h" +#include "map/demloader.h" #include "map/maplist.h" #include "map/emptymap.h" #include "map/crs.h" @@ -1145,7 +1145,7 @@ void GUI::loadData(const Data &data) _pathName = QString(); for (int i = 0; i < _tabs.count(); i++) - graphs.append(_tabs.at(i)->loadData(data)); + graphs.append(_tabs.at(i)->loadData(data, _map)); if (updateGraphTabs()) _splitter->refresh(); paths = _mapView->loadData(data); diff --git a/src/GUI/heartrategraph.cpp b/src/GUI/heartrategraph.cpp index 7e23602e..dd7af091 100644 --- a/src/GUI/heartrategraph.cpp +++ b/src/GUI/heartrategraph.cpp @@ -39,8 +39,9 @@ void HeartRateGraph::setInfo() clearInfo(); } -QList HeartRateGraph::loadData(const Data &data) +QList HeartRateGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/heartrategraph.h b/src/GUI/heartrategraph.h index d0b6c0f3..60825925 100644 --- a/src/GUI/heartrategraph.h +++ b/src/GUI/heartrategraph.h @@ -14,7 +14,7 @@ public: ~HeartRateGraph(); QString label() const {return tr("Heart rate");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void showTracks(bool show); diff --git a/src/GUI/powergraph.cpp b/src/GUI/powergraph.cpp index b48b9cc7..5436449a 100644 --- a/src/GUI/powergraph.cpp +++ b/src/GUI/powergraph.cpp @@ -39,8 +39,9 @@ void PowerGraph::setInfo() clearInfo(); } -QList PowerGraph::loadData(const Data &data) +QList PowerGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/powergraph.h b/src/GUI/powergraph.h index 89476685..29d7512a 100644 --- a/src/GUI/powergraph.h +++ b/src/GUI/powergraph.h @@ -14,7 +14,7 @@ public: ~PowerGraph(); QString label() const {return tr("Power");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void showTracks(bool show); diff --git a/src/GUI/speedgraph.cpp b/src/GUI/speedgraph.cpp index 6ca708ec..8d26073c 100644 --- a/src/GUI/speedgraph.cpp +++ b/src/GUI/speedgraph.cpp @@ -69,8 +69,9 @@ GraphItem *SpeedGraph::loadGraph(const Graph &graph, const Track &track, return gi; } -QList SpeedGraph::loadData(const Data &data) +QList SpeedGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/speedgraph.h b/src/GUI/speedgraph.h index 8bcaccc2..f44b7b4a 100644 --- a/src/GUI/speedgraph.h +++ b/src/GUI/speedgraph.h @@ -16,7 +16,7 @@ public: ~SpeedGraph(); QString label() const {return tr("Speed");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void setUnits(Units units); void setTimeType(TimeType type); diff --git a/src/GUI/temperaturegraph.cpp b/src/GUI/temperaturegraph.cpp index 97ec630f..da4fe6c2 100644 --- a/src/GUI/temperaturegraph.cpp +++ b/src/GUI/temperaturegraph.cpp @@ -43,8 +43,9 @@ void TemperatureGraph::setInfo() clearInfo(); } -QList TemperatureGraph::loadData(const Data &data) +QList TemperatureGraph::loadData(const Data &data, Map *map) { + Q_UNUSED(map); QList graphs; for (int i = 0; i < data.tracks().count(); i++) { diff --git a/src/GUI/temperaturegraph.h b/src/GUI/temperaturegraph.h index f93eed79..6e3dc0c6 100644 --- a/src/GUI/temperaturegraph.h +++ b/src/GUI/temperaturegraph.h @@ -14,7 +14,7 @@ public: ~TemperatureGraph(); QString label() const {return tr("Temperature");} - QList loadData(const Data &data); + QList loadData(const Data &data, Map *map); void clear(); void setUnits(enum Units units); void showTracks(bool show); diff --git a/src/GUI/waypointitem.cpp b/src/GUI/waypointitem.cpp index aa2183a7..479747f4 100644 --- a/src/GUI/waypointitem.cpp +++ b/src/GUI/waypointitem.cpp @@ -25,7 +25,7 @@ ToolTip WaypointItem::info() const tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name()); tt.insert(qApp->translate("WaypointItem", "Coordinates"), Format::coordinates(_waypoint.coordinates(), _format)); - QPair elevations(_waypoint.elevations()); + QPair elevations(_waypoint.elevations(_map)); if (!std::isnan(elevations.first)) { QString val = Format::elevation(elevations.first, _units); if (!std::isnan(elevations.second)) @@ -71,7 +71,7 @@ ToolTip WaypointItem::info() const } WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map, - QGraphicsItem *parent) : GraphicsItem(parent) + QGraphicsItem *parent) : GraphicsItem(parent), _map(map) { _waypoint = waypoint; _showLabel = false; @@ -93,6 +93,12 @@ WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map, setAcceptHoverEvents(true); } +void WaypointItem::setMap(Map *map) +{ + _map = map; + setPos(map->ll2xy(_waypoint.coordinates())); +} + void WaypointItem::updateCache() { QPainterPath p; diff --git a/src/GUI/waypointitem.h b/src/GUI/waypointitem.h index 95e3dc9f..186c43c5 100644 --- a/src/GUI/waypointitem.h +++ b/src/GUI/waypointitem.h @@ -17,7 +17,7 @@ public: const Waypoint &waypoint() const {return _waypoint;} - void setMap(Map *map) {setPos(map->ll2xy(_waypoint.coordinates()));} + void setMap(Map *map); void setSize(int size); void setColor(const QColor &color); void showLabel(bool show); @@ -51,6 +51,8 @@ private: Waypoint _waypoint; + Map *_map; + QColor _color; int _size; bool _showLabel; diff --git a/src/data/route.cpp b/src/data/route.cpp index 59a25386..5e680258 100644 --- a/src/data/route.cpp +++ b/src/data/route.cpp @@ -1,4 +1,4 @@ -#include "common/dem.h" +#include "map/map.h" #include "route.h" bool Route::_useDEM = false; @@ -49,19 +49,17 @@ Graph Route::gpsElevation() const return graph; } -Graph Route::demElevation() const +Graph Route::demElevation(Map *map) const { Graph graph; QDateTime date; GraphSegment gs(date); - DEM::lock(); for (int i = 0; i < _data.size(); i++) { - qreal dem = DEM::elevation(_data.at(i).coordinates()); + qreal dem = map->elevation(_data.at(i).coordinates()); if (!std::isnan(dem)) gs.append(GraphPoint(_distance.at(i), NAN, dem)); } - DEM::unlock(); if (gs.size() >= 2) graph.append(gs); @@ -72,18 +70,18 @@ Graph Route::demElevation() const return graph; } -GraphPair Route::elevation() const +GraphPair Route::elevation(Map *map) const { if (_useDEM) { - Graph dem(demElevation()); + Graph dem(demElevation(map)); return (dem.isEmpty()) ? GraphPair(gpsElevation(), Graph()) : GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph()); } else { Graph gps(gpsElevation()); return (gps.isEmpty()) - ? GraphPair(demElevation(), Graph()) - : GraphPair(gps, _show2ndElevation ? demElevation() : Graph()); + ? GraphPair(demElevation(map), Graph()) + : GraphPair(gps, _show2ndElevation ? demElevation(map) : Graph()); } } diff --git a/src/data/route.h b/src/data/route.h index 1b88969f..e330a5f3 100644 --- a/src/data/route.h +++ b/src/data/route.h @@ -6,6 +6,8 @@ #include "graph.h" #include "path.h" +class Map; + class Route { public: @@ -13,7 +15,7 @@ public: const RouteData &data() const {return _data;} Path path() const; - GraphPair elevation() const; + GraphPair elevation(Map *map) const; qreal distance() const; const QString &name() const {return _data.name();} @@ -30,7 +32,7 @@ public: private: Graph gpsElevation() const; - Graph demElevation() const; + Graph demElevation(Map *map) const; RouteData _data; QVector _distance; diff --git a/src/data/track.cpp b/src/data/track.cpp index 42833d2c..e42c8b86 100644 --- a/src/data/track.cpp +++ b/src/data/track.cpp @@ -1,4 +1,4 @@ -#include "common/dem.h" +#include "map/map.h" #include "track.h" @@ -277,11 +277,10 @@ Graph Track::gpsElevation() const return ret; } -Graph Track::demElevation() const +Graph Track::demElevation(Map *map) const { Graph ret; - DEM::lock(); for (int i = 0; i < _data.size(); i++) { const SegmentData &sd = _data.at(i); if (sd.size() < 2) @@ -290,7 +289,7 @@ Graph Track::demElevation() const GraphSegment gs(seg.start); for (int j = 0; j < sd.size(); j++) { - qreal dem = DEM::elevation(sd.at(j).coordinates()); + qreal dem = map->elevation(sd.at(j).coordinates()); if (std::isnan(dem) || seg.outliers.contains(j)) continue; gs.append(GraphPoint(seg.distance.at(j), seg.time.at(j), dem)); @@ -299,7 +298,6 @@ Graph Track::demElevation() const if (gs.size() >= 2) ret.append(filter(gs, _elevationWindow)); } - DEM::unlock(); if (_data.style().color().isValid()) ret.setColor(_data.style().color()); @@ -307,18 +305,18 @@ Graph Track::demElevation() const return ret; } -GraphPair Track::elevation() const +GraphPair Track::elevation(Map *map) const { if (_useDEM) { - Graph dem(demElevation()); + Graph dem(demElevation(map)); return (dem.isEmpty()) ? GraphPair(gpsElevation(), Graph()) : GraphPair(dem, _show2ndElevation ? gpsElevation() : Graph()); } else { Graph gps(gpsElevation()); return (gps.isEmpty()) - ? GraphPair(demElevation(), Graph()) - : GraphPair(gps, _show2ndElevation ? demElevation() : Graph()); + ? GraphPair(demElevation(map), Graph()) + : GraphPair(gps, _show2ndElevation ? demElevation(map) : Graph()); } } diff --git a/src/data/track.h b/src/data/track.h index f54991b9..4beaeae2 100644 --- a/src/data/track.h +++ b/src/data/track.h @@ -9,6 +9,7 @@ #include "graph.h" #include "path.h" +class Map; class Track { @@ -17,7 +18,7 @@ public: Path path() const; - GraphPair elevation() const; + GraphPair elevation(Map *map) const; GraphPair speed() const; Graph heartRate() const; Graph temperature() const; @@ -68,7 +69,7 @@ private: qreal lastTime(int seg); bool discardStopPoint(const Segment &seg, int i) const; - Graph demElevation() const; + Graph demElevation(Map *map) const; Graph gpsElevation() const; Graph reportedSpeed() const; Graph computedSpeed() const; diff --git a/src/data/waypoint.cpp b/src/data/waypoint.cpp index ab1875f0..f747f795 100644 --- a/src/data/waypoint.cpp +++ b/src/data/waypoint.cpp @@ -1,18 +1,16 @@ #include #include -#include "common/dem.h" +#include "map/map.h" #include "waypoint.h" bool Waypoint::_useDEM = false; bool Waypoint::_show2ndElevation = false; QHash Waypoint::_symbolIcons; -QPair Waypoint::elevations() const +QPair Waypoint::elevations(Map *map) const { if (_useDEM) { - DEM::lock(); - qreal dem = DEM::elevation(coordinates()); - DEM::unlock(); + qreal dem = map->elevation(coordinates()); if (!std::isnan(dem)) return QPair(dem, _show2ndElevation ? elevation() : NAN); @@ -20,12 +18,10 @@ QPair Waypoint::elevations() const return QPair(elevation(), NAN); } else { if (hasElevation()) { - DEM::lock(); - qreal dem = _show2ndElevation ? DEM::elevation(coordinates()) : NAN; - DEM::unlock(); + qreal dem = _show2ndElevation ? map->elevation(coordinates()) : NAN; return QPair(elevation(), dem); } else - return QPair(DEM::elevation(coordinates()), NAN); + return QPair(map->elevation(coordinates()), NAN); } } diff --git a/src/data/waypoint.h b/src/data/waypoint.h index 641add76..a46af7be 100644 --- a/src/data/waypoint.h +++ b/src/data/waypoint.h @@ -12,6 +12,8 @@ #include "link.h" #include "style.h" +class Map; + class Waypoint { public: @@ -33,7 +35,7 @@ public: qreal elevation() const {return _elevation;} const PointStyle &style() const {return _style;} - QPair elevations() const; + QPair elevations(Map *map) const; void setCoordinates(const Coordinates &coordinates) {_coordinates = coordinates;} diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp index 1b9e31b8..f07e8ceb 100644 --- a/src/map/IMG/rastertile.cpp +++ b/src/map/IMG/rastertile.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "common/dem.h" +#include "map/dem.h" #include "map/textpathitem.h" #include "map/textpointitem.h" #include "map/bitmapline.h" diff --git a/src/common/dem.cpp b/src/map/dem.cpp similarity index 99% rename from src/common/dem.cpp rename to src/map/dem.cpp index 7755a0b9..3c5abf56 100644 --- a/src/common/dem.cpp +++ b/src/map/dem.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "rectc.h" +#include "common/rectc.h" #include "dem.h" diff --git a/src/common/dem.h b/src/map/dem.h similarity index 100% rename from src/common/dem.h rename to src/map/dem.h diff --git a/src/common/demloader.cpp b/src/map/demloader.cpp similarity index 100% rename from src/common/demloader.cpp rename to src/map/demloader.cpp diff --git a/src/common/demloader.h b/src/map/demloader.h similarity index 100% rename from src/common/demloader.h rename to src/map/demloader.h diff --git a/src/common/downloader.cpp b/src/map/downloader.cpp similarity index 100% rename from src/common/downloader.cpp rename to src/map/downloader.cpp diff --git a/src/common/downloader.h b/src/map/downloader.h similarity index 100% rename from src/common/downloader.h rename to src/map/downloader.h diff --git a/src/map/map.cpp b/src/map/map.cpp index 065df662..1a3fcd2d 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -1,6 +1,6 @@ #include #include -#include "common/dem.h" +#include "dem.h" #include "map.h" diff --git a/src/map/mapsforge/rastertile.cpp b/src/map/mapsforge/rastertile.cpp index 02eb723f..12c1484e 100644 --- a/src/map/mapsforge/rastertile.cpp +++ b/src/map/mapsforge/rastertile.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "common/dem.h" +#include "map/dem.h" #include "map/rectd.h" #include "map/hillshading.h" #include "map/filter.h" diff --git a/src/map/mapsource.h b/src/map/mapsource.h index c9ad98a7..734606be 100644 --- a/src/map/mapsource.h +++ b/src/map/mapsource.h @@ -5,7 +5,7 @@ #include "common/range.h" #include "common/rectc.h" #include "common/kv.h" -#include "common/downloader.h" +#include "downloader.h" #include "coordinatesystem.h" class Map; diff --git a/src/map/onlinemap.cpp b/src/map/onlinemap.cpp index 3f8557e5..019f7a4f 100644 --- a/src/map/onlinemap.cpp +++ b/src/map/onlinemap.cpp @@ -3,7 +3,7 @@ #include #include "common/rectc.h" #include "common/programpaths.h" -#include "common/downloader.h" +#include "downloader.h" #include "osm.h" #include "onlinemap.h" diff --git a/src/map/tileloader.h b/src/map/tileloader.h index c384eefa..12fae419 100644 --- a/src/map/tileloader.h +++ b/src/map/tileloader.h @@ -3,7 +3,7 @@ #include #include -#include "common/downloader.h" +#include "downloader.h" #include "rectd.h" class TileLoader : public QObject diff --git a/src/map/wms.h b/src/map/wms.h index 3734909d..7954bdcb 100644 --- a/src/map/wms.h +++ b/src/map/wms.h @@ -6,7 +6,7 @@ #include "common/range.h" #include "common/rectc.h" #include "common/kv.h" -#include "common/downloader.h" +#include "downloader.h" #include "projection.h" #include "coordinatesystem.h" diff --git a/src/map/wmts.h b/src/map/wmts.h index 85597a5d..ccf73868 100644 --- a/src/map/wmts.h +++ b/src/map/wmts.h @@ -9,7 +9,7 @@ #include "common/hash.h" #include "common/rectc.h" #include "common/kv.h" -#include "common/downloader.h" +#include "downloader.h" #include "projection.h" #include "coordinatesystem.h"