summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
Commit message (Collapse)AuthorAgeFilesLines
* qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
| | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
* Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-231-2/+2
| | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Port Nokia geo service plugin to QRegularExpressionSamuel Gaist2018-12-041-4/+6
| | | | | | | | | This patch updates the Nokia geo service plugin code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: Idc7459351c6f1a1b12ba1528c426fced324039a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make QPlace extensiblePaolo Angelelli2018-01-271-0/+1
| | | | | | | | This change makes it possible to subclass QPlace with custom private implementations. Change-Id: I363c0e8b7db41d9a8400ce6dbddf5405c619eeef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-1/+1
|\ | | | | | | Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
| * Update "nokia" geoservices plugin to use HERE APIsChris Adams2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | The old Nokia URL endpoints are being deprecated. This commit updates the "nokia" plugin to use the modern HERE API endpoints. It also removes the (now nonexistent) China-specific URLs. Change-Id: Ieaf75cef1538d0ebb6a22623fc041ab504cf491f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | fix expensive iteration over QMap::keys(), QHash::keys()Anton Kudryavtsev2016-01-151-6/+6
|/ | | | | | | ... and QJsonObject::keys() Change-Id: I9a8ba44406a1e2cbdfffd266d2b5cb664f7440fc Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Add "here" prefix to all Here geoservices parametersAlex Blasche2015-05-271-3/+3
| | | | | | | Task-number: QTBUG-42151 Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix incomplete category hierarchy in Here pluginAlex Blasche2015-04-171-0/+1
| | | | | | | | | The recent addition of a second level of categories failed to set the parent cat id for each child. Change-Id: Ib30050463b84c2f62972082c0a883bb96bc89c52 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add new Here standard categoriesAlex Blasche2015-04-021-5/+32
| | | | | | | | | This is based on: http://places.api.here.com/places/static/doc/public/#topics/categories.html Change-Id: I13d5e35d769d80e3c5121bd0c2db5be3414fe099 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Avoid symbol clash between here and osm pluginAlex Blasche2015-03-301-7/+7
| | | | | | | | | | This is of relevance for static Qt builds Task-number: QTBUG-43681 Task-number: QTBUG-45214 Change-Id: Iea9b4a7cad055dc47265bb51fe2654af80e356b7 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Changes key of "nokia" geoservices plugin to "here"Alex Blasche2015-03-251-1/+1
| | | | | | | | | | | | The old name is not advertised anymore but the plugin can still be loaded using the "nokia" key. This will be removed by later versions of Qt. Adds a QGeoServiceProvider unit tests Change-Id: I01f36f1bb19d31e0855e90c1605b99e61ee4450b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
* Add center() function to QGeoShape.Aaron McCarthy2014-12-041-20/+8
| | | | | | | | | | | | | | It is frequently useful to calculate the geometric center of a shape. Both QGeoCircle and QGeoRectangle already define center() functions, however, the application developer must cast each QGeoShape into either a QGeoCirlce or QGeoRectangle before calling. Providing QGeoShape::center() allows application code to be simplified. Existing QGeoCircle::center() and QGeoRectangle::center() functions are kept for compatibility. Change-Id: I92b727ab5e713f70174588a27040446c992ae14e Reviewed-by: Alex Blasche <alexander.blasche@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>
* Use QStringLiteral whereever possibleAlex Blasche2014-05-151-48/+48
| | | | | | | This replaces a lot of old QLatin1String cases Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix crash when initializing Nokia place categories.Aaron McCarthy2014-04-231-31/+46
| | | | | | | | | If network errors occur while initializing categories stale categories were left in the category tree which can result in unbounded recursion. Change-Id: I93a3b7a01f152473d25b492bba579b9300639bba Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove offset attribute from place content requests.Aaron McCarthy2014-01-221-52/+40
| | | | | | | | | | | | This complements 1d0966c6924876655c52725e779a7aa24866ff60 Not all service providers support arbitrary offsets when requesting place content. The offset attribute has been removed, instead service providers can supply a previous and next content request query in the form of a QPlaceContentRequest. Change-Id: I6239b42c31bed5dcd6645d86d5a48d7e6a667f46 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove offset attribute from place search requests.Aaron McCarthy2014-01-201-10/+0
| | | | | | | | | Not all service providers support arbitrary search offsets. The offset attribute has been removed, instead service providers can supply a previous and next search query in the form of a QPlaceSearchRequest. Change-Id: If68e969b06f909f3fa62718656cbef70d1bf84a6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.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>
* Support explore functionality.Aaron McCarthy2013-07-261-28/+41
| | | | | | | | | | | | | | | | | | | | | Add support for Nokia's explore functionality in places. This adds the ProposedSearchResult search result type. The proposed search result has a QPlaceSearchRequest, which can be submitted to QPlaceManager::search() to perform the proposed search. This has the added advantage that any arbitrary search request can be returned as a search result. To facilitate this further a search context field has been added to the place search request. This field can be used by backends to store additional search context. Other relevant fields should also be filled in. This allows additional search context to be kept. The Nokia v2 places implementation has be updated to use the explore feature and to return ProposedSearchResults as well as place results. Task-number: QTBUG-24874 Change-Id: Ib20c5a8c8a60e6bf16f38dcd75961a752b8b1b32 Reviewed-by: Alex <alexander.blasche@digia.com>
* Update copyright year to 2013Sergio Ahumada2013-06-131-1/+1
| | | | | Change-Id: I5b0cb7d56997ad7b91c073b3e02b31d0368fdcfa Reviewed-by: Alex <alexander.blasche@digia.com>
* Rename namespace QtLocation -> QLocationSze Howe Koh2013-02-051-4/+4
| | | | | | | | | | | | | | Main code, tests and docs updated. For consistency (with minimal disruption to the Qt 5.0.0 release), namespaces with a "Qt" prefix were renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Ic728cbbe39e0140dca1cdee24257dda095c9a478 Reviewed-by: Laszlo Papp <lpapp@kde.org> 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>
* Fix incorrect error code during details fetch for nokia pluginabcd2012-08-061-0/+1
| | | | | | | | | | | Previously a CommunicationError was returned if the id did not exist, this was because an incorrect id would result in a non-existent URL being used. Now we make the assumption if the URL content is not found, then it must be because the id did not exist. In such a case we can return a PlaceDoesNotExistError. Change-Id: Ibfc21b826e0514fd694cb69d0372ef99e46e768e Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* provide check for invalid coordinate parameters for nokia pluginabcd2012-07-121-19/+37
| | | | | Change-Id: I725af80fdd47d3d0bb50c6c2f02058bec7736b75 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Add in checks for invalid arguments for search suggestionsabcd2012-07-031-0/+20
| | | | | Change-Id: Iceb3777ea3518988971bec8b484e9e05fa606db4 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Refactor detection of unsupported search parameter combinationsabcd2012-07-031-3/+4
| | | | | Change-Id: I58c4992d4f189effdbd43df691d6eb01e730c422 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fix finished signaling (on error) for nokia pluginabcd2012-07-021-1/+3
| | | | | | | | The engine was not emitting a finished signal when the search reply errored out due to bad search arguments. Change-Id: I7010da1de31c98bc5a082fbf116e3ff6f3bf136b Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Manager should have been assigned to iconabcd2012-06-271-0/+4
| | | | | Change-Id: I731c61636e714f1891892603dfd9068289ac7a86 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Refactor recommendationsabcd2012-06-211-35/+25
| | | | | | | | Recommendations can be incorporated into ordinary searches. this is more convenient for the developer. Change-Id: Ifd3e040b6b7a964227981175b074ca4f52d7579c Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Rename QGeoBoundingArea and related classes to QGeoShape.Aaron McCarthy2012-06-211-7/+7
| | | | | | | | | | | | | | | | | | | | | 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>
* Update Nokia places service URLs.Aaron McCarthy2012-06-071-23/+17
| | | | | | | | | Update to the new places service URLs. Remove the /places path from the host name. Task-number: QTBUG-24984 Change-Id: Ib0be6505a457e16bb5ff2f309a2c56c8b3ef1c57 Reviewed-by: abcd <amos.choy@nokia.com>
* Move hard-codded messages into separate file and declare constants for them.Vladimir Bezkorovainyi2012-05-311-6/+8
| | | | | Change-Id: I35a2a5ca9d4c4dc20e291051666bb88f4264ab33 Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
* QtLocation: Fix compiler warnings.Friedemann Kleint2012-05-291-0/+1
| | | | | | | | - Assigned/unused variables. - Signed/unsigned comparison Change-Id: I712baa90442f9fc9699965e7c7e1c5f4ca319aab Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
* Refactor to allow specification for nokia icons onlyabcd2012-05-251-46/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an plugin parmeter called places.icons.custom that defines whether custom 3rd party icons or nokia icons are presented to the user for the jsondb plugin. For the nokia plugins, nokia icons can be subdivded into two types. The first is explictly set icons, the second is icons generated from the categories. In both cases the base icon is identified by the nokiaIcon key and a base icon value. However in the case of a generated icon there is a nokiaIconGenerated key that is set to true. When saving a place to the jsondb plugin, if the icon is generated, the icon data is not saved to jsondb. The category data however always is. When the place is retrieved from jsondb, the base icon will be generated from the category data. If an icon is not generated, then the base icon is saved to jsondb under the "nokiaIcon" field. When the place is retried from jsondb, this field will be used to provide the base icon. Change-Id: I9100011c519185719cdd7b62e12c2386f7f0f8d7 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Prepend protocol to request urls for online places pluginabcd2012-05-241-7/+21
| | | | | Change-Id: I6669d2ce04c9b533d8f6daa7e60f44e38672f503 Reviewed-by: Aaron McCarthy <aaron.mccarthy@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>
* China shifting support for dual simvladimirb2012-05-161-42/+13
| | | | | Change-Id: I278bad0a8b167a3a40c8e737622a83683e966e64 Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Coding style fixes: whitespace around pointers/referencesAlex Wilson2012-05-151-1/+1
| | | | | | Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf Reviewed-by: Thomas Lowe <thomas.lowe@nokia.com> Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Use QUrlQuery instead of the deprecated QList-based API.Thiago Macieira2012-05-091-57/+58
| | | | | | Change-Id: I0beb68af965b911af909170119001027dff37f3e Reviewed-by: Cristian Adam <cristian.adam@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Use local icons if possible and enable choosing of themes.abcd2012-05-011-1/+45
| | | | | | | | | | If no theme is provided the platform theme is used. A developer can explicitly request to use the non-platform specific default theme by specifying a theme plugin parameter of "default" Change-Id: I92b9f6511cdce7aa95ea7e67c731c6d63c8783f3 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Wrap network access to enable testing in Nokia pluginJean Gressmann2012-04-271-27/+11
| | | | | | | | | 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>
* Fix searching by coordinate onlyabcd2012-04-171-2/+4
| | | | | Change-Id: I41baba9dce9f57ca8a9ad02e4d8f4b375c0804d8 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Use tf="html" instead of tf="plain"abcd2012-04-171-7/+7
| | | | | | | This is so we can use attribution strings as is from the server. Change-Id: Ia694d1b3c8d44afda30f301ef020d58b50695cd6 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Added support for proxy autodetection.Cristian Adam2012-03-291-1/+5
| | | | | Change-Id: Icef793831e54f0333e9872293859b9009a7164cf Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
* Uniform usage of proxy, app_id, and, token for all managers.Cristian Adam2012-03-261-8/+16
| | | | | | | | There is no reason to have different <service>.proxy, <service.app_id <service>.token parameters, since they are the same for all services. Change-Id: Ie17c39ac5fd94027ce477267f9e957d4cc4a5e1b Reviewed-by: Alex Wilson <alex.wilson@nokia.com>