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

Refactored osmp

Browse source
This commit is contained in:
Robert 2021-04-18 17:34:00 +02:00
parent 87046f5d18
commit 569812c0a5
14 changed files with 171 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.cpp
View file

@ -44,14 +44,14 @@ int main(int argc, char** argv)
int windowWidth = windowHeight * aspectRatio;
// Fetch all the ways
std::vector<std::shared_ptr<osmp::Way>> ways = obj->GetWays();
osmp::Ways ways = obj->GetWays();
// Turn them into renderable ways by mapping the global coordinates to screen coordinates (do this smarter in the future pls)
std::vector<Area> buildings;
std::vector<Highway> highways;
for (std::shared_ptr<osmp::Way> way : ways)
for (osmp::Way way : ways)
{
const std::vector<std::shared_ptr<osmp::Node>>& nodes = way->GetNodes();
const osmp::Nodes& nodes = way->GetNodes();
std::string highwayVal = way->GetTag("highway");
std::string railwayVal = way->GetTag("railway");
if (way->area)
@ -119,9 +119,9 @@ int main(int argc, char** argv)
}
// Fetch all relations
std::vector<std::shared_ptr<osmp::Relation>> relations = obj->GetRelations();
osmp::Relations relations = obj->GetRelations();
std::vector<Multipolygon> multipolygons;
for (const std::shared_ptr<osmp::Relation>& relation : relations)
for (const osmp::Relation& relation : relations)
{
if (relation->GetRelationType() == "multipolygon" && !relation->HasNullMembers())
{
@ -174,9 +174,9 @@ int main(int argc, char** argv)
SDL_SetRenderDrawColor(renderer, 240, 240, 250, 255);
SDL_RenderClear(renderer);
for (Multipolygon& multipolygon : multipolygons) {
multipolygon.Draw(renderer);
}
// for (Multipolygon& multipolygon : multipolygons) {
// multipolygon.Draw(renderer);
// }
//for (Area& area : buildings)
//{

14
src/multipolygon.cpp
View file

@ -19,7 +19,7 @@ struct TriangulationData {
};
struct Ring {
std::vector<osmp::Relation::Member> members;
osmp::MemberWays ways;
int ring;
};
@ -33,14 +33,14 @@ inline double Map(double A, double B, double a, double b, double x)
bool SelfIntersecting(const Ring & ring)
{
struct Segment {
std::shared_ptr<osmp::Node> p1, p2;
osmp::Node p1, p2;
};
// Get all segments
std::vector<Segment> segments;
for (const osmp::Relation::Member member : ring.members)
for (const osmp::MemberWay way : ring.ways)
{
std::vector<std::shared_ptr<osmp::Node>> nodes = std::dynamic_pointer_cast<osmp::Way>(member.member)->GetNodes();
osmp::Nodes nodes = way.way->GetNodes();
for (auto it = nodes.begin(); it != nodes.end() - 1; it++)
{
segments.push_back({
@ -78,13 +78,13 @@ bool SelfIntersecting(const Ring & ring)
return false;
}
Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int width, int height, osmp::Bounds bounds) :
Multipolygon::Multipolygon(const osmp::Relation& relation, int width, int height, const osmp::Bounds& bounds) :
r(255), g(0), b(255), visible(true), rendering(RenderType::FILL), id(relation->id)
{
if (relation->HasNullMembers())
return;
const std::vector<osmp::Relation::Member>& members = relation->GetWays();
const osmp::MemberWays& members = relation->GetWays();
// Implement https://wiki.openstreetmap.org/wiki/Relation:multipolygon/Algorithm
// Ring assignment
@ -97,7 +97,7 @@ Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int
rings.push_back({ {members[0]}, ringCount });
// RA-3
if (rings[ringCount].members.front().member == rings[ringCount].members.back().member)
if (rings[ringCount].ways.front().way == rings[ringCount].ways.back().way)
{
if (SelfIntersecting(rings[ringCount]))
{