summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeotiledmappingmanagerengine_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Change private slots into protected in QGeoTiledMappingManagerEnginePaolo Angelelli2018-04-101-1/+1
| | | | | | | So that they can not only be reimplemented, but also used in subclasses. Change-Id: I8e64ba47aa8dd377e71352b9710ca29051f3ea4c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Allow threaded tile provisioningPaolo Angelelli2018-04-061-6/+4
| | | | | | | | | | | | This change virtualizes four key methods of QGeoTiledMappingManagerEngine, that need to be reimplemented in order to be able to run tile provisioning in a separate thread. QGeoTileRequestManager is also now privately exported, as it has to be used in those methods. Finally the patch includes some minor cleanup in QGeoTileFetcher. Change-Id: I3063263120f935f0cde54abf00bd1caa476ab215 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-051-1/+1
| | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add parameter to control prefetching in tile-based geoservice pluginsPaolo Angelelli2017-03-271-0/+2
| | | | | Change-Id: I18fc1788f7af0efe76f97257ffe739eb1a96e6cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix export macro in private headersPaolo Angelelli2017-02-141-2/+2
| | | | | | | | Changing Q_LOCATION_EXPORT to Q_LOCATION_PRIVATE_EXPORT in all _p headers to avoid confusion. Change-Id: Ic42d1c59f0cd68c27bcf40296c612d005da11efd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Refactor: move CacheAreas to QAbstractGeoTileCachePaolo Angelelli2017-01-161-16/+6
| | | | | | | | | | | | | | | This change moves QGeoTiledMappingManagerEngine::CacheAreas to the more appropriate container that is QAbstractGeoTileCache, which already uses this enum in its interface. Together with making the virtual init() method of QAbstractGeoTileCache public, instead of protected, this patch effectively disentangle QAbstractGeoTileCache/QGeoFileTileCache from the QGeoTiledMappingManagerEngine, and makes it usable potentially also by other (tile) renderers. Change-Id: Ic635b81660f81d86884cc6b00e3a2ab9420daa9f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove createTileCacheWithDir from QGeoTiledMappingManagerEngineMichal Klocek2015-10-271-3/+1
| | | | | | | | | Recent change adds setter for TileCache, use new setter in here plugin, remove obsolate create function. Change-Id: I8f5ee726f6c14ea6fa2adf82a4713d5b37c6a78b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Added method to set the map cacheHarald Meyer2015-10-261-0/+1
| | | | | | | | | | | | This update adds a new method "setTileCache" to the QGeoTiledMappingManagerEngine class. The method allows custom map implementations to set their own cache. The update also fixes a compiler warning (ctor variable order) and adds Q_DECL_OVERRIDE checks. Change-Id: I22cfdb218ae5c9af145d688f11aab655f4ed3e4b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Split QGeoTileCache for easier customization of the tile cache.Harald Meyer2015-10-221-3/+3
| | | | | | | | | | | | | | | The QGeoTileCache is split into two classes: The abstract class QAbstractGeoTileCache offers interfaces for inserting and getting tiles, as well as getting cache status information such as used texture memory. The new class QGeoFileTileCache implements QAbstractGeoTileCache and offers a file based caching implementation (the implementation is the same as before splitting the class). Change-Id: I2eab7491d489ac5b251c1296b67688901f5cc7d7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-081-0/+11
| | | | | Change-Id: Id3ef277b5610a45ffa42850dd9415e963ed45285 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix tile version handlingMichal Klocek2015-06-041-1/+3
| | | | | | | | | | Here maps plugin checks server for tile version. When tile version is updated, update not only the current camera tiles, but also scene tiles. Task-number: QTBUG-44809 Change-Id: Iedb3add5308a2e61cc18e169e33ea4510e1a4fee Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove de/register from qgeotiledmappingmanagerengineMichal Klocek2015-06-031-2/+1
| | | | | | | Removes not required engine registration. Change-Id: I5d30043a33785e0dcd798517754e846a7f420220 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix missing guarded pointers for mapping engineMichal Klocek2015-05-211-4/+3
| | | | | | | | | | | | | | | | Since mapping engine is going to be destroyed on geoseriveprovider change/plugin unload use QPointer to track engine existence before making calls. This commit refactors a bit QGeoTileRequestManager to handle all the calls to the enigne. Check for null pointer before calling the engine. Move registerMap method to base class. Update QGeoTiledMapNokia class accordingly. Change-Id: I886e85e660b2c515e4a617e98e9cc0c3c13781b6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Cleanup QGeoTileMap code.Michal Klocek2015-05-051-1/+1
| | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations * adds Q_DECL_OVERRIDE * removes prefetchTiles() call Change-Id: I3f41cce7fcb0050adb8a5ad90304419b81476955 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Set shorter name for class names with 'MapData'Michal Klocek2015-05-041-4/+4
| | | | | | | | Rename all references and files with 'MapData' to use shorter name 'Map'. Change-Id: I8ab790146ee28e540e6866ba0218eea61bae6e64 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove all Nokia specific license details.Alex Blasche2015-02-261-7/+0
| | | | | | | | | | | | The terms and conditions were not accurate anymore. Instead we refer to the relevant URL. In general the Nokia plugin is no different than other plugins. The user must comply with each services T&Cs. Nokia and Ovi don't exist anymore. The service runs under the Here term these days. Change-Id: Ie73b5cc9577946a2e1ce433ed67e0bca0b894a57 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove LGPLv2.1 and add GPLv2+ from/to QtLocationAlex Blasche2015-02-191-14/+17
| | | | | | Change-Id: I3007aa04d3dbc0e00cb0a43987d64d01ddf91edd Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update contact URL in all license headers to qt.ioAlex Blasche2015-02-181-1/+1
| | | | | Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-08-241-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Iedee2507ab1bd46788409a98505d7be510253110 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Tile cache versioning for Nokia mapsAnders Gunnarsson2014-03-031-0/+1
| | | | | | | | | | | | | | | | Added to avoid mixing of different map versions in map view. Generic cache versioning by adding an incremental version number to tile specs and filenames. Default version -1 falls back to not using version in file names for backward compatibility. Nokia specific version management by implementing the version request, comparing all version information and increment the version if anything has changed. Task-number: QTBUG-25559 Change-Id: I6820f2efbe7458701475cc833d3077022797b2df Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove use of QT_{BEGIN,END}_HEADER macros.Aaron McCarthy2013-02-031-4/+0
| | | | | | | | | These macros were removed from Qt Core and they are no longer defined causing Qt Location to fail to build. Change-Id: Ibed30daa1a802957cebe95a577dfe86f0f643970 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Change copyright from 2012 to 2013Rainer Keller2013-01-171-1/+1
| | | | | Change-Id: I61ae1bd1a9f68d120d4e11635f306374b1f494d0 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ic1390da64a219642fa1e1482a7677a4c2db15cbc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove Maps from public C++ API.Aaron McCarthy2012-06-071-34/+77
| | | | | | | | | | | | The preliminary C++ Maps API was exposed to provide an interface between the QML plugin and the geo services plugins. Mark it as private API for now as it is likely to change when the full C++ API is developed. Mapping functionality is currently only available through QML. Change-Id: Id16e0f1a2165c70192047dffa40e69ab1f29ba69 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Coding style fixes: whitespace around pointers/referencesAlex Wilson2012-05-151-3/+3
| | | | | | Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf Reviewed-by: Thomas Lowe <thomas.lowe@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Files renamed and cache only accessed through engineThomas Lowe2012-05-091-1/+1
| | | | | | | | | | | | | | | | | This isn't completely what was requested on the ticket, but it makes the cache more separate, so easier to pull in/out. Mainly this is a slight reworking of the caching to make it a bit simpler for future prefetching. In particular: mapGeometry renamed to mapScene mapImages renames to tileRequestManager and mapImages::setVisible is now tileRequestManager::requestTiles The data flow has been simplified so the requestManager speaks directly to the tiledMappingManagerEngine and this engine takes care of inspecting the single cache. Task-number: QTBUG-25560 Change-Id: I31b2e26c45f7a7ac56fe138cf1a8906a228a93d3 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Fixes various Coverity warnings.David Laing2012-03-161-6/+6
| | | | | Change-Id: I58a7191dae9cd441025cad658d82422561f216f6 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Refactoring of QtLocation APIBasel Hashisho2012-03-091-0/+92
Refactoring QGeoMap, QGeoMappingManager, QGeoMappingManagerEngine Introducing QGeoMapData, QGeoTiledMap, QGeoTiledMappingManagerEngine, QGeoTileFetcher QGeoMap: Container for QGeoMapData QGeoMapData: No tiles data/functionality QGeoTiledMapData: Implements tiles data/functionality. QGeoMappingManager: Looses tiles-related data/functionality. QGeoMappingManagerEngine => QGeoMappingManagerEngine (no tiles data/functionality) QGeoTiledMappingManagerEngine (implements tiles-related data/functionality). QGeoTileFetcher: Implements tile fetching functionality from tiles provider. This commit compiles and runs through mapviewer example. Tests also were adjusted to fit refactored architecture. Change-Id: Id2b62d62d5cd4aaca8295c67e44c009cde636462 Reviewed-by: Alex <alex.blasche@nokia.com>