From c6f18b1c8916962b59c90d28ca958503c00d1f45 Mon Sep 17 00:00:00 2001 From: Matthias Rauter Date: Thu, 23 Feb 2023 09:40:10 +0100 Subject: Avoid adding x-y-z structure of tile server if it already exists in url Change-Id: I94255b1c6406e82bd12b126fbdff6ac43e63dbd2 Reviewed-by: Volker Hilsheimer --- src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1