summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
Commit message (Collapse)AuthorAgeFilesLines
* Split QGeoTileCache for easier customization of the tile cache.Harald Meyer2015-10-221-0/+2
| | | | | | | | | | | | | | | 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>
* Set shorter name for class names with 'MapData'Michal Klocek2015-05-041-1/+1
| | | | | | | | Rename all references and files with 'MapData' to use shorter name 'Map'. Change-Id: I8ab790146ee28e540e6866ba0218eea61bae6e64 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove QGeoMapData class.Michal Klocek2015-05-041-1/+1
| | | | | | | | | Since QGeoMap class does not have any subclasses, there is no need for keeping the bridge in form of QGeoMapData. This commit basically renames QGeoMapData to be QGeoMap. Change-Id: I6eb2f56f7ea83663034f4a8297e8e8f7f185d6a9 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/+7
| | | | | | | | | | | | | | | | 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 dependency between MapStyle and Nokia map schemesAnders Gunnarsson2014-02-071-3/+5
| | | | | | | | | | | Makes it possible to add Nokia base schemes without adding new MapStyles. Removes the redundant collection of base schemes. Change-Id: Ia2189a3f10ba47cc40087b7d4fee9a2c5d84caad Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Nokia plug-in URL and tiler API updatesAnders Gunnarsson2014-02-071-1/+1
| | | | | | | | | | | | | | | | | | Updated URLs for places and map tiler to current ones. Added URL management for additional hosts for hybrid, terrain and satellite maps. Added new languages and map types available in the new tiler API. Bug fixes for code evaluating copyrights text to show. Now only copyrights related to viewed maps are shown and each name is shown only once. Updated drawing of copyright information to show HERE logo and copyrights text side by side. This is to avoid having logo jumping up and down. Change-Id: Ide18a95335c4299c8219c4dbcfb0cc60b43d46c3 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Use QVariantMap instead of QMap<QString, QVariant>.Aaron McCarthy2014-01-081-1/+1
| | | | | | | | It is shorter, easier to read, easier to type and it doesn't affect the ABI. Change-Id: Ic4d8a371d00b434ac84382dd75d8d82a963089cb Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Split QtLocation into QtPositioning and QtLocationAlex Blasche2013-09-021-1/+1
| | | | | | | | | | | | QtPositioning is not dependent on any gui component and mostly covers everything around the retrieval of position information. QtLocation covers place, map and navigation APIs. Several documentation issues were fixed during the process. Change-Id: I98e2a53065549a2fc43f93a75b4f65b5bc884c92 Reviewed-by: Alex Blasche <alexander.blasche@digia.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>
* Rename QGeoBoundingArea and related classes to QGeoShape.Aaron McCarthy2012-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | QGeoBoundingArea is used for describing more than just a bounding area. Renaming it to a more appropriate name, QGeoShape. The same is done for subclasses and QML equivalents. In C++: QGeoBoundingArea -> QGeoShape QGeoBoundingCircle -> QGeoCircle QGeoBoundingBox -> QGeoRectangle In QML: BoundingArea -> GeoShape BoundingCircle -> GeoCircle BoundingBox -> GeoRectangle Change-Id: I93c6df8f1b6c5179ed52fd8354a05f709063b1cf Reviewed-by: abcd <amos.choy@nokia.com>
* Remove Maps from public C++ API.Aaron McCarthy2012-06-071-2/+2
| | | | | | | | | | | | 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>
* Renamed terms and conditions as Nokia.Chris Axiarlis2012-05-161-3/+3
| | | | | | | | | The OVI name was discontinued last year. This change reflects this change. Also the product is no longer called mobility. Change-Id: Ib6653eef8ad117f8bfd527719994661223d6c6e9 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Coding style fixes: whitespace around pointers/referencesAlex Wilson2012-05-151-2/+2
| | | | | | Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf Reviewed-by: Thomas Lowe <thomas.lowe@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Wrap network access to enable testing in Nokia pluginJean Gressmann2012-04-271-1/+3
| | | | | | | | | This enables subsequent testing of the stack (from C++) without being connected to the network. Change-Id: I55ad5ece9c323ec82a493d059f1418f68169c5e6 Task-number: QTBUG-25416 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Implementation of copyrights notice handling for Nokia online plugin.bhashish2012-03-221-1/+35
| | | | | | | | | | | | | | | | Introducing classes QGeoCopyrightsCacheNokia, QGeoMapCopyrightsContext. - QGeoCopyrightsCacheNokia: Provides shared copyrights fetching and lookup services and is common for all maps generated by QGeoTiledMappingManagerEngineNokia, hence its instance is owned by the engine. - QGeoMapCopyrightsContext: Encapsulates copyrights info for last rendered frame per QGeoTiledMapDataNokia class, and is passed to QGeoCopyrightsCacheNokia::evaluateContext(...) to evaluate the validity of last copyrights notice upon signaling by base QGeoTiledMapData. Change-Id: I23cb378d51670c4fa124ac607c71f199e9520cb0 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Refactoring of QtLocation APIBasel Hashisho2012-03-091-0/+75
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>