summaryrefslogtreecommitdiff
path: root/src/location
Commit message (Collapse)AuthorAgeFilesLines
* DocFix: mark the new QDeclarativeGeoMap API in 5.10 as tech previewv5.10.0-beta2Paolo Angelelli2017-10-071-0/+4
| | | | | Change-Id: Iec1cf03fe5cb480cb6dcd24b43046d7009a37f23 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Paolo Angelelli2017-09-113-10/+34
|\ | | | | | | Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
| * Fix tile cache not honoring cost 0Paolo Angelelli2017-09-112-9/+33
| | | | | | | | | | | | | | | | | | This patch fixes the case of disabling the various caches. Currently setting the cache size to 0 results in default initial values instead. Change-Id: I019cd15ac23b6479e4367a3e102dd661895a7fda Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Prevent MapItemView from fitting viewport on map when not readyPaolo Angelelli2017-09-111-1/+1
| | | | | | | | | | Change-Id: I4c066c858801f9d80974018c00b245ec86c05d1e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Use QGeoPolygon for returning the visible regionv5.10.0-alpha1Paolo Angelelli2017-09-091-5/+6
| | | | | | | | | | Change-Id: I5be81916c5c7b4802bdde00c60c370b9a12c07e9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-09-053-7/+81
|\ \ | |/ | | | | Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
| * Mapbox GL native circle supportBruno de Oliveira Abinader2017-08-302-7/+11
| | | | | | | | | | | | | | | | | | | | 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>
| * Add a configure feature for each geoservice pluginPaolo Angelelli2017-08-301-0/+70
| | | | | | | | | | | | | | | | 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>
* | Merge dev into 5.10Frederik Gladhorn2017-09-024-14/+69
|\ \ | | | | | | | | | Change-Id: I36d66c69ac72fe44a5161f7a45803d47d97f8e6e
| * \ Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-274-14/+69
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h Change-Id: I4940db79ebe500ff7e37ded42c7d29d7ccfb6253
| | * Fix PluginParameter not working with script as property valuesPaolo Angelelli2017-08-232-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the undocumented QDeclarativeGeoServiceProviderParameter::initialized signal, to signal to the parent when a parameter becomes fully initialized, so that the parent QDeclarativeGeoServiceProvider can attach. Task-number: QTBUG-62075 Change-Id: Ie3615abf31d19f39587c5e54b202f8f2c4a711cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * Fix GeocodeModel not autoUpdating if plugin attaches latePaolo Angelelli2017-08-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch handles the case when the plugin attaches after QDeclarativeGeocodeModel::componentComplete() has been called. Change-Id: Ib9e4991ab3a4a34730da2d55fae20a492ac9d9f2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Fix QDeclarativeGeoMap::populateMap duplicating itemsPaolo Angelelli2017-08-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since apparently children() and childItems() do not necessarily return disjoint sets, concatenating the two lists did, in some cases, cause duplicated items in the map. This patch resorts to uniting sets to remove the duplicates. Change-Id: I07ef19a2fdff65429eb65d92be278d7c02ac1999 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Fix the filter attribute name inside the named filterJarek Kobus2017-09-011-1/+1
|/ / | | | | | | | | Change-Id: Ib19c416b07d2d14771beb1445a2209dbf8b1fa96 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-1014-232/+214
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/declarative_ui/tst_map.qml Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
| * Fix routes comparisonBogDan Vatra2017-08-091-2/+2
| | | | | | | | | | Change-Id: Ie02061804efdb79911a997bd017d13ed0d65d262 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix visible region computation in QGeoProjectionWebMercatorPaolo Angelelli2017-08-092-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the visible region is calculated as the intersection between the viewing frustum and the map plane clipped against the map extended rectangle in mercator space (from -1 to 2 in x coords, 0 to 1 in y coords). The result is correct in the extended mercator space. However, this may lead to overlapping coordinates when converted back to latitude and longitude. For this reason, this patch changes the clipping geometry to be the map un-extended rectangle centered around the current map center. The result is a geometry that never wraps around or overlaps, thus removing the need for handling separately the case when the map is fully visible when returning the visible region. Task-number: QTBUG-57690 Change-Id: I8396c40a123ce94bff4388dfefbd8a694657b8bd Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Restore usage of setProperty on Map.fitViewportToGeoShapePaolo Angelelli2017-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | setProperty was initially introduced with 2867f1efc989478667ea7ae56ff91cd991d74121 to animate center and zoom level, if an animation was present, but then removed. This change restores it. Change-Id: Id1f6da820b6cccb62b18eeb78d7dba21ebc073bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapCircle artifacts with small radiusesPaolo Angelelli2017-08-032-7/+23
| | | | | | | | | | | | Task-number: QTBUG-62154 Change-Id: I86647b0509b4682ea6fde1305834b6a86b0b6f64 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix memleak: delete QGeoMap when QDeclarativeGeoMap gets deletedBogDan Vatra2017-07-285-25/+25
| | | | | | | | | | | | Task-number: QTBUG-62122 Change-Id: I538e1eeb6bce3f5de424003b0b31fa59599dc2d5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-285-23/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.9.0 map items are clipped against the visible region. This implies that their geometry is also clipped against the visible region. This is problematic in ::geometryChanged, since the old geometry is always clipped in this way. This patch clips items against a "projectable" region instead, that is the part of the map that is in front of the camera. Since this can produce very large vertices, mapbox earcut 3rd party library is pulled in, to replace qTriangulate that only supports coordinates up to 1<<21. This patch also contains a fix for earcut.hpp to make it build also on QNX6.6 Task-number: QTBUG-61727 Change-Id: Iffc95fdae88fef982c1eb86db567b326b5e51057 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Revert "Fix dragging items out of map bounds"Paolo Angelelli2017-07-195-94/+23
| | | | | | | | | | | | | | | | This reverts commit 2ab93acd9751b3ffe2c36a4a0e37dc792686a08f. Reason being: not passing QNX6 bot Change-Id: If45fe095b6e6959f7c40e3e0ed7a14d278bbb230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Remove dead code in QDeclarativePolygon/Polyline MapItemsPaolo Angelelli2017-07-172-149/+0
| | | | | | | | | | Change-Id: I95c1d361bd6ba43a3eed5465fc2f74b7a622af72 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix dragging items out of map boundsPaolo Angelelli2017-07-175-23/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.9.0 map items are clipped against the visible region. This implies that their geometry is also clipped against the visible region. This is problematic in ::geometryChanged, since the old geometry is always clipped in this way. This patch clips items against a "projectable" region instead, that is the part of the map that is in front of the camera. Since this can produce very large vertices, mapbox earcut 3rd party library is pulled in, to replace qTriangulate that only supports coordinates up to 1<<21. Task-number: QTBUG-61727 Change-Id: I7449e755a4848a2b2107c5de4e27821e3e887bfb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix Map.toCoordinate always clamping y values to 0Paolo Angelelli2017-07-172-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows to call toCoordinate also on negative y values, given that the y value is still below the horizon. If not, the y value will be clamped to the "minimum unprojectable y value", a value that is clamped to 0. Task-number: QTBUG-61813 Change-Id: I177d3b459b6eaf827daf860b7d4011511a7e76ee Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Do not draw mapQuickItems if coordinate_ is invalidPaolo Angelelli2017-07-051-1/+8
| | | | | | | | | | | | | | | | | | This change also reverts a4dc11fd52f42676265cff2ff9396a7396f1ccb3 Task-number: QTBUG-61070 Change-Id: I2046356e339b5889860b3dce10627d6b736ac02f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add invokables to add/remove mapItemViewsPaolo Angelelli2017-08-074-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds two new methods to QDeclarativeGeoMap, to allow users to add or remove MapItemViews at runtime. [ChangeLog][QtLocation][Map] Added methods to add or remove MapItemViews at runtime. Task-number: QTBUG-55782 Change-Id: I4e612a9476a864331f61d49dac811a8069ae010f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add setPath overload to QDeclarativePolylineMapItemPaolo Angelelli2017-08-032-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a Q_INVOKABLE setPath overload that takes a QGeoPath. This can be beneficial when a path is already available and should be set without going through javascript array conversion. This method should come handy also when pushing polyline data from C++. [ChangeLog][QtLocation][MapPolyline] Added setPath overload taking a QGeoPath. Change-Id: I6916500473865b8234b48e8df08dfb465a2a75d2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add alignCoordinateToPoint methodPaolo Angelelli2017-08-032-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method effectively extends the functionalities offered by the center qml property, allowing to set a coordinate to an item position other than the center of the item. This is useful in those applications where the center of the scene (e.g., a cursor) is not to be place exactly in the center of the map. [ChangeLog][QtLocation][QDeclarativeGeoMap] Added alignCoordinateToPoint method to QDeclarativeGeoMap. Change-Id: I68a3d12e8376b83c4c1775a3af5e2125d3e71d63 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add setBearing overload to rotate around a coordinatePaolo Angelelli2017-08-032-0/+29
| | | | | | | | | | | | | | | | | | | | | | This patch adds an overload for setBearing in QDeclarativeGeoMap to rotate the map around a specific QGeoCoordinate. [ChangeLog][QtLocation][QDeclarativeGeoMap] Added setBearing overload to rotate the map around a given QGeoCoordinate. Change-Id: I5d2428d852b0c3537f4a1cdb1925c059788c45c5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add camera capabilities + metadata to QGeoMapType/QDeclarativeGeoMapTypePaolo Angelelli2017-07-318-15/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enriches QGeoMapType/QDeclarativeGeoMapType embedding into this object the camera capabilities for this type, that are then exposed via a new QML Type, CameraCapabilities, and custom metadata in form of a QVariantMap, that can be accessed via the new metadata property. [ChangeLog][QtLocation][QDeclarativeGeoMapType] Added CameraCapabilities and metadata properties to QDeclarativeGeoMapType. Task-number: QTBUG-58931 Change-Id: I97a8852fbb3bbac88fdbf0d47e8247ea7ed1f31e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Allow to tilt/rotate the map using the scroll wheelPaolo Angelelli2017-07-171-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | This patch allows to rotate the map by using the scroll wheel in combination with the Shift key, and to tilt the map in combination with the Control key. [ChangeLog][QtLocation][MapGestureArea] Added rotation and tilt scrollwheel actions. Change-Id: I1cfdad7615258e75506802ac4f4e71413b71b8ce Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move anchorCoordinateToPoint into QGeoProjectionPaolo Angelelli2017-07-173-14/+25
| | | | | | | | | | | | | | | | | | | | anchorCoordinateToPoint functionality actually belongs to QGeoProjection. Moving it there so that it can be used in other parts of the module. Change-Id: Id135a7a4bbe14d9c83ef160682a317e3426b15ac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add virtual fetchingEnabled in QGeoTileFetcherPaolo Angelelli2017-07-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | With this, a plugin can programmatically prevent the fetcher from acessing the network. E.g., by using a QNetworkConfigurationManager. The change introduced in this patch does however not allow the user to dynamically enable/disable the fetcher's network access. For that, additional support, together with public API, is necessary. Change-Id: I8250cd3dc8d4b2c36ccf243b5ddeab2878b549b4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-0612-24/+95
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
| * Fix build with -qreal floatPaolo Angelelli2017-06-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-61538 Change-Id: Ib1e5cbe1bdcfc324e3e9dcaca7045c9318a5059e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix for Plugin.required being readonlyPaolo Angelelli2017-06-202-1/+24
| | | | | | | | | | | | | | | | | | | | The documentation clearly states that this property should be writable but it's not. Task-number: QTBUG-57419 Change-Id: I1dc93d45ddf52f2e1eee9572f153f4f19916ca2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix Mapbox plugin mixing tiles for specified map_idsPaolo Angelelli2017-06-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the handling of map_ids, preventing the plugin from picking the wrong ids when reading or writing tiles. This changes also makes the generation of map types consistent with the other plugin, with the first type having mapId of 1. Change-Id: I1562a2bbccacf11958ee22a60e9eee74faa15a2e Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix compilation error without openglPaolo Angelelli2017-06-181-0/+2
| | | | | | | | | | | | | | | | If opengl is not present, now that warnings are error, Location fails to build due to an unused ogl variable. Change-Id: Id1e9a1f4da8bc31a65e29b3dd2770250284d02bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix add/removeMapItemGroup not checking if the item is added to a mapPaolo Angelelli2017-06-183-6/+20
| | | | | | | | | | | | | | | | | | Currently these methods aren't checking if a group is already added to another map. This patch fixes it. Change-Id: I58a5e633b44abfcae5c362f8e97d4c6706869ac5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapQuickItems w/o zoomLevel sticking around when behind the cameraPaolo Angelelli2017-06-141-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the case when rendering a map with MapQuickItems in it that have the zoomLevel property not set and using a tilting angle. Without the patch, in some scenarios the items may stick around on the screen while they should simply go away. Change-Id: Ic485ecf5851d27a0248ff1745ae552bbb81423ba Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix for QDeclarativeGeoMapCopyrightNotice crashing the applicationPaolo Angelelli2017-06-142-6/+16
| | | | | | | | | | | | | | | | Some pointers were used without prior check. This adds checks where necessary. Change-Id: I82e01b72fd3a46a6add7cf286e81686b686b272b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix Map.addMapItemGroup documentationPaolo Angelelli2017-06-121-3/+1
| | | | | | | | | | | | | | Items in map item groups are not reparented anymore. Change-Id: I1d083bf8cba5aa46e8640c175bf90aa9f04b69aa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix for GeocodeModel documentationPaolo Angelelli2017-06-091-3/+3
| | | | | | | | | | | | | | Links to Location QML element are broken Change-Id: Iffda8fd8c8cdd9e00e45592ee2f0e971865defb9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix incorrect Map.visibleRegion when all the map is visiblePaolo Angelelli2017-06-091-1/+11
| | | | | | | | | | | | Change-Id: I9d532416e0e6dd06f84216d97bcf160e3e8e43be Task-number: QTBUG-57690 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add TrafficFeature to QGeoRouteRequest/RouteQueryPaolo Angelelli2017-06-074-2/+7
|/ | | | | | | | [ChangeLog][QtLocation][QGeoRouteRequest/RouteQuery] Add TrafficFeature to the query features. Change-Id: I50243865da97e302943f43b0eda430e9d8383880 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add unnecessary break to keep GCC 7 happyThiago Macieira2017-06-061-0/+1
| | | | | | | | | | | Falling through or breaking have the same effect, since the next case label repeats the same condition in the "if", which must necessarily be false for the code to have fallen through. qdeclarativesearchresultmodel.cpp:632:9: error: this statement may fall through [-Werror=implicit-fallthrough=] Change-Id: Ia3e896da908f42939148fffd14c48127381f219d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix documentation for return types from QJSValue to the actual QML typePaolo Angelelli2017-05-313-3/+3
| | | | | Change-Id: I6db1f0db07de3bb9446f0b04ea95f34b56acf805 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Check for validity in QDeclarativeGeoMapQuickItem::setCoordinatePaolo Angelelli2017-05-291-1/+1
| | | | | | Task-number: QTBUG-61070 Change-Id: I610a943e9aeaa2129b87bfd4e4f5afa391bc7c31 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Refactor: move code not depending on "this" into static methodsPaolo Angelelli2017-05-292-57/+70
| | | | | | | | | | | This patch moves the implementation of the default filenameToTileSpec and tileSpecToFileName methods into standalone public static methods so that they can be possibly reused by plugins or other components, since these implementations do not actually depend on any member of QGeoFileTileCache. Change-Id: I6e3f59615ff3a5e0924f946aa13aabebb8157e42 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status