| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
QtLocation was missnig basic example to show maps,
the one you can simply jump in and start hacking.
Change-Id: I0aec90ae25aa703d84f7e52e4dd523931819e79c
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The current implementation is calculating the bounding box of
a geocircle based on moving along a circle of latitude by the
distance of a circle's radius. Unfortunately the distances
on a small circle of a sphere are greater than great circle
distances. Reimplement the calculation using tangential
points between a geocircle and meridians.
Do not center the viewport in the center of the geoshape,
use the center of the bounding box instead.
Simplify zoom level adjustment calculations, use the reference
world plane to get rid of longitude wrapping and rounding
erros.
Finally update a viewport unit test, adjust the minimum map
size to 256x256, so fitToViewport calls have chance to succeed.
Fix out of order test execution.
Task-number: QTBUG-54337
Change-Id: I61726a4eb7183470c493ceb03d101f3a75305121
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently setTileFetcher and setTileCache behave in two different
ways, while the former relies on having the parent set properly
for the destruction, the latter is deleted on destruction
With this patch handles both pointers are handled in the same
way: they are parented in the setter, and the destruction is
left to the qobject destructor.
Change-Id: Iaf11a12cd95088fd2268817b39fb9d58311b1812
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Examples in binary packages now directly match the install path.
Change-Id: I9315d395c4546adfa58e264f66d98fb443ab1e72
Task-number: QTBUG-52953
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
|
|
|
|
|
|
|
|
| |
Subjects each *.png file that (still) matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce -force
Change-Id: I75a34e5cc3ddc0add55bfd5b0bc0cbe6610a8025
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Wzero-as-null-pointer-constant
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.
Task-number: QTBUG-45291
Change-Id: I279fd100b61d3e2b2e46e7cbd30cc6b4bfb4d10e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Iebbcbf2bae7545bceab69d30d9edebb1640486cb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
The current way of documenting examples is to include
qdoc and images source into example directory.
Fix examples in location and positioning.
Replace planespotter.jpg with png.
Change-Id: I4eeacbfa575e7ae3ef747703348f2f201899e548
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
The recent QML changes were not added to the API change documentation.
Change-Id: I8c9dc5656941fa9d266059733b0a6b6cafb636ba
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Harald Meyer <dev@meh.at>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I98bdcfbb57d3d597e23ecaf3bb862daa5a917f00
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add clearData call to clear texture, memory and disk
cache. Update mapviewer example and add "prefetchData"
and "clearData" to Tools menu.
Task-number: QTBUG-47292
Change-Id: Ifc71a3652688d1403f5b011ef231b59381c17ee3
Reviewed-by: Harald Meyer <dev@meh.at>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qmlfy map gesture area API:
* do not use "is" for properties (panActive,pinchActive)
* do not use "active" for accepted gestures (acceptedGestures)
* do not use "ZoomGestures" (PinchGesture)
* make private panEnabled, pinchEnabled
* remove pan/pinchEnabled signals
* update documentation
* fix order of emitting panFinished, flickFinished
[ChangeLog][MapGestureArea] Improve QML API including renaming and removal of
obsolete elements.
Change-Id: I643c923dcd94388475feb402b29ce3df916037a7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Initialize QGeoTileTexture with QImage instead of
converting from QPixmap
Change-Id: I69dddda385ebc9ce63cb0dd68fee3d3fa6eed73f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Use visibleRegion to fit the map's viewport
[ChangeLog][Map] Remove fitViewportToGeoShape from map qml api
Change-Id: I378329602a5c1f4cceda327f7abcca61c1217564
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
With this update tiles which failed to load and have zero data are not
saved (cached).
Change-Id: I580db9096553d403d89c135bcf90ac5fb4c97fe8
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Recent change adds setter for TileCache, use new setter
in here plugin, remove obsolate create function.
Change-Id: I8f5ee726f6c14ea6fa2adf82a4713d5b37c6a78b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This update adds a new method "setTileCache" to the
QGeoTiledMappingManagerEngine class. The method allows custom
map implementations to set their own cache.
The update also fixes a compiler warning (ctor variable order) and
adds Q_DECL_OVERRIDE checks.
Change-Id: I22cfdb218ae5c9af145d688f11aab655f4ed3e4b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QGeoTileCache is split into two classes:
The abstract class QAbstractGeoTileCache offers interfaces for inserting
and getting tiles, as well as getting cache status information such as
used texture memory.
The new class QGeoFileTileCache implements QAbstractGeoTileCache and offers
a file based caching implementation (the implementation is the same
as before splitting the class).
Change-Id: I2eab7491d489ac5b251c1296b67688901f5cc7d7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The examplesinstallpath variable in .qdocconf files defines the path
under QT_INSTALL_EXAMPLES where examples are found.
To match the way examples are packaged in Qt 5.6, prefix each
install path with the repository name.
Task-number: QTBUG-48736
Change-Id: Ie14b7b15f94e96540d94a7384530faabd8b539f3
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
|
|
|
|
|
| |
Change-Id: Id3ef277b5610a45ffa42850dd9415e963ed45285
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-48482
Change-Id: I24aa4f3fbca69c4bf6db9da2c785693d230eb5f1
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
| |
Change-Id: I5b9b46aafa8e8bf79c7ba54ecab9a4523a3d4476
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
5.5 was a tech preview release. The real release is 5.6.
Some 5.5 interfaces did change. It is possible that there are apps
in existence which are based on the 5.5 API's. To avoid miscommunication
we bump all version tags to the real first release version.
The existing 5.5 QML imports will continue to work but apps may encounter
API changes when they move from 5.5 to 5.6. The API changes are listed
in the QtLocation documentation.
Change-Id: Ia7000e871a5ee6b09234e5d58d4fc8927e93b154
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
| |
Starting with Qt 5.6 the API commit is given.
Change-Id: I795cc7385a8216646bd972e08635f025260be4de
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enforced application isolation (AppArmor) may make it impossible to write
to $HOME/.cache as applications are only allowed to use their own specific
directories (as returned by CacheLocation). QtCore is not able to recognize
this so the value returned for GenericCacheLocation is still non-empty in
this case. Therefore do a write check.
Task-number: QTBUG-41187
Change-Id: I6ad136abc69997d25715dcdbbc1b8ffb55ec65e0
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The MapQuest servers use JPEG, not PNG. The disk cache, unlike the memory
one, passed in the extension as the format to loadFromData(). This failed
for JPEG files with an extension of .png.
In addition, using split('.')[1] to determine the file extension is bogus.
On Linux for example, a directory of "$HOME/.cache/QtLocation/..." results
in putting "cache/..." into format which is then conveniently ignored by
QImageReader. On OS X however there is no dot, so it "correctly" picks
"png" for the JPEG data, hence the console is flooded with warnings about
failed tile loading.
On top of the above, the disk cache is made more robust by not relying on the
format string. As long as only formats supported by QImageReader are in use,
it can recognize the correct format from the data. (the memory cache does this
already anyway)
Change-Id: I90ece5bd157d457afa0025527c84070427a60313
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I23e1151c300254a1f297c61e4be344b7fd88cc95
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
1.) Remove not required/duplicated enums
2.) Add docs for new enum values
3.) Sorted the enums by alphabet (except for NoErrror)
4.) Other minor spelling corrections
5.) Update and expand tests
Change-Id: I83bf9e5e40f1237ead45320d020b315b39442946
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/imports/location/qquickgeomapgesturearea.cpp
Change-Id: If115a052678b140eee46b8c0d9471b7d96953915
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before being made run-time selectable the only a single prefetch style
was used. Restore the same behavior by adding a break to the switch
statement.
Change-Id: Id16a4b11709497df1511b2605c0a9b5837590b3a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change position used in examples to Oslo. Update marker
icons to be the same as in mapviewer example.
Update screenshots, so they contain osm map.
Add marker icon to places_list, so it does not look so boring.
Add places title to places_map, so it is more readable.
Change-Id: Ia321aa8577e77f76468c504cd4e6ce877712089c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
/home/bb/dev/qt/qt56/qtlocation/src/imports/location/qquickgeomapgesturearea.cpp:145:
warning: C++ class QDeclarativeGeoMapGestureArea not found: \instantiates QDeclarativeGeoMapGestureArea
/home/bb/dev/qt/qt56/qtlocation/src/location/places/qplaceeditorial.cpp:99: warning: Cannot find 'QPlaceEditorial(...)'
in '\fn' QPlaceEditorial::QPlaceEditorial(const QPlaceContent &other)
[I cannot find any function of that name with the specified signature. Make sure that the signature is identical to the declaration, including 'const' qualifiers.]
Change-Id: I10c2326364c8e8d29ddf641f42267302b05b9379
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't iterate through all items to create a temporary
QList we don't need.
Change-Id: I4acc4fa6f8c845b836d35c8ad50a86942e31b36c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Here maps plugin checks server for tile version.
When tile version is updated, update not only
the current camera tiles, but also scene tiles.
Task-number: QTBUG-44809
Change-Id: Iedb3add5308a2e61cc18e169e33ea4510e1a4fee
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
Removes not required engine registration.
Change-Id: I5d30043a33785e0dcd798517754e846a7f420220
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|/
|
|
|
|
|
| |
Keeps the same function name across all classes.
Change-Id: I3f8b723ce513e50ea93a3fd1af99c7d2ba79a11d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Id224d73d2b68a947bc6c7121175a2f83bd0059fa
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
The first release is 5.5 and not 5.0
Change-Id: Ib659adf77293e10e8f3d117ce16bbc25858d6ab2
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I708421dad06bf68fd6da585ba4305e185be3c5ac
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As an example the HERE plugin requires the here.app_id and here.token
parameter. There is no point in passing those parameters on to
e.g. the mapbox plugin. The OSM, mapbox and here plugin were already
converted in such a way that they only use prefixed parameter keys.
Non-prefixed parameters continue to be shared among all plugins.
Change-Id: I9bdc0dccb95160a842800b785916f18ed78fdcd7
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
| |
Renames class members to use m_ naming convention
Change-Id: I5bebc9be7fc29cce15d2b198beb8e8216f9cae4b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
This commit:
* renames class members to use m_ naming convention
* removes not required includes
* updates PIMPL
Change-Id: Id9d1087389df0a5e314353b4220330934910b364
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
It is not an API break in the traditional sense but it is a break
of some sort. Hence we need to document them.
Task-number: QTBUG-42151
Change-Id: I9f0d11762239213f3104bf997d8a6fbd4af5e46e
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-42151
Change-Id: I58648bac947b19e675f129d78bec61e079a93d2c
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-42151
Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|