summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Fix incorrect method invocation in QPlaceSearchReplyOsmPaolo Angelelli2017-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | A previous change removed the QPlaceReply:: prefix on setError, now causing to recursively call itself endlessly. This patch reverts the change. Change-Id: Iacf704760c970fab44490897ca1192b817814b83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Warn when mapbox-gl-native submodule is not presentThiago Marcos P. Santos2017-02-241-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | If the mapboxgl plugin can be built (i.e. compiler support, opengl, etc is in place), fail the build if the submodule is not checked in and print a message on how to fix it. If the plugin is not supported, ignore it completely. Task-number: QTBUG-58939 Change-Id: I7fc05567921cd31fc26fa540ba5806f676e015fb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Better dependency tracking when building 3rdparty modulesThiago Marcos P. Santos2017-02-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make the component using the 3rdparty module depend directly on the module instead of depending on the 3rdparty directory as a whole. This will speedup compiling time when doing parallel builds and make build more consistent when building only selected pieces of QtLocation. Task-number: QTBUG-58943 Change-Id: I95b5ef8302109fb0c5fad760027a7a53d021bfa4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix support for MapParameters on Mapbox GL pluginThiago Marcos P. Santos2017-02-176-333/+872
| | | | | | | | | | | | | | | | | | | | Mapbox GL plugin can now accept MapParameters, such as MapParameters used for the Mapbox runtime style API, allowing runtime changes on the map, not restricted only to style, but also adding new geometries and features. Change-Id: If0394bd044a2d3058fe5480966880a1055614ea2 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Move mapboxgl.use_fbo to the mapboxgl.mapping namespaceThiago Marcos P. Santos2017-02-171-2/+2
| | | | | | | | | | | | | | Follow the pattern, as this only affects how maps are rendered. Change-Id: Ieacc3df4149fb5045b15f2cee6d4521e93de5b6e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Optional support for QSGMapboxGLRenderNodeBruno de Oliveira Abinader2017-02-166-23/+114
| | | | | | | | | | | | | | | | | | | | | | | | QSGMapboxGLRenderNode support is experimental: It doesn't support QQuickItem transforms nor stencil clipping. By default, QSGMapboxGLTextureNode is enabled. The user can select QSGMapboxGLRenderNode by setting 'mapboxgl.use_fbo' plugin parameter to 'false'. Change-Id: I3d5338990458f62fdbe7b8dc00317a85ee1ff188 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | QGeoMapMapboxGL: Fix tr()-context of warningFriedemann Kleint2017-02-151-1/+1
| | | | | | | | | | | | | | | | QObject::tr() should not be used. Amends 68b515cdff46dc1030b027a664ef5f3f6cde946a. Change-Id: Id22f730d9bd09c41a22783d1b5530835e9fb0d1c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Support for Mapbox GL Native rendering of QML Map{Polygon,Polyline} itemsBruno de Oliveira Abinader2017-02-144-110/+327
| | | | | | | | | | | | | | | | | | | | | | | | Replaces Mapbox GL Native annotations with runtime styles API. Missing: - Map{Polygon,Rectangle} border width property - see QTBUG-58872 for details. - MapCircle support - see QTBUG-58869 for detais. Change-Id: I77c9daee813a63efc60104f94f440f00ac3cf70f Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-141-7/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp Change-Id: I2428d360c07b55ec5ee61f81c6f97b3d7b20f363
| * Fix HERE Plugin requesting invalid range when on high dpi modePaolo Angelelli2017-02-081-8/+12
| | | | | | | | | | | | | | Apparently HERE does not support ZL 0 and 20 when using 512x512 tiles Change-Id: Ic52f98648243ce866646d921e3fc70b494fed62c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Default style for the copyright defined on the pluginThiago Marcos P. Santos2017-02-139-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | The Mapbox GL plugin defines a logo image on the copyright notice that needs styling in order to have an appealing look and feel. The default style is empty, so we need to fetch one for the plugin to make this work. Task-number: QTBUG-58601 Change-Id: Ib3f7d7d7fcb2797c6381fc862ce7513b516c9ff5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | mapbox-gl-native and mapboxgl depend on opengl (attempt 2)Liang Qi2017-02-131-1/+1
| | | | | | | | | | | | | | | | | | This amends c3eb798dc7b4e82b86169533ae59648205d88d48. Task-number: QTBUG-58807 Change-Id: I1bd0785331d9b66420758023c73100e04fa01658 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | QGeoMapMapboxGL: Fix tr()-context of warningFriedemann Kleint2017-02-131-1/+1
| | | | | | | | | | | | | | | | QObject::tr() should not be used. Amends f5021281c56b660b81d0122608ca9b577889f99e. Change-Id: I5eb56f462bbf9894585acc563f911c02b3f70dc5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | mapbox-gl-native and mapboxgl depend on openglLiang Qi2017-02-131-8/+10
| | | | | | | | | | | | | | Task-number: QTBUG-58807 Change-Id: I64f66024e83eaf6414a80085ef98d1ad041464dd Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add a default development token for Mapbox GL stylesThiago Marcos P. Santos2017-02-082-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea here is to have a map working zero conf, without having to create a token. Useful for developers that want to try Mapbox GL maps without creating an account. The token should not be used in production (and will display a warning telling so). It is subject to change, throttling, etc and also a violation of the ToS. Also fixes runtime exception when access token is not set on mapbox:// style. Task-number: QTBUG-58599 Change-Id: Ie7205ccbdb3ccaee753b04116aed0f5ba35f8522 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Fix Mapbox GL plugin not being bundled on AndroidThiago Marcos P. Santos2017-02-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make the plugin dependencies explicit and visible so androiddeployqt can see it and add them to the bundle. Only dependencies that are exclusively used by Mapbox GL need to be visible, the others are already exposed by Qt Location. Task-number: QTBUG-58589 Change-Id: Ia2bd2109f49e1305a9868e288a390979622db311 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-021-0/+3
|\ \ | |/ | | | | Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2
| * Fix for index OOBPaolo Angelelli2017-01-271-0/+3
| | | | | | | | | | | | | | Adding a range check to prevent an index OOB error. Change-Id: I9d2d13f27755511893a0731f3cf0bb934b0a8795 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add support for native polylines in Mapbox GL pluginBruno de Oliveira Abinader2017-01-314-0/+188
| | | | | | | | | | Change-Id: I14240e095bb6260d56925c026cf78fc1a3ceacdb Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Re-enable the Mapbox GL 3rdparty and the pluginThiago Marcos P. Santos2017-01-312-2/+16
| | | | | | | | | | | | | | | | It was previously disabled so we could move the 3rdparty package to a more consistent location. Change-Id: I9ebd8c8fe131b2821aa3205e0deda87e9e9db19c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Momentarily disable/remove Mapbox GL 3rdpartyThiago Marcos P. Santos2017-01-313-34/+0
| | | | | | | | | | | | | | | | | | We are moving it to a new directory, but seems like the CI bots are not happy with moving a submodule, so we will remove and then add again in a new location. Change-Id: I66a251fd567ebdb8864d3afaaef1a9a663c7b106 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add color and style properties to QDeclarativeGeoMapCopyrightNoticePaolo Angelelli2017-01-312-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds two new properties to the MapCopyrightNotice element to allow changing the background color and content style of the notice. backgroundColor controls the color of the background of the element. styleSheet, on the other hand, sets a stylesheet to the html, which allows to change color, font and size of the html. To make this work, the html output from the plugins has to be properly enclosed in <body></body> tags. Change-Id: I776f78f4b26b5b2cf04510a9fbc6302334b09c61 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Fix Mapbox GL plugin not rendering when reloadedThiago Marcos P. Santos2017-01-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The code was using a 'static' flag for checking if rendering on a separated thread, and thus, force the map refresh. Side effect is this code path was only accessible once per application run once the check was performed. Make the flag a member attribute instead, so the flag is reset on every new QGeoMapMapboxGLPrivate instance. Change-Id: I7f2bbf2f0f21e45b9f470976cf8e7878a0f0c6f8 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status