summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-12-153-11/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
| * Remove OpenGL ES limitation for Mapbox GL on WindowsBruno de Oliveira Abinader2017-11-301-9/+0
| | | | | | | | | | | | | | | | | | | | Also fixes an issue preventing GL native from working on MinGW. mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: Iab9a560adcd54194cd9829a326b325856f8c8cc2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Enforce numberAlternativeRoutes where possible when doing route requestsPaolo Angelelli2017-11-282-2/+2
| | | | | | | | | | Change-Id: I321e802d795df36d8cdd1b8578e77094c500cc2e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-16/+17
|\ \ | |/ | | | | Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
| * Fix Mapbox GL plugin OpenGL usageThiago Marcos P. Santos2017-11-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were linking directly with the OpenGL library available in the system. On Windows for instance the only option was ANGLE. Now Mapbox GL is using OpenGL through QOpenGLFunctions and shall offer much better compatibility. Task-number: QTBUG-62108 Task-number: QTBUG-61767 Task-number: QTBUG-60897 Change-Id: Iabd29ff6c0b6daf14373508d4847344c07d01a57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Enable alpha channel in QSGMapboxGLTextureNodeBruno de Oliveira Abinader2017-11-031-1/+8
| | | | | | | | | | | | | | Task-number: QTBUG-64038 Change-Id: Icfa079d181994d8db9bd738bbd6107dce0ea76d1 Reviewed-by: Ola Røer Thorsen <ola@silentwings.no> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix ICU linkage on the Mapbox GL pluginThiago Marcos P. Santos2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes both the Mapbox GL plugin and the Mapbox GL engine at src/3rdparty/mapbox-gl-native use ICU in the same way as qtbase. QMAKE_USE_PRIVATE += icu This should fix build errors when using an ICU that doesn't have headers installed on the default header lookup path. That assumption was specially true for the Mapbox GL engine 3rdparty submodule. Task-number: QTBUG-63571 Change-Id: Id0ab4cb8fb42b8eda8afb9650cd678ee7c5c45ad Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Consider map item color alpha channel when applying opacityBruno de Oliveira Abinader2017-10-261-4/+4
| | | | | | | | | | | | Task-number: QTBUG-63928 Change-Id: I8b09da92e182dc5464516842718b8d30bc9a48fc Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Check if coordinates are non-empty before repeating the first entryBruno de Oliveira Abinader2017-10-261-1/+4
| | | | | | | | | | | | Task-number: QTBUG-63926 Change-Id: Ic57090dbc78705893280e040e5b4556cf296f949 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-261-7/+10
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
| * Fix MapboxGL crashing when no OpenGLContext can be createdPaolo Angelelli2017-09-261-7/+10
| | | | | | | | | | | | Task-number: QTBUG-63374 Change-Id: Iff172e7715ac9f59da23e890bae77ff522ed9e47 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Paolo Angelelli2017-09-112-8/+9
|\ \ | |/ | | | | Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
| * Fix disabling redirection for providers that have no local fallbackMårten Nordheim2017-09-112-8/+9
| | | | | | | | | | | | | | | | | | | | | | Currently these providers would not turn ready when disableRedirection() is called, while they also get disconnected, thus never being tried to be resolved, resulting in stalling the completion of the provider's resolution process Task-number: QTBUG-63033 Change-Id: I316b858fbc66b82bc124b8814b25fe29bc0c21a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-09-055-15/+102
|\ \ | |/ | | | | Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
| * Fix Mapbox GL plugin not respecting MapItem visibility and opacityThiago Marcos P. Santos2017-09-052-3/+19
| | | | | | | | | | | | | | | | Now opacity and visibility will be respected for the fill color as borders are not supported yet. Change-Id: I58f982dc9285537fde770e14238c5d6d903913e6 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Mapbox GL native circle supportBruno de Oliveira Abinader2017-08-303-7/+64
| | | | | | | | | | | | | | | | | | | | 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>
| * Fix broken native text rendering with Mapbox GL pluginThiago Marcos P. Santos2017-08-301-0/+12
| | | | | | | | | | | | | | | | | | Mapbox is "leaking" the pixel storage mode. So we need to restore it after we render otherwise it breaks native text rendering. Task-number: QTBUG-62861 Change-Id: I12643e34e462cce58cdf30da52ab927499f38442 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Add a configure feature for each geoservice pluginPaolo Angelelli2017-08-301-5/+7
| | | | | | | | | | | | | | | | 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>
| * Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-224-12/+26
| | | | | | | | | | | | | | | | mapbox-gl-native @ bd15e273dce767458d335aeb1f50aa081390d593 Task-number: QTBUG-62454 Change-Id: I241ae47d8590a5de7da95f39ae056abeab9c172b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fixed MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix 3D buildings not being renderedThiago Marcos P. Santos2017-08-211-0/+1
| | | | | | | | | | | | | | | | Let Mapbox GL know about what FBO is in use so it can set texture attachments properly. Change-Id: Ie70de0f449eecf1d8a1f1dec8b89e60495ca5386 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix MapParameters not having effect on Mapbox GL if added dynamicallyThiago Marcos P. Santos2017-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The previous code was not handling the case of MapParameters changing the style appearance after the style is fully loaded, which happens when MapParameters are created dynamically at runtime. [ChangeLog][QtLocation][MapboxGL] Fix MapParameter dynamic usage Task-number: QTBUG-61442 Change-Id: I64a8a1416dd5f7477297878f42760ad9008382a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Update Mapbox GL stylesThiago Marcos P. Santos2017-08-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced deprecated styles and added new navigation styles. Replaced: - traffic-day-v1 -> navigation-preview-day-v2 - traffic-night-v1 -> navigation-preview-night-v2 New: - navigation-guidance-day-v2 - navigation-guidance-night-v2 [ChangeLog][QtLocation][MapboxGL] Updated map styles Task-number: QTBUG-62002 Change-Id: I461335b7354bf78ee5d4c380bffd72a5bfda3285 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devPaolo Angelelli2017-08-101-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/declarative_ui/tst_map.qml Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
| * 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>
* | Bump Mapbox GL to v1.1.0Thiago Marcos P. Santos2017-08-093-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ edd7948893fcd40a24d96b790e21d3dd028cecbe New features include: - 3D extrusions - Data driven styles - Style transitions - Bug fixes [ChangeLog][QtLocation][MapboxGL] Updated Mapbox GL Native to v1.1.0 Change-Id: Ib4f88f382dc726e4b229dfe41530034009d7c12b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add camera capabilities + metadata to QGeoMapType/QDeclarativeGeoMapTypePaolo Angelelli2017-07-3111-81/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-065-25/+26
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
| * Fix Mapbox plugin mixing tiles for specified map_idsPaolo Angelelli2017-06-193-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-06-301-1/+2
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Support requesting traffic-aware routing from MapboxPaolo Angelelli2017-06-071-6/+13
| | | | | | | | | | | | Change-Id: I1c09d5a4d34fdb642ed38b32d9e01cf55802195f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add TrafficFeature to QGeoRouteRequest/RouteQueryPaolo Angelelli2017-06-071-0/+1
| | | | | | | | | | | | | | | | [ChangeLog][QtLocation][QGeoRouteRequest/RouteQuery] Add TrafficFeature to the query features. Change-Id: I50243865da97e302943f43b0eda430e9d8383880 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0733-115/+273
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/geoservices/geoservices.pro Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
| * 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>
| * Make it possible to MapItems to rendered under some style layersThiago Marcos P. Santos2017-05-257-8/+27
| | | | | | | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-231-1/+2
| |\ | | | | | | | | | Change-Id: I122bd675639baca961882ec9d512900f4e7e773b
| | * 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>
| * | Fix resources not loading on static buildsThiago Marcos P. Santos2017-05-208-3/+27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Explicitly call Q_INIT_RESOURCE, otherwise the resources are not found and the plugins using resources are broken when building Qt with -static. This patch also adds a prefix to these resources to avoid collision, since they are very generic like "logo.png" or "maps.json". Task-number: QTBUG-60007 Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix for mobile maps from the HERE plugin not showing in low-dpiPaolo Angelelli2017-05-081-1/+8
| | | | | | | | | | | | | | | | Apparently these maps support only 250ppi or more. Task-number: QTBUG-60545 Change-Id: Iadb59c4f034cbfd94a825048358583f3a978315f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add pluginName to QGeoMapType and check against it in setActiveMapTypePaolo Angelelli2017-05-077-63/+68
| | | | | | | | | | | | | | | | | | | | | | This patch adds a QByteArray member to QGeoMapType with the name of the plugin providing that map type. This value is then used to validate what is passed to QDeclarativeGeoMap::setActiveMapType to see if it's a map type for the currently set plugin. Change-Id: If15b67c32150f0c3c2815d28e26fc37138d4cf71 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Enable Mapbox GL plugin on MinGW buildsThiago Marcos P. Santos2017-04-283-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Qt CI is using MinGW 5.3.0 that should do the job compiling Mapbox GL. For now, only the ANGLE OpenGL backend is supported on Windows for this plugin. I.e. you need to set QT_OPENGL=angle or Qt::AA_UseOpenGLES. Task-number: QTBUG-60110 Change-Id: Iebd4d1569191f47a14b264c489b5d3fb23338d78 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Update Mapbox GL styles to the latest versionv5.9.0-beta3Thiago Marcos P. Santos2017-04-201-3/+3
| | | | | | | | | | | | | | Better cartography and visuals. Change-Id: I1d751beeafc216351c1f7459a270d48f67693295 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update Mapbox logoThiago Marcos P. Santos2017-04-201-0/+0
| | | | | | | | | | | | | | Mapbox released a new logo today. Change-Id: I15d271762a492d142571f6cae3920af30e04aaa6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix build for -no-feature-concurrentStephan Binner2017-04-191-1/+5
| | | | | | | | | | Change-Id: I42e67c0af0b0658d6f1a876191e561d86aaa3ae8 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Allow overzooming when setting zoomLevel directly in a MapPaolo Angelelli2017-04-124-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the lower/upper bound check on setZoom from QDeclarativeGeoMap to the gesture area, allowing to set higher zoom levels than the maximumZoomLevel when setting Map.zoomLevel directly, for the map types that support overzoom. This is now safe as the bound check is introduced in the tile fetcher, so no invalid tiles will be requested, and is beneficial when combining layers supporting different maximum zoom levels. Change-Id: I08ee9c282ee2ebc1dafa3c68a238b93ffbc1ba02 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bound check QGeoTileSpec against min/max ZL before requesting itPaolo Angelelli2017-04-126-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now we have not honored the min/max zoom levels specified in QGeoCameraCapabilities when requesting tiles. As a result we have often fired requests for non-existing tile layers. This change complements the added support for individual camera caps for each map type, and makes the tile fetcher honor the bounds defined in the camera capabilities. This also allows to set larger zoom levels in the renderer, overzooming existing tiles, without the fetcher firing requests for invalid resources Change-Id: Ic8a523a114147109f7ef8af3510a3ab78d06d714 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Replace QGeoMapType argument of cameraCapabilitiesPaolo Angelelli2017-04-122-6/+6
| | | | | | | | | | | | | | | | | | | | Since the only part of QGeoMapType used in the method is mapId, there's no need to pass the whole map type as argument. The benefit is that the camera caps can be requested solely based on the info in QGeoTileSpec. Change-Id: Iafd0e2a1d4d45fbf02b862efe56841001cbebd75 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix itemsoverlay .pro file structurePaolo Angelelli2017-04-111-2/+3
| | | | | | | | | | | | | | | | This patch makes the structure of the pro file of the itemsoverlay plugin the same as the other plugins (like the mapbox plugin). Change-Id: Iada6296562282b238c6f793b9f0b80ade8ec6ddf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status