summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | QGeoManeuver: Fix QVariantMap includeFriedemann Kleint2018-04-181-1/+1
|/ | | | | | | | | | Prepend module name, which is required for generating Qt for Python bindinds. Task-number: PYSIDE-487 Change-Id: I84614bae08efa74393c4048bc16196eb730f0e6b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-04-1776-99/+4801
|\ | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qgeomapobject.cpp src/location/declarativemaps/qgeomapobject_p_p.h src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
| * Add q pointer to QDeclarativeNavigatorPrivatewip/navigationPaolo Angelelli2018-04-172-1/+10
| | | | | | | | | | | | | | | | | | Since QDeclarativeNavigatorPrivate is what gets passed to the engine, a QParameterizableObject *q becomes necessary in order to extract and connect the QGeoMapParameters in the engines. Change-Id: Id4a8a99f2287faab9c7e67e5355e9c90c33eaa8f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Introduce map objects reference implementationPaolo Angelelli2018-04-1739-35/+2183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add documentation for QDeclarativeNavigatorPaolo Angelelli2018-04-171-6/+110
| | | | | | | | | | Change-Id: I8dd9a35b05b7015c8f4fc6badfa0b0909c669e62 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Introduce Navigator QML typePaolo Angelelli2018-04-178-16/+597
| | | | | | | | | | | | | | | | | | A new QML type, Navigator, is introduced in Qt.labs.location Its intended purpose is to be a front-end for the functionalities offered by NavigationManagerEngines. Change-Id: Ic93bed0bfaaf32453e759b12a348fa6ef1ae2c93 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapPolylineObjectPaolo Angelelli2018-04-171-0/+32
| | | | | | | | | | Change-Id: I2112ae3aa2bb5b9c8dc18552c7643039c37a694e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapRouteObjectPaolo Angelelli2018-04-171-0/+18
| | | | | | | | | | Change-Id: I0b78ec63e3474db9343094661932cb6a1f31728e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapPolygonObjectPaolo Angelelli2018-04-171-0/+38
| | | | | | | | | | Change-Id: I02eb18655f1c32842465addf5c937028af39f5bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapCircleObjectPaolo Angelelli2018-04-171-0/+44
| | | | | | | | | | Change-Id: I41e792a7c8d0b707ca087c20a4a5dc5e906bd124 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapIconObjectPaolo Angelelli2018-04-171-0/+40
| | | | | | | | | | Change-Id: I36f2cc5d8fe71c0a3446b8572203bd2e032e9541 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add documentation for QMapObjectViewPaolo Angelelli2018-04-161-2/+32
| | | | | | | | | | Change-Id: I6cc147892b1fe2fce18df52335b0ffeaa56e2c6f 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>
| * Move locationlabs code into locationPaolo Angelelli2018-03-2326-58/+46
| | | | | | | | | | | | | | | | | | | | The labs feature will still be controlled by location-labs-plugin config option. They will simply come from the QtLocation module, and be exposed to QML via the additional qml plugin in imports/locationlabs. Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Introduce MapPolylineObject and MapPolygonObjectPaolo Angelelli2018-03-217-0/+801
| | | | | | | | | | Change-Id: I95b21a8df6e1de600b31ce2fbea55d0a31b31c7f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Introduce MapCircleObjectPaolo Angelelli2018-03-214-0/+455
| | | | | | | | | | Change-Id: Ic8b2ae65f461b55c3f655af66865c4e8bbf50d14 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/5.11' into wip/navigationPaolo Angelelli2018-03-2027-61/+242
| |\ | | | | | | | | | Change-Id: I558b3b2de394b946d70f484a19d0c1f7bef25515
| * | Introduce MapIconObjectPaolo Angelelli2018-03-014-3/+401
| | | | | | | | | | | | | | | Change-Id: I3ce8956ed77d4307521cb6b5e9b53fb4cc5fed7c Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | Prepare for dual mode item creation in MapObjectViewPaolo Angelelli2018-02-231-7/+10
| | | | | | | | | | | | | | | | | | | | | Put variables in place to switch between sync/async incubation. Change-Id: Iabe2d0af4b6a4c5f4c4a8e840333bba44926db3f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | Add virtual QGeoMap::removeMapObjectPaolo Angelelli2018-02-212-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | this can be called in ~QGeoMapObjectPrivate overrides to delete themselves from the map. Change-Id: I715491728a60b3d1bd60944a51dfa0ba07a3b29e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Assign QGeoMapObjectPrivate::m_map after creating the new implementationPaolo Angelelli2018-02-211-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Or else it will be null, as no copy constructor for QGeoMapPrivate is defined (and used). Change-Id: I6045ccd4ec15c775a6ae0f9c55107103dfe28e9e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | Change QDeclarativeGeoMapItemBase::map_ into a QPointerPaolo Angelelli2018-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Or else it may cause crashes on shutdown due to map_ not being parented with QDeclarativeGeoMap and potentially being deleted earlier. Change-Id: I2bed1c884eb556e48261371e889aae5e190476bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into wip/navigationPaolo Angelelli2018-02-2033-263/+685
| |\ \ | | | | | | | | | | | | Change-Id: If8c2766bc6cd2ef7c424f92212ed8db2a4824d09
* | | | Fix MapItemView not setting context data upon item deletionPaolo Angelelli2018-04-179-502/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation does not properly re-set context data upon model item deletion/change. This patch uses a QQmlDelegateModel that does all the management internally. To accommodate for items disappearing/reappearing all at once, potentially introducing flickering, a fixed opacity transition 300msec long has been introduced as exit transition. In later Qt releases, new API can be added to let the user change it, as well as also adding an enter transition and possibly more. Task-number: QTBUG-62086 Task-number: QTBUG-65833 Change-Id: I59a8147a12f035d5c7f86c2546e9144b2e1a7b3c Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix coding style in QDeclarativeGeoMapItemViewPaolo Angelelli2018-04-173-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace trailing underscore with leading m_ Change-Id: I9c22beefa1819a33ff49dc26f4601af04eecaf58 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix crash when calling Map.clearData at application startupPaolo Angelelli2018-04-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-67759 Change-Id: Ie14291ed099aef520ca158c7d146c46ad49625d7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | API Fix: remove QGeoCoordinate <-> QGeoCoordinateObjectPaolo Angelelli2018-04-173-60/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was some code needed for supporting something that eventually did not get in. So we can as well remove it altogether from the API. Change-Id: Ibbfc50fb950c316308ce1d666e39da33527faa9e Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Improve QGeoPath::path documentation and add autotestsv5.11.0-beta4Paolo Angelelli2018-04-122-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8359c79f114abd0006012098cc154695013e0512 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix Clipper screwing polyline topology during clippingPaolo Angelelli2018-04-113-6/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix uses a different polyline clipping algorithm to do line-polygon clipping which uses Clipper internally only to do inside/outside testing. Among other things, this method appears to be much faster than the older one. Task-number: QTBUG-66692 Task-number: QTBUG-66830 Change-Id: I2ed6f46c5d9d426a740611bec13aff69be49eb2a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Support Mapbox Directions API voice & banner instructionsBruno de Oliveira Abinader2018-04-113-55/+244
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89f4f9940c2a9a862ffaec066e5a7841bc00bd05 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | 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>
* | | | QQuickGeoMapGestureArea: Fix crasher when m_mousePoint is nullDaniel d'Andrada2018-04-102-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Happens when the first input it receives is a touch one. Task-number: QTBUG-67580 Change-Id: Ia9441c753da15f2fe907901450d182027e11c8aa 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>
* | | | Add OSRM's {leg,step}_index extra attribute to QGeoManeuverBruno de Oliveira Abinader2018-04-091-4/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f6fd2e29a9689baa9db3efbbcc17242925484db Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Allow threaded tile provisioningPaolo Angelelli2018-04-063-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Request 6-digit precision from OSRM geometriesBruno de Oliveira Abinader2018-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having an additional digit provides extra detail and can return more accurate results along a path e.g. at the equator, six digits gives 10cm of precision, while five digits yields about a meter. Change-Id: Iec93ac77edbc0b355edee6e4184f1f8f8002e98a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Doc: Document QtPositioning::geopolygon QML basic typev5.11.0-beta3Topi Reinio2018-04-032-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And revert the changes from commit acc8bc07 that erraneously converted references of 'geopolygon' to 'geoshape'. Change-Id: I8ad5c17b3ad3dcd3cec6d7ba49bfa078b87ad33d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Implement QGeoRoute{,Private}MapboxBruno de Oliveira Abinader2018-03-283-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Introduce setParentVisiblityBogDan Vatra2018-03-273-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's needed to determine the item visibility without altering user-set visibility values. Change-Id: Ibc78cdbc4eab83ddf93326e58ab4d2a883de444b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Doc: Fix all documentation warningsTopi Reinio2018-03-2753-153/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Refactor input handling codePaolo Angelelli2018-03-232-127/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix coding style in map gesture area, and move all input handling code in the same section in qdeclarativegeomap.cpp Change-Id: I33ef572cb85ebbb446ee9ff0a1359abbe55c3dfa Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
* | | | Declare/Register metatype for QGeoPositionInfoPaolo Angelelli2018-03-2313-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of doing it all over the place, declare it in qgeopositioninfo.h and register it in QGeoPositionInfoSource() as well as in positioning.cpp Task-number: QTBUG-65937 Change-Id: I819af3393921bdc9ca46832d5b4181d41546dac0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | QGeoServiceProvider: Consider navigation manager when setting localePaolo Angelelli2018-03-231-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b93d477c94cba528b9b6764e69cb6363c270702 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix tst_map_mouse.qml test_basic_press_release not stealing eventsPaolo Angelelli2018-03-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With 5af3f07c95e758636090ad4a928fa8e86a7b2dc6, the map gesture area does not get into active state anymore upon mouse release. This behavioral fix causes tst_map_mouse.qml(536) to fail, since clicking somewhere and releasing somewhere else does not activate the gesture area anymore. This patch adds the necessary real-life mouse move in between the two to activate the gesture area, and trigger the tested event stealing. Change-Id: I459a663f9862d0768b17a9ecd71065342917dc10 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Deprecate MapParameter, introduce DynamicParameterPaolo Angelelli2018-03-222-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same thing, different name, more suitable for being used outside a Map element (e.g., inside MapObjects, MapItems, or Navigator). Change-Id: I79839ef42daad0347a2b760d61d4124496c56fdd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix clearData not triggering scene updatePaolo Angelelli2018-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-66880 Change-Id: I14f3d3fa933b63436dcd3034c07a5dad51f18b1f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix MapPolyline QQuickItem geometry to allow enabling layersPaolo Angelelli2018-03-221-3/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | The geometry now considers the line width, so that, when enabling layers, the item won't be incorrectly clipped at the borders. Task-number: QTBUG-38459 Change-Id: I82c1e49c914a4a1219bb1f1ec3a70ff7bfbfbcfe Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QGeoServiceProviderFactory: Restore binary compatibility to Qt 5.10Paolo Angelelli2018-03-204-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new QGeoServiceProviderFactoryV2 to load plugins offering a navigation manager engine. To be able to still load plugins compiled against Qt 5.10, both factories are considered when loading plugins, using the pointer to the V2 only when accessing the newly exposed functionality. Change-Id: I8e5e868737c77142e77caaacef278686565928df Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix export for QDoubleVector2D and QDoubleVector3DPaolo Angelelli2018-03-192-4/+4
| | | | | | | | | | | | | | | Change-Id: I422b4e67843fe1910f85299cec437a5c7c24814d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status