diff options
Diffstat (limited to 'src/location/labs/qgeojson.cpp')
-rw-r--r-- | src/location/labs/qgeojson.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/location/labs/qgeojson.cpp b/src/location/labs/qgeojson.cpp index 163a140f..f5995d9c 100644 --- a/src/location/labs/qgeojson.cpp +++ b/src/location/labs/qgeojson.cpp @@ -587,7 +587,7 @@ static QGeoPolygon importPolygon(const QVariantMap &inputMap) QList<QList<QGeoCoordinate>> perimeters = importArrayOfArrayOfPositions(valueCoordinates); for (int i = 0; i < perimeters.size(); ++i) { // Import an array of QList<QGeocoordinates> if (i == 0) - returnedObject.setPath(perimeters.at(i)); // External perimeter + returnedObject.setPerimeter(perimeters.at(i)); // External perimeter else returnedObject.addHole(perimeters.at(i)); // Inner perimeters } @@ -640,7 +640,7 @@ static QVariantList importMultiPolygon(const QVariantMap &inputMap) for (int j = 0; j < coordinatesList.size(); ++j) { if (j == 0) - singlePoly.setPath(coordinatesList.at(j)); + singlePoly.setPerimeter(coordinatesList.at(j)); else singlePoly.addHole(coordinatesList.at(j)); } @@ -816,7 +816,7 @@ static QJsonObject exportPolygon(const QVariantMap &polygonMap) QJsonValue polyCoordinates; QList<QList<QGeoCoordinate>> obtainedCoordinatesPoly; QGeoPolygon parsedPoly = polygonVariant.value<QGeoPolygon>(); - obtainedCoordinatesPoly << parsedPoly.path(); + obtainedCoordinatesPoly << parsedPoly.perimeter(); if (parsedPoly.holesCount()!=0) for (int i = 0; i < parsedPoly.holesCount(); ++i) { obtainedCoordinatesPoly << parsedPoly.holePath(i); @@ -867,7 +867,7 @@ static QJsonObject exportMultiPolygon(const QVariantMap &multiPolygonMap) int polyHoles = 0; int currentHole; for (int i = 0; i < multiPolygonList.size(); ++i) { // Start parsing Polygon list - extractedCoordinatesValue << multiPolygonList.at(i).value<QVariantMap>().value(QStringLiteral("data")).value<QGeoPolygon>().path(); // Extract external polygon path + extractedCoordinatesValue << multiPolygonList.at(i).value<QVariantMap>().value(QStringLiteral("data")).value<QGeoPolygon>().perimeter(); // Extract external polygon path polyHoles = multiPolygonList.at(i).value<QVariantMap>().value(QStringLiteral("data")).value<QGeoPolygon>().holesCount(); if (polyHoles) // Check if the polygon has holes for (currentHole = 0 ; currentHole < polyHoles; currentHole++) @@ -1158,7 +1158,7 @@ QTextStream &operator << (QTextStream &stream, const QGeoShape &shape) case QGeoShape::PolygonType: { QGeoPolygon poly(shape); stream << "QGeoPolygon("; - for (auto c: poly.path()) + for (auto c: poly.perimeter()) stream << c << ", "; stream << ")"; break; |