| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Since QStandardPaths::writableLocation() is used, it's best
to make sure we have to write permissions on Android.
Task-number: QTBUG-80717
Change-Id: I992661aed25e7d40254f7c7d6373273cf84aac16
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ibfd9321f80367173575afb9393307d8b7ce5f399
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If running minimal_map example on Android, the map view
is shown on a small view on top of the screen only, with
all the remaining view as blank, this is not desirable.
Change-Id: I727247428c9a33e0281083abef672379f479c5be
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change introduces a metric-based implementation of the
Ramer-Douglas-Peucker line simplification algorithm to generate a
LOD pyramid for the polyline geometries.
This comes with a related property (in MapItemBase), lodThreshold,
that can be used to change the threshold after which no simplification
will be used.
By default the value of this property is 0, meaning that the
behavior will be unchanged and no LOD will be used.
This change also introduces LOD on map polyine objects QSG, for which
no property is introduced, and there's a default threshold set to
zoom level 12 (which appear to produce acceptable results).
Finally, this patch makes use of a threadpool with 1 thread
to enqueue geometry simplification tasks, which would otherwise
freeze the UI when computing for the first time.
Support for geometry simplification is currently added only to polylines.
It might be of interest extending it to polygons as well, once
a proper strategy for handling the simplification of inner holes has
been identified.
Finally, extending it to circles could be of interest, while potentially
bringing only minor benefits, as circle geometries are currently fixed
to 128 vertices.
Also adds a MapObject-based delegate to the geojson viewer example.
Task-number: QTBUG-46652
Task-number: QTBUG-38459
Task-number: QTBUG-49303
Change-Id: I64b5db4577962db17e5388812909285c9356ef0d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With this change, all the geo-to-screen conversion,
and the triangulation operations for geo polylines
and geo polygon are performed either at set time
or in the shader.
A separate bounding box geometry is processed
in the old way to provide a correct QtQuick Item
geometry, that can be used for nesting mouse areas,
performing translations, input event delivery, etc.
With this approach, performance are improved by more
than one order of magnitude in average, but complex
geometries will of course benefit more.
It also adds correct rendering support for polygons
with holes, previously only rendered correctly
by the MapboxGL plugin.
The polyline shader has basic miter joins. The miter is
skipped if the angle is too sharp to avoid complicating
the implementation.
This shader introduces some glitches when the polyline
is minified, for which the real fix is to
have LOD for the geometry, and render simplified
geometries at low zoom levels (added in a subsequent patch).
Note: this approach, at least in its current implementation,
does not support enabling layers on individual items, only
on the Map element.
Task-number: QTBUG-49303
Task-number: QTBUG-38459
Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|/
|
|
|
| |
Change-Id: I15f7cae7efc58279d76e9ac7d0be3b7fd63ae1cd
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-76780
Change-Id: I543ec1e89c8b9e8ba66524345d230c5e4dd7c08b
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Fix various documentation-related issues, including
missing parameter documentation, broken links, and
typos.
Do some minor language editing.
Change-Id: I0a8f8457e0d1ab56b4fc4670376509adf1fd26a3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\
| |
| |
| | |
Change-Id: I3753abe2e06c0f310abda87dc688b22a02959887
|
| |
| |
| |
| |
| | |
Change-Id: Id0e7e14a06306a2d8c2098bcb6de6c53d28ca88f
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Switches to Qt.labs.platform FileDialog and sets the proper initial
directory, as well as handles command line argument
Change-Id: I2ae4fc3244d1e2566556d3966aedf273ac98e3d1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
Add a Class to convert a GeoJSON document to a QVariantList ready to be
used as Model in a MapItemView. It comes with autotests, example and
detailed documentation.
[ChangeLog][QtLocation] Added a GeoJSON parser which can be used to
annotate maps with tracks, polygonal boundaries, etc.
Fixes: QTBUG-64111
Change-Id: Ib06d3902a052f69f75ae40be5c9ab56023cad916
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
|
|
|
|
|
|
|
|
| |
In this way these transitions can now be customized
by the user.
Change-Id: I949d0caab65b0e71012bf77baee9c847c8f415a0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-68933
Change-Id: Ie7863b196363022c0bb7c1fa4f258c4700b5abb3
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/location/declarativemaps/qdeclarativegeomap.cpp
src/location/maps/qgeomap.cpp
src/location/maps/qgeomap_p_p.h
src/location/maps/qgeorouteparserosrmv5.cpp
src/location/maps/qgeotiledmap.cpp
src/positioning/positioning.pro
Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb
|
| |
| |
| |
| |
| |
| |
| |
| | |
Or else it prevents QML debugging.
Task-number: QTBUG-64827
Change-Id: I7a31b6a575ed7a4f96368b87aaa883fd3ba2b940
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/imports/location/location.cpp
src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp
Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a workaround for QTBUG-38735.
Task-number: QTBUG-58589
Change-Id: I8e9031657d04f192b64581ea060dfc91bce3fada
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The mapviewer example currently uses the minimap to show a red
MapRectangle sized 10 degrees in latitude and 10 degrees in longitude.
This patch makes the minimap visualize the actual displayed area in
the main map as a red rectangle in the minimap.
The minimap zoom level is also now gently bound to the main map zoom
level.
There's one bug left, though, but not related to this qml component, which
causes the border of the red MapRectangle of the minimap to often be drawn
on the left of the rectangle.
Change-Id: I6ba332bf72f0489f5ada765c85f6890a09ca1a98
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
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
|