diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:43:47 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:43:47 +0100 |
| commit | 87d7387c51f564f44602a8d2841d49df2d789e41 (patch) | |
| tree | 69a4e65f94ecb2dffc9466a3b2e2760185ce6363 /src/plugins/geoservices/osm | |
| parent | 25b42f4165d23b64faa02adf6c71d6c5f6d985bb (diff) | |
| parent | 55d4490ee62d5c1105a6733b717f2ef7340af492 (diff) | |
| download | qtlocation-87d7387c51f564f44602a8d2841d49df2d789e41.tar.gz | |
Merge dev into 5.9
Change-Id: Ib755265554410a62e14ee3e23fd09d9f4385519b
Diffstat (limited to 'src/plugins/geoservices/osm')
| -rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmaposm.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/plugins/geoservices/osm/qgeotiledmaposm.cpp b/src/plugins/geoservices/osm/qgeotiledmaposm.cpp index d94a40a6..e1383afb 100644 --- a/src/plugins/geoservices/osm/qgeotiledmaposm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmaposm.cpp @@ -45,6 +45,11 @@ QT_BEGIN_NAMESPACE +static QString bodify(const QString &html) +{ + return QStringLiteral("<body>") + html + QStringLiteral("</body>"); +} + QGeoTiledMapOsm::QGeoTiledMapOsm(QGeoTiledMappingManagerEngineOsm *engine, QObject *parent) : QGeoTiledMap(engine, parent), m_mapId(-1), m_engine(engine) { @@ -95,13 +100,13 @@ void QGeoTiledMapOsm::onProviderDataUpdated(const QGeoTileProviderOsm *provider) } if (!dataCopy.isEmpty()) { if (!copyRights.isEmpty()) - copyRights += QStringLiteral("<br/>"); + copyRights += QStringLiteral(" | "); copyRights += QStringLiteral("Data © "); copyRights += dataCopy; } if (!styleCopy.isEmpty()) { if (!copyRights.isEmpty()) - copyRights += QStringLiteral("<br/>"); + copyRights += QStringLiteral(" | "); copyRights += QStringLiteral("Style © "); copyRights += styleCopy; } @@ -109,7 +114,7 @@ void QGeoTiledMapOsm::onProviderDataUpdated(const QGeoTileProviderOsm *provider) if (copyRights.isEmpty() && provider->mapType().style() == QGeoMapType::CustomMap) copyRights = m_engine->customCopyright(); - emit copyrightsChanged(copyRights); + emit copyrightsChanged(bodify(copyRights)); } QT_END_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index 3228b31b..e9e48008 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -57,6 +57,12 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian QGeoCameraCapabilities cameraCaps; cameraCaps.setMinimumZoomLevel(0.0); cameraCaps.setMaximumZoomLevel(19.0); + cameraCaps.setSupportsBearing(true); + cameraCaps.setSupportsTilting(true); + cameraCaps.setMinimumTilt(0); + cameraCaps.setMaximumTilt(80); + cameraCaps.setMinimumFieldOfView(20.0); + cameraCaps.setMaximumFieldOfView(120.0); setCameraCapabilities(cameraCaps); setTileSize(QSize(256, 256)); |