From 340774d8f66f1cf359bfe01257bc26e8e64eb020 Mon Sep 17 00:00:00 2001 From: Robert Altner Date: Tue, 3 May 2022 15:49:25 +0200 Subject: [PATCH] minor refactor --- .gitignore | 6 +++++ .gitmodules | 3 +++ CMakeLists.txt | 26 +++------------------ include/osmobject.hpp | 40 -------------------------------- src/CMakeLists.txt | 14 +++++++++++ src/osmimember.cpp | 4 ++-- {include => src}/osmimember.hpp | 14 +++++------ src/osmnode.cpp | 2 +- {include => src}/osmnode.hpp | 6 ++--- src/osmobject.cpp | 8 +++---- src/osmobject.hpp | 40 ++++++++++++++++++++++++++++++++ {include => src}/osmp.hpp | 0 src/osmrelation.cpp | 10 ++++---- {include => src}/osmrelation.hpp | 6 ++--- {include => src}/osmtag.hpp | 0 src/osmway.cpp | 7 +++--- {include => src}/osmway.hpp | 12 +++++----- src/util.cpp | 2 +- {include => src}/util.hpp | 0 vendor/tinyxml2 | 1 + 20 files changed, 103 insertions(+), 98 deletions(-) create mode 100644 .gitignore create mode 100644 .gitmodules delete mode 100644 include/osmobject.hpp create mode 100644 src/CMakeLists.txt rename {include => src}/osmimember.hpp (65%) rename {include => src}/osmnode.hpp (87%) create mode 100644 src/osmobject.hpp rename {include => src}/osmp.hpp (100%) rename {include => src}/osmrelation.hpp (94%) rename {include => src}/osmtag.hpp (100%) rename {include => src}/osmway.hpp (71%) rename {include => src}/util.hpp (100%) create mode 160000 vendor/tinyxml2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f389bb1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +[Oo]ut/ +[Bb]uild/ + +.vs/ + +*.json \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d4d5a97 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/tinyxml2"] + path = vendor/tinyxml2 + url = git@github.com:leethomason/tinyxml2.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e8bf4ac..c1c674a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,6 @@ cmake_minimum_required(VERSION 3.10) -find_package(tinyxml2 CONFIG REQUIRED) +project(osmparser) -file(GLOB_RECURSE CPP_FILES - "src/*.cpp" -) - -file(GLOB_RECURSE HPP_FILES - "include/*.hpp" -) - -get_target_property(TINYXML2_INCLUDE_DIR tinyxml2::tinyxml2 INTERFACE_INCLUDE_DIRECTORIES) - -add_library(osmp STATIC - ${CPP_FILES} -) - -target_include_directories(osmp PUBLIC - include - ${TINYXML2_INCLUDE_DIR} -) - -target_link_libraries(osmp PRIVATE - tinyxml2::tinyxml2 -) \ No newline at end of file +add_subdirectory("vendor/tinyxml2") +add_subdirectory("src") \ No newline at end of file diff --git a/include/osmobject.hpp b/include/osmobject.hpp deleted file mode 100644 index 7cb02c6..0000000 --- a/include/osmobject.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once -#include -#include -#include -#include - -#include - -namespace osmp -{ - class Object - { - public: - explicit Object(const std::string& file); - ~Object(); - - [[nodiscard]] Nodes GetNodes() const; - [[nodiscard]] size_t GetNodesSize() const; - [[nodiscard]] Node GetNode(uint64_t id) const; - - [[nodiscard]] Ways GetWays() const; - [[nodiscard]] size_t GetWaysSize() const; - [[nodiscard]] Way GetWay(uint64_t id) const; - - [[nodiscard]] Relations GetRelations() const; - [[nodiscard]] size_t GetRelationsSize() const; - [[nodiscard]] Relation GetRelation(uint64_t id) const; - - public: - const std::string version; - const std::string generator; - - Bounds bounds; - - private: - std::map nodes; - std::map ways; - std::map relations; - }; -} \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..47cc86f --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 3.10) + +add_library(osmparser STATIC + "osmimember.cpp" + "osmnode.cpp" + "osmobject.cpp" + "osmrelation.cpp" + "osmway.cpp" + "util.cpp" +) + +target_link_libraries(osmparser PUBLIC + tinyxml2 +) \ No newline at end of file diff --git a/src/osmimember.cpp b/src/osmimember.cpp index e038607..61a9fdb 100644 --- a/src/osmimember.cpp +++ b/src/osmimember.cpp @@ -1,6 +1,6 @@ -#include +#include "osmimember.hpp" -#include +#include "osmobject.hpp" #include namespace xml = tinyxml2; diff --git a/include/osmimember.hpp b/src/osmimember.hpp similarity index 65% rename from include/osmimember.hpp rename to src/osmimember.hpp index b9846d9..4debe84 100644 --- a/include/osmimember.hpp +++ b/src/osmimember.hpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include "util.hpp" +#include "osmtag.hpp" namespace osmp { @@ -22,12 +22,12 @@ namespace osmp IMember(const IMember& other) = delete; virtual ~IMember() {} - [[nodiscard]] IMember::Type GetType() const; + IMember::Type GetType() const; - [[nodiscard]] const TagList& GetTags() const; - [[nodiscard]] size_t GetTagsSize() const; - [[nodiscard]] const Tag& GetTag(size_t index) const; - [[nodiscard]] std::string GetTag(const std::string& key) const; + const TagList& GetTags() const; + size_t GetTagsSize() const; + const Tag& GetTag(size_t index) const; + std::string GetTag(const std::string& key) const; protected: IMember(const tinyxml2::XMLElement* element, Object* parent, IMember::Type type); diff --git a/src/osmnode.cpp b/src/osmnode.cpp index 3770645..b2a778d 100644 --- a/src/osmnode.cpp +++ b/src/osmnode.cpp @@ -1,4 +1,4 @@ -#include +#include "osmnode.hpp" #include diff --git a/include/osmnode.hpp b/src/osmnode.hpp similarity index 87% rename from include/osmnode.hpp rename to src/osmnode.hpp index 6e31ee2..4198afa 100644 --- a/include/osmnode.hpp +++ b/src/osmnode.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include -#include -#include +#include "util.hpp" +#include "osmimember.hpp" +#include "osmtag.hpp" namespace osmp { diff --git a/src/osmobject.cpp b/src/osmobject.cpp index 45e0db8..205dd86 100644 --- a/src/osmobject.cpp +++ b/src/osmobject.cpp @@ -1,13 +1,13 @@ -#include +#include "osmobject.hpp" #include #include #include -#include -#include -#include +#include "osmnode.hpp" +#include "osmway.hpp" +#include "osmrelation.hpp" namespace xml = tinyxml2; diff --git a/src/osmobject.hpp b/src/osmobject.hpp new file mode 100644 index 0000000..3f9bea9 --- /dev/null +++ b/src/osmobject.hpp @@ -0,0 +1,40 @@ +#pragma once +#include +#include +#include +#include + +#include "util.hpp" + +namespace osmp +{ + class Object + { + public: + explicit Object(const std::string& file); + ~Object(); + + Nodes GetNodes() const; + size_t GetNodesSize() const; + Node GetNode(uint64_t id) const; + + Ways GetWays() const; + size_t GetWaysSize() const; + Way GetWay(uint64_t id) const; + + Relations GetRelations() const; + size_t GetRelationsSize() const; + Relation GetRelation(uint64_t id) const; + + public: + const std::string version; + const std::string generator; + + Bounds bounds; + + private: + std::map nodes; + std::map ways; + std::map relations; + }; +} \ No newline at end of file diff --git a/include/osmp.hpp b/src/osmp.hpp similarity index 100% rename from include/osmp.hpp rename to src/osmp.hpp diff --git a/src/osmrelation.cpp b/src/osmrelation.cpp index 0e8f7c0..52732d9 100644 --- a/src/osmrelation.cpp +++ b/src/osmrelation.cpp @@ -1,12 +1,12 @@ -#include "..\include\osmrelation.hpp" -#include +#include "osmrelation.hpp" #include #include -#include -#include -#include + +#include "osmobject.hpp" +#include "osmnode.hpp" +#include "osmway.hpp" namespace xml = tinyxml2; diff --git a/include/osmrelation.hpp b/src/osmrelation.hpp similarity index 94% rename from include/osmrelation.hpp rename to src/osmrelation.hpp index e270a31..c5b931e 100644 --- a/include/osmrelation.hpp +++ b/src/osmrelation.hpp @@ -2,9 +2,9 @@ #include #include -#include -#include -#include +#include "util.hpp" +#include "osmtag.hpp" +#include "osmimember.hpp" namespace osmp { diff --git a/include/osmtag.hpp b/src/osmtag.hpp similarity index 100% rename from include/osmtag.hpp rename to src/osmtag.hpp diff --git a/src/osmway.cpp b/src/osmway.cpp index 0325966..43cb3e9 100644 --- a/src/osmway.cpp +++ b/src/osmway.cpp @@ -1,10 +1,11 @@ -#include +#include "osmway.hpp" #include #include -#include -#include + +#include "osmobject.hpp" +#include "osmtag.hpp" namespace xml = tinyxml2; diff --git a/include/osmway.hpp b/src/osmway.hpp similarity index 71% rename from include/osmway.hpp rename to src/osmway.hpp index 66110f5..c6b0776 100644 --- a/include/osmway.hpp +++ b/src/osmway.hpp @@ -2,9 +2,9 @@ #include #include -#include -#include -#include +#include "util.hpp" +#include "osmtag.hpp" +#include "osmimember.hpp" namespace osmp { @@ -19,9 +19,9 @@ namespace osmp friend Way CreateWay(const tinyxml2::XMLElement* way_elem, Object* parent); - [[nodiscard]] const Nodes& GetNodes() const; - [[nodiscard]] size_t GetNodesSize() const; - [[nodiscard]] Node GetNode(size_t index) const; + const Nodes& GetNodes() const; + size_t GetNodesSize() const; + Node GetNode(size_t index) const; protected: IWay(const tinyxml2::XMLElement* way_elem, Object* parent); diff --git a/src/util.cpp b/src/util.cpp index 8490796..2209a79 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,4 +1,4 @@ -#include +#include "util.hpp" #include #include diff --git a/include/util.hpp b/src/util.hpp similarity index 100% rename from include/util.hpp rename to src/util.hpp diff --git a/vendor/tinyxml2 b/vendor/tinyxml2 new file mode 160000 index 0000000..e45d9d1 --- /dev/null +++ b/vendor/tinyxml2 @@ -0,0 +1 @@ +Subproject commit e45d9d16d430a3f5d3eee9fe40d5e194e1e5e63a