summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
...
| * Bump Mapbox GL to the latest versionThiago Marcos P. Santos2018-05-163-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | New features like: - Heatmaps - Better label rendering - Bugfixes mapbox-gl-native @ 27b21363e62c105db0b040b4c5a5ef31170ebd30 Change-Id: I443fb91ba42065b0de101d13c3bf51713ed01a89 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devPaolo Angelelli2018-05-164-128/+36
|\ \ | |/ | | | | Change-Id: Ied604f4c229a976749457034eba8ae2f2a385c06
| * Change nominatim base URL to HTTPSPaolo Angelelli2018-05-152-2/+4
| | | | | | | | | | | | | | | | | | Nominatim switched to HTTPS only recently. This updates the endpoint url. Task-number: QTBUG-68261 Change-Id: I8a5328db61fe4f510ecdc70bf442fc069ae0a998 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix QGeoMapObject handling in reference implementationPaolo Angelelli2018-04-222-126/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setVisible was neither changing the visibility nor triggering repaint. Pimpls weren't removing themselves in their destructors when dynamically added/removed via QGeoMapObjectView add/removeMapObject. This patch also factors out the duplicated QGeoMapObject support from QGeoTiledMapLabs and QGeoMapObjectsOverlay and moves it into an own class, QGeoMapObjectQSGSupport. To properly flush the scene graph nodes upon object removal, a pointer to the QSGNode is added to the MapObject struct, now moved inside QGeoMapObjectQSGSupport. Change-Id: Ie8c6d54f8f340ba3867717d9620791d3fe8021cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-273-18/+0
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I03294a3ee43097ce535ef7c2805ee33a99e7dd25 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QPlaceManagerEngineMapbox: No longer use deprecated qSort()Friedemann Kleint2018-04-201-2/+4
| | | | | | | | | | Replace by std::sort(), fixing: qplacesearchreplymapbox.cpp:213:10: warning: 'void qSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QList<QPlaceSearchResult>::iterator; LessThan = QPlaceSearchReplyMapbox::onReplyFinished()::<lambda(const QPlaceResult&, const QPlaceResult&)>]' is deprecated: Use std::sort [-Wdeprecated-declarations] Amends 13189f0741c755bfbde889e91c67c168faa3709f. Change-Id: Ib5bab5a924e559f810754f44ebdd849915d70c43 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-04-1717-20/+239
|\ | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qgeomapobject.cpp src/location/declarativemaps/qgeomapobject_p_p.h src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
| * Introduce map objects reference implementationPaolo Angelelli2018-04-1715-16/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a reference implementation for the QGeoMapObject subclasses in the locationlabs module. If this module is built, all current plugins, with the exception of mapboxgl, will also be able to render map objects. The current reference implementation of map objects is not optimized, but it can be useful for both testing and feature parity (so that switching between plugins will give the same result). Change-Id: I830ebb3813f219e42c085f450952a2b4327361cd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Compile windowsJan Arve Sæther2018-04-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use "interface" keyword unless really needed. The interface keyword is defined as a preprocessor macro: #define interface struct This was done by MS in order to be able to write this (which adds more semantic): interface { HRESULT foo() = 0; [...] } Change-Id: I95c6396158971220299cdc0ded6ffb11c677990c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Support Mapbox Directions API voice & banner instructionsBruno de Oliveira Abinader2018-04-111-3/+166
| | | | | | | | | | | | Change-Id: I89f4f9940c2a9a862ffaec066e5a7841bc00bd05 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | mapboxgl: Specify map margins in pixels via 'margins' map parameterBruno de Oliveira Abinader2018-04-092-1/+53
| | | | | | | | | | Change-Id: Ifa95aea264dc1807b90d7619a0946bf291df16ce Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Implement QGeoRoute{,Private}MapboxBruno de Oliveira Abinader2018-03-281-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | Adds QGeoRoutePrivate::metadata(), which provides a QVariantMap containing route plugin-specific data, that could be privately used by other plugins. Taking Mapbox routes as example, we want to expose the route JSON server reply, so we've added QGeoRouteMapbox for that purpose. Change-Id: I6823ed4623b05a0e678b73676b2361cf74823ddb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Doc: Fix all documentation warningsTopi Reinio2018-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix multiple warnings caused by invalid documentation configuration, missing QML module specifiers, wrong QML type names, incorrect arguments for the \fn command, and missing documentation. Remove incorrect statement from the example usage of the Waypoint QML type. Use 'QtLocation' as the name for the module throughout the docs. Clang (used as the parser for QDoc in Qt 5.11) was unable to resolve the path for qlocation.h, causing QDoc to omit the QLocation namespace documentation. Fix this by including the file explicitly from qlocationglobal.h for documentation builds. Change-Id: I2bd790db1ff5ad96f0cdb415a682b97593b3a6dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Fix QGeoMapItemsOverlay not overriding QGeoMap::capabilitiesPaolo Angelelli2018-03-232-0/+8
|/ | | | | | | As result, it won't pan any longer Change-Id: Id65be2936d628a12e2bb4c99bc119473014774c9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Replace Q_NULLPTR with nullptrKevin Funk2018-02-057-8/+8
| | | | | Change-Id: Icbebfaae93cc5827d80ef09323ec82868789838a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-0524-88/+88
| | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Introduce Qt.location.labsPaolo Angelelli2018-01-271-1/+1
| | | | | | | | | | | Introducing the new labs qml plugin, Qt.labs.location, and associated qt module. The intended use is to introduce and validate new QML API before they can be moved into QtLocation. Change-Id: If70d1dcedaf708be96e918dc5e25578df93db370 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Allow plugins to use alternative map projectionsPaolo Angelelli2018-01-273-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | QtLocation mapping has always been geared around the WebMercator projection. Some mapping SDKs support additional projections, such as General Perspective (often called globe view or globe rendering). The goal of this patch is to allow a plugin to provide such a view, disabling WebMercator specific features, and redirecting API calls to plugin-specific implementations. In particular, this patch disables the rendering of Map Items (QDeclarativeGeoMapItemBase and sons) for projections different from WebMercator, with the exception of MapQuickItems. MapQuickItems, in turn, lose the ability to draw "on the map", when the projection is different from WebMercator. However, they can still be used to add geolocated popups, buttons and other UI elements. fitViewportToMapItems is also disabled, for both it can't be computed and there wouldn't be any item to fit (with the exception of mapquickitems) Change-Id: I9fa2fdd01a35a078fc4663efc9d269c4ecaa3f41 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make QPlace extensiblePaolo Angelelli2018-01-272-0/+2
| | | | | | | | This change makes it possible to subclass QPlace with custom private implementations. Change-Id: I363c0e8b7db41d9a8400ce6dbddf5405c619eeef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* OSM Places: support query limit parameterPaolo Angelelli2018-01-112-0/+7
| | | | | Change-Id: I9d5b5b547c5932270e0c1f68a21253b01e1d52cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add debug parameter to OSM plugin to include the request url in resultsPaolo Angelelli2018-01-104-0/+17
| | | | | Change-Id: Ib2c0ba380ed6f5eecc7eb6bec75037a4922a567f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QGeoShapes properly throughout the modulePaolo Angelelli2018-01-094-36/+18
| | | | | | | | Adds proper support to other valid shapes and use ::boundingGeoRectangle where appropriate. Change-Id: Ibba4cb18f5cca08df62d15b76fa0e1f249dc6fbb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devPaolo Angelelli2018-01-072-10/+1
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/location/location.cpp src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515
| * Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-12-153-11/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
| | * Remove OpenGL ES limitation for Mapbox GL on WindowsBruno de Oliveira Abinader2017-11-301-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes an issue preventing GL native from working on MinGW. mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: Iab9a560adcd54194cd9829a326b325856f8c8cc2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * Enforce numberAlternativeRoutes where possible when doing route requestsPaolo Angelelli2017-11-282-2/+2
| | | | | | | | | | | | | | | Change-Id: I321e802d795df36d8cdd1b8578e77094c500cc2e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Support waypoints bearing in the HERE backendPaolo Angelelli2017-12-051-4/+15
| | | | | | | | | | | | | | | Change-Id: I9246b648da809672510460273c2cc21aa478c550 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Unify OSRM backends for OSM and Mapbox pluginsPaolo Angelelli2017-11-293-135/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch unifies the OSRM backend in both the OSM and Mapbox plugins, adding some extra functionalities to QGeoRouteParserOsrmV5 to handle the extra osrm-text-instructions information coming from the Mapbox servers. It also adds a plugin parameter to let the user choose whether to use the server's text instructions or the plugin-generated ones. Change-Id: Id7ce73f4285e2e7db6872f40d72c0610847fce91 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Implement QGeoCodingManagerEngineMapboxBruno de Oliveira Abinader2017-11-297-11/+480
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements QtLocation's Geocoding functionality, providing forward and reverse geocoding based on Mapbox web services APIs [1]. New 'mapbox' plugin features: - "OnlineGeocodingFeature" - "ReverseGeocodingFeature" - "LocalizedGeocodingFeature" [1] https://www.mapbox.com/api-documentation Change-Id: Icaaf06373bd5c2b5abc5aed3cea46364664cae8f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Implement QPlaceManagerEngineMapboxBruno de Oliveira Abinader2017-11-29163-16/+3216
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements QtLocation's Places functionality, providing points of interests (POIs) support based on Mapbox web services APIs [1]. New 'mapbox' plugin features: - OnlinePlacesFeature - PlaceRecommendationsFeature - SearchSuggestionsFeature - LocalizedPlacesFeature Place icons are kindly provided via Mapbox Maki under CC0 license [2]. [1] https://www.mapbox.com/api-documentation [2] https://www.mapbox.com/maki Change-Id: Ice51abe184908250f584a9c08f70d28e95c30683 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-16/+17
|\ \ | |/ | | | | Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
| * Fix Mapbox GL plugin OpenGL usageThiago Marcos P. Santos2017-11-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were linking directly with the OpenGL library available in the system. On Windows for instance the only option was ANGLE. Now Mapbox GL is using OpenGL through QOpenGLFunctions and shall offer much better compatibility. Task-number: QTBUG-62108 Task-number: QTBUG-61767 Task-number: QTBUG-60897 Change-Id: Iabd29ff6c0b6daf14373508d4847344c07d01a57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Enable alpha channel in QSGMapboxGLTextureNodeBruno de Oliveira Abinader2017-11-031-1/+8
| | | | | | | | | | | | | | Task-number: QTBUG-64038 Change-Id: Icfa079d181994d8db9bd738bbd6107dce0ea76d1 Reviewed-by: Ola Røer Thorsen <ola@silentwings.no> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix ICU linkage on the Mapbox GL pluginThiago Marcos P. Santos2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes both the Mapbox GL plugin and the Mapbox GL engine at src/3rdparty/mapbox-gl-native use ICU in the same way as qtbase. QMAKE_USE_PRIVATE += icu This should fix build errors when using an ICU that doesn't have headers installed on the default header lookup path. That assumption was specially true for the Mapbox GL engine 3rdparty submodule. Task-number: QTBUG-63571 Change-Id: Id0ab4cb8fb42b8eda8afb9650cd678ee7c5c45ad Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Consider map item color alpha channel when applying opacityBruno de Oliveira Abinader2017-10-261-4/+4
| | | | | | | | | | | | Task-number: QTBUG-63928 Change-Id: I8b09da92e182dc5464516842718b8d30bc9a48fc Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Check if coordinates are non-empty before repeating the first entryBruno de Oliveira Abinader2017-10-261-1/+4
| | | | | | | | | | | | Task-number: QTBUG-63926 Change-Id: Ic57090dbc78705893280e040e5b4556cf296f949 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-261-7/+10
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
| * Fix MapboxGL crashing when no OpenGLContext can be createdPaolo Angelelli2017-09-261-7/+10
| | | | | | | | | | | | Task-number: QTBUG-63374 Change-Id: Iff172e7715ac9f59da23e890bae77ff522ed9e47 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Paolo Angelelli2017-09-112-8/+9
|\ \ | |/ | | | | Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
| * Fix disabling redirection for providers that have no local fallbackMårten Nordheim2017-09-112-8/+9
| | | | | | | | | | | | | | | | | | | | | | Currently these providers would not turn ready when disableRedirection() is called, while they also get disconnected, thus never being tried to be resolved, resulting in stalling the completion of the provider's resolution process Task-number: QTBUG-63033 Change-Id: I316b858fbc66b82bc124b8814b25fe29bc0c21a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-09-055-15/+102
|\ \ | |/ | | | | Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
| * Fix Mapbox GL plugin not respecting MapItem visibility and opacityThiago Marcos P. Santos2017-09-052-3/+19
| | | | | | | | | | | | | | | | Now opacity and visibility will be respected for the fill color as borders are not supported yet. Change-Id: I58f982dc9285537fde770e14238c5d6d903913e6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Mapbox GL native circle supportBruno de Oliveira Abinader2017-08-303-7/+64
| | | | | | | | | | | | | | | | | | | | Circles crossing one pole are drawn inverted. Circles crossing 2 poles do not even have the correct geometry. Nevertheless, a first approximation. Task-number: QTBUG-58869 Change-Id: I5a508f5d6e27c4f08412a7ae327883866068a1e9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix broken native text rendering with Mapbox GL pluginThiago Marcos P. Santos2017-08-301-0/+12
| | | | | | | | | | | | | | | | | | Mapbox is "leaking" the pixel storage mode. So we need to restore it after we render otherwise it breaks native text rendering. Task-number: QTBUG-62861 Change-Id: I12643e34e462cce58cdf30da52ab927499f38442 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Add a configure feature for each geoservice pluginPaolo Angelelli2017-08-301-5/+7
| | | | | | | | | | | | | | | | This patch makes it possible to disable geoservice plugins at configuration time using the QtLite -no-feature-geoservices_xxx syntax. Change-Id: I276382833db8cfca27383705cbb3f994ced47cb3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-224-12/+26
| | | | | | | | | | | | | | | | mapbox-gl-native @ bd15e273dce767458d335aeb1f50aa081390d593 Task-number: QTBUG-62454 Change-Id: I241ae47d8590a5de7da95f39ae056abeab9c172b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fixed MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix 3D buildings not being renderedThiago Marcos P. Santos2017-08-211-0/+1
| | | | | | | | | | | | | | | | Let Mapbox GL know about what FBO is in use so it can set texture attachments properly. Change-Id: Ie70de0f449eecf1d8a1f1dec8b89e60495ca5386 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fix MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>