summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.0' in qt/qtlocationv6.5.06.5.0Qt Submodule Update Bot2023-03-281-2/+2
| | | | | Change-Id: Icffc9ec1b3396347fbcce6f46d6f34f4d5d671af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-261-3/+3
| | | | | Change-Id: I4056a0995e4b3824d3e28209d7527bcaee9e3b17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-251-3/+3
| | | | | Change-Id: Ibce48a8675b1f29de878bc3ce71d32a103756f28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-221-3/+3
| | | | | Change-Id: I121da27bbad7a0cfecf87c4dba95359a4a6cde20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationv6.5.0-rc1Qt Submodule Update Bot2023-03-141-3/+3
| | | | | Change-Id: Ib702d54bcbe7973a614d0ba898b39d08c1d238ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-131-3/+3
| | | | | Change-Id: I9c73d8945fad36e5cbdd725469e050894e775ff6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-111-3/+3
| | | | | Change-Id: I76587b5a2eee803ea57791ab3facd79d2eb8aa14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Fix links and snippetsVolker Hilsheimer2023-03-097-14/+12
| | | | | | | | | | | | | | | | Add modules in which linked-to types live to the qdoc dependencies, fix links, and adapt snippets to changes in the examples (and add tags to quoted files as needed). This makes the documentation generate without warnings, so set the warninglimit to 0 as well to block future regressions. Change-Id: I43fdfce1087c2a35212f91b41bba1ff9481e609d Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> Reviewed-by: <safiyyah.moosa@qt.io> (cherry picked from commit fea04eea8b142aa5ac89b1024bbfc5298685fb0c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update the documentationMatthias Rauter2023-03-099-106/+69
| | | | | | Change-Id: Icff1282a22c3cefbbbbfb1dc03910066eb7c85f3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 838426f5159c795fdeb94a6e657a478d4ac63511)
* Minimal updates to Places Map example documentationMatthias Rauter2023-03-092-2/+2
| | | | | | Change-Id: Ie3d18d1f9ac4beed2ec3e00f171a5fc80404455f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit faefc8772a3317e7b881c5dd0542dd1c1abceb90)
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-081-3/+3
| | | | | Change-Id: I0e297242c3f9621357e03c5489d7dedf5643de8b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Examples: Fix qmake buildFriedemann Kleint2023-03-075-5/+4
| | | | | | | | | | Fix the resources and remove C++ 11. Change-Id: I1141594eae239b32b3c00663f2e0d78ec00421fd Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 2a05e3206af01b7edc05e154a71dfd7e6c44c6f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* map viewer/places examples: Brush up the codeFriedemann Kleint2023-03-075-93/+83
| | | | | | | | | | | | | | | | | | | | | - Use modern string literals - Use the variadic template version of QMetaObject::invokeMethod() - Use modern connect syntax - Reorder includes - Trim newlines in QML Fix minor bugs: - Skip empty elements of library path (namely when variable is not set) - Fix the check for osm.useragent to operate on the map - Exit cleanly on QML loading errors Since places uses similar code, apply the changes there as well. Change-Id: Ibaeffc6e003c55c458137458c5017584e0c072f1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 20b0c2fb20f3c37c2549b7aa59f686a7726a2817) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qtlocationQt Submodule Update Bot2023-03-041-3/+3
| | | | | Change-Id: Ia84b1c9e6b8ab18e839a178935148dad3c38acad Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Mapviewer exampleMatthias Rauter2023-03-0316-327/+68
| | | | | | | | | | | | Removed MapItems and argument parsing for old plugins. Replaced some circles with markers. Updated documentation and resources. Change-Id: I2c33d33d52ba2f5c1c81f444e8b414a4349dc505 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 633239ff830a9c72ae88d53329875878a8876e66)
* Update location examples to work with MapView/HandlersShawn Rutledge2023-03-0323-505/+470
| | | | | | | | | | | | | | | | | | MapView replaces Map in the examples to reintroduce event handling. Some of the functionality is still in mapview.map and the code has to be adjusted respectivly. The following examples are affected: mapviewer, places, places_map. The mapviewer example has a new menu to draw mapitems. The places example draws places icons instead of a fixed marker. Fixes: QTBUG-111005 Change-Id: I15ca2b3d3ecb7c35684b9fd4c2b7a86249add11c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit e770809db4b6c92ee4be22b5ea021ccc505cec8f) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add documentation for GeoJson Viewer exampleMatthias Rauter2023-03-039-62/+308
| | | | | | | | | Some code has been changed to make the documentation clearer. Change-Id: Icae03a7babc7e40d10cbdca5bfa81d3ab8efbd86 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4d7ae8a74e70896a757f483865fe7095120fedc1) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Remove unsupported plugin parameters from places exampleMatthias Rauter2023-03-011-18/+0
| | | | | | | Change-Id: I31641784ecc06711a06fafa650631fb3e4da8f45 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0ef7f20ad7b1dbe4d1ff0381ff8d2d0db10ba136) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace MouseArea with TapHandler in Planespotter exampleMatthias Rauter2023-03-012-7/+5
| | | | | | | Change-Id: Ib5e02e914090a22183230cdd128fbcba608d82fc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 07ac2096ce088c6ce3e5d692e5048b89364173af) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-03-011-3/+3
| | | | | Change-Id: I10312e0c703c16fdf14376975ada2fc4ae8e6245 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve a duplicate static symbol during Unity BuildAmir Masoud Abdol2023-02-282-11/+2
| | | | | | | | | | | | Removed a duplicate function, and replaced it with direct calculation since it was only being used once in one of the files anyway. The same for `invLog2`, as the compiler should be taking care of it already. Task-number: QTBUG-109394 Change-Id: I9095bca32ea127f770fa2cb0523b05110bd8ef21 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 95e2cae51e6c92315fbf33c5d3e8a1826cca8907) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Resolve duplicate meta type definition causing issue for unity buildAmir Masoud Abdol2023-02-283-6/+4
| | | | | | | | Task-number: QTBUG-109394 Change-Id: Ic909c4e0e76e8744176421125d9fcda6b602bf0c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 7334a4b08d553d00aba6d1f5301e833c30029510) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Resolve a duplicate symbol during Unity BuildAmir Masoud Abdol2023-02-271-0/+3
| | | | | | | | | | | By excluding them from the unity build Task-number: QTBUG-109394 Change-Id: I7108d75e792900f9bcc70d858ee058a3a3ba80f1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit bf874c86f710faf627439f3e53b9cdfd5adca71f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Return early from export function if data is empty to avoid crashesMatthias Rauter2023-02-231-0/+2
| | | | | | | Change-Id: I4713d4a97b7854df8310e6d0766a694e11473768 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 925d9cb0308af5b9d7ae84e7e16ca2c73a88b369) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-02-231-3/+3
| | | | | Change-Id: I6de97b99bffd22ea5a5688aeed01494da3ea3f1f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add drawing of mapItems to GeoJson viewer exampleMatthias Rauter2023-02-228-5/+279
| | | | | | | Change-Id: I362acbb6a428e83c3490742824b54aa68890c47f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0d7a0d92c64a906748b0676ea502ec3d6ccf27d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add boundaries to zoomLevel in MapViewMatthias Rauter2023-02-224-143/+84
| | | | | | | | | | There was a bug in the notification handling in QDeclarativeGeoMap that prevented BoundaryRule to work properly. This bug was fixed along the way. Change-Id: Iae85019c7cceb77dab6f20478b564908797f7ccd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f19a0b27d4945ef633ca6602d4af63abad88f134) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve documentation and fix warnings and examplesVolker Hilsheimer2023-02-216-88/+35
| | | | | | | | | | | | | | - Waypoint was removed in bf12a34712d14d382b410b5ba5154eba90963675, so remove the documentation for the QML type - document the icon QML type from the Places module - remove dead code from example - adjust snippet quoting to changes - fix some qdoc warnings Change-Id: I8ee2b55d8a48afa6f700be1edab06f2364c6ff04 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 7580137c8fd295ba1b3abd3199cf9eb4fd949690) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve compatibility between OSM plugin and places exampleMatthias Rauter2023-02-202-8/+9
| | | | | | | | | | | | | The categories are searched as well as possible. However, searches for e.g. all shops are not possible with OSM since a recent API change. The category is written into the PlacesReply object so that they can be displayed in the ui. Change-Id: Ic08e5bef393313672775b6f39d365484ee8b0c58 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 992f57fcf993b9804dcda9b12bf4d67ed102f284) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationv6.5.0-beta3Qt Submodule Update Bot2023-02-171-3/+3
| | | | | Change-Id: Iabf0bfaf29a25a7f005b365af08c068a7960b95b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add baseline tests to qtlocationMatthias Rauter2023-02-1532-0/+2183
| | | | | | | | | Testing rendering of QDeclarativeMapItems. Change-Id: I9767314945a022006fdf02341744018c04206099 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 51a895b3d280ce5103785e016e82b77676c26c5f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add benchmark example for DeclarativeMapItemsMatthias Rauter2023-02-158-0/+571
| | | | | | | Change-Id: I42ec79a55eb16d768a3268212272cd06436d24b9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 854758eaa75fa2b1caf443b9e89c85e362555a06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct and improve the rendering of QuickMapItemsMatthias Rauter2023-02-1418-849/+353
| | | | | | | | | | | | | | | | | | | | | | | | Various MapItems were not rendered correctly, especially in corner cases. This change ensures that MapItems are rendered correctly in the vast majority of cases. All MapItems are shown correctly if they wrap around the globe and appear twice on the map. Circles that span around the globe or are located near poles are shown correclty and filled all the way to the border of the map. Polygons are shown correctly including their holes. The code was simplified and some artefacts of previous implementations were removed. Fixes: QTBUG-110701 Fixes: QTBUG-110511 Change-Id: I1110659989436cd5a93f6ec26f75caa06d5f2b71 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 8b9ecad4bed0150adcbdf91db3f5f9507a156fd6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use new handler API in GeoJson Viewer exampleMatthias Rauter2023-02-141-5/+36
| | | | | | | Change-Id: I8408c37a2692e93dd420c558147071d07d85523f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b842a6cdcce0ee43a48ec084180d9dc065b599a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix the broken test after the retirement of qt_parse_all_argumentsAmir Masoud Abdol2023-02-101-1/+1
| | | | | | | | | | | | As we are now processing the arguments with cmake_parse_arguments(PARSE_ARGV, we don't need to pass the escape characters anymore. Task-number: QTBUG-99238 Change-Id: I618d4cd0105988bffb1d496fa2b3149d0e609710 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit dcc3724eed2499b0737f460f358846a8434a3100) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-02-101-3/+3
| | | | | Change-Id: I86748b338930182d0ce540e9e8357a7451806767 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove old code for rendering MapItems and the respecitve switchMatthias Rauter2023-02-0811-678/+0
| | | | | | | Change-Id: I59311a3b9d32ca9df3a5b66a6352b45448a52cdc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 351bb54f544f1f6d63c469caa8e999473714b2ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Implement all four map items with ShapeLaszlo Agocs2023-02-0814-74/+501
| | | | | | | | | | | | | | With a master switch in qdeclarativegeomapitembase_p.h, this is enabled by default. For now the old method is still available by just commenting out the define. The old path can be removed in follow-up patches; for now keeping both so one can compare and debug if further issues arise. Change-Id: I01c44ee8a07d7d5f7eb018be33ac5d161ba90e2a Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 34fccf47ecf8ab2db53b23013f4f402c175ce9de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use SPDX license identifiersVolker Hilsheimer2023-02-03619-22475/+3001
| | | | | | | | Task-number: QTBUG-67283 Change-Id: I4b8f877cc355c7c6cd410b3b1683defa58486381 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit cd4db512ae08836f5fa1d746000052215cf70a9c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-02-021-3/+3
| | | | | Change-Id: I42cd9d75a6c7cac272e11a974265f52610d36bfd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-01-311-3/+3
| | | | | Change-Id: I10d8c1ef1febd834f4d439cac40daf4900ef72f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix small inconsistencies in the example places_mapMatthias Rauter2023-01-312-19/+12
| | | | | | | | | | | Change the search radius in example places_map to get a reasonable amount of results. Replace search term pizza with food to get a reasonable amount of results within 1km radius. Cleaned up some code and replaced static values with bindings. Change-Id: I51aedadaf46a1576d033178ec8c0b94222dffca7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit bc834c4b40adf8263f60d422681d9c0b7bae21d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix small inconsistencies in the example places_listMatthias Rauter2023-01-312-3/+3
| | | | | | | | | | Chang the search radius in example places_list to match the comment. Replace search term pizza with food to get a reasonable amount of results within 5km radius. Change-Id: Ibf8a97afb85c80e8cd9b646f2c82d41a836359d2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 5ef3e454c7903e4b8e0db41aea87cfaf21c641e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add MapViewShawn Rutledge2023-01-2912-469/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has nearly complete functionality now. A couple of approaches were possible: one way is to have the Map larger than the MapView, so that the MapView defines a viewport. This allows the handlers to function more "normally": DragHandler already knows how to move the Map in the viewport, etc. But then you can pan off the edge of the Map; so we needed a recenter() function to calculate and set the map.center property, and call that at the right times. This needs to be done when the MapView is resized too, and that turned out to be tricky to get right. Another advantage though would be that we could ensure Map doesn't re-generate geometry any more often than necessary: small changes to the center and scale of the map would often merely change one QSGTransformNode. We could still try this approach again later on, but perhaps Map should be doing more of the work to make it possible; and the new ItemObservesViewport flag ought to be useful. But for now, we do it the existing way: Map does its own viewporting. Thus, we assume that Map is optimized to limit geometry re-generation internally. In practice, redrawing while executing a pinch gesture feels fast enough. One of the main reasons we needed the recent changes in handlers is to get deltas. We cannot use bindings directly from handler properties to Map properties, because there are multiple ways to modify each property (you can zoom by pinch or wheel in MapView, and probably via a keyboard shortcut in the application), so we need to increment the zoomLevel and bearing properties rather than binding them. When it comes to panning: instead of a property, Map has a pan(dx, dy) invokable function; so we call that in response to the DragHandler.translationChanged signal, which now carries a delta-vector argument. The alignCoordinateToPoint() function turned out to be ideal to make the pinch gesture zoom into and rotate the map around the centroid (the point between the touchpoints). Since we call that function when either the rotation or scale changes, we do not need an onTranslationChanged(), because you can't do a pinch gesture that only pans without also changing scale and rotation slightly. All three signals are firing constantly, so handling two of them is enough. The Vector3dAnimation turned out to be a good fit to get flicking momentum (let the panning continue a little while after the finger is released); needing to use the pan() function here is a little clumsy, but we can live with it. Handlers and Animations would both prefer to set properties directly. But if there were a property, it would tend to have type QVector2D or QPointF, and the Vector3dAnimation wouldn't know how to set it anyway (but that could be hacked in, or we could write a Vector2dAnimation). Calculating the limits for zooming seems to be tricky: Map.minimumZoomLevel is zero, but in practice the minimum zoom depends on the size (because we cannot zoom out so far that the map no longer fills the viewport, but if the viewport is smaller, then you can zoom out further). So PinchHandler currently limits the max zoom fairly well, but when you try to zoom out too far, it is Map rather than PinchHandler that applies its own runtime limit. That makes PinchHandler.persistentScale useless; but now PinchHandler applies only incremental zoom deltas, so it doesn't matter. But WheelHandler cannot apply limits on its own, so currently it lets you zoom in too far. Map stops you from zooming past level 30, which is strange, since it already knows that OSM maps are limited to level 18. So either we need to figure out how to calculate both the min and max accurately so that we can apply BoundaryRule (which will also replace the use of PinchHandler's own limits, and will depend on a fix for PinchHandler to work with BoundaryRule), or we can get Map to enforce the lower limit: 18 instead of 30. A little bit of zooming beyond 18 is ok (for example to 20), but if you go even further, the rendering suddenly disappears. This could be done in a followup patch, and a couple of autotests need fixing then. The incremental zooming is treated as base-2-logarithmmic, although that's an approximation: https://wiki.openstreetmap.org/wiki/Zoom_levels tells us that sometimes one zoom level corresponds exactly to zooming 2X, but going from zoom level 16 to 15 is an 8:15 ratio. It's close enough to feel smooth anyway; and it turns out that Map is rendering fractional zoom levels well enough already. If that were not the case, we'd need to bring the Item.scale property into play. Now that the Map is the same size as the MapView, we have a choice whether the root of MapView should be a wrapper Item or not. The root could be Map itself, with handlers inside; the upside would be that all Map properties are left exposed. The downsides would be losing the opportunity to go back to the other architecture later on (with the root defining a viewport, and rendering a larger map inside, but re-rendering less often), and losing the opportunity to make the view's minimumZoomLevel and maximumZoomLevel different than those in Map itself. As explained above, minimumZoomLevel should depend on viewport size. So perhaps it's better to keep it like this: we have control over which Map properties to expose directly, and for the rest, the user can bind to things like mapview.map.center instead of mapview.center. The geojson example is updated to use MapView, whereas minimal_map applies its own handlers to the Map. Other examples still need updating. [ChangeLog][MapView] MapView is the interactive replacement for the Map item in earlier releases. It wraps a Map instance with pointer handlers to make it interactive. Fixes: QTBUG-68108 Change-Id: Ibf6bcf71fa7588fcf8cf117e213f35cebd105639 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit eaab46307c04004649eaa481ff9ba35972d9b967) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove all C++ event handling, prep for pointer handlersShawn Rutledge2023-01-299-2563/+16
| | | | | | | | | | | | | | The QML Map type is now non-interactive. The plan is to replace QQuickGeoMapGestureArea with a set of pointer handlers on top of Map, probably in a new QML type called MapView. [ChangeLog][Map] Map is now non-interactive, concerned only with rendering. Task-number: QTBUG-68108 Change-Id: Ie64ffd13abc2b3e00d8e90043f3bb672299f4f15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4b81f1a34c6936b7b5a752ed4555f65847b13337) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Get Map.minimum/maximumZoomLevel from camera rather than gesture areaShawn Rutledge2023-01-292-21/+6
| | | | | | | | | | | The gesture area will eventually be eliminated; but PinchHandler needs to have minimum/maximumScale set, so it's not useful to ever have those values being NaN. Change-Id: Ib69de2370038711a0704f870e005be3b83f9655c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 12004dfa1d5040a38f26e4170eb43347e06c2ac8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationQt Submodule Update Bot2023-01-271-3/+3
| | | | | Change-Id: I45eb51019be234d36a5ac39556f198f9d999abd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtlocationv6.5.0-beta2Qt Submodule Update Bot2023-01-231-3/+3
| | | | | Change-Id: Ib6d1aaff9ebc930f355d55b3c69d05810d85f062 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update MapQuickItems correctly after a size changeMatthias Rauter2023-01-191-2/+3
| | | | | | | | | | | The position of MapQuickItems was not updated after a height change. The function setCameraData(...) did not update the position. Fixes: QTBUG-100333 Change-Id: I86310000d04b00bfd3de0e7ef3cdc854f2b08a46 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c26af08e42d535fe3ed81c1506ee6e5d3fc35d1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unused extraParametersVolker Hilsheimer2023-01-138-82/+1
| | | | | | | | | | No plugin implements or uses it, and we could use dynamic properties to pass more data through to backend implementations, if needed. Change-Id: Ie7cbc1e24fadf51e5f39e0ced53860e6a2c6609b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 6ea8dcf6b9dda083f46c0cb67ca493bd8b6363cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status