| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Use new version with commercial exception.
Change-Id: I11058c94138615f7df2f99b6c3245ab075cd8222
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: Ie9771204ea1aa46e333d96ab0f392c795c512946
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: I4d2d430a1315afb1b5cbbaf254b08691579d28f2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous setup enforced a small 360x640 view size on Android which
makes no sense on the platform's full screen premise.
This patch tells the QML rectangle to adjust to the parent's size and
shifts the size limitation to the surrounding QuickView. At the same
time the QuickView will automatically change to full screen as per
platform requirement.
Change-Id: I2dcd0fc345f6c1ef7520bb10116d9f2fe0722dff
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
|
|
|
|
|
|
|
| |
The new screenshot did not match the code (showing Helsinki's pizzerias,
not Oslo's)
Change-Id: Ie51ca95c3e554e8a353d57e7a7db8f36521eef83
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
|
| |
| |
| |
| |
| |
| | |
Change-Id: I18e750713befae9a30b052cc001cec8577349479
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8a6e6a34ea22b5ba96b46f05e970cdaa91dbc6b4
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
In this way there's a way to easily get to a zoom level where the map
is sharp
Change-Id: I176cf3870d9c3fe970191d46c804e13daab674fa
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Better rendering using Mapbox GL plugin.
Change-Id: I3ef1862988e652c1caad62920c2f3b5775f18552
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch does some improvements to the MapViewer example.
Namely:
- sliders, which have been problematic in many ways, are now from
QtQuickControls 2, and this solves a couple of glitches.
- changing map provider now retains tilt, bearing and field of view,
if possible.
- High DPI scaling is enabled by default in main()
- the slider panel is open at start
Change-Id: I1cc380e3d05b89aa547139d912c142e4f0d266c9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The new MapSliders.qml component introduced a different way of binding
the sliders properties.
This makes the slider change the value in the map when these bindings
kick in.
This change explicitly sets a sensible default at map initialization
time.
Change-Id: I90d977003a571c2226c2dd6d5b66bc67a246e754
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch adds a new qml element, MapSliders, that consist of a
set of sliders to control camera parameters.
This element can be hidden/shown using the included semitransparent
button.
The element can also be ported to the other examples to offer the
same controls.
This element can be positioned on the left or the right of the map,
and for this example it has been moved to the left to not occlude
the minimap.
Change-Id: Icc56d90b181c2481727e73e3d332a66c05352f57
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add Mapbox GL as a plugin for rendering vector tiles
using OpenGL.
Patch by:
- Bruno de Oliveira Abinader <bruno@mapbox.com>
- Thiago Marcos P. Santos <thiago@mapbox.com>
Change-Id: I1671ae4dba0891e280a327543f15e73de1df385d
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch adds RotationGesture and TiltGesture to the acceptedGestures
in the mapviewer example, previously limited only to pan, pinch and
flick.
Change-Id: I4c47cfb669abe5433e4b9b3fc4bb0a9d6c596fc3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
|
| |
| |
| |
| |
| |
| |
| |
| | |
Using 'state' as property is considered bad practice
and it can lead to undefined behavior.
Change-Id: I3a77c4849a9e68334958216200d6c469b8f3d064
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QGeoProjection is currently a class containing only static methods for
WebMercator conversion/interpolation.
This patch renames it to QWebMercator, effectively freeing the
QGeoProjection name for a real projection class
Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch makes the MapViewer example fetch and add additional
library paths from the environment variable
"QTLOCATION_EXTRA_LIBRARY_PATH".
This path is colon separated, and can be used to add and test additional
plugins easily, without the need to modify the example.
Change-Id: I61563e1062d2ea860f4288ff17b54067b6bf9c8d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
|
|
|
|
|
|
| |
Add the ability in these two examples who let the user switch provider
at runtime to fetch the tokens from environment variables.
This makes it easier to test them without having to modify the code or
to always run them with command line parameters
Change-Id: I6469414ed70522bbf3481b73e1e43a82d18302c5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: 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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|