diff options
author | Matthias Rauter <matthias.rauter@qt.io> | 2023-02-23 09:40:10 +0100 |
---|---|---|
committer | Matthias Rauter <matthias.rauter@qt.io> | 2023-02-27 10:13:49 +0100 |
commit | c6f18b1c8916962b59c90d28ca958503c00d1f45 (patch) | |
tree | fbb2e3495c200ea1b30e77cac6d28d0206ecd054 | |
parent | 29d4d810eaa866aee2c9441916adc8c1760aa589 (diff) | |
download | qtlocation-c6f18b1c8916962b59c90d28ca958503c00d1f45.tar.gz |
Avoid adding x-y-z structure of tile server if it already exists in url
Change-Id: I94255b1c6406e82bd12b126fbdff6ac43e63dbd2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index 8a4652ac..56f63456 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -181,10 +181,12 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian if (parameters.contains(QStringLiteral("osm.mapping.copyright"))) m_customCopyright = parameters.value(QStringLiteral("osm.mapping.copyright")).toString(); + if (!tmsServer.endsWith(".png")) + tmsServer += QStringLiteral("%z/%x/%y.png"); m_providers.push_back( new QGeoTileProviderOsm( nmCached, QGeoMapType(QGeoMapType::CustomMap, tr("Custom URL Map"), tr("Custom url map view set via urlprefix parameter"), false, false, 8, pluginName, cameraCaps), - { new TileProvider(tmsServer + QStringLiteral("%z/%x/%y.png"), + { new TileProvider(tmsServer, QStringLiteral("png"), mapCopyright, dataCopyright) }, cameraCaps |