summaryrefslogtreecommitdiff
path: root/src/location
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix missing overrides in QDeclarativeSearchResultModelPaolo Angelelli2018-07-261-7/+7
| | | | | | | | | | | | | | This now triggers compile errors on macOS. Change-Id: I412dd1e3157fd5bf68d0f5fdc125d6eff9d704e7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Introduce Map.visibleAreaPaolo Angelelli2018-07-2616-51/+381
| | | | | | | | | | | | | | | | | | | | 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>
* | Fix compilation when building with qreal defined as floatLuca Carlon2018-07-191-12/+12
| | | | | | | | | | | | | | | | Call function templates with explicit type to force call using double precision arguments even when qreal is defined as float. Change-Id: Ida5004cdcba9b984a897e2eb7ae15044080d6adc Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-143-3/+3
|\ \ | |/ | | | | Change-Id: I749522d1f277159d4ee222c59b07044e954c3926
| * QGeoMapObject: Fix MSVC warnings about '*/' found outside of commentFriedemann Kleint2018-07-103-3/+3
| | | | | | | | | | | | | | | | | | labs\qsg\qmappolylineobjectqsg.cpp(103): warning C4138: '*/' found outside of comment labs\qsg\qmappolygonobjectqsg.cpp(81): warning C4138: '*/' found outside of comment labs\qsg\qqsgmapobject.cpp(53): warning C4138: '*/' found outside of comment Change-Id: I5c000dbd40e59af6504b52303bd4ae4a1b782dc9 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Enable incremental updates in PlaceSearchModelPaolo Angelelli2018-07-056-30/+184
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Expose add/remove transitions in MapItemViewPaolo Angelelli2018-07-042-2/+20
| | | | | | | | | | | | | | | | In this way these transitions can now be customized by the user. Change-Id: I949d0caab65b0e71012bf77baee9c847c8f415a0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Adjust to internal API changes in qtdeclarativeLars Knoll2018-07-034-0/+16
| | | | | | | | | | | | Change-Id: I37fd81cfaf2599859581e2a359f87f15b772db98 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devPaolo Angelelli2018-06-285-3/+41
|\ \ | |/ | | | | Change-Id: I2a881d8b9d29539735071a2d76d774e629a5c8c0
| * Add Qt.labs.location::Navigator::trackPositionSource propertyBruno de Oliveira Abinader2018-06-263-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | This property tells whether the Navigator should control the Map camera to keep track of position source updates. This property is enabled by default, and setting it to false is useful in cases where e.g. the user starts gesturing over the map area. Task-number: QTBUG-69031 Change-Id: I86157f69890f8cf0eb60d457d0f9c4134e2befb0 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Document potential ssl dependency in OSM providerPaolo Angelelli2018-06-252-3/+7
| | | | | | | | | | | | | | Task-number: QTBUG-68086 Change-Id: Idce724314777f0edc0ffefcea6cc838757800067 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add QDeclarativeGeoRoute::equalsPaolo Angelelli2018-06-262-0/+14
|/ | | | | | | So that deep comparisons can be performed in QML too Change-Id: I484644d4ddf3334c16321e5fc361504e9de105b2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Add missing dots (qtlocation)Paul Wicking2018-06-211-1/+1
| | | | | | Task-number: QTBUG-68933 Change-Id: Ie7863b196363022c0bb7c1fa4f258c4700b5abb3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix condition in QGeoRoute::operator==Paolo Angelelli2018-06-081-2/+2
| | | | | | | | | Closing parenthesis was in the wrong place. Change-Id: I41acade226f46ba830b3f44fe310d87f5d9bdd7c Reviewed-by: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix QGeoRouteRequest::operator==Paolo Angelelli2018-06-081-2/+3
| | | | | | | | Perform deep comparison using the already implemented QGeoRouteRequestPrivate::operator== if pointers aren't the same. Change-Id: I03260596753677054283d8381108a67ed8999ff4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QPointer to avoid dangling QDeclarativeGeoRoute in NavigatorPrivatePaolo Angelelli2018-06-084-8/+45
| | | | | | | | | | | | | | | QDeclarativeNavigator::setRoute takes a QDeclarativeGeoRoute. This type is not COW, and could be destroyed by the user or the route model. This patch stores it inside a QPointer. It also stores the contained QGeoRoute, that is what the navigation engines are supposed to use to perform navigation, and is COW. Task-number: QTBUG-68536 Change-Id: I73fb79faeb3ac9efefcbd778ee106d29fbf26658 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix PlaceSearchModel::data documentationJulian Sherollari2018-05-301-1/+1
| | | | | | | | The return type should be Variant. Change-Id: I78ecf4e0048d28c92e032b65c2fa2f7c75805177 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapItemView deleting wrong itemsPaolo Angelelli2018-05-292-8/+39
| | | | | | | | | Asynchronous incubation caused messing up with internal index. Task-number: QTBUG-68366 Change-Id: I9d9edbe42b7ace488c1a7f8728214ae1061caa26 Reviewed-by: Peter Staab <peter.staab76@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix change-of-sign warningThiago Macieira2018-05-231-1/+1
| | | | | | | | | qdeclarativegeoroute_p.h(102): error #68: integer conversion resulted in a change of sign void initSegments(unsigned int lastIndex = -1); ^ Change-Id: I052407b777ec43f78378fffd15311bd2bb1cdfdc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapObjectView object removalPaolo Angelelli2018-05-221-1/+3
| | | | | | | Call delegateModel.cancel if the object is still incubating Change-Id: Iee4af5530b6a00981280b9531cc3c1643db71d03 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Use FDL license for all .qdoc filesKai Koehne2018-05-181-21/+9
| | | | | Change-Id: I4c2712ce9acc4c5144b259a9f6b0f902ea6c5623 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Support raster-dem source type in Mapbox GL Map QML pluginBruno de Oliveira Abinader2018-05-161-0/+2
| | | | | | | Task-number: QTBUG-68121 Change-Id: Ica6bbd875777aa5689a683127937c594f4ff05f8 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix QDeclarativeGeoRouteModel::get docPaolo Angelelli2018-05-091-1/+1
| | | | | Change-Id: I4bba86863bb902b26f493bd0104dbe87579de9e6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix crash in Map{Polyline,Polygon,Route}ObjectQsgPaolo Angelelli2018-05-093-7/+7
| | | | | | | | | | | | | | | | When these objects get added to a map but aren't immediately visible (meaning are outside the visible region entirely), their respective QSGNodes will be marked as blocked. However, this isn't handled gracefully in qsgbatchrenderer. Renderer::nodeWasAdded discards nodes that are blocked. Meaning that when they will become unblocked, the node will result in being unallocated. This patch makes sure that a node is not instantiated at all if it would result in a blocked node. Change-Id: I8e174ba1d317e1d0c4006d993ec558bdad8a5b39 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix MapPolyline docPaolo Angelelli2018-05-091-5/+0
| | | | | | | | GL_LINES aren't used anymore. Remove the related note. Task-number: QTBUG-63223 Change-Id: Ic309b3ad4626506151b20f69e5f11a3f1d7cc888 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtLocation: Fix build warningsFriedemann Kleint2018-05-042-1/+12
| | | | | | | | | | QtLocation: WARNING: qtlocation/src/location/qlocationglobal.h includes qlocation.h when it should include QtLocation/qlocation.h QtLocation: WARNING: qtlocation/src/location/labs/qsg/qqsgmapobject_p.h does not have the "We mean it." warning Amends 2782765e20ba3bc6af92375574456fd54d4243f7. Change-Id: I6c225c8af70ebc5753b3b20aec1900efd1bc2c5c Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Paolo Angelelli2018-05-0440-265/+555
|\ | | | | | | Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b
| * Fix casting QGeoServiceProviderFactoryV2v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Paolo Angelelli2018-05-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | qobject_cast ing to QGeoServiceProviderFactory when the instance is a QGeoServiceProviderFactoryV2 returns 0. Use factoryV2 in this case. Task-number: QTBUG-68062 Change-Id: Ibed1902749b6d06c905d309514c3750e75b75626 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
| * Let QDeclarativeNavigator::{start,stop} update m_activeBruno de Oliveira Abinader2018-05-031-8/+4
| | | | | | | | | | | | | | | | | | | | | | QDeclarativeNavigator should call QNavigatorManager::start() inside QDeclarativeNavigator::start(), however because we were already updating m_active in QDeclarativeNavigator::setActive(), the call for QNavigationManager::start() never happens. Task-number: QTBUG-68066 Change-Id: I486381fdec7fc77ac977ee46683fabd2465cf799 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * QDeclarativeGeoMap::copyrightsVisibleChanged() was not added in Qt 5.11Alex Blasche2018-04-241-1/+1
| | | | | | | | | | | | Change-Id: Id80bf6b1919f0c6d6f96a315289f67ddad220f2f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix QGeoMapObject handling in reference implementationPaolo Angelelli2018-04-2229-243/+536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: Remove \since tag from Waypoint::metadataKai Koehne2018-04-221-2/+0
| | | | | | | | | | | | | | The whole type got introduced only in 5.11. Change-Id: I4368c95dc6c0d39da0088e0aed6b72d3b34c2bc9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Update qmltypes and revision for Qt 5.11 in Location and PositioningAlex Blasche2018-04-225-7/+7
| | | | | | | | | | Change-Id: Ie7493cbb33e656c270ef522fa26460461215e145 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Merge 5.11 into 5.11.0Oswald Buddenhagen2018-04-207-31/+37
| |\ | | | | | | | | | Change-Id: I93bd8e6bdd86795e5a52a9fc6e65fd3f0b9fc6ba
| * | Bump Qt Positioning and Location import versions to latest 5.11Alex Blasche2018-04-192-3/+3
| | | | | | | | | | | | | | | Change-Id: I846f00703b2c6c173e445bf053a92098626db8e2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Add QML revision info to new QML signals in geomapitembaseAlex Blasche2018-04-191-2/+2
| | | | | | | | | | | | | | | Change-Id: I5c3e45a5d44f3f7f5c3ecda6823035aae07ae825 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Remove unused variablePaolo Angelelli2018-04-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This fixes error: unused variable 'kClipperScaleFactorInv' in dev on macOS. Change-Id: I37dda7aca1c20797b2aede291a425fd327670655 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Fix MapCircle QQuickItem geometry to allow enabling layersPaolo Angelelli2018-04-201-3/+11
| |/ |/| | | | | | | | | | | | | | | This patch does not include a fix for the degenerated cases: - circle including one pole - circle including both poles Change-Id: I78d9a29bf1071ab3b3405179f34f42a71c0a79a5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix MapRectangle QQuickItem geometry to allow enabling layersPaolo Angelelli2018-04-191-3/+3
| | | | | | | | | | | | | | | | The geometry now considers the line width, so that, when enabling layers, the item won't be incorrectly clipped at the borders. Change-Id: I14578adb2fc393983a3c1be901241d78949c9dde Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove dead code in QGeoMapPolylineGeometry::updateScreenPointsPaolo Angelelli2018-04-191-8/+2
| | | | | | | | | | | | | | | | QTriangulatingStroker does apparently not use the clip argument, so the patch removes the code that calculates it. Change-Id: I14eeb2e7aac38e3f066d4d33c68ceae63555944d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add QGeoMapPolylineGeometry::containsPaolo Angelelli2018-04-193-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | This patch makes QGeoMapItemGeometry::contains virtual, and overrides it in QGeoMapPolylineGeometry, so that it can be used in items that have QGeoMapPolylineGeometry for borders. This patch fixes the issue of map polygons not being interactive on their borders. Task-number: QTBUG-67765 Change-Id: I7c571e57b9f1d26203f3e5857d47e85380281b28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix MapPolyline being drawn misplaced and moving when clippedPaolo Angelelli2018-04-195-7/+10
|/ | | | | | | Regression introduced in f0bc0db15ed262a8f31bb07b3b46a5cdf9277e79 Change-Id: I4c4a3cb2302daeb825be21f9e2f6c235d2cb7c93 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix MapPolygon being drawn misplaced and moving as it gets clippedPaolo Angelelli2018-04-182-6/+9
| | | | | | | | This patch fixes a regression introduced with commit f0bc0db15ed262a8f31bb07b3b46a5cdf9277e79 Change-Id: Ie974b7a95d8ecd5f6affafc070848d289f7afa06 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add accessor for screenOutline in QGeoMapItemGeometryPaolo Angelelli2018-04-181-0/+4
| | | | | Change-Id: I4e48d8e8b5c75bec620e7bdab3666a2f5c4e357e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Increase expansion factor for expanded visible region to 1.2Paolo Angelelli2018-04-181-1/+1
| | | | | | | | This to adjust for potentially large item borders, whose extent is not considered when clipping the item itself. Change-Id: I9ec11fbc8ce48870608378e7618721899bc0b4dc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix MapRectangle: Expression depends on non-NOTIFYable propertiesPaolo Angelelli2018-04-181-1/+1
| | | | | | | | Add the missing CONSTANT to the border property. Change-Id: Id70335511716e798247c0dfcb6dd4653e99af2c2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* 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-1752-31/+5402
|\ | | | | | | | | | | | | | | | | 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-1723-19/+1934
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status