summaryrefslogtreecommitdiff
path: root/examples/location
diff options
context:
space:
mode:
Diffstat (limited to 'examples/location')
-rw-r--r--examples/location/geojson_viewer/GeoJsonDelegate.qml9
-rw-r--r--examples/location/geojson_viewer/main.qml16
-rw-r--r--examples/location/geojson_viewer/mapitems/CircleItem.qml3
-rw-r--r--examples/location/geojson_viewer/mapitems/PolygonItem.qml3
-rw-r--r--examples/location/geojson_viewer/mapitems/PolylineItem.qml3
-rw-r--r--examples/location/geojson_viewer/mapitems/RectangleItem.qml3
6 files changed, 30 insertions, 7 deletions
diff --git a/examples/location/geojson_viewer/GeoJsonDelegate.qml b/examples/location/geojson_viewer/GeoJsonDelegate.qml
index 87b0abfe..075e33e3 100644
--- a/examples/location/geojson_viewer/GeoJsonDelegate.qml
+++ b/examples/location/geojson_viewer/GeoJsonDelegate.qml
@@ -27,8 +27,9 @@ DelegateChooser {
border.color: hh.hovered ? "magenta" : Qt.darker(color)
opacity: dc.defaultOpacity
color: (props && props.color) || (parent && parent.props && parent.props.color) || dc.defaultColor
- autoFadeIn: false
//! [DelegateChoice Point]
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
//! [Handler Point]
TapHandler {
@@ -57,7 +58,8 @@ DelegateChooser {
line.width: 2
opacity: dc.defaultOpacity
line.color: hh.hovered ? "magenta" : (props && props.color) || (parent && parent.props && parent.props.color) || Qt.darker(dc.defaultColor)
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
TapHandler {
onTapped: {
@@ -85,7 +87,8 @@ DelegateChooser {
color: (props && props.color) || (parent && parent.props && parent.props.color) || dc.defaultColor
border.width: 2
border.color: hh.hovered ? "magenta" : Qt.darker(color)
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
TapHandler {
onTapped: {
diff --git a/examples/location/geojson_viewer/main.qml b/examples/location/geojson_viewer/main.qml
index 0db8ab2f..aa8bece5 100644
--- a/examples/location/geojson_viewer/main.qml
+++ b/examples/location/geojson_viewer/main.qml
@@ -105,6 +105,20 @@ ApplicationWindow {
geoJsoner.print(miv)
}
}
+ MenuItem {
+ text: "Auto fade in items"
+ checkable: true
+ checked: false
+ onCheckedChanged: view.autoFadeIn = checked
+ }
+ MenuItem {
+ text: "Draw path on globe"
+ checkable: true
+ checked: false
+ onCheckedChanged: view.referenceSurface = (checked ?
+ QtLocation.ReferenceSurface.Globe :
+ QtLocation.ReferenceSurface.Map);
+ }
}
}
@@ -132,6 +146,8 @@ ApplicationWindow {
//! [MapView Creation]
property variant unfinishedItem: undefined
+ property bool autoFadeIn: false
+ property variant referenceSurface: QtLocation.ReferenceSurface.Map
signal showMainMenu(variant coordinate)
diff --git a/examples/location/geojson_viewer/mapitems/CircleItem.qml b/examples/location/geojson_viewer/mapitems/CircleItem.qml
index 2f6790e7..637f22be 100644
--- a/examples/location/geojson_viewer/mapitems/CircleItem.qml
+++ b/examples/location/geojson_viewer/mapitems/CircleItem.qml
@@ -9,7 +9,8 @@ MapCircle {
border.width: 2
smooth: true
opacity: 0.75
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
property string geojsonType: "Point"
diff --git a/examples/location/geojson_viewer/mapitems/PolygonItem.qml b/examples/location/geojson_viewer/mapitems/PolygonItem.qml
index 2dcd4e11..a21e2037 100644
--- a/examples/location/geojson_viewer/mapitems/PolygonItem.qml
+++ b/examples/location/geojson_viewer/mapitems/PolygonItem.qml
@@ -9,7 +9,8 @@ MapPolygon {
border.width: 2
smooth: true
opacity: 0.75
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
property string geojsonType: "Polygon"
diff --git a/examples/location/geojson_viewer/mapitems/PolylineItem.qml b/examples/location/geojson_viewer/mapitems/PolylineItem.qml
index cea4111c..ed005305 100644
--- a/examples/location/geojson_viewer/mapitems/PolylineItem.qml
+++ b/examples/location/geojson_viewer/mapitems/PolylineItem.qml
@@ -8,7 +8,8 @@ MapPolyline {
line.width: 2
opacity: 0.75
smooth: true
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
property string geojsonType: "Polyline"
diff --git a/examples/location/geojson_viewer/mapitems/RectangleItem.qml b/examples/location/geojson_viewer/mapitems/RectangleItem.qml
index 02946ef9..cafe5bed 100644
--- a/examples/location/geojson_viewer/mapitems/RectangleItem.qml
+++ b/examples/location/geojson_viewer/mapitems/RectangleItem.qml
@@ -9,7 +9,8 @@ MapRectangle {
border.width: 2
smooth: true
opacity: 0.75
- autoFadeIn: false
+ autoFadeIn: view.autoFadeIn
+ referenceSurface: view.referenceSurface
function setGeometry(anchorCoordinate) {
topLeft = anchorCoordinate