summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm
Commit message (Collapse)AuthorAgeFilesLines
* qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-155-6/+6
| | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Fix OSM parsing of place_idPaolo Angelelli2019-10-311-1/+1
| | | | | | | | | | Something must have changed in Qt json API/parser, or in the return value of nominatim. Either way, place_id is now an int. Change-Id: Ic340bed9c556665ce1114966d6b9157a3f380ad3 (cherry picked from commit 7533c81ccef992b0e932b299cdb1257d21e012d2) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta4Qt Forward Merge Bot2019-05-072-16/+24
|\ | | | | | | Change-Id: I28b2db32a10b2f70d8c3626d645d279cfedb49f5
| * Use network cache when fetching provider data in the OSM pluginPaolo Angelelli2019-05-062-16/+24
| | | | | | | | | | | | | | | | | | Otherwise it becomes problematic to start up applications in absence of network. Change-Id: Ia543b88bd56bb6c93c803a66e345be1610a4dfe0 Reviewed-by: Tuomas Vaarala <tuomas.vaarala@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-012-1/+24
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-252-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins request map data for some map types over HTTPS. Without SSL support (Qt built without SSL support, or missing OpenSSL libraries) this typically translates into blank maps. This is very evident on the MapViewer example. This patch makes sure that the example displays a notice when this situation happens. [ChangeLog] Added a notice to the MapViewer example to inform when a HTTPS-based map is selected without SSL support. Change-Id: I85428bb0536f33089a0e6045301c089fafe69d74 Fixes: QTBUG-74195 Fixes: QTBUG-74294 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Import OSM GeoJSON when extended data is requestedPaolo Angelelli2019-03-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Make use of QGeoJSON and import the Nominatim-returned geojson in geocode requests. Useful to get the shape of the geocode results. [ChangeLog] GeoJSON returned in Nominatim queries is now converted into the corresponding geoshapes using QGeoJson. Change-Id: Ie260e82d99363d55ed094e8dbf214d68c2ccadef Fixes: QTBUG-74248 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-237-10/+10
| | | | | | | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-011-0/+7
|\ \ | |/ | | | | Change-Id: I52053e7871fe1ce8a6aead52db38ead6ee78e1d8
| * Introduce a map plugin parameter to decide U-Turn directionTasuku Suzuki2018-12-261-0/+7
| | | | | | | | | | | | | | | | | | | | | | When "uturn" comes from OSRM, Qt returns UTurnLeft since Right Hand Traffic is in use in most countries. This commit allows qml to set traffic side to return correct u-turn direction. Task-number: QTBUG-72462 Change-Id: Ifaa002b063159b4e4ee563d007721ba7a4a587a4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Extract all available fields in osm geocode replyPaolo Angelelli2018-12-111-1/+8
| | | | | | | | | | | | | | | | | | The reply object that OSM Nominatim returns includes a number of nominatim-specific fields. This patch exposes them through the extendedAttributes property. Change-Id: I7d46880e0674b6b513738e4a9e82ce6b728c377c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Provide extended, plugin dependent information for Geo LocationsPaolo Angelelli2018-12-044-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | This includes support for osm geojson and class fields. At the present, the content of the geojson field is returned as is. As soon as QGeoJson support is finalized, this will be integrated with a QGeoPolygon. Fixes: QTBUG-43401 Change-Id: Ifa7e24cf904a2c1e1e77ebfaa7948ac0ce81d265 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Allow QGeoCodeReplyPrivate to be subclassed and carry extra dataPaolo Angelelli2018-12-044-2/+46
|/ | | | | | | | Stored in form of a variant map. Currently used for debugging purposes. Change-Id: I49fa4b51da0d5947e3b292b6cde96cb496cef9e6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Set the request into QGeoRoute results in osm, mapbox pluginsPaolo Angelelli2018-08-271-0/+7
| | | | | Change-Id: Iec8d1cb9ad369fe765e34bdcff2512e2726797ad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-282-105/+41
|\ | | | | | | Change-Id: Ia764bb5526b00f58f9ff0a0dd5a8ab1b20fb99ad
| * Remove indexing of offline data from OSM pluginPaolo Angelelli2018-07-262-105/+41
| | | | | | | | | | | | | | | | | | With this patch, offline tiles will be looked up on the fly, thus removing the need to index the offline content at startup. Task-number: QTBUG-59665 Change-Id: I1db62c38363dafe82ee2f2ffc7f493ac5d958fc2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Enable incremental updates in PlaceSearchModelPaolo Angelelli2018-07-052-1/+8
|/ | | | | | | | | | | This way pages can be changed without resetting the model. To achieve this, new members into QPlaceSearchRequestPrivate are introduced, to keep the relationship between a request for one page, and the previous or the next page. In this way sparse population of the model becomes possible. Change-Id: Ic8db0281408f3500ba83f78c7e152ee0b68cd099 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Change nominatim base URL to HTTPSPaolo Angelelli2018-05-152-2/+4
| | | | | | | | | Nominatim switched to HTTPS only recently. This updates the endpoint url. Task-number: QTBUG-68261 Change-Id: I8a5328db61fe4f510ecdc70bf442fc069ae0a998 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Introduce map objects reference implementationPaolo Angelelli2018-04-173-2/+11
| | | | | | | | | | | | | | | | This patch introduces a reference implementation for the QGeoMapObject subclasses in the locationlabs module. If this module is built, all current plugins, with the exception of mapboxgl, will also be able to render map objects. The current reference implementation of map objects is not optimized, but it can be useful for both testing and feature parity (so that switching between plugins will give the same result). Change-Id: I830ebb3813f219e42c085f450952a2b4327361cd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2018-02-051-2/+2
| | | | | Change-Id: Icbebfaae93cc5827d80ef09323ec82868789838a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-055-18/+18
| | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* OSM Places: support query limit parameterPaolo Angelelli2018-01-112-0/+7
| | | | | Change-Id: I9d5b5b547c5932270e0c1f68a21253b01e1d52cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add debug parameter to OSM plugin to include the request url in resultsPaolo Angelelli2018-01-104-0/+17
| | | | | Change-Id: Ib2c0ba380ed6f5eecc7eb6bec75037a4922a567f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QGeoShapes properly throughout the modulePaolo Angelelli2018-01-092-21/+3
| | | | | | | | Adds proper support to other valid shapes and use ::boundingGeoRectangle where appropriate. Change-Id: Ibba4cb18f5cca08df62d15b76fa0e1f249dc6fbb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-12-151-1/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
| * Enforce numberAlternativeRoutes where possible when doing route requestsPaolo Angelelli2017-11-281-1/+1
| | | | | | | | | | Change-Id: I321e802d795df36d8cdd1b8578e77094c500cc2e 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 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>
* | Add camera capabilities + metadata to QGeoMapType/QDeclarativeGeoMapTypePaolo Angelelli2017-07-313-20/+10
|/ | | | | | | | | | | | | | 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>
* Add pluginName to QGeoMapType and check against it in setActiveMapTypePaolo Angelelli2017-05-071-9/+10
| | | | | | | | | | | 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>
* Allow overzooming when setting zoomLevel directly in a MapPaolo Angelelli2017-04-121-0/+1
| | | | | | | | | | | | | 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-122-2/+2
| | | | | | | | | | | | | | | | | | 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 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>
* Add parameter to control prefetching in tile-based geoservice pluginsPaolo Angelelli2017-03-271-0/+12
| | | | | Change-Id: I18fc1788f7af0efe76f97257ffe739eb1a96e6cc Reviewed-by: Alex Blasche <alexander.blasche@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>
* | | 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>
* | Default style for the copyright defined on the pluginThiago Marcos P. Santos2017-02-131-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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 color and style properties to QDeclarativeGeoMapCopyrightNoticePaolo Angelelli2017-01-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add rotation/tilting support to QGeoTiledMapScene/QGeoCameraTilesPaolo Angelelli2017-01-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds rotation and tilting support to QGeoTiledMapScene and QGeoCameraTiles. It also adds the related capabilities to the geoservice plugins mapping managers QML Api is added in a separate patch Change-Id: I3de1b52a9928c4856f6ee57ad39191acebe0f770 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-1/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
View Lorry Controller Status