summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix visible region computation in QGeoProjectionWebMercatorPaolo Angelelli2017-08-094-16/+70
| | | | | | | | | | | | | | | | | | | | | 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 MapFlick::test_flick_diagonal autotestPaolo Angelelli2017-08-081-6/+6
| | | | | | | | | | | init() is currently setting zoomLevel to 0. This prevents the map from flicking diagonally as there's no room for that when the map is fully visible vertically. This test is currently passing in CI for unclear reasons, but it's failing locally. Change-Id: I0bb7c703a6cd2d4b5f440ce629c3933cf41268f6 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-288-23/+901
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Fix plugins build dependencyPeter Seiderer2017-07-241-2/+1
| | | | | | | | | Do not build the plugins before the dependency on module positioning for the plugin subdir position is available. Task-number: QTBUG-62098 Change-Id: Ic7473db937359f3dad47aef0ffa3671be8cbd349 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Revert "Fix dragging items out of map bounds"Paolo Angelelli2017-07-198-897/+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-173-150/+3
| | | | | Change-Id: I95c1d361bd6ba43a3eed5465fc2f74b7a622af72 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix dragging items out of map boundsPaolo Angelelli2017-07-178-23/+895
| | | | | | | | | | | | | | | | | | | | | 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>
* Fix OSM plugin not working with providersrepository.disabled = truePaolo Angelelli2017-07-071-0/+2
| | | | | | | | Provider's status was not updated when disabling the redirection. Task-number: QTBUG-61637 Change-Id: I5987cc8363f69060c5e9ed7daafaab03043e333c Reviewed-by: Alex Blasche <alexander.blasche@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>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+43
|\ | | | | | | Change-Id: I2f51a4f677d1810dcb5dc439cadbcc943cfb19ea
| * Add changes file for 5.9.1v5.9.15.9.1Antti Kokko2017-06-231-0/+43
| | | | | | | | | | Change-Id: I8ba700ef2d0c755c282bd2459e983983c5569f18 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: Ia3bc239d0d08c21d591f266e1aa61ded19a4c00c
* | Android: fix resolving null locationManagerVyacheslav Koscheev2017-06-291-0/+4
| | | | | | | | | | | | Change-Id: I5be4c3af8cedd6755296bc9b445562549784c050 Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Update binary compatibility files for Qt5.9.0 for QtLocationMilla Pohjanheimo2017-06-271-0/+4446
| | | | | | | | | | | | | | Binary compatibility files updated Change-Id: Icb554c390a2c662a724d68d33909838f2a3e23e7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | 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-194-21/+24
|/ | | | | | | | | | | | | | 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>
* Use QDeclarativeGeoMapItemBase objectName to create mapboxgl item idPaolo Angelelli2017-06-182-4/+5
| | | | | | | | | | With this patch is now possible to predict what's the layer name that the mapboxgl plugin is generating for a specific map item, if that item has the objectName set. Change-Id: I7726e44c6b0cc981d30e7725326075025f49af30 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> 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>
* Blacklist tst_QGeoTiledMap::fetchTiles on b2qtPaolo Angelelli2017-06-171-0/+2
| | | | | | | | | This test has, in the last week, started to fail more often than not. Since it's very likely to be a CI problem, blacklisting it for now. Task-number: QTBUG-61485 Change-Id: Ifb68274f83b7ecc1652394623454230b527b2002 Reviewed-by: Liang Qi <liang.qi@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>
* Update QtPositioning qmltypes definitionPaolo Angelelli2017-06-091-3/+27
| | | | | Change-Id: Ic45f7c8aa819d373e96cf60082fcda95a63f79b8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for non-existing QtPositioning 5.9Paolo Angelelli2017-06-081-4/+4
| | | | | | Change-Id: I5190564ef3e4a25f1e387c8918ec269a0a52bbea Task-number: QTBUG-61266 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QtLocation qmltypes definitionAlex Blasche2017-06-061-3/+163
| | | | | Change-Id: I675167f90579f9999d3e1d3cba42951bd5b7ea3b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for incorrect QGeoPathPrivate::containsPaolo Angelelli2017-06-062-4/+4
| | | | | Change-Id: I4067d6df69aad0af9495a29532a34f0a7e992596 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>
* Add mean to create qgeopath in locationsingletonPaolo Angelelli2017-06-053-0/+73
| | | | | | | | | As currently there is no way to create a pre-filled qgeopath, this patch adds an overload to QtPositioning.geopath() to pass parameters to the constructor. Change-Id: I05af4dbef07bd62e9e2eace7105b5255e8a392fa 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>
* Fix build when OpenGL is disabledThiago Marcos P. Santos2017-05-301-1/+1
| | | | | | | | | Make OpenGL a requirement for the Mapbox GL plugin. Task-number: QTBUG-61087 Change-Id: I8d8224f14fdff01c03d48991c4ff704d74e70234 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@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>
* Make it possible to MapItems to rendered under some style layersThiago Marcos P. Santos2017-05-258-9/+40
| | | | | | | | | Add a MapParamter to specify the default "before" layer for MapItems that Mapbox GL can render. This can be used for inserting route lines before labels. Change-Id: I3ee414ee8af31f38b74c95b3ecc31df6085bed30 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* More detailed attribution file for Mapbox GLThiago Marcos P. Santos2017-05-251-0/+0
| | | | | | | | | Add individual entries for all the Mapbox GL own dependencies used when building the Mapbox GL plugin. Task-number: QTBUG-60821 Change-Id: I1da2617eed6eabd3ef35c6b23db3418bf56370a0 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into ↵Liang Qi2017-05-245-4/+139
|\ | | | | | | refs/staging/5.9
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-235-4/+139
| |\ | | | | | | | | | Change-Id: I122bd675639baca961882ec9d512900f4e7e773b
| | * Document MapboxGL plugin API to be Tech Previewv5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Paolo Angelelli2017-05-191-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: I2444bacedb230101bfef615db1f5c10252b6f367 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
| | * ChangeLog: Document new mapbox-gl-native codeKai Koehne2017-05-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to (pending) QUIP-4 removing, updating or adding third party code should be mentioned under "Third Party Code" section in the Changelog. Change-Id: I817b031c66785d35490379f5946e344bdcbddda1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix compile due to change in private API in qtdeclarativeJan Arve Saether2017-05-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0c30279ec1fad88346ed3fb483bc3c672fdd01b in qtdeclarative changed some private APIs, so we need to adjust code correspondingly. Task-number: QTBUG-57253 Change-Id: I0cf30b5f4aaf5c040d72a384d87b0fe277a84d27 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
| | * mapboxgl: Fix dynamic opengl buildOliver Wolff2017-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default in Qt was changed back to ANGLE being split into libEGL and libGLESv2. mapboxgl now supports both both configurations - having two libraries and combining them into QtANGLE. Task-number: QTBUG-60795 Change-Id: Id3297ed295b20872bc0693b8cd3596a03e739b98 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | * Add changes file for 5.9.0Paolo Angelelli2017-05-101-0/+121
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I838dcf3e0f6c04f1dc6d87e92f82d5e7cd785710 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix build on Android with clangThiago Marcos P. Santos2017-05-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt builds Android with clang using libstdc++ instead of libc++. This bumps mapbox-gl-native to a version with a fix that takes that into account. Task-number: QTBUG-60533 Change-Id: I7379cbb43623a745d221cbcdb8bf748486e6cbac Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status