summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Fix linking error when building Mapbox GL plugin with ICUThiago Marcos P. Santos2017-04-101-4/+4
| | | | | | | | | | | | | | | | Mapbox GL depends on ICU, so it should be after -lqmapboxgl in the linker command line. Change-Id: I725d32d1132520ddd0704c7d9e998453a92e10ab Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Mapbox GL static/debug build fixesBruno de Oliveira Abinader2017-04-071-1/+1
| | | | | | | | | | | | Task-number: QTBUG-59281 Change-Id: I3605265ca9c330ea782bdda53ce5af004ef35a22 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix Clang warning about inconsistent use of override keywordThiago Macieira2017-04-031-2/+2
| | | | | | | | | | | | | | qgeotiledmappingmanagerengineosm.h:62:14: error: 'createMap' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] Change-Id: I27b55fdf514247549455fffd14b17c97ad2db003 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Prevent creating the Mapbox GL node map if size is emptyBruno de Oliveira Abinader2017-03-291-0/+5
| | | | | | | | | | Change-Id: I3fe2c7fecd8cf8036f84fed5c4875e39d937c9cd Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Minimum texture size check for QSGMapboxGLTextureNodeBruno de Oliveira Abinader2017-03-281-4/+7
| | | | | | | | | | | | Change-Id: I096a14f5f1e8f83d4671990d052ecfff8095e985 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Better battery usage on Mapbox GL plugin with threaded GLThiago Marcos P. Santos2017-03-272-9/+29
| | | | | | | | | | | | | | | | Stop the refresh timer hack when all the resources are loaded so we don't keep waking up for re-drawing when it is not needed. Change-Id: Iada46850adf4fec04dc70c9d3f7263b71c325d8a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Add parameter to control prefetching in tile-based geoservice pluginsPaolo Angelelli2017-03-274-3/+52
| | | | | | | | | | Change-Id: I18fc1788f7af0efe76f97257ffe739eb1a96e6cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Disable Mapbox GL Native plugin for QNXThiago Marcos P. Santos2017-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | Unsupported for now. Needs to get it building first and also testing. Task-number: QTBUG-59685 Change-Id: Iec965cb758b9a1a7f007f6f1aaf69ac04d86edf2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * Allow clearing before rendering for Mapbox GL pluginBruno de Oliveira Abinader2017-03-211-2/+0
| | | | | | | | | | Change-Id: I5a82c663287c35584567280efd9a8dd20a549fcb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix stringJarek Kobus2017-05-171-1/+1
| | | | | | | | | | Change-Id: I3e3217a993b0c2259775bc0ee3c04ccf0451361f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Exclude mapbox-gl on systems without OpenGL (like watchOS)Jake Petroules2017-04-211-1/+1
|/ | | | | Change-Id: I27156cf27ad66424d1f16c8bacbf780c0c1f0dfd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Fix build when building with -qt-zlibThiago Marcos P. Santos2017-03-141-3/+5
| | | | | | | | | | Qt configures zlib to prefix symbols with z_ and that was messing with mapbox-gl-native own function names due to preprocessor sorcery. Task-number: QTBUG-59447 Change-Id: Ib664a33103990f262b6979953d1415d06f230fd3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add itemsoverlay pluginPaolo Angelelli2017-03-089-1/+483
| | | | | | | | | | | This change adds a new plugin that does only offer an empty transparent map. The intended usage is to add overlay layers into which to place only map items. Change-Id: I51e64b0354f533bf73480e800e0d5338920a7fc5 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use $$MODULE_BASE_OUTDIR/lib in Mapbox GL nativeBruno de Oliveira Abinader2017-03-081-1/+2
| | | | | | Task-number: QTBUG-59281 Change-Id: Iec3a1fefb029e9eb0386b29b40e7844eba04bbd7 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Simplify the criterea for building the Mapbox GL pluginThiago Marcos P. Santos2017-03-071-19/+1
| | | | | | | | What we should really be looking for is if we can do C++14. Change-Id: I43ce71e02a397b970eb4e57b8c25aee99d4282e0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Remove dependency on QtWidgetsThiago Marcos P. Santos2017-03-062-5/+0
| | | | | | | | | Mapbox GL Native was using QtOpenGL and that was pulling in the dependency on QtWidgets. Now we use only QtGui. Task-number: QTBUG-58821 Change-Id: Iae4c0d6de24988180fd8c837ff53ffc426831a30 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix line rendering when ending and joiningBruno de Oliveira Abinader2017-03-062-0/+35
| | | | | | Change-Id: I30e1ae3ec70e8ab36ef3344cecb7a66b1d37a952 Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* ICU support in Mapbox GL Native upon availabilityBruno de Oliveira Abinader2017-03-031-0/+4
| | | | | | | Change-Id: I5102b3013263a3cb5158673b19ef7b89655d7fa7 Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
* Fix typo in QMapboxGLStyleSetPaintProperty ctorBruno de Oliveira Abinader2017-03-031-1/+1
| | | | | | Change-Id: I804bd7077eb6fd99e4c2facbfb9c9b1d30ecc4fd Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Unwrap longitude in Mapbox GL when neededBruno de Oliveira Abinader2017-03-021-3/+24
| | | | | | | This is in order to keep parity with Qt visual expectations. Change-Id: Iea758483972e53b8f42e352401390d95dd1c1407 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge "Merge remote-tracking branch 'gerrit/5.8' into 5.9" into refs/staging/5.9Paolo Angelelli2017-02-283-35/+49
|\
| * Merge remote-tracking branch 'gerrit/5.8' into 5.9Alex Blasche2017-02-283-35/+49
| |\ | | | | | | | | | Change-Id: I3c27a0635fa324dfea7a1d19774a66e21c066bbe
| | * Fix null pointer exceptionPaolo Angelelli2017-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a null pointer exception happening when the application starts without network and then the network becomes available Change-Id: Iedeacf8fb8f350dfa92c05c1d2e16f62199ca5fd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Reduce the amount of mutexed codePaolo Angelelli2017-02-281-2/+3
| | | | | | | | | | | | | | | Change-Id: Ic0dfe488ba8aafb0f3ca3a2b6209d59484d07af8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix incorrect handling of provider resolution for offline storagePaolo Angelelli2017-02-282-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the incorrect handling of the population/repopulation of OSM offline tiles when the providers are initially populated. In this way it is now fine if the user selects high dpi tiles, and has both high dpi and low dpi offline tiles, and the high dpi provider is unavailable. Change-Id: I4d7080d6f259663bf6ca7a985fd9784fb81cfec3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Do not create error when mapgl submodule is not checked outAlex Blasche2017-02-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I7251226b520bd3b296071c90420c648ac720cc2a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Make QGeoCameraCapabilities independent of the enginePaolo Angelelli2017-02-285-12/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes it possible to change QGeoCameraCapabilites at runtime, when the map type changes, to accommodate for those plugins that offer different maps having different capabilities. This is then used to properly push the min/max zoom levels for each map type in our OSM plugin. Autotests are included. Change-Id: I48532da77ffb3eaf2e752561395945c3a2c21985 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status