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

Tried to fix a few things

Browse source
This commit is contained in:
Robert 2021-04-18 14:33:38 +02:00
parent 8559aca4bb
commit 8864df77d5
4 changed files with 299459 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/multipolygon.hpp
View file

@ -33,6 +33,7 @@ private:
int r;
int g;
int b;
uint64_t id;
bool visible;
enum RenderType {
FILL,

299410
res/center.osm Normal file
View file

File diff suppressed because it is too large Load diff

8
src/main.cpp
View file

@ -178,10 +178,10 @@ int main(int argc, char** argv)
multipolygon.Draw(renderer);
}
for (Area& area : buildings)
{
filledPolygonRGBA(renderer, area.x, area.y, area.length, area.r, area.g, area.b, 255);
}
//for (Area& area : buildings)
//{
// filledPolygonRGBA(renderer, area.x, area.y, area.length, area.r, area.g, area.b, 255);
//}
for (Highway& highway : highways)
{

50
src/multipolygon.cpp
View file

@ -1,6 +1,8 @@
#include "..\include\multipolygon.hpp"
#include <vector>
#include <algorithm>
#include <map>
#include <iostream>
#include <triangle.h>
@ -23,11 +25,14 @@ inline double Map(double A, double B, double a, double b, double x)
}
Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int width, int height, osmp::Bounds bounds) :
r(255), g(0), b(255), visible(true), rendering(RenderType::FILL)
r(255), g(0), b(255), visible(true), rendering(RenderType::FILL), id(relation->id)
{
if (relation->HasNullMembers())
return;
// BREAKIF(7344428);
// BREAKIF(6427823);
std::vector<TriangulationData> data;
std::vector<osmp::Relation::Member> ways = relation->GetWays();
@ -43,7 +48,7 @@ Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int
std::shared_ptr<osmp::Way> way = std::dynamic_pointer_cast<osmp::Way>(member.member);
if (member.role == "inner")
{
if (hasSeenOuter) // TODO: Find better way to sort things
if (!hasSeenOuter) // TODO: Find better way to sort things
continue;
if (innerWays.empty() || !lastWasInner)
@ -140,9 +145,22 @@ Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int
// Push all vertices to data
std::vector<REAL> vertices;
std::map<int, int> duplicates;
int n = td.vertices.size() / 2;
for (const std::shared_ptr<osmp::Node>& node : nodes) {
vertices.push_back(Map(bounds.minlon, bounds.maxlon, 0, width, node->lon));
vertices.push_back(height - Map(bounds.minlat, bounds.maxlat, 0, height, node->lat));
double x = Map(bounds.minlon, bounds.maxlon, 0, width, node->lon);
double y = height - Map(bounds.minlat, bounds.maxlat, 0, height, node->lat);
auto xit = std::find(td.vertices.begin(), td.vertices.end(), x);
auto yit = std::find(td.vertices.begin(), td.vertices.end(), y);
if (std::distance(xit, yit) == 1) {
duplicates.insert(std::make_pair(n, std::distance(td.vertices.begin(), xit) / 2));
}
else {
vertices.push_back(x);
vertices.push_back(y);
}
n++;
}
if (inner)
@ -165,8 +183,25 @@ Multipolygon::Multipolygon(const std::shared_ptr<osmp::Relation>& relation, int
// Get segments
int segNum = td.vertices.size() / 2;
for (int i = 0; i < vertices.size(); i += 2) {
td.segments.push_back(segNum);
td.segments.push_back(++segNum);
auto dit = duplicates.find(segNum);
if (dit != duplicates.end())
{
td.segments.push_back(dit->second);
}
else
{
td.segments.push_back(segNum++);
}
dit = duplicates.find(segNum);
if (dit != duplicates.end())
{
td.segments.push_back(dit->second);
}
else
{
td.segments.push_back(segNum);
}
}
td.segments.back() = td.vertices.size() / 2;
@ -624,6 +659,9 @@ void Multipolygon::Draw(SDL_Renderer* renderer)
if (!visible)
return;
// if (id != 6427823)
// return;
for (const Polygon& polygon : polygons) {
switch(rendering)
{