summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-11 06:15:50 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-11 06:15:50 (GMT)
commitb2e184c04e552739c5cf0249264dc25a6c643538 (patch)
tree42bffa850739f294468edc4c1a041fb73d2ffcc3
parentb3dce195aae05d0c1708ccb6c743728762384102 (diff)
Remove PlacemarkFilter class which serves no purpose
-rw-r--r--tools/vectorosm-tilecreator/CMakeLists.txt1
-rw-r--r--tools/vectorosm-tilecreator/NodeReducer.cpp2
-rw-r--r--tools/vectorosm-tilecreator/NodeReducer.h4
-rw-r--r--tools/vectorosm-tilecreator/PlacemarkFilter.cpp23
-rw-r--r--tools/vectorosm-tilecreator/PlacemarkFilter.h26
-rw-r--r--tools/vectorosm-tilecreator/TagsFilter.cpp4
-rw-r--r--tools/vectorosm-tilecreator/TagsFilter.h4
-rw-r--r--tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp2
-rw-r--r--tools/vectorosm-tilecreator/TinyPlanetProcessor.h4
-rw-r--r--tools/vectorosm-tilecreator/WayConcatenator.h2
10 files changed, 11 insertions, 61 deletions
diff --git a/tools/vectorosm-tilecreator/CMakeLists.txt b/tools/vectorosm-tilecreator/CMakeLists.txt
index dda6576..93e6ec4 100644
--- a/tools/vectorosm-tilecreator/CMakeLists.txt
+++ b/tools/vectorosm-tilecreator/CMakeLists.txt
@@ -26,7 +26,6 @@ set( ${TARGET}_SRC
main.cpp
BaseClipper.cpp
BaseFilter.cpp
-PlacemarkFilter.cpp
TinyPlanetProcessor.cpp
NodeReducer.cpp
TagsFilter.cpp
diff --git a/tools/vectorosm-tilecreator/NodeReducer.cpp b/tools/vectorosm-tilecreator/NodeReducer.cpp
index 09eb49f..09399ff 100644
--- a/tools/vectorosm-tilecreator/NodeReducer.cpp
+++ b/tools/vectorosm-tilecreator/NodeReducer.cpp
@@ -22,7 +22,7 @@
namespace Marble {
NodeReducer::NodeReducer(GeoDataDocument* document, int zoomLevel) :
- PlacemarkFilter(document),
+ BaseFilter(document),
m_resolution(resolutionForLevel(zoomLevel)),
m_removedNodes(0),
m_remainingNodes(0)
diff --git a/tools/vectorosm-tilecreator/NodeReducer.h b/tools/vectorosm-tilecreator/NodeReducer.h
index 9d22de2..a01b4be 100644
--- a/tools/vectorosm-tilecreator/NodeReducer.h
+++ b/tools/vectorosm-tilecreator/NodeReducer.h
@@ -11,13 +11,13 @@
#ifndef MARBLE_NODEREDUCER_H
#define MARBLE_NODEREDUCER_H
-#include "PlacemarkFilter.h"
+#include "BaseFilter.h"
#include "GeoDataLineString.h"
#include "MarbleMath.h"
namespace Marble {
-class NodeReducer : public PlacemarkFilter {
+class NodeReducer : public BaseFilter {
public:
NodeReducer(GeoDataDocument* document, int zoomLevel);
void process() override;
diff --git a/tools/vectorosm-tilecreator/PlacemarkFilter.cpp b/tools/vectorosm-tilecreator/PlacemarkFilter.cpp
deleted file mode 100644
index f44ec27..0000000
--- a/tools/vectorosm-tilecreator/PlacemarkFilter.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2016 David Kolozsvari <freedawson@gmail.com>
-//
-
-#include "PlacemarkFilter.h"
-
-#include "GeoDataPlacemark.h"
-
-namespace Marble {
-
-PlacemarkFilter::PlacemarkFilter(GeoDataDocument *document) :
- BaseFilter(document)
-{
- qDebug() << "Placemark count:" << placemarks().size();
-}
-
-}
diff --git a/tools/vectorosm-tilecreator/PlacemarkFilter.h b/tools/vectorosm-tilecreator/PlacemarkFilter.h
deleted file mode 100644
index 51f006c..0000000
--- a/tools/vectorosm-tilecreator/PlacemarkFilter.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// This file is part of the Marble Virtual Globe.
-//
-// This program is free software licensed under the GNU LGPL. You can
-// find a copy of this license in LICENSE.txt in the top directory of
-// the source code.
-//
-// Copyright 2016 David Kolozsvari <freedawson@gmail.com>
-//
-
-#ifndef PLACEMARKHANDLER_H
-#define PLACEMARKHANDLER_H
-
-#include "BaseFilter.h"
-
-namespace Marble {
-
-class PlacemarkFilter : public BaseFilter
-{
-public:
- explicit PlacemarkFilter(GeoDataDocument* document);
-};
-
-}
-
-#endif // PLACEMARKHANDLER_H
diff --git a/tools/vectorosm-tilecreator/TagsFilter.cpp b/tools/vectorosm-tilecreator/TagsFilter.cpp
index 09c7fcc..f536c4d 100644
--- a/tools/vectorosm-tilecreator/TagsFilter.cpp
+++ b/tools/vectorosm-tilecreator/TagsFilter.cpp
@@ -11,7 +11,7 @@
#include <QString>
#include <QStringList>
-#include "PlacemarkFilter.h"
+#include "BaseFilter.h"
#include "TagsFilter.h"
#include "GeoDataObject.h"
#include "GeoDataDocument.h"
@@ -21,7 +21,7 @@
namespace Marble {
TagsFilter::TagsFilter(GeoDataDocument *geoDocument, const QStringList &tagsList, bool andFlag )
- : PlacemarkFilter(geoDocument),
+ : BaseFilter(geoDocument),
m_accepted(new GeoDataDocument)
{
int total=0, tagCount=0;
diff --git a/tools/vectorosm-tilecreator/TagsFilter.h b/tools/vectorosm-tilecreator/TagsFilter.h
index a5ce3cc..a2f2701 100644
--- a/tools/vectorosm-tilecreator/TagsFilter.h
+++ b/tools/vectorosm-tilecreator/TagsFilter.h
@@ -12,7 +12,7 @@
#ifndef MARBLE_TAGSFILTER_H
#define MARBLE_TAGSFILTER_H
-#include "PlacemarkFilter.h"
+#include "BaseFilter.h"
#include <QMap>
#include <QString>
@@ -21,7 +21,7 @@ namespace Marble {
class GeoDataDocument;
-class TagsFilter : public PlacemarkFilter
+class TagsFilter : public BaseFilter
{
public:
//Filters placemarks which have tags in the hash
diff --git a/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp b/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
index 591d064..3f47715 100644
--- a/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
+++ b/tools/vectorosm-tilecreator/TinyPlanetProcessor.cpp
@@ -24,7 +24,7 @@
namespace Marble {
TinyPlanetProcessor::TinyPlanetProcessor(GeoDataDocument* document) :
- PlacemarkFilter(document)
+ BaseFilter(document)
{
}
diff --git a/tools/vectorosm-tilecreator/TinyPlanetProcessor.h b/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
index e204ab8..5f2bee9 100644
--- a/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
+++ b/tools/vectorosm-tilecreator/TinyPlanetProcessor.h
@@ -11,14 +11,14 @@
#ifndef TINYPLANETPROCESSOR_H
#define TINYPLANETPROCESSOR_H
-#include "PlacemarkFilter.h"
+#include "BaseFilter.h"
#include "OsmPlacemarkData.h"
#include <GeoDataLatLonBox.h>
namespace Marble {
-class TinyPlanetProcessor : public PlacemarkFilter
+class TinyPlanetProcessor : public BaseFilter
{
public:
explicit TinyPlanetProcessor(GeoDataDocument* document);
diff --git a/tools/vectorosm-tilecreator/WayConcatenator.h b/tools/vectorosm-tilecreator/WayConcatenator.h
index 5ca965d..a6cf069 100644
--- a/tools/vectorosm-tilecreator/WayConcatenator.h
+++ b/tools/vectorosm-tilecreator/WayConcatenator.h
@@ -11,7 +11,7 @@
#ifndef MARBLE_WAYCONCATENATOR_H
#define MARBLE_WAYCONCATENATOR_H
-#include "PlacemarkFilter.h"
+#include "BaseFilter.h"
#include "TagsFilter.h"
namespace Marble {