root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-23 19:25:54 +01:00
Code Issues Projects Releases Activity

Centroid computation cleanup

Browse Source
This commit is contained in:
Martin Tůma 2024-11-21 17:52:54 +01:00
parent 890985bacd
commit 6d450023b0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/mapsforge/mapdata.cpp
View File

@ -20,18 +20,19 @@ using namespace Mapsforge;
#define KEY_ELE "ele" #define KEY_ELE "ele"
static Coordinates centroid(const Polygon &polygon) static Coordinates centroid(const QVector<Coordinates> &v)
{ {
double area = 0; double area = 0;
double cx = 0, cy = 0; double cx = 0, cy = 0;
const QVector<Coordinates> &v = polygon.first();
for (int i = 0; i < v.count(); i++) { for (int i = 0; i < v.count() - 1; i++) {
int j = (i == v.count() - 1) ? 0 : i + 1; const Coordinates &ci = v.at(i);
double f = (v.at(i).lon() * v.at(j).lat() - v.at(j).lon() * v.at(i).lat()); const Coordinates &cj = v.at(i+1);
double f = (ci.lon() * cj.lat() - cj.lon() * ci.lat());
area += f; area += f;
cx += (v.at(i).lon() + v.at(j).lon()) * f; cx += (ci.lon() + cj.lon()) * f;
cy += (v.at(i).lat() + v.at(j).lat()) * f; cy += (ci.lat() + cj.lat()) * f;
} }
double factor = 1.0 / (3.0 * area); double factor = 1.0 / (3.0 * area);
@ -710,7 +711,7 @@ bool MapData::readPaths(const VectorTile *tile, int zoom, QList<Path> *list)
p.point.coordinates = Coordinates(outline.first().lon() + MD(lon), p.point.coordinates = Coordinates(outline.first().lon() + MD(lon),
outline.first().lat() + MD(lat)); outline.first().lat() + MD(lat));
else if (p.closed) else if (p.closed)
p.point.coordinates = centroid(p.poly); p.point.coordinates = centroid(outline);
list->append(p); list->append(p);
} }