lauchmelder/MapViewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

プログレス。。。

Browse source
This commit is contained in:
Robert 2021-04-17 03:15:07 +02:00
parent 19a188e059
commit fe87e22b16
14 changed files with 271 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/osmparser/include/osmimember.hpp
View file

@ -40,7 +40,7 @@ namespace osmp
// std::map<std::string, std::string> tags;
public:
unsigned int id;
uint64_t id;
std::string user;
unsigned int uid;
bool visible;

2
lib/osmparser/include/osmnode.hpp
View file

@ -15,6 +15,6 @@ namespace osmp
Node(const tinyxml2::XMLElement* xml, Object* parent);
public:
float lat, lon;
double lat, lon;
};
}

12
lib/osmparser/include/osmobject.hpp
View file

@ -20,15 +20,15 @@ namespace osmp
std::vector<std::shared_ptr<Node>> GetNodes() const;
size_t GetNodesSize() const;
std::shared_ptr<Node> GetNode(unsigned int id) const;
std::shared_ptr<Node> GetNode(uint64_t id) const;
std::vector<std::shared_ptr<Way>> GetWays() const;
size_t GetWaysSize() const;
std::shared_ptr<Way> GetWay(unsigned int id) const;
std::shared_ptr<Way> GetWay(uint64_t id) const;
std::vector<std::shared_ptr<Relation>> GetRelations() const;
size_t GetRelationsSize() const;
std::shared_ptr<Relation> GetRelation(unsigned int id) const;
std::shared_ptr<Relation> GetRelation(uint64_t id) const;
public:
const std::string version;
@ -37,8 +37,8 @@ namespace osmp
Bounds bounds;
private:
std::map<unsigned int, std::shared_ptr<Node>> nodes;
std::map<unsigned int, std::shared_ptr<Way>> ways;
std::map<unsigned int, std::shared_ptr<Relation>> relations;
std::map<uint64_t, std::shared_ptr<Node>> nodes;
std::map<uint64_t, std::shared_ptr<Way>> ways;
std::map<uint64_t, std::shared_ptr<Relation>> relations;
};
}

6
lib/osmparser/include/util.hpp
View file

@ -11,11 +11,11 @@ namespace osmp
{
typedef struct sBounds
{
float minlat, minlon, maxlat, maxlon;
double minlat, minlon, maxlat, maxlon;
} Bounds;
std::string GetSafeAttributeString(const tinyxml2::XMLElement* elem, const std::string& name);
float GetSafeAttributeFloat(const tinyxml2::XMLElement* elem, const std::string& name);
unsigned int GetSafeAttributeUint(const tinyxml2::XMLElement* elem, const std::string& name);
double GetSafeAttributeFloat(const tinyxml2::XMLElement* elem, const std::string& name);
uint64_t GetSafeAttributeUint64(const tinyxml2::XMLElement* elem, const std::string& name);
bool GetSafeAttributeBool(const tinyxml2::XMLElement* elem, const std::string& name);
}