summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-05 16:34:10 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-11-05 16:49:38 (GMT)
commit116108b7c33e6b5c500ce230bae1408b3104db63 (patch)
treec0b8c8db46fd7bca40736638f8fc170131a8934a
parentb574746e74eda52dd6c52da20d58cdb7702aa01f (diff)
Revert "Do not create additional placemarks when converting file formats"
This reverts remaining bits of commit 98d069f88f2da028d10e70ecf989c08d98a4e3ae.
-rw-r--r--src/lib/marble/geodata/data/GeoDataDocument.h3
-rw-r--r--src/plugins/runner/osm/OsmParser.h1
-rw-r--r--src/plugins/runner/osm/OsmWay.h1
-rw-r--r--tools/vectorosm-tilecreator/TileDirectory.cpp2
4 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataDocument.h b/src/lib/marble/geodata/data/GeoDataDocument.h
index 3229496..bfb890c 100644
--- a/src/lib/marble/geodata/data/GeoDataDocument.h
+++ b/src/lib/marble/geodata/data/GeoDataDocument.h
@@ -41,8 +41,7 @@ enum DocumentRole {
UserDocument,
TrackingDocument,
BookmarkDocument,
- SearchResultDocument,
- ConversionDocument
+ SearchResultDocument
};
diff --git a/src/plugins/runner/osm/OsmParser.h b/src/plugins/runner/osm/OsmParser.h
index adecf40..ea05fc1 100644
--- a/src/plugins/runner/osm/OsmParser.h
+++ b/src/plugins/runner/osm/OsmParser.h
@@ -17,7 +17,6 @@
#include "OsmNode.h"
#include "OsmWay.h"
#include "OsmRelation.h"
-#include <GeoDataDocument.h>
#include <QString>
diff --git a/src/plugins/runner/osm/OsmWay.h b/src/plugins/runner/osm/OsmWay.h
index 89f01ba..3a9efa0 100644
--- a/src/plugins/runner/osm/OsmWay.h
+++ b/src/plugins/runner/osm/OsmWay.h
@@ -14,7 +14,6 @@
#include "OsmNode.h"
#include <osm/OsmPlacemarkData.h>
#include <StyleBuilder.h>
-#include <GeoDataDocument.h>
#include <QSet>
#include <QString>
diff --git a/tools/vectorosm-tilecreator/TileDirectory.cpp b/tools/vectorosm-tilecreator/TileDirectory.cpp
index ff3ecf7..e37d519 100644
--- a/tools/vectorosm-tilecreator/TileDirectory.cpp
+++ b/tools/vectorosm-tilecreator/TileDirectory.cpp
@@ -144,7 +144,7 @@ QString TileDirectory::name() const
QSharedPointer<GeoDataDocument> TileDirectory::open(const QString &filename, ParsingRunnerManager &manager)
{
// Timeout is set to 10 min. If the file is reaaally huge, set it to something bigger.
- GeoDataDocument* map = manager.openFile(filename, DocumentRole::ConversionDocument, 600000);
+ GeoDataDocument* map = manager.openFile(filename, DocumentRole::MapDocument, 600000);
if(map == nullptr) {
qWarning() << "File" << filename << "couldn't be loaded.";
}