summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@jollamobile.com>2014-07-17 14:04:41 +1000
committerAaron McCarthy <mccarthy.aaron@gmail.com>2014-07-21 02:12:35 +0200
commit825534f725425cbaae6f9f8cfd3a6f4cf02ba360 (patch)
tree390f58f70f91928b978e27a4279f52832ea11ded
parent4bdf3bc386d8ace566633ae56505b9875764b16a (diff)
downloadqtlocation-825534f725425cbaae6f9f8cfd3a6f4cf02ba360.tar.gz
Add mobile optimized pedestrian maps to Nokia/HERE plugin.
The description of the existing pedestrian maps falsely indicated that they were mobile optimized. The mobile wording has been removed and actually mobile optimized maps have been added. Change-Id: I48f7ea043cfbe424508fc783adabef47f283d2e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 1d8785bf..7a091791 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -99,9 +99,11 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
types << QGeoMapType(QGeoMapType::StreetMap, tr("Mobile Night Street Map"), tr("Mobile normal map view in night mode"), true, true, 14);
types << QGeoMapType(QGeoMapType::GrayStreetMap, tr("Gray Night Street Map"), tr("Color-reduced map view in night mode (especially used for background maps)"), false, true, 15);
types << QGeoMapType(QGeoMapType::GrayStreetMap, tr("Mobile Gray Night Street Map"), tr("Mobile color-reduced map view in night mode (especially used for background maps)"), true, true, 16);
- types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Pedestrian Street Map"), tr("Pedestrian map view in daylight mode for mobile usage"), true, false, 17);
- types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Pedestrian Night Street Map"), tr("Pedestrian map view in night mode for mobile usage"), true, true, 18);
- types << QGeoMapType(QGeoMapType::CarNavigationMap, tr("Car Navigation Map"), tr("Normal map view in daylight mode for car navigation"), false, false, 19);
+ types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Pedestrian Street Map"), tr("Pedestrian map view in daylight mode"), false, false, 17);
+ types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Mobile Pedestrian Street Map"), tr("Mobile pedestrian map view in daylight mode for mobile usage"), true, false, 18);
+ types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Pedestrian Night Street Map"), tr("Pedestrian map view in night mode"), false, true, 19);
+ types << QGeoMapType(QGeoMapType::PedestrianMap, tr("Mobile Pedestrian Night Street Map"), tr("Mobile pedestrian map view in night mode for mobile usage"), true, true, 20);
+ types << QGeoMapType(QGeoMapType::CarNavigationMap, tr("Car Navigation Map"), tr("Normal map view in daylight mode for car navigation"), false, false, 21);
setSupportedMapTypes(types);
QGeoTileFetcherNokia *fetcher = new QGeoTileFetcherNokia(parameters, networkManager, this, tileSize());
@@ -167,8 +169,10 @@ void QGeoTiledMappingManagerEngineNokia::populateMapSchemes()
m_mapSchemes[15] = QStringLiteral("normal.night.grey");
m_mapSchemes[16] = QStringLiteral("normal.night.grey.mobile");
m_mapSchemes[17] = QStringLiteral("pedestrian.day");
- m_mapSchemes[18] = QStringLiteral("pedestrian.night");
- m_mapSchemes[19] = QStringLiteral("carnav.day.grey");
+ m_mapSchemes[18] = QStringLiteral("pedestrian.day.mobile");
+ m_mapSchemes[19] = QStringLiteral("pedestrian.night");
+ m_mapSchemes[20] = QStringLiteral("pedestrian.night.mobile");
+ m_mapSchemes[21] = QStringLiteral("carnav.day.grey");
}
QString QGeoTiledMappingManagerEngineNokia::getScheme(int mapId)