diff options
Diffstat (limited to 'src/plugins/geoservices')
8 files changed, 95 insertions, 94 deletions
diff --git a/src/plugins/geoservices/esri/geocodereply_esri.cpp b/src/plugins/geoservices/esri/geocodereply_esri.cpp index 1ef3c9d6..cc2ea378 100644 --- a/src/plugins/geoservices/esri/geocodereply_esri.cpp +++ b/src/plugins/geoservices/esri/geocodereply_esri.cpp @@ -95,18 +95,14 @@ void GeoCodeReplyEsri::networkReplyFinished() switch (operationType()) { case Geocode: { - QJsonArray candidates = object.value(QStringLiteral("candidates")).toArray(); + const QJsonArray candidates = object.value(QStringLiteral("candidates")).toArray(); QList<QGeoLocation> locations; - for (int i = 0; i < candidates.count(); i++) { - if (!candidates.at(i).isObject()) + for (const auto candidate : candidates) { + if (!candidate.isObject()) continue; - - QJsonObject candidate = candidates.at(i).toObject(); - - QGeoLocation location = parseCandidate(candidate); - locations.append(location); + locations.append(parseCandidate(candidate.toObject())); } setLocations(locations); @@ -116,12 +112,7 @@ void GeoCodeReplyEsri::networkReplyFinished() case ReverseGeocode: { - QGeoLocation location = parseAddress(object); - - QList<QGeoLocation> locations; - locations.append(location); - - setLocations(locations); + setLocations({parseAddress(object)}); setFinished(true); } break; diff --git a/src/plugins/geoservices/esri/georoutejsonparser_esri.cpp b/src/plugins/geoservices/esri/georoutejsonparser_esri.cpp index 34d877df..811f5cba 100644 --- a/src/plugins/geoservices/esri/georoutejsonparser_esri.cpp +++ b/src/plugins/geoservices/esri/georoutejsonparser_esri.cpp @@ -183,7 +183,7 @@ void GeoRouteJsonParserEsri::parseDirection(const QJsonObject &direction) }; QGeoRouteSegment firstSegment; - for (int i = features.size() - 1; i >= 0; --i) + for (qsizetype i = features.size() - 1; i >= 0; --i) { QJsonObject feature = features.at(i).toObject(); QJsonObject attributes = feature.value(kDirectionsFeaturesAttributesKey).toObject(); diff --git a/src/plugins/geoservices/esri/placesearchreply_esri.cpp b/src/plugins/geoservices/esri/placesearchreply_esri.cpp index 2d26d2ca..1c79a6a1 100644 --- a/src/plugins/geoservices/esri/placesearchreply_esri.cpp +++ b/src/plugins/geoservices/esri/placesearchreply_esri.cpp @@ -119,28 +119,22 @@ void PlaceSearchReplyEsri::replyFinished() return; QJsonDocument document = QJsonDocument::fromJson(reply->readAll()); - if (!document.isObject()) - { + if (!document.isObject()) { setError(ParseError, tr("Response parse error")); return; } QJsonValue suggestions = document.object().value(kCandidatesKey); - if (!suggestions.isArray()) - { + if (!suggestions.isArray()) { setError(ParseError, tr("Response parse error")); return; } - QJsonArray resultsArray = suggestions.toArray(); + const QJsonArray resultsArray = suggestions.toArray(); QList<QPlaceSearchResult> results; - for (int i = 0; i < resultsArray.count(); ++i) - { - QJsonObject item = resultsArray.at(i).toObject(); - QPlaceResult placeResult = parsePlaceResult(item); - results.append(placeResult); - } + for (const auto result : resultsArray) + results.append(parsePlaceResult(result.toObject())); setResults(results); setFinished(true); diff --git a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.cpp b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.cpp index 1dbfe018..3abe09c9 100644 --- a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.cpp @@ -43,12 +43,14 @@ QT_BEGIN_NAMESPACE -QGeoFileTileCacheMapbox::QGeoFileTileCacheMapbox(const QList<QGeoMapType> &mapTypes, int scaleFactor, const QString &directory, QObject *parent) +QGeoFileTileCacheMapbox::QGeoFileTileCacheMapbox(const QList<QGeoMapType> &mapTypes, + int scaleFactor, const QString &directory, + QObject *parent) :QGeoFileTileCache(directory, parent), m_mapTypes(mapTypes) { m_scaleFactor = qBound(1, scaleFactor, 2); - for (int i=0; i < mapTypes.size(); i++) - m_mapNameToId.insert(mapTypes[i].name(), i+1); + for (qsizetype i = 0; i < mapTypes.size(); i++) + m_mapNameToId.insert(mapTypes[i].name(), i + 1); } QGeoFileTileCacheMapbox::~QGeoFileTileCacheMapbox() @@ -56,7 +58,8 @@ QGeoFileTileCacheMapbox::~QGeoFileTileCacheMapbox() } -QString QGeoFileTileCacheMapbox::tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const +QString QGeoFileTileCacheMapbox::tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, + const QString &directory) const { QString filename = spec.plugin(); filename += QLatin1String("-"); @@ -93,25 +96,23 @@ QGeoTileSpec QGeoFileTileCacheMapbox::filenameToTileSpec(const QString &filename if (parts.length() != 3) // 3 because the map name has always a dot in it. return QGeoTileSpec(); - QString name = parts.at(0) + QChar('.') + parts.at(1); - QStringList fields = name.split('-'); + const QString name = parts.at(0) + QChar('.') + parts.at(1); + const QStringList fields = name.split('-'); - int length = fields.length(); - if (length != 6 && length != 7) { + const qsizetype length = fields.length(); + if (length != 6 && length != 7) + return QGeoTileSpec(); + const qsizetype scaleIdx = fields.last().indexOf("@"); + if (scaleIdx < 0 || fields.last().size() <= (scaleIdx + 2)) + return QGeoTileSpec(); + const int scaleFactor = fields.last()[scaleIdx + 1].digitValue(); + if (scaleFactor != m_scaleFactor) return QGeoTileSpec(); - } else { - int scaleIdx = fields.last().indexOf("@"); - if (scaleIdx < 0 || fields.last().size() <= (scaleIdx + 2)) - return QGeoTileSpec(); - int scaleFactor = fields.last()[scaleIdx + 1].digitValue(); - if (scaleFactor != m_scaleFactor) - return QGeoTileSpec(); - } QList<int> numbers; bool ok = false; - for (int i = 2; i < length-1; ++i) { // skipping -@_X + for (qsizetype i = 2; i < length - 1; ++i) { // skipping -@_X ok = false; int value = fields.at(i).toInt(&ok); if (!ok) diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp index 01c25f9d..5208e687 100644 --- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.cpp @@ -123,8 +123,8 @@ QGeoTiledMappingManagerEngineMapbox::QGeoTiledMappingManagerEngineMapbox(const Q } QList<QString> mapIds; - for (int i=0; i < mapTypes.size(); ++i) - mapIds.push_back(mapTypes[i].name()); + for (const auto &mapType : qAsConst(mapTypes)) + mapIds.push_back(mapType.name()); setSupportedMapTypes(mapTypes); diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp index 26c27d75..318f34b5 100644 --- a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp +++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.cpp @@ -87,15 +87,15 @@ QGeoTileSpec QGeoFileTileCacheNokia::filenameToTileSpec(const QString &filename) { QGeoTileSpec emptySpec; - QStringList parts = filename.split('.'); + const QStringList parts = filename.split('.'); if (parts.length() != 2) return emptySpec; - QString name = parts.at(0); - QStringList fields = name.split('-'); + const QString name = parts.at(0); + const QStringList fields = name.split('-'); - int length = fields.length(); + const qsizetype length = fields.length(); if (length != 6 && length != 7) return emptySpec; else if (fields.last() != m_ppi) @@ -104,7 +104,7 @@ QGeoTileSpec QGeoFileTileCacheNokia::filenameToTileSpec(const QString &filename) QList<int> numbers; bool ok = false; - for (int i = 1; i < length-1; ++i) { // skipping -<ppi> + for (qsizetype i = 1; i < length-1; ++i) { // skipping -<ppi> ok = false; int value = fields.at(i).toInt(&ok); if (!ok) diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index 519c8231..e09cc15a 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -94,7 +94,8 @@ void QGeoRouteXmlParser::run() bool QGeoRouteXmlParser::parseRootElement() { if (!m_reader->readNextStartElement()) { - m_reader->raiseError("Expected a root element named \"CalculateRoute\" (no root element found)."); + m_reader->raiseError(QStringLiteral("Expected a root element named \"CalculateRoute\" " + "(no root element found).")); return false; } @@ -106,8 +107,11 @@ bool QGeoRouteXmlParser::parseRootElement() } bool updateroute = false; - if (m_reader->name() != QLatin1String("CalculateRoute") && m_reader->name() != QLatin1String("GetRoute")) { - m_reader->raiseError(QString("The root element is expected to have the name \"CalculateRoute\" or \"GetRoute\" (root element was named \"%1\").").arg(m_reader->name().toString())); + if (m_reader->name() != QLatin1String("CalculateRoute") + && m_reader->name() != QLatin1String("GetRoute")) { + m_reader->raiseError(QStringLiteral("The root element is expected to have the name " + "\"CalculateRoute\" or \"GetRoute\" (root element " + "was named \"%1\").").arg(m_reader->name().toString())); return false; } else if (m_reader->name() == QLatin1String("GetRoute")) { updateroute = true; @@ -115,7 +119,8 @@ bool QGeoRouteXmlParser::parseRootElement() if (m_reader->readNextStartElement()) { if (m_reader->name() != QLatin1String("Response")) { - m_reader->raiseError(QString("Expected a element named \"Response\" (element was named \"%1\").").arg(m_reader->name().toString())); + m_reader->raiseError(QStringLiteral("Expected a element named \"Response\" (element " + "was named \"%1\").").arg(m_reader->name().toString())); return false; } } @@ -148,8 +153,8 @@ bool QGeoRouteXmlParser::parseRoute(QGeoRoute *route) m_legs.clear(); int legIndex = 0; m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Route")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QLatin1String("Route")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QLatin1String("RouteId")) { route->setRouteId(m_reader->readElementText()); @@ -244,11 +249,11 @@ bool QGeoRouteXmlParser::postProcessRoute(QGeoRoute *route) // Step 3: populate the linkMap, linkId -> linkContainer - for (int i = 0; i < m_maneuvers.size(); i++) { + for (qsizetype i = 0; i < m_maneuvers.size(); i++) { legSegments << QList<QGeoRouteSegment>(); QList<QGeoRouteSegment> &segments = legSegments[i]; QList<QGeoManeuverContainer> &maneuvers = m_maneuvers[i]; - for (int j = 0; j < m_maneuvers.at(i).size(); j++) { + for (qsizetype j = 0; j < m_maneuvers.at(i).size(); j++) { QGeoManeuverContainer &maneuver = maneuvers[j]; QGeoRouteSegment segment; @@ -273,7 +278,7 @@ bool QGeoRouteXmlParser::postProcessRoute(QGeoRoute *route) QGeoRouteSegment segment; QGeoRouteSegment firstSegment; for (auto &segments: legSegments) { - for (int j = 0; j < segments.size(); j++) { + for (qsizetype j = 0; j < segments.size(); j++) { if (segment.isValid()) { segment.setNextRouteSegment(segments[j]); } else { @@ -291,25 +296,26 @@ bool QGeoRouteXmlParser::postProcessRoute(QGeoRoute *route) route->setFirstRouteSegment(firstSegment); // Step 8: fill route legs. - for (int i = 0; i < m_legs.size(); i++) { - m_legs[i].setTravelMode(route->travelMode()); - m_legs[i].setRequest(route->request()); - m_legs[i].setOverallRoute(*route); - m_legs[i].setLegIndex(i); + for (qsizetype i = 0; i < m_legs.size(); i++) { + auto &leg = m_legs[i]; + leg.setTravelMode(route->travelMode()); + leg.setRequest(route->request()); + leg.setOverallRoute(*route); + leg.setLegIndex(i); - m_legs[i].setFirstRouteSegment(legSegments[i].first()); + leg.setFirstRouteSegment(legSegments[i].first()); // handle path QList<QGeoCoordinate> path; - QGeoRouteSegment s = m_legs[i].firstRouteSegment(); + QGeoRouteSegment s = leg.firstRouteSegment(); while (s.isValid()) { path.append(s.path()); if (s.isLegLastSegment()) break; s = s.nextRouteSegment(); } - m_legs[i].setPath(path); - m_legs[i].setBounds(QGeoPath(path).boundingGeoRectangle()); + leg.setPath(path); + leg.setBounds(QGeoPath(path).boundingGeoRectangle()); } route->setRouteLegs(m_legs); m_legs.clear(); @@ -349,8 +355,8 @@ bool QGeoRouteXmlParser::parseMode(QGeoRoute *route) Q_ASSERT(m_reader->isStartElement() && m_reader->name() == QLatin1String("Mode")); m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Mode")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QLatin1String("Mode")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QLatin1String("TransportModes")) { QString value = m_reader->readElementText(); @@ -386,8 +392,8 @@ bool QGeoRouteXmlParser::parseSummary(QGeoRoute *route) double baseTime = -1, trafficTime = -1; - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Summary")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QLatin1String("Summary")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QLatin1String("Distance")) { route->setDistance(m_reader->readElementText().toDouble()); @@ -418,8 +424,8 @@ bool QGeoRouteXmlParser::parseCoordinates(QGeoCoordinate &coord) QString currentElement = m_reader->name().toString(); m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == currentElement) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == currentElement) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { QString name = m_reader->name().toString(); QString value = m_reader->readElementText(); @@ -446,8 +452,8 @@ bool QGeoRouteXmlParser::parseManeuver(QList<QGeoManeuverContainer> &maneuvers) maneuverContainter.id = m_reader->attributes().value("id").toString(); m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("Maneuver")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QLatin1String("Maneuver")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QLatin1String("Position")) { QGeoCoordinate coordinates; @@ -514,8 +520,8 @@ bool QGeoRouteXmlParser::parseLink(QList<QGeoRouteSegmentContainer> &links) QGeoRouteSegmentContainer segmentContainer; - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QStringLiteral("Link")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QStringLiteral("Link")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QStringLiteral("LinkId")) { segmentContainer.id = m_reader->readElementText(); @@ -532,7 +538,8 @@ bool QGeoRouteXmlParser::parseLink(QList<QGeoRouteSegmentContainer> &links) QGeoDynamicSpeedInfoContainer speedInfo; if (!parseDynamicSpeedInfo(speedInfo)) return false; - const double time = speedInfo.trafficTime >= 0 ? speedInfo.trafficTime : speedInfo.baseTime; + const double time = speedInfo.trafficTime >= 0 + ? speedInfo.trafficTime : speedInfo.baseTime; if (time >= 0) segmentContainer.segment.setTravelTime(time); } else { @@ -548,32 +555,40 @@ bool QGeoRouteXmlParser::parseLink(QList<QGeoRouteSegmentContainer> &links) return true; } -bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName) +bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, + const QString &elementName) { - QStringList rawPoints = strPoints.split(' '); + const QStringList rawPoints = strPoints.split(' '); - for (int i = 0; i < rawPoints.length(); ++i) { - QStringList coords = rawPoints[i].split(','); + for (const auto &rawPoint : rawPoints) { + const QStringList coords = rawPoint.split(','); if (coords.length() != 2) { - m_reader->raiseError(QString("Each of the space separated values of \"%1\" is expected to be a comma separated pair of coordinates (value was \"%2\")").arg(elementName).arg(rawPoints[i])); + m_reader->raiseError(QStringLiteral("Each of the space separated values of \"%1\" " + "is expected to be a comma separated pair of " + "coordinates (value was \"%2\")") + .arg(elementName).arg(rawPoint)); return false; } bool ok = false; - QString latString = coords[0]; + const QString latString = coords[0]; double lat = latString.toDouble(&ok); if (!ok) { - m_reader->raiseError(QString("The latitude portions of \"%1\" are expected to have a value convertable to a double (value was \"%2\")").arg(elementName).arg(latString)); + m_reader->raiseError(QStringLiteral("The latitude portions of \"%1\" are expected to " + "have a value convertable to a double (value was " + "\"%2\")").arg(elementName).arg(latString)); return false; } - QString lngString = coords[1]; + const QString lngString = coords[1]; double lng = lngString.toDouble(&ok); if (!ok) { - m_reader->raiseError(QString("The longitude portions of \"%1\" are expected to have a value convertable to a double (value was \"%2\")").arg(elementName).arg(lngString)); + m_reader->raiseError(QStringLiteral("The longitude portions of \"%1\" are expected to " + "have a value convertable to a double (value was " + "\"%2\")").arg(elementName).arg(lngString)); return false; } @@ -592,8 +607,8 @@ bool QGeoRouteXmlParser::parseBoundingBox(QGeoRectangle &bounds) QGeoCoordinate br; m_reader->readNext(); - while (!(m_reader->tokenType() == QXmlStreamReader::EndElement && m_reader->name() == QLatin1String("BoundingBox")) && - !m_reader->hasError()) { + while (!(m_reader->tokenType() == QXmlStreamReader::EndElement + && m_reader->name() == QLatin1String("BoundingBox")) && !m_reader->hasError()) { if (m_reader->tokenType() == QXmlStreamReader::StartElement) { if (m_reader->name() == QLatin1String("TopLeft")) { QGeoCoordinate coordinates; diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 6d40a417..4dd4d72d 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -163,13 +163,13 @@ QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &rout bool QGeoRoutingManagerEngineNokia::checkEngineSupport(const QGeoRouteRequest &request, QGeoRouteRequest::TravelModes travelModes) const { - QList<QGeoRouteRequest::FeatureType> featureTypeList = request.featureTypes(); + const QList<QGeoRouteRequest::FeatureType> featureTypeList = request.featureTypes(); QGeoRouteRequest::FeatureTypes featureTypeFlag = QGeoRouteRequest::NoFeature; QGeoRouteRequest::FeatureWeights featureWeightFlag = QGeoRouteRequest::NeutralFeatureWeight; - for (int i = 0; i < featureTypeList.size(); ++i) { - featureTypeFlag |= featureTypeList.at(i); - featureWeightFlag |= request.featureWeight(featureTypeList.at(i)); + for (const auto &featureType : featureTypeList) { + featureTypeFlag |= featureType; + featureWeightFlag |= request.featureWeight(featureType); } if ((featureTypeFlag & supportedFeatureTypes()) != featureTypeFlag) |