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

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)
//{