summaryrefslogtreecommitdiff
path: root/src/location/doc/src/plugins/osm.qdoc
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated FDL headerKai Koehne2017-10-171-4/+4
| | | | | Change-Id: Ie9771204ea1aa46e333d96ab0f392c795c512946 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix prefetching documentation for pluginsPaolo Angelelli2017-05-021-1/+2
| | | | | | | | | | Depending on the plugin, and the map type, the prefetching parameter might be overridden for specific reasons. This patch changes the description of prefetching stating that this parameter is a hint for the engine, that might get ignored. Change-Id: Iba68ed735f48ffaca19622b8f8933a44aa257c90 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add parameter to control prefetching in tile-based geoservice pluginsPaolo Angelelli2017-03-271-0/+7
| | | | | Change-Id: I18fc1788f7af0efe76f97257ffe739eb1a96e6cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'gerrit/5.8' into 5.9Alex Blasche2017-02-281-3/+5
|\ | | | | | | Change-Id: I3c27a0635fa324dfea7a1d19774a66e21c066bbe
| * Clarify osm plugin documentationPaolo Angelelli2017-02-281-3/+5
| | | | | | | | | | | | Task-number: QTBUG-55176 Change-Id: Id70a5e501425c7581acc18f7d1aae1c33b42d7ba Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix OSM plugin documentation causing the table to exceed default widthPaolo Angelelli2017-01-301-1/+2
|/ | | | | | Change-Id: I0b4fd6e8fdcb124e6b683e35d47a34632e7f64ad Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* Add cache cost strategy parameters to all geoservice pluginsPaolo Angelelli2016-11-241-3/+33
| | | | | | | | This patch adds the possibility to change the cost strategy on all the geoservice plugins Change-Id: I0903d931ea228cc468216780fb87b466bc383063 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-021-1/+7
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| * Add OSRMv5 support in osm pluginPaolo Angelelli2016-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the OSRMv5 protocol (the only one currently available on the OSRM demo server router.project.osrm.org). Support for the old v4 protocol is retained, in case of users who supply their own osm.routing.host parameter pointing at a self hosted OSRMv4 server. The support for OSRMv4 and v5 has been moved away from the osm plugin and into the location module because this should be used in the mapbox plugin in a subsequent patch (the routing support in the mapbox plugin currently uses the text direction coming from the server, which does not support i18n) Task-number: QTBUG-56119 Change-Id: Id30fd536c7fd434011795f643221f55becfc9e18 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-181-1/+3
|\ \ | |/ | | | | Change-Id: I5bcca8956007506362c5a96ff345e28718da584c
| * Fix for broken geocoding in mapviewer with OSM pluginPaolo Angelelli2016-08-261-1/+3
| | | | | | | | | | | | | | | | | | OSM Nominatim blocks user agents for default libraries. This patch adds a specific user agent to the mapviewer example if one isn't provided by the user Change-Id: I9bc598eec6f53b0990c7cd0fb42cf3ef7807bedb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add OSM plugin parameter osm.mapping.highdpi_tilesPaolo Angelelli2016-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a mean to enable/disable high dpi support for the OSM plugin too, following the same approach taken for the mapbox and here plugins. In order to do so, it has been necessary to rework QGeoTileProviderOsm. It can now be constructed with an arbitrary number of TileProviders, as opposed to the previous approach with one primary and one fallback tileprovider. It has also been necessary to disable Nearest interpolation for high dpi tiles, as it appears to produce considerable artifacts. So in presence of highdpi tiles, Linear interpolation is now always used. Change-Id: Id7d20fd5a320f3d5ef41b9fa28447a5c4f5398be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-021-2/+7
|\ \ | |/ | | | | Change-Id: I9bfe99e7e619cbf03cda73c3df4f2f51851474ae
| * Enable dynamic addition/removal of map types by the mapping managerPaolo Angelelli2016-07-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map types are currently fixed in the constructor, regardless of whether they were available, or, now, whether they are enabled or not. This patch makes the geomappingmanager notify (e.g., emit a signal) when the available map types change at runtime. This is used in the OSM mappingmanagerengine, which can now disable map types if provider records turn out to be invalid or disabled after they have been fetched. Change-Id: I8e0e75504c882609f91c6d1ceb88424eee656f26 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'gerrit/5.7' into devAlex Blasche2016-07-291-5/+20
|\ \ | |/ | | | | Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1
| * Add indirection for osm providersPaolo Angelelli2016-07-271-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent furter breakage of qtlocation osm provider in existing qt versions, this patch introduces one level of indirection in resolving OSM providers, fetching the tile server address from files hosted at http://maps-redirect.qt.io/osm/5.6/ The content of the files requested for the server address resolution must be in JSON format, containing (currently) the following fields: { "Enabled" : bool, (optional) "UrlTemplate" : "<url template>", (mandatory) "ImageFormat" : "<image format>", (mandatory) "MapCopyRight" : "<copyright>", (mandatory) "DataCopyRight" : "<copyright>", (mandatory) "MinimumZoomLevel" : <minimumZoomLevel>, (optional) "MaximumZoomLevel" : <maximumZoomLevel>, (optional) } Enabled is optional, and allows us to temporarily disable tile providers if they go offline without firing requests to them. Default is true. MinimumZoomLevel and MaximumZoomLevel are also optional, and allow us to prevent tile requests to the providers, if they do not support the specific ZL. Default is 0 and 19, respectively. <server address template> is required, and is the tile url template, with %x, %y and %z as placeholders for the actual parameters. Example: http://localhost:8080/maps/%z/%x/%y.png <image format> is required, and is the format of the tile. Example: "png" or "jpg" <MapCopyRight> is required and is the string that will be displayed in the "Map (c)" part of the on-screen copyright notice. example: "<a href='http://www.mapquest.com/'>MapQuest</a>" <DataCopyRight> is required and is the string that will be displayed in the "Data (c)" part of the on-screen copyright notice. example: "a href= 'http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors" The patch also adds four additional OSM plugin parameters, modifies an existing ones, and removes another existing one. Removed: - osm.mapping.copyright, now removed and replaced by two other parameters (see below). New: - osm.mapping.providersrepository.address, allowing to change the hardcoded http://maps-redirect.qt.io/osm/5.6/ The implication of this parameter is that it becomes possible to use file:// urls or even qrc:, allowing to ship custom providers with the applicarions - osm.mapping.providersrepository.disabled, allowing to disable the indirection and go with hardcoded URLs by default. - osm.mapping.custom.mapcopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Map (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled - osm.mapping.custom.datacopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Data (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled Modified: - osm.mapping.host now became osm.mapping.custom.host, improving the naming consistency. Task-number: QTBUG-54599 Change-Id: Iee88883572a198c00bcf54cf2bc33fbcc0498a68 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | OSM Geoservice plugin improvements, including offline data supportPaolo Angelelli2016-07-211-0/+23
|/ | | | | | | | | | | | | | | | | | | | | | | | This patch contains improvements for the OSM geoservice plugin, in form of property-controllable disk cache, and the support for a directory containing an offline dataset. The offline directory can contain subdirectories also in form of symlinks. If duplicate tiles are present, the newest is used. The population of the offline tiles registry is offloaded to a thread to prevent blocking the startup of the application. No synchronization is used (except on cache destruction), so that, as the tiles are being indexed, they can be used in the application. For the time being, no support is given to populate such directory (mostly due to current API limitations), but tiles can be placed manually, for example copying them from the disk cache directory. Task-number: QTBUG-45284 Change-Id: I518980669a3ee474545025adf05adc69cdd29781 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Isolate the default cache directoryLaszlo Agocs2015-09-151-0/+8
| | | | | | | | | | | | | Instead of having it in several random places, have a central function that contains all the cache directory selection logic. As per QtCore docs GenericCacheLocation can be empty so introduce a fallback to CacheLocation (the app-specific, non-shared location) in case some future platform does not support the former. Task-number: QTBUG-41187 Change-Id: Icfe5e8926e917483ac11844f625244318ff815c7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add missing url parameter for OSM places search.Alex Blasche2015-07-161-4/+11
| | | | | | | | | Fixes a few minor grammar/spelling issues in related documentation too. Change-Id: I21c153596b02931c66a38f7068173c687cbe0ad9 Task-number: QTBUG-47188 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Allow custom URLs for OSM geocodingWolfgang Bremer2015-05-281-0/+6
| | | | | | | | | This enables the usage of another geocoding server than the default osm project. The api still needs to be the same, but it is possible to use another server. Change-Id: I72f3835f28b9c52c042b23e9c4fdf2e85c752c56 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Use "osm" prefix for osm plugin parametersAlex Blasche2015-05-271-8/+12
| | | | | | | Task-number: QTBUG-42151 Change-Id: I58648bac947b19e675f129d78bec61e079a93d2c Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Allow custom URLs for OSRM routingWolfgang Bremer2015-05-081-0/+7
| | | | | | | | | This enables the usage of another routing server than the default osrm project. The api still needs to be the same, but it is possible to drive your own server using the OSRM project sources. Change-Id: Ib335fdf97eb1e208caafb17783c22d9b423a40e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Allow custom URLs for OSM tilesWolfgang Bremer2015-05-081-0/+26
| | | | | | | | | | | | This enables the usage of various mapping services which use the OSM API for tile distribution. One only needs to set the urlprefix parameter to a correct url and the activeMapType to the "Custom URL Map". Task-number: QTBUG-32937 Change-Id: Ib24da19dc598ccc288047ce2651e6c1792ae2054 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Update contact URL in all license headers to qt.ioAlex Blasche2015-02-181-1/+1
| | | | | Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update all FDL licensesAlex Blasche2015-02-181-4/+4
| | | | | | | | Changes the copyright owner to The Qt Company and sets the copyright year to 2015. Change-Id: Iad6d74044968befe94c2824af2f7f9273bed843a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Add support for more tile types to OSM plugin.Aaron McCarthy2015-01-281-3/+4
| | | | | | | | | | | | | | | | | | In addition to the existing MapQuest tile set make the ThunderForest tile set also available as additional supported map types. This change adds the following map types to the OSM plugin: StreetMap - from MapQuest SatelliteMapDay - from MapQueset CycleMap - from ThunderForest TransitMap (day) - from ThunderForest TransitMap (night) - from ThunderForest TerrainMap - from ThunderForest PedestrianMap - from ThunderForeset Change-Id: I663b275689ee55929d0afa7da20ed3c57c78e037 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add credits for MapQuest and OSM data/services.Alex Blasche2014-02-041-0/+3
| | | | | Change-Id: I66bb2ef931384d5894d445a81d66e109dc0b946a Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix QtLocation documentationAlex Blasche2013-07-121-0/+55
This moves the docs to its proper place and fixes content as well as broken links. There are still some warnings left. Change-Id: Ie83086f4feabab5f3b3d6c92eb6b401a5ff43e29 Reviewed-by: Alex <alexander.blasche@digia.com>