| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patches fixes an incorrect behavior (that is also a regression)
introduced as a side effect of the no gray bands patch in the map
viewer example
Task-number: QTBUG-55085
Change-Id: I2078ba72e1d1588357bb2002d0c8e38b2f59253c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Ifa6fba19f79385d4806fad5ac58b36bada6e3df2
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: Ifed3a326085bd4aaff069007966efd6932c2be3b
|
| |
| |
| |
| |
| | |
Change-Id: Ie482e84b0552608239a032ec95b44665997a0c01
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I9e85d2002151f7c53d2edbb4d8a078816aff693e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce
(Some of them needed -force but did get smaller.)
Change-Id: Ib92045f3e0fb34aac1061fbc3dbb77d998228808
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
openweathermap.org requires an appid these days. The free plan permits
usage for commercial and non-commercial cases.
Task-number: QTBUG-49772
Change-Id: I28be90709b4879df515346e03372d494d94a4f01
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently identified problems with this example are:
- the map element loses focus upon provider switch, or opening some
other page (geocoding page, for example)
- caused by changes in the StackView. Solved by forcing the focus
upon map change
- selecting minimap causes segfault
- caused by dereferencing a null pointer (m_flick.m_animation)
in qquickgeomapgesturearea.cpp
- occasional (random) crashes with "QVector index out of bound" error
- the menus show up on the wrong screen most of the time if the window
spans multiple screens (but this is a broader qtquick problem)
This patch fixes the first two issues
Task-number: QTBUG-50519
Change-Id: Ic6b4a35e62e4651bd8003f47fade45f44a99d81c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qdeclarativegeomap_p.h
Change-Id: Iaf232acbe9098eb1b57f571638dd37f75b2ff345
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: Ia305efe8c4b616ed70309dfcae47f39cd1a4c4da
|
| |
| |
| |
| |
| |
| |
| | |
Prints the error and reports the failure back to the user.
Change-Id: Ic11d3e1fdb54f411c1802de448017155b1a08df5
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
| |
In some cases (for instance a helper mini map) the copyright notice is displayed
multiple times. The new parameter allows to hide the copyright notice in such cases.
Change-Id: I659c1ac019b8c21545c410a38cdc840f93d928ce
Task-number: QTBUG-47025
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/imports/location/qquickgeomapgesturearea.cpp
Change-Id: If115a052678b140eee46b8c0d9471b7d96953915
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A map pan is based on synthesized events due to the fact that
rest of qt (qtcontrols , mouse area etc) depend on it in case of touch
handling. However when there are two touch points on the screen
pinch handling is activated. After accepting the touch event,
mouse synthesized events are no longer generated for the first touch
point, what's more as a result we might not get even
mouseUngrabEvent nor mouseReleaseEvent. This breaks internal
tracking of mouse position. This workaround resets mouse tracking point
in case of getting touchUngrabEvent.
Remove dummy extra MouseArea from places example.
TODO: fix broken mouse area state in pinch unit tests
Task-number: QTBUG-46388
Change-Id: I5588fbd4dbf0c5d25c44f994292c1aae7b3d70d4
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Improved: Double tapping/mouse wheel based zooming keeps the map at the current geo location.
Added: Left/Right/Up/Down keys can be used to move the map.
Task-number: QTBUG-47020
Task-number: QTBUG-47019
Change-Id: I63859319b282e7738a173b0d3917433860fc8969
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
| |
[ChangeLog][QtPositioning][Platform Specific Behavior] Removed
BlackBerry 10 support from QtPositioning.
Change-Id: If4e24831a0830c8744f51e912f6f37e198362923
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
| |
This was discovered when testing on Windows.
Change-Id: I6e61f13e4dc6900a97234e5c8950875967446243
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Id224d73d2b68a947bc6c7121175a2f83bd0059fa
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-46388
Change-Id: I4ba1eb18d86f92a9dd89c4b96a0ba963dc13493c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
* fix Map Component creation
* same QML components version across the files
* use "Proceed" instead of "Go !" for buttons
Change-Id: Ia75b0663a8b08241c0f842dacf80da089a6ee841
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a squash commit of:
* add qtquickcontrols window to 'places' example
* add MenuBar to 'places' example
* replace Slider in 'places' example
* add stackView and MessageForm to 'places' example
* replace SearchBox in 'places' example
* replace SearchCenter dialog in 'places' example
* replace SearchBoundingBox dialog in 'places' example
* replace SearchBoundingCircle dialog in 'places' example
* tune up categoryDelegate in 'places' example
* tune up SearchResultDelegate in 'places' example
* tune up PlacesDelegate in 'places' example
* replace OptionsDialog in 'places' example
* remove 'common' controls from location
* clean up filenames in 'places' example
* update MapComponent in 'places' example
* code style formating of places.qml
* remove backgroundRect from 'places' example
* tune up EditorialPage in 'places' example
* tune up ImageView in 'places' example
* tune up ReviewPage in 'places' example
* tune up SuggestionView in 'places' example
* update imports version numbers in 'places' example
* change searchBox and busyIndicator
* update design in 'places' example
Change-Id: I680c8b88f26689cb9728ee61617f7d2d3aa2a172
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Current plugins do not support adding or removing
place and category. Remove this support from
'places' example.
Change-Id: I768697e0509c7ff74cc61c5a1ffc3709d28d0b6f
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
If users reselects 'tools' dialog, rewind to
map page immediately.
Change-Id: Iefc3786c78e441ca765466c54d872ef475a80d59
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
appDirPath was used by videoitem which was removed during earlier
rewrite of the mapviewer example.
Change-Id: I7ac49accbe93fd09c125a45fbeafde660beabf3a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ia07c5741b52420ca8196121589ccc336193a65ca
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ic54f239cf26c8caef1e61d32eb06722643e89933
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I340f1ad3a623a04a1846c5a57ad2bbcb9e253556
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Update marker and change colors.
Change-Id: Ia12ed0145367c5a086ec6b6828db602b4666403e
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This diversifies the location examples as it adds a relatively small
example. Short of the places examples there is only one large
demo-like mapviewer example.
This new example demonstrates the following features:
- integration of C++ types into QML
- coordinate animations
- fitting viewport of maps
Change-Id: Id0b5b9669cfd1d98bb5dce7d7d42d220efd60142
Task-number: QTBUG-45415
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I73fb797f2b96198459214ea88f3b708fda53e543
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I6fe478f1e7fd3c243c1da9623eac0a80f693e1a8
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I83511201db05298899dd1f9202cbe3c26b6b19ea
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Refactor code so the MapComponent holds the most of revelant
code for documenting. Rewrite mapviewer example documentation
so it fits the current code snippets.
Change-Id: Idf468d2025303a42cea6ca8d24ed541c509911c0
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Set zoom slider to be vertical and move map scale information to right
bottom corner. Now it is easier to read map copyrights and scale.
Change-Id: I5d76fabe2e7b3fc08a4274a3efb25435ebd1dc0d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Rename files, move the subdirectories, remove
obsolete dependencies to location examples plugin.
Conflicts:
examples/location/mapviewer/mapviewer.pro
Change-Id: Id85dfffc32761eb9d2999b8e07b87f9912700659
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Make code to follow qml coding conventions.
Use switch instead of if-else statement.
Add helper.js with common functions.
Change-Id: Iba989d3677fa428b45609f24a82b26ef7cefe675
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I4010e9081d5718e18a05df6933a1297421ffccd7
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Remove not existing nokia POIs.
Use The Qt Company POIs instead.
Change-Id: Id16ada3ca977b7040047ec65c57217ef9633dc6b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Old implementation is hard to use with touch devices,
since it requires drag from left edge of screen to
see the route information. Show route info from item's
menu instead. Use qtquickcontrols.
Change-Id: I8dc73d13a9e2ed0b7730f1ecbde413f22e1c897b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|