From 3807b83c62b595727a3e5caea907616fe5899909 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 14 Jul 2015 11:10:55 +0200 Subject: Fix OSM parameters The documentation states the plugin uses "osm" as parameter name prefix. These cases where forgotten when this naming convention was introduced. Change-Id: I7a3735e04db7b55b8b3d4d6bf84002d63dbcfea9 Task-number: QTBUG-47188 Reviewed-by: Harald Meyer Reviewed-by: Michal Klocek Reviewed-by: Alex Blasche --- src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp | 2 +- src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp index 4ddc8a79..757b9577 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp @@ -75,7 +75,7 @@ QGeoCodingManagerEngineOsm::QGeoCodingManagerEngineOsm(const QVariantMap ¶me m_userAgent = "Qt Location based application"; if (parameters.contains(QStringLiteral("osm.geocoding.host"))) - m_urlPrefix = parameters.value(QStringLiteral("geocoding.host")).toString().toLatin1(); + m_urlPrefix = parameters.value(QStringLiteral("osm.geocoding.host")).toString().toLatin1(); else m_urlPrefix = QStringLiteral("http://nominatim.openstreetmap.org"); diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp index ab582434..df3351c2 100644 --- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp @@ -43,13 +43,13 @@ QGeoRoutingManagerEngineOsm::QGeoRoutingManagerEngineOsm(const QVariantMap ¶ QString *errorString) : QGeoRoutingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this)) { - if (parameters.contains(QStringLiteral("useragent"))) - m_userAgent = parameters.value(QStringLiteral("useragent")).toString().toLatin1(); + if (parameters.contains(QStringLiteral("osm.useragent"))) + m_userAgent = parameters.value(QStringLiteral("osm.useragent")).toString().toLatin1(); else m_userAgent = "Qt Location based application"; - if (parameters.contains(QStringLiteral("routing.host"))) - m_urlPrefix = parameters.value(QStringLiteral("routing.host")).toString().toLatin1(); + if (parameters.contains(QStringLiteral("osm.routing.host"))) + m_urlPrefix = parameters.value(QStringLiteral("osm.routing.host")).toString().toLatin1(); else m_urlPrefix = QStringLiteral("http://router.project-osrm.org/viaroute"); -- cgit v1.2.1