summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning about QString::SkipEmptyParts being deprecatedThiago Macieira2020-05-063-3/+3
| | | | | | | | /home/tjmaciei/src/qt/qt5/qtlocation/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp:107:98: warning: ‘QString::SkipEmptyParts’ is deprecated [-Wdeprecated-declarations] Pick-To: 5.15 Change-Id: Ib3333a58f37746f3b935fffd1607e152af50f386 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix Clang 10 warnings about deprecated copy constructorsThiago Macieira2020-05-051-1/+1
| | | | | | | | | qgeocodereplyosm.cpp:115:21: error: loop variable 'k' of type 'const QString' creates a copy from type 'const QString' [-Werror,-Wrange-loop- construct] Task-number: QTBUG-83666 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b4a12bee11723 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-071-0/+5
|\ | | | | | | Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
| * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3Qt Forward Merge Bot2020-03-311-0/+5
| |\ | | | | | | | | | Change-Id: I8b84b78bf234556b7162066b8401630da2afb311
| | * Support custom Mapbox API base URLsAlex Leung2020-03-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Added support for custom Mapbox API base URLs. Fixes: QTBUG-82655 Change-Id: Ieebcc834f8aeaeb223b036100e5edadd55749101 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge 5.15 to dev and fix resulting compile issuesQt Forward Merge Bot2020-04-0227-59/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/location.cpp The change fixes the bare minimum of what needs to be done to compile and run. This includes the following issues: 1. Fix build failures as a result of QMetaType changes in qtbase moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like: "invalid application of 'sizeof' to an incomplete type 'QDeclarativeGeoMap'" 2. Adopts QtQML API changes. A private QJSValue ctor was removed. The "replacement" is QJSValuePrivate::fromReturnedValue(..). 3. The mapboxgl 3rdparty backend does not compile at this point in time and seems unmaintained. For the time being, the mapboxgl backend is disabled in the interest of keeping qtlocation closer to dev HEAD of other Qt modules. Change-Id: I756e1c2effb29eaaf96a61a28c1c17338774b77c
| * | QtLocation: get rid of now unneeded qOverloadsTimur Pocheptsov2020-03-2324-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a preparation for final cleanup in dev/Qt6. This amends the recent change in QtNetwork where we deprecated ambiguous signal overload. Also, fix old SIGNAL to use the proper name. Task-number: QTBUG-82605 Change-Id: Ifc92ce4569ba15ac5429fe379f134a6dbe3a5f73 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Revert "qtlocation: remove uses of the deprecated member-function"Timur Pocheptsov2020-02-2523-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b482674e51c097fccffa1e1cc32b4843ad393894. Reason for revert: naming in QProcess is considered to be the correct one. Change-Id: I6722adfc06b351c76fb432628a678c4ce887d594 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Enable mercator-to-screen projection in GLSLPaolo Angelelli2020-02-111-3/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, all the geo-to-screen conversion, and the triangulation operations for geo polylines and geo polygon are performed either at set time or in the shader. A separate bounding box geometry is processed in the old way to provide a correct QtQuick Item geometry, that can be used for nesting mouse areas, performing translations, input event delivery, etc. With this approach, performance are improved by more than one order of magnitude in average, but complex geometries will of course benefit more. It also adds correct rendering support for polygons with holes, previously only rendered correctly by the MapboxGL plugin. The polyline shader has basic miter joins. The miter is skipped if the angle is too sharp to avoid complicating the implementation. This shader introduces some glitches when the polyline is minified, for which the real fix is to have LOD for the geometry, and render simplified geometries at low zoom levels (added in a subsequent patch). Note: this approach, at least in its current implementation, does not support enabling layers on individual items, only on the Map element. Task-number: QTBUG-49303 Task-number: QTBUG-38459 Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-1523-28/+28
|/ | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add image source support to Mapbox GL pluginTadej Novak2019-11-091-1/+5
| | | | | | | [ChangeLog][QtLocation][MapboxGL] Added support for image sources Change-Id: I5334f36e033d26824300d90ad8d9aacf3ac75ac3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-012-2/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I21ae20734645fc34b302409163f7400015d8302c
| * Fix MapPolygon::color not changing in mapboxgl5.13Paolo Angelelli2019-10-311-1/+1
| | | | | | | | | | | | Change-Id: Ie02e3ea6135e443bcb3143e74d5ca0460e6ab7a8 Fixes: QTBUG-79489 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix OSM parsing of place_idPaolo Angelelli2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | Something must have changed in Qt json API/parser, or in the return value of nominatim. Either way, place_id is now an int. Change-Id: Ic340bed9c556665ce1114966d6b9157a3f380ad3 (cherry picked from commit 7533c81ccef992b0e932b299cdb1257d21e012d2) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-311-0/+6
|\ \ | |/ | | | | Change-Id: Ic431a95117ee8290a5b91937a756e9f9cfc37c7a
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-0/+6
| |\ | | | | | | | | | Change-Id: If3fd3389c3e2eed55daf342d1bde1899d2fe01a2
| | * Improve debugging in mapboxgl plugin when running without opengl backendPaolo Angelelli2019-08-201-0/+6
| | | | | | | | | | | | | | | Change-Id: I252c163ad9296b52f14b83710fda0a469f882d73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Add correct header for QSGPlainTextureLiang Qi2019-07-071-0/+4
|/ / | | | | | | | | | | | | | | | | Guard with QT_HAS_INCLUDE, because the header isn't there, yet, but adding it is blocked by the missing include here. Task-number: QTBUG-76928 Change-Id: Iaa4e67a73662de26b600207852e4668762cf5d96 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta4Qt Forward Merge Bot2019-05-072-16/+24
|\ \ | |/ | | | | Change-Id: I28b2db32a10b2f70d8c3626d645d279cfedb49f5
| * Use network cache when fetching provider data in the OSM pluginPaolo Angelelli2019-05-062-16/+24
| | | | | | | | | | | | | | | | | | Otherwise it becomes problematic to start up applications in absence of network. Change-Id: Ia543b88bd56bb6c93c803a66e345be1610a4dfe0 Reviewed-by: Tuomas Vaarala <tuomas.vaarala@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-014-18/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-253-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins request map data for some map types over HTTPS. Without SSL support (Qt built without SSL support, or missing OpenSSL libraries) this typically translates into blank maps. This is very evident on the MapViewer example. This patch makes sure that the example displays a notice when this situation happens. [ChangeLog] Added a notice to the MapViewer example to inform when a HTTPS-based map is selected without SSL support. Change-Id: I85428bb0536f33089a0e6045301c089fafe69d74 Fixes: QTBUG-74195 Fixes: QTBUG-74294 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix incorrect indexing of Mapbox tiles in the cachePaolo Angelelli2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A missing '.' was causing to index the wrong tile specs for all map types. [ChangeLog] Fixed incorrect indexing of Mapbox tiles in the cache. Change-Id: Ic22dd60f4a608b31d071520bae750efddb48d59a Fixes: QTBUG-70438 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Import OSM GeoJSON when extended data is requestedPaolo Angelelli2019-03-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Make use of QGeoJSON and import the Nominatim-returned geojson in geocode requests. Useful to get the shape of the geocode results. [ChangeLog] GeoJSON returned in Nominatim queries is now converted into the corresponding geoshapes using QGeoJson. Change-Id: Ie260e82d99363d55ed094e8dbf214d68c2ccadef Fixes: QTBUG-74248 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Introduce Qt.labs.location QtLocationLabs singleton typePaolo Angelelli2019-03-112-0/+40
| | | | | | | | | | | | | | | | | | | | | | This singleton is meant to offer tech-preview map-related API. It starts with a mapObjectsAt invokable, that can be used to probe MapObjects at a specific coordinate of a map. Reference implementation for Q*ObjectQSG, based on QGeoShape::contains, included. Change-Id: Ief692eb5a43115ca02d4642c82023d1b2e217400 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-2324-49/+49
| | | | | | | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-221-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8d0881209c8b0a0dce4ed949ef89ee2679448420
| * Fix use_mapbox_text_instructions typoTasuku Suzuki2019-01-131-1/+1
| | | | | | | | | | Change-Id: Ie6e1b7a21818a10b893b161183da2dd447e41ec5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-012-1/+14
|\ \ | |/ | | | | Change-Id: I52053e7871fe1ce8a6aead52db38ead6ee78e1d8
| * Introduce a map plugin parameter to decide U-Turn directionTasuku Suzuki2018-12-262-1/+14
| | | | | | | | | | | | | | | | | | | | | | When "uturn" comes from OSRM, Qt returns UTurnLeft since Right Hand Traffic is in use in most countries. This commit allows qml to set traffic side to return correct u-turn direction. Task-number: QTBUG-72462 Change-Id: Ifaa002b063159b4e4ee563d007721ba7a4a587a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Extract all available fields in osm geocode replyPaolo Angelelli2018-12-111-1/+8
| | | | | | | | | | | | | | | | | | The reply object that OSM Nominatim returns includes a number of nominatim-specific fields. This patch exposes them through the extendedAttributes property. Change-Id: I7d46880e0674b6b513738e4a9e82ce6b728c377c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-12-102-8/+9
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I00453b819d65460dabf771617e6181275461cc78
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-101-4/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifd3514a958d0df4320b253c26e3da3a632088be8
| | * Mapbox: Only include matching categories in the resultsAndy Shaw2018-11-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If an entry in the results had no categories specified at all then it would end up including this in the results even if a specific category was requested to match against. Change-Id: I506b40b73ec07608bd2b2562d92065376fbb67c9 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>
* | | Provide extended, plugin dependent information for Geo LocationsPaolo Angelelli2018-12-044-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes support for osm geojson and class fields. At the present, the content of the geojson field is returned as is. As soon as QGeoJson support is finalized, this will be integrated with a QGeoPolygon. Fixes: QTBUG-43401 Change-Id: Ifa7e24cf904a2c1e1e77ebfaa7948ac0ce81d265 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Allow QGeoCodeReplyPrivate to be subclassed and carry extra dataPaolo Angelelli2018-12-044-2/+46
|/ / | | | | | | | | | | | | | | Stored in form of a variant map. Currently used for debugging purposes. Change-Id: I49fa4b51da0d5947e3b292b6cde96cb496cef9e6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Mapbox GL: Add mapboxgl.china plugin parameterBruno de Oliveira Abinader2018-10-314-28/+49
| | | | | | | | | | | | | | | | | | Adds support for setting up Mapbox China API base URL + China government-approved styles. Change-Id: I66d9e15f336804466285e0996b0e326ef288be44 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Esri: enable place searchv5.12.0-beta3v5.12.0-beta2Guillaume Belz2018-10-0930-30/+939
| | | | | | | | | | Change-Id: I136ef0a3125b42b484e36413d26aa49e59a43b57 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix HERE route parsingv5.12.0-beta1Paolo Angelelli2018-09-243-229/+51
| | | | | | | | | | | | | | | | | | | | We were previously not requesting all relevant attributes, and deriving some required info by ourself, in the wrong way. So just request what's needed and use it. Task-number: QTBUG-70499 Change-Id: I6e0d4b28da1412a4c13460d25e16e383f0aca9a0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix HERE qgeoroutexmlparser and add legs supportPaolo Angelelli2018-09-052-74/+297
| | | | | | | | | | | | | | | | | | | | All route segments after the second waypoint contain broken paths. This patch fixes it refactoring the parsing logic, also adding support for route legs. Change-Id: I30ec9e889a5e16bf81c4a0caf1b59fc895b7ea5e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Set the request into QGeoRoute results in osm, mapbox pluginsPaolo Angelelli2018-08-272-0/+14
| | | | | | | | | | Change-Id: Iec8d1cb9ad369fe765e34bdcff2512e2726797ad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Honor QGeoPolygon holes in the MapboxGL pluginPaolo Angelelli2018-08-221-9/+21
| | | | | | | | | | | | | | | | This since mapbox-gl-native is able to properly render these holes. Change-Id: I29ee9efd256c607ad36543a949b64699de310371 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix visibleArea handling in mapboxgl pluginPaolo Angelelli2018-07-311-5/+9
| | | | | | | | | | | | | | The empty visibleArea case was not handled properly. Change-Id: I1f04139e709ff7dab0b6db075d65d246a5b37cf9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-282-105/+41
|\ \ | |/ | | | | Change-Id: Ia764bb5526b00f58f9ff0a0dd5a8ab1b20fb99ad
| * Remove indexing of offline data from OSM pluginPaolo Angelelli2018-07-262-105/+41
| | | | | | | | | | | | | | | | | | With this patch, offline tiles will be looked up on the fly, thus removing the need to index the offline content at startup. Task-number: QTBUG-59665 Change-Id: I1db62c38363dafe82ee2f2ffc7f493ac5d958fc2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Introduce Map.visibleAreaPaolo Angelelli2018-07-265-60/+67
| | | | | | | | | | | | | | | | | | | | This will allow moving the visible map area to a subregion of the viewport, allowing to maintain the desired visible region visible when overlaying controls on top of the map. Task-number: QTBUG-68966 Change-Id: Idf4b30f7c1e4062e5e1c0ddc01a31bc856c0bc0c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Enable incremental updates in PlaceSearchModelPaolo Angelelli2018-07-053-1/+18
| | | | | | | | | | | | | | | | | | | | | | This way pages can be changed without resetting the model. To achieve this, new members into QPlaceSearchRequestPrivate are introduced, to keep the relationship between a request for one page, and the previous or the next page. In this way sparse population of the model becomes possible. Change-Id: Ic8db0281408f3500ba83f78c7e152ee0b68cd099 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-24/+32
|\ \ | |/ | | | | Change-Id: Id27e5a31f3a72eac38b976d546a1f733226cd5ae
| * Support dynamic properties in QMapboxGLStyleChangeBruno de Oliveira Abinader2018-06-061-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | QMapboxGLStyleChange should iterate also over dynamic properties when generating the style change objects. These dynamic properties could come from generic QGeoMapParameter objects instantiated from C++ code. Task-number: QTBUG-68598 Change-Id: I01a3e0971615c61f74789446c03255185a373803 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status