From 97df99c134a5c4adbf083af0b1e5f8c9713dbb1f Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 8 Dec 2016 17:55:49 -0200 Subject: [Qt] Remove route before adding This will allow to bind a GeoJSON to the source data property without throwing an exception. --- platform/qt/qmlapp/main.qml | 36 +- platform/qt/resources/common.qrc | 3 +- platform/qt/resources/source.geojson | 1172 --------------------------------- platform/qt/resources/source1.geojson | 1172 +++++++++++++++++++++++++++++++++ platform/qt/resources/source2.geojson | 92 +++ platform/qt/src/qmapboxgl.cpp | 8 +- 6 files changed, 1304 insertions(+), 1179 deletions(-) delete mode 100644 platform/qt/resources/source.geojson create mode 100644 platform/qt/resources/source1.geojson create mode 100644 platform/qt/resources/source2.geojson (limited to 'platform/qt') diff --git a/platform/qt/qmlapp/main.qml b/platform/qt/qmlapp/main.qml index fa157333d0..6e6f290e43 100644 --- a/platform/qt/qmlapp/main.qml +++ b/platform/qt/qmlapp/main.qml @@ -30,10 +30,11 @@ ApplicationWindow { property var fillColor: waterColorDialog.color }, MapParameter { + id: source property var type: "source" property var name: "routeSource" property var sourceType: "geojson" - property var data: ":source.geojson" + property var data: ":source1.geojson" }, MapParameter { property var type: "layer" @@ -256,11 +257,11 @@ ApplicationWindow { title: "Style:" ColumnLayout { - ExclusiveGroup { id: group } + ExclusiveGroup { id: styleGroup } RadioButton { text: "Streets" checked: true - exclusiveGroup: group + exclusiveGroup: styleGroup onClicked: { style.url = "mapbox://styles/mapbox/streets-v9" landColorDialog.color = "#e0ded8" @@ -269,7 +270,7 @@ ApplicationWindow { } RadioButton { text: "Dark" - exclusiveGroup: group + exclusiveGroup: styleGroup onClicked: { style.url = "mapbox://styles/mapbox/dark-v9" landColorDialog.color = "#343332" @@ -278,7 +279,7 @@ ApplicationWindow { } RadioButton { text: "Satellite" - exclusiveGroup: group + exclusiveGroup: styleGroup onClicked: { style.url = "mapbox://styles/mapbox/satellite-v9" } @@ -300,6 +301,31 @@ ApplicationWindow { onClicked: waterColorDialog.open() } + GroupBox { + anchors.left: parent.left + anchors.right: parent.right + title: "Route:" + + ColumnLayout { + ExclusiveGroup { id: sourceGroup } + RadioButton { + text: "Route 1" + checked: true + exclusiveGroup: sourceGroup + onClicked: { + source.data = ":source1.geojson" + } + } + RadioButton { + text: "Route 2" + exclusiveGroup: sourceGroup + onClicked: { + source.data = ":source2.geojson" + } + } + } + } + CheckBox { id: toggleRoute anchors.left: parent.left diff --git a/platform/qt/resources/common.qrc b/platform/qt/resources/common.qrc index e9fd46cfa7..9d409760cc 100644 --- a/platform/qt/resources/common.qrc +++ b/platform/qt/resources/common.qrc @@ -1,6 +1,7 @@ - source.geojson + source1.geojson + source2.geojson label-arrow.svg label-background.svg diff --git a/platform/qt/resources/source.geojson b/platform/qt/resources/source.geojson deleted file mode 100644 index 1d270ba189..0000000000 --- a/platform/qt/resources/source.geojson +++ /dev/null @@ -1,1172 +0,0 @@ -{ - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "properties": { - "type": "label", - "name": "Start" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 24.934420000000003, - 60.163500000000006 - ] - } - }, - { - "type": "Feature", - "properties": { - "type": "label", - "name": "End" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 24.943690000000004, - 60.155280000000005 - ] - } - }, - { - "type": "Feature", - "properties": { - "type": "label", - "name": "Gas station" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 24.915920000000003, - 60.17544 - ] - } - }, - { - "type": "Feature", - "properties": { - "type": "label", - "name": "Construction" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 24.94884, - 60.18657 - ] - } - }, - { - "type": "Feature", - "properties": { - "name": "Route" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - 24.934420000000003, - 60.163500000000006 - ], - [ - 24.934500000000003, - 60.16344000000001 - ], - [ - 24.93338246049353, - 60.16305251411869 - ], - [ - 24.932264947341018, - 60.162665018830225 - ], - [ - 24.931147460542068, - 60.16227751413501 - ], - [ - 24.930030000000002, - 60.16189000000001 - ], - [ - 24.929800000000004, - 60.16180000000001 - ], - [ - 24.929550000000003, - 60.16178000000001 - ], - [ - 24.92931, - 60.16180000000001 - ], - [ - 24.929280000000002, - 60.16172 - ], - [ - 24.928800000000003, - 60.161730000000006 - ], - [ - 24.927669986590868, - 60.161340004809425 - ], - [ - 24.926540000000003, - 60.16095000000001 - ], - [ - 24.92632, - 60.16089 - ], - [ - 24.925890000000003, - 60.16086000000001 - ], - [ - 24.925520000000002, - 60.16089 - ], - [ - 24.92472, - 60.16105 - ], - [ - 24.924270000000003, - 60.161210000000004 - ], - [ - 24.923490008921945, - 60.16159500239787 - ], - [ - 24.922710000000002, - 60.16198000000001 - ], - [ - 24.922390000000004, - 60.16221 - ], - [ - 24.922050000000002, - 60.16228 - ], - [ - 24.921770000000002, - 60.16236000000001 - ], - [ - 24.921580000000002, - 60.16243000000001 - ], - [ - 24.921010000000003, - 60.16284 - ], - [ - 24.92094, - 60.16328000000001 - ], - [ - 24.920890000000004, - 60.16342 - ], - [ - 24.92087, - 60.16344000000001 - ], - [ - 24.920830000000002, - 60.16362 - ], - [ - 24.920820000000003, - 60.16371 - ], - [ - 24.920840000000002, - 60.16376 - ], - [ - 24.92077, - 60.164320000000004 - ], - [ - 24.92077, - 60.164500000000004 - ], - [ - 24.92085, - 60.16467000000001 - ], - [ - 24.92086, - 60.16479 - ], - [ - 24.92086, - 60.164860000000004 - ], - [ - 24.92096, - 60.165090000000006 - ], - [ - 24.920920000000002, - 60.165420000000005 - ], - [ - 24.92096, - 60.16561000000001 - ], - [ - 24.920885001120794, - 60.16610000000575 - ], - [ - 24.920810000000003, - 60.16659000000001 - ], - [ - 24.920800000000003, - 60.166790000000006 - ], - [ - 24.920840000000002, - 60.166900000000005 - ], - [ - 24.920990000000003, - 60.167 - ], - [ - 24.920895002461783, - 60.16785500012713 - ], - [ - 24.920800000000003, - 60.168710000000004 - ], - [ - 24.920740000000002, - 60.16913 - ], - [ - 24.920620000000003, - 60.16971 - ], - [ - 24.920520000000003, - 60.1698 - ], - [ - 24.92049, - 60.169900000000005 - ], - [ - 24.92041, - 60.169920000000005 - ], - [ - 24.919000036342872, - 60.17034334830489 - ], - [ - 24.91759003634794, - 60.17076668163695 - ], - [ - 24.91618, - 60.17119 - ], - [ - 24.916240000000002, - 60.171290000000006 - ], - [ - 24.916220000000003, - 60.17134000000001 - ], - [ - 24.916150000000002, - 60.171530000000004 - ], - [ - 24.916, - 60.17181000000001 - ], - [ - 24.915840000000003, - 60.172000000000004 - ], - [ - 24.915390000000002, - 60.17239000000001 - ], - [ - 24.91524, - 60.17257000000001 - ], - [ - 24.914990000000003, - 60.172990000000006 - ], - [ - 24.914910000000003, - 60.173190000000005 - ], - [ - 24.914830000000002, - 60.17352 - ], - [ - 24.914820000000002, - 60.17365 - ], - [ - 24.915090000000003, - 60.17452000000001 - ], - [ - 24.91512, - 60.17457 - ], - [ - 24.91562, - 60.17486 - ], - [ - 24.915770000000002, - 60.174980000000005 - ], - [ - 24.915860000000002, - 60.175090000000004 - ], - [ - 24.915930000000003, - 60.17526 - ], - [ - 24.915940000000003, - 60.17533 - ], - [ - 24.915920000000003, - 60.17544 - ], - [ - 24.91581, - 60.17564000000001 - ], - [ - 24.9174, - 60.175850000000004 - ], - [ - 24.91786, - 60.17593000000001 - ], - [ - 24.919449989456812, - 60.17614500950065 - ], - [ - 24.92104, - 60.17636 - ], - [ - 24.922050000000002, - 60.176570000000005 - ], - [ - 24.922120000000003, - 60.17683 - ], - [ - 24.921950000000002, - 60.17681 - ], - [ - 24.921770000000002, - 60.17681 - ], - [ - 24.922120000000003, - 60.17683 - ], - [ - 24.922050000000002, - 60.176570000000005 - ], - [ - 24.92207, - 60.176570000000005 - ], - [ - 24.922140000000002, - 60.17658000000001 - ], - [ - 24.922110000000004, - 60.176520000000004 - ], - [ - 24.923530000000003, - 60.17681 - ], - [ - 24.925056651315714, - 60.17697335086663 - ], - [ - 24.92658331781631, - 60.17713668418224 - ], - [ - 24.928110000000004, - 60.1773 - ], - [ - 24.928300000000004, - 60.177330000000005 - ], - [ - 24.92856, - 60.17738000000001 - ], - [ - 24.92978, - 60.17752000000001 - ], - [ - 24.929520000000004, - 60.17797 - ], - [ - 24.929240000000004, - 60.17855000000001 - ], - [ - 24.929840000000002, - 60.178610000000006 - ], - [ - 24.930080000000004, - 60.1786 - ], - [ - 24.93081, - 60.17866000000001 - ], - [ - 24.93081, - 60.178720000000006 - ], - [ - 24.930840000000003, - 60.178830000000005 - ], - [ - 24.931040000000003, - 60.17929 - ], - [ - 24.931060000000002, - 60.179410000000004 - ], - [ - 24.93111, - 60.180170000000004 - ], - [ - 24.931130000000003, - 60.18099000000001 - ], - [ - 24.931160000000002, - 60.18117 - ], - [ - 24.93137, - 60.181670000000004 - ], - [ - 24.931620000000002, - 60.18218 - ], - [ - 24.931710000000002, - 60.182410000000004 - ], - [ - 24.93173, - 60.18253000000001 - ], - [ - 24.93173, - 60.18263 - ], - [ - 24.93166, - 60.18280000000001 - ], - [ - 24.931410000000003, - 60.182990000000004 - ], - [ - 24.931520000000003, - 60.18309000000001 - ], - [ - 24.93177999609094, - 60.183585000274455 - ], - [ - 24.93204, - 60.18408 - ], - [ - 24.93221, - 60.184450000000005 - ], - [ - 24.932250000000003, - 60.18451 - ], - [ - 24.93242, - 60.18462 - ], - [ - 24.932660000000002, - 60.184670000000004 - ], - [ - 24.93428, - 60.184900000000006 - ], - [ - 24.93574999134566, - 60.18509500814494 - ], - [ - 24.937220000000003, - 60.18529 - ], - [ - 24.93774, - 60.18538 - ], - [ - 24.939459986412267, - 60.185640011141956 - ], - [ - 24.941180000000003, - 60.185900000000004 - ], - [ - 24.941160000000004, - 60.185930000000006 - ], - [ - 24.941750000000003, - 60.186020000000006 - ], - [ - 24.942120000000003, - 60.18609000000001 - ], - [ - 24.943450000000002, - 60.186280000000004 - ], - [ - 24.943720000000003, - 60.1863 - ], - [ - 24.94433, - 60.18634000000001 - ], - [ - 24.94583332994822, - 60.186376683681516 - ], - [ - 24.94733666325508, - 60.186413350347536 - ], - [ - 24.94884, - 60.18645000000001 - ], - [ - 24.94884, - 60.18657 - ], - [ - 24.95034, - 60.186600000000006 - ], - [ - 24.95033, - 60.18666 - ], - [ - 24.95034, - 60.186600000000006 - ], - [ - 24.950400000000002, - 60.18661 - ], - [ - 24.95072, - 60.186640000000004 - ], - [ - 24.95097, - 60.1867 - ], - [ - 24.95107, - 60.1867 - ], - [ - 24.95108, - 60.186640000000004 - ], - [ - 24.951130000000003, - 60.18659 - ], - [ - 24.951310000000003, - 60.18647000000001 - ], - [ - 24.95137, - 60.18636000000001 - ], - [ - 24.95144, - 60.185790000000004 - ], - [ - 24.95152000182123, - 60.18504000008196 - ], - [ - 24.951600000000003, - 60.184290000000004 - ], - [ - 24.951610000000002, - 60.184050000000006 - ], - [ - 24.95164, - 60.183960000000006 - ], - [ - 24.95174, - 60.183870000000006 - ], - [ - 24.952, - 60.183730000000004 - ], - [ - 24.95287, - 60.18339 - ], - [ - 24.952990000000003, - 60.18334000000001 - ], - [ - 24.95322, - 60.183310000000006 - ], - [ - 24.95451501994334, - 60.182800006380525 - ], - [ - 24.955810000000003, - 60.18229 - ], - [ - 24.955840000000002, - 60.182230000000004 - ], - [ - 24.95588, - 60.18222000000001 - ], - [ - 24.956170000000004, - 60.182050000000004 - ], - [ - 24.957440000000002, - 60.181490000000004 - ], - [ - 24.958235008897837, - 60.1811250023513 - ], - [ - 24.959030000000002, - 60.18076000000001 - ], - [ - 24.9587, - 60.180580000000006 - ], - [ - 24.958460000000002, - 60.180510000000005 - ], - [ - 24.957690000000003, - 60.18009000000001 - ], - [ - 24.957320000000003, - 60.17987000000001 - ], - [ - 24.95689, - 60.17974 - ], - [ - 24.956770000000002, - 60.17969000000001 - ], - [ - 24.95634, - 60.17929 - ], - [ - 24.95633, - 60.179140000000004 - ], - [ - 24.95654, - 60.17907 - ], - [ - 24.956590000000002, - 60.17902000000001 - ], - [ - 24.95661, - 60.178940000000004 - ], - [ - 24.956895004072333, - 60.178465000388556 - ], - [ - 24.95718, - 60.17799000000001 - ], - [ - 24.957240000000002, - 60.177800000000005 - ], - [ - 24.957305000964798, - 60.17730000020621 - ], - [ - 24.95737, - 60.17680000000001 - ], - [ - 24.957440000000002, - 60.17665 - ], - [ - 24.957520000000002, - 60.17654 - ], - [ - 24.95774, - 60.176390000000005 - ], - [ - 24.9581, - 60.176260000000006 - ], - [ - 24.95867, - 60.176190000000005 - ], - [ - 24.959410000000002, - 60.1762 - ], - [ - 24.959410000000002, - 60.17627 - ], - [ - 24.95999, - 60.17627 - ], - [ - 24.96028, - 60.17625 - ], - [ - 24.960610000000003, - 60.176190000000005 - ], - [ - 24.96113, - 60.17598 - ], - [ - 24.961430000000004, - 60.17582 - ], - [ - 24.961570000000002, - 60.175700000000006 - ], - [ - 24.961660000000002, - 60.17557000000001 - ], - [ - 24.96168, - 60.17551 - ], - [ - 24.961820000000003, - 60.17551 - ], - [ - 24.961920001933628, - 60.17487500003499 - ], - [ - 24.962020000000003, - 60.174240000000005 - ], - [ - 24.96189, - 60.17401 - ], - [ - 24.961509982032023, - 60.17323333442284 - ], - [ - 24.961129982033466, - 60.17245666775814 - ], - [ - 24.96075, - 60.17168 - ], - [ - 24.960810000000002, - 60.171670000000006 - ], - [ - 24.960880000000003, - 60.17181000000001 - ], - [ - 24.960880000000003, - 60.171800000000005 - ], - [ - 24.960810000000002, - 60.171670000000006 - ], - [ - 24.96075, - 60.17168 - ], - [ - 24.960429987467663, - 60.17103666743907 - ], - [ - 24.960109987468513, - 60.170393334106876 - ], - [ - 24.95979, - 60.16975000000001 - ], - [ - 24.95971, - 60.16967 - ], - [ - 24.95961, - 60.16962 - ], - [ - 24.95953, - 60.169610000000006 - ], - [ - 24.958840000000002, - 60.16959000000001 - ], - [ - 24.9587, - 60.169540000000005 - ], - [ - 24.958640000000003, - 60.16946000000001 - ], - [ - 24.958650000000002, - 60.169000000000004 - ], - [ - 24.95859, - 60.16892000000001 - ], - [ - 24.95795, - 60.16852000000001 - ], - [ - 24.95794, - 60.16848 - ], - [ - 24.95737, - 60.16809000000001 - ], - [ - 24.957390000000004, - 60.168060000000004 - ], - [ - 24.95728, - 60.16798000000001 - ], - [ - 24.956850000000003, - 60.167910000000006 - ], - [ - 24.956010000000003, - 60.167880000000004 - ], - [ - 24.955890000000004, - 60.167860000000005 - ], - [ - 24.954429998196012, - 60.16782000802667 - ], - [ - 24.95297, - 60.16778000000001 - ], - [ - 24.952630000000003, - 60.16772 - ], - [ - 24.952550000000002, - 60.167680000000004 - ], - [ - 24.952520000000003, - 60.16762000000001 - ], - [ - 24.9526, - 60.16675000000001 - ], - [ - 24.95266, - 60.16673000000001 - ], - [ - 24.953120000000002, - 60.166740000000004 - ], - [ - 24.95314, - 60.16662 - ], - [ - 24.953170000000004, - 60.166320000000006 - ], - [ - 24.95315, - 60.16608000000001 - ], - [ - 24.953080000000003, - 60.16581000000001 - ], - [ - 24.95313, - 60.165290000000006 - ], - [ - 24.95285, - 60.16528 - ], - [ - 24.952910000000003, - 60.16467000000001 - ], - [ - 24.953030000000002, - 60.16438000000001 - ], - [ - 24.95324, - 60.164100000000005 - ], - [ - 24.953470000000003, - 60.16389 - ], - [ - 24.954400035687588, - 60.16326000649468 - ], - [ - 24.955330035716912, - 60.16263000647425 - ], - [ - 24.95626, - 60.162000000000006 - ], - [ - 24.95652, - 60.16174 - ], - [ - 24.956760000000003, - 60.161300000000004 - ], - [ - 24.956640000000004, - 60.161280000000005 - ], - [ - 24.956400000000002, - 60.16131000000001 - ], - [ - 24.95626, - 60.161280000000005 - ], - [ - 24.956200000000003, - 60.16124000000001 - ], - [ - 24.95597, - 60.16091000000001 - ], - [ - 24.956010000000003, - 60.160830000000004 - ], - [ - 24.955930000000002, - 60.16075000000001 - ], - [ - 24.955604994572663, - 60.16020500033396 - ], - [ - 24.955280000000002, - 60.15966 - ], - [ - 24.955070000000003, - 60.159290000000006 - ], - [ - 24.95493, - 60.159020000000005 - ], - [ - 24.954860000000004, - 60.158930000000005 - ], - [ - 24.954780000000003, - 60.158950000000004 - ], - [ - 24.954860000000004, - 60.158930000000005 - ], - [ - 24.95428499256551, - 60.158505001245636 - ], - [ - 24.95371, - 60.158080000000005 - ], - [ - 24.952809982572653, - 60.157445003022275 - ], - [ - 24.95191, - 60.15681000000001 - ], - [ - 24.951030000000003, - 60.156200000000005 - ], - [ - 24.95089, - 60.15614000000001 - ], - [ - 24.950260000000004, - 60.15605000000001 - ], - [ - 24.948617471181432, - 60.15585753049101 - ], - [ - 24.94697496159803, - 60.15566504065723 - ], - [ - 24.94533247125144, - 60.15547253049904 - ], - [ - 24.943690000000004, - 60.155280000000005 - ] - ] - } - } - ] -} diff --git a/platform/qt/resources/source1.geojson b/platform/qt/resources/source1.geojson new file mode 100644 index 0000000000..1d270ba189 --- /dev/null +++ b/platform/qt/resources/source1.geojson @@ -0,0 +1,1172 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "type": "label", + "name": "Start" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.934420000000003, + 60.163500000000006 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "label", + "name": "End" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.943690000000004, + 60.155280000000005 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "label", + "name": "Gas station" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.915920000000003, + 60.17544 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "label", + "name": "Construction" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.94884, + 60.18657 + ] + } + }, + { + "type": "Feature", + "properties": { + "name": "Route" + }, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + 24.934420000000003, + 60.163500000000006 + ], + [ + 24.934500000000003, + 60.16344000000001 + ], + [ + 24.93338246049353, + 60.16305251411869 + ], + [ + 24.932264947341018, + 60.162665018830225 + ], + [ + 24.931147460542068, + 60.16227751413501 + ], + [ + 24.930030000000002, + 60.16189000000001 + ], + [ + 24.929800000000004, + 60.16180000000001 + ], + [ + 24.929550000000003, + 60.16178000000001 + ], + [ + 24.92931, + 60.16180000000001 + ], + [ + 24.929280000000002, + 60.16172 + ], + [ + 24.928800000000003, + 60.161730000000006 + ], + [ + 24.927669986590868, + 60.161340004809425 + ], + [ + 24.926540000000003, + 60.16095000000001 + ], + [ + 24.92632, + 60.16089 + ], + [ + 24.925890000000003, + 60.16086000000001 + ], + [ + 24.925520000000002, + 60.16089 + ], + [ + 24.92472, + 60.16105 + ], + [ + 24.924270000000003, + 60.161210000000004 + ], + [ + 24.923490008921945, + 60.16159500239787 + ], + [ + 24.922710000000002, + 60.16198000000001 + ], + [ + 24.922390000000004, + 60.16221 + ], + [ + 24.922050000000002, + 60.16228 + ], + [ + 24.921770000000002, + 60.16236000000001 + ], + [ + 24.921580000000002, + 60.16243000000001 + ], + [ + 24.921010000000003, + 60.16284 + ], + [ + 24.92094, + 60.16328000000001 + ], + [ + 24.920890000000004, + 60.16342 + ], + [ + 24.92087, + 60.16344000000001 + ], + [ + 24.920830000000002, + 60.16362 + ], + [ + 24.920820000000003, + 60.16371 + ], + [ + 24.920840000000002, + 60.16376 + ], + [ + 24.92077, + 60.164320000000004 + ], + [ + 24.92077, + 60.164500000000004 + ], + [ + 24.92085, + 60.16467000000001 + ], + [ + 24.92086, + 60.16479 + ], + [ + 24.92086, + 60.164860000000004 + ], + [ + 24.92096, + 60.165090000000006 + ], + [ + 24.920920000000002, + 60.165420000000005 + ], + [ + 24.92096, + 60.16561000000001 + ], + [ + 24.920885001120794, + 60.16610000000575 + ], + [ + 24.920810000000003, + 60.16659000000001 + ], + [ + 24.920800000000003, + 60.166790000000006 + ], + [ + 24.920840000000002, + 60.166900000000005 + ], + [ + 24.920990000000003, + 60.167 + ], + [ + 24.920895002461783, + 60.16785500012713 + ], + [ + 24.920800000000003, + 60.168710000000004 + ], + [ + 24.920740000000002, + 60.16913 + ], + [ + 24.920620000000003, + 60.16971 + ], + [ + 24.920520000000003, + 60.1698 + ], + [ + 24.92049, + 60.169900000000005 + ], + [ + 24.92041, + 60.169920000000005 + ], + [ + 24.919000036342872, + 60.17034334830489 + ], + [ + 24.91759003634794, + 60.17076668163695 + ], + [ + 24.91618, + 60.17119 + ], + [ + 24.916240000000002, + 60.171290000000006 + ], + [ + 24.916220000000003, + 60.17134000000001 + ], + [ + 24.916150000000002, + 60.171530000000004 + ], + [ + 24.916, + 60.17181000000001 + ], + [ + 24.915840000000003, + 60.172000000000004 + ], + [ + 24.915390000000002, + 60.17239000000001 + ], + [ + 24.91524, + 60.17257000000001 + ], + [ + 24.914990000000003, + 60.172990000000006 + ], + [ + 24.914910000000003, + 60.173190000000005 + ], + [ + 24.914830000000002, + 60.17352 + ], + [ + 24.914820000000002, + 60.17365 + ], + [ + 24.915090000000003, + 60.17452000000001 + ], + [ + 24.91512, + 60.17457 + ], + [ + 24.91562, + 60.17486 + ], + [ + 24.915770000000002, + 60.174980000000005 + ], + [ + 24.915860000000002, + 60.175090000000004 + ], + [ + 24.915930000000003, + 60.17526 + ], + [ + 24.915940000000003, + 60.17533 + ], + [ + 24.915920000000003, + 60.17544 + ], + [ + 24.91581, + 60.17564000000001 + ], + [ + 24.9174, + 60.175850000000004 + ], + [ + 24.91786, + 60.17593000000001 + ], + [ + 24.919449989456812, + 60.17614500950065 + ], + [ + 24.92104, + 60.17636 + ], + [ + 24.922050000000002, + 60.176570000000005 + ], + [ + 24.922120000000003, + 60.17683 + ], + [ + 24.921950000000002, + 60.17681 + ], + [ + 24.921770000000002, + 60.17681 + ], + [ + 24.922120000000003, + 60.17683 + ], + [ + 24.922050000000002, + 60.176570000000005 + ], + [ + 24.92207, + 60.176570000000005 + ], + [ + 24.922140000000002, + 60.17658000000001 + ], + [ + 24.922110000000004, + 60.176520000000004 + ], + [ + 24.923530000000003, + 60.17681 + ], + [ + 24.925056651315714, + 60.17697335086663 + ], + [ + 24.92658331781631, + 60.17713668418224 + ], + [ + 24.928110000000004, + 60.1773 + ], + [ + 24.928300000000004, + 60.177330000000005 + ], + [ + 24.92856, + 60.17738000000001 + ], + [ + 24.92978, + 60.17752000000001 + ], + [ + 24.929520000000004, + 60.17797 + ], + [ + 24.929240000000004, + 60.17855000000001 + ], + [ + 24.929840000000002, + 60.178610000000006 + ], + [ + 24.930080000000004, + 60.1786 + ], + [ + 24.93081, + 60.17866000000001 + ], + [ + 24.93081, + 60.178720000000006 + ], + [ + 24.930840000000003, + 60.178830000000005 + ], + [ + 24.931040000000003, + 60.17929 + ], + [ + 24.931060000000002, + 60.179410000000004 + ], + [ + 24.93111, + 60.180170000000004 + ], + [ + 24.931130000000003, + 60.18099000000001 + ], + [ + 24.931160000000002, + 60.18117 + ], + [ + 24.93137, + 60.181670000000004 + ], + [ + 24.931620000000002, + 60.18218 + ], + [ + 24.931710000000002, + 60.182410000000004 + ], + [ + 24.93173, + 60.18253000000001 + ], + [ + 24.93173, + 60.18263 + ], + [ + 24.93166, + 60.18280000000001 + ], + [ + 24.931410000000003, + 60.182990000000004 + ], + [ + 24.931520000000003, + 60.18309000000001 + ], + [ + 24.93177999609094, + 60.183585000274455 + ], + [ + 24.93204, + 60.18408 + ], + [ + 24.93221, + 60.184450000000005 + ], + [ + 24.932250000000003, + 60.18451 + ], + [ + 24.93242, + 60.18462 + ], + [ + 24.932660000000002, + 60.184670000000004 + ], + [ + 24.93428, + 60.184900000000006 + ], + [ + 24.93574999134566, + 60.18509500814494 + ], + [ + 24.937220000000003, + 60.18529 + ], + [ + 24.93774, + 60.18538 + ], + [ + 24.939459986412267, + 60.185640011141956 + ], + [ + 24.941180000000003, + 60.185900000000004 + ], + [ + 24.941160000000004, + 60.185930000000006 + ], + [ + 24.941750000000003, + 60.186020000000006 + ], + [ + 24.942120000000003, + 60.18609000000001 + ], + [ + 24.943450000000002, + 60.186280000000004 + ], + [ + 24.943720000000003, + 60.1863 + ], + [ + 24.94433, + 60.18634000000001 + ], + [ + 24.94583332994822, + 60.186376683681516 + ], + [ + 24.94733666325508, + 60.186413350347536 + ], + [ + 24.94884, + 60.18645000000001 + ], + [ + 24.94884, + 60.18657 + ], + [ + 24.95034, + 60.186600000000006 + ], + [ + 24.95033, + 60.18666 + ], + [ + 24.95034, + 60.186600000000006 + ], + [ + 24.950400000000002, + 60.18661 + ], + [ + 24.95072, + 60.186640000000004 + ], + [ + 24.95097, + 60.1867 + ], + [ + 24.95107, + 60.1867 + ], + [ + 24.95108, + 60.186640000000004 + ], + [ + 24.951130000000003, + 60.18659 + ], + [ + 24.951310000000003, + 60.18647000000001 + ], + [ + 24.95137, + 60.18636000000001 + ], + [ + 24.95144, + 60.185790000000004 + ], + [ + 24.95152000182123, + 60.18504000008196 + ], + [ + 24.951600000000003, + 60.184290000000004 + ], + [ + 24.951610000000002, + 60.184050000000006 + ], + [ + 24.95164, + 60.183960000000006 + ], + [ + 24.95174, + 60.183870000000006 + ], + [ + 24.952, + 60.183730000000004 + ], + [ + 24.95287, + 60.18339 + ], + [ + 24.952990000000003, + 60.18334000000001 + ], + [ + 24.95322, + 60.183310000000006 + ], + [ + 24.95451501994334, + 60.182800006380525 + ], + [ + 24.955810000000003, + 60.18229 + ], + [ + 24.955840000000002, + 60.182230000000004 + ], + [ + 24.95588, + 60.18222000000001 + ], + [ + 24.956170000000004, + 60.182050000000004 + ], + [ + 24.957440000000002, + 60.181490000000004 + ], + [ + 24.958235008897837, + 60.1811250023513 + ], + [ + 24.959030000000002, + 60.18076000000001 + ], + [ + 24.9587, + 60.180580000000006 + ], + [ + 24.958460000000002, + 60.180510000000005 + ], + [ + 24.957690000000003, + 60.18009000000001 + ], + [ + 24.957320000000003, + 60.17987000000001 + ], + [ + 24.95689, + 60.17974 + ], + [ + 24.956770000000002, + 60.17969000000001 + ], + [ + 24.95634, + 60.17929 + ], + [ + 24.95633, + 60.179140000000004 + ], + [ + 24.95654, + 60.17907 + ], + [ + 24.956590000000002, + 60.17902000000001 + ], + [ + 24.95661, + 60.178940000000004 + ], + [ + 24.956895004072333, + 60.178465000388556 + ], + [ + 24.95718, + 60.17799000000001 + ], + [ + 24.957240000000002, + 60.177800000000005 + ], + [ + 24.957305000964798, + 60.17730000020621 + ], + [ + 24.95737, + 60.17680000000001 + ], + [ + 24.957440000000002, + 60.17665 + ], + [ + 24.957520000000002, + 60.17654 + ], + [ + 24.95774, + 60.176390000000005 + ], + [ + 24.9581, + 60.176260000000006 + ], + [ + 24.95867, + 60.176190000000005 + ], + [ + 24.959410000000002, + 60.1762 + ], + [ + 24.959410000000002, + 60.17627 + ], + [ + 24.95999, + 60.17627 + ], + [ + 24.96028, + 60.17625 + ], + [ + 24.960610000000003, + 60.176190000000005 + ], + [ + 24.96113, + 60.17598 + ], + [ + 24.961430000000004, + 60.17582 + ], + [ + 24.961570000000002, + 60.175700000000006 + ], + [ + 24.961660000000002, + 60.17557000000001 + ], + [ + 24.96168, + 60.17551 + ], + [ + 24.961820000000003, + 60.17551 + ], + [ + 24.961920001933628, + 60.17487500003499 + ], + [ + 24.962020000000003, + 60.174240000000005 + ], + [ + 24.96189, + 60.17401 + ], + [ + 24.961509982032023, + 60.17323333442284 + ], + [ + 24.961129982033466, + 60.17245666775814 + ], + [ + 24.96075, + 60.17168 + ], + [ + 24.960810000000002, + 60.171670000000006 + ], + [ + 24.960880000000003, + 60.17181000000001 + ], + [ + 24.960880000000003, + 60.171800000000005 + ], + [ + 24.960810000000002, + 60.171670000000006 + ], + [ + 24.96075, + 60.17168 + ], + [ + 24.960429987467663, + 60.17103666743907 + ], + [ + 24.960109987468513, + 60.170393334106876 + ], + [ + 24.95979, + 60.16975000000001 + ], + [ + 24.95971, + 60.16967 + ], + [ + 24.95961, + 60.16962 + ], + [ + 24.95953, + 60.169610000000006 + ], + [ + 24.958840000000002, + 60.16959000000001 + ], + [ + 24.9587, + 60.169540000000005 + ], + [ + 24.958640000000003, + 60.16946000000001 + ], + [ + 24.958650000000002, + 60.169000000000004 + ], + [ + 24.95859, + 60.16892000000001 + ], + [ + 24.95795, + 60.16852000000001 + ], + [ + 24.95794, + 60.16848 + ], + [ + 24.95737, + 60.16809000000001 + ], + [ + 24.957390000000004, + 60.168060000000004 + ], + [ + 24.95728, + 60.16798000000001 + ], + [ + 24.956850000000003, + 60.167910000000006 + ], + [ + 24.956010000000003, + 60.167880000000004 + ], + [ + 24.955890000000004, + 60.167860000000005 + ], + [ + 24.954429998196012, + 60.16782000802667 + ], + [ + 24.95297, + 60.16778000000001 + ], + [ + 24.952630000000003, + 60.16772 + ], + [ + 24.952550000000002, + 60.167680000000004 + ], + [ + 24.952520000000003, + 60.16762000000001 + ], + [ + 24.9526, + 60.16675000000001 + ], + [ + 24.95266, + 60.16673000000001 + ], + [ + 24.953120000000002, + 60.166740000000004 + ], + [ + 24.95314, + 60.16662 + ], + [ + 24.953170000000004, + 60.166320000000006 + ], + [ + 24.95315, + 60.16608000000001 + ], + [ + 24.953080000000003, + 60.16581000000001 + ], + [ + 24.95313, + 60.165290000000006 + ], + [ + 24.95285, + 60.16528 + ], + [ + 24.952910000000003, + 60.16467000000001 + ], + [ + 24.953030000000002, + 60.16438000000001 + ], + [ + 24.95324, + 60.164100000000005 + ], + [ + 24.953470000000003, + 60.16389 + ], + [ + 24.954400035687588, + 60.16326000649468 + ], + [ + 24.955330035716912, + 60.16263000647425 + ], + [ + 24.95626, + 60.162000000000006 + ], + [ + 24.95652, + 60.16174 + ], + [ + 24.956760000000003, + 60.161300000000004 + ], + [ + 24.956640000000004, + 60.161280000000005 + ], + [ + 24.956400000000002, + 60.16131000000001 + ], + [ + 24.95626, + 60.161280000000005 + ], + [ + 24.956200000000003, + 60.16124000000001 + ], + [ + 24.95597, + 60.16091000000001 + ], + [ + 24.956010000000003, + 60.160830000000004 + ], + [ + 24.955930000000002, + 60.16075000000001 + ], + [ + 24.955604994572663, + 60.16020500033396 + ], + [ + 24.955280000000002, + 60.15966 + ], + [ + 24.955070000000003, + 60.159290000000006 + ], + [ + 24.95493, + 60.159020000000005 + ], + [ + 24.954860000000004, + 60.158930000000005 + ], + [ + 24.954780000000003, + 60.158950000000004 + ], + [ + 24.954860000000004, + 60.158930000000005 + ], + [ + 24.95428499256551, + 60.158505001245636 + ], + [ + 24.95371, + 60.158080000000005 + ], + [ + 24.952809982572653, + 60.157445003022275 + ], + [ + 24.95191, + 60.15681000000001 + ], + [ + 24.951030000000003, + 60.156200000000005 + ], + [ + 24.95089, + 60.15614000000001 + ], + [ + 24.950260000000004, + 60.15605000000001 + ], + [ + 24.948617471181432, + 60.15585753049101 + ], + [ + 24.94697496159803, + 60.15566504065723 + ], + [ + 24.94533247125144, + 60.15547253049904 + ], + [ + 24.943690000000004, + 60.155280000000005 + ] + ] + } + } + ] +} diff --git a/platform/qt/resources/source2.geojson b/platform/qt/resources/source2.geojson new file mode 100644 index 0000000000..df300d1040 --- /dev/null +++ b/platform/qt/resources/source2.geojson @@ -0,0 +1,92 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "type": "label", + "name": "Start" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.943320751190186, + 60.166471893909794 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "label", + "name": "End" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.942440986633297, + 60.16715507391703 + ] + } + }, + { + "type": "Feature", + "properties": { + "type": "label", + "name": "Traffic Accident" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.94018793106079, + 60.16696293097573 + ] + } + }, + { + "type": "Feature", + "properties": {}, + "geometry": { + "type": "LineString", + "coordinates": [ + [ + 24.943320751190186, + 60.166471893909794 + ], + [ + 24.934544563293453, + 60.16347213858629 + ], + [ + 24.93321418762207, + 60.16446497048834 + ], + [ + 24.94018793106079, + 60.16696293097573 + ], + [ + 24.93875026702881, + 60.16806240040351 + ], + [ + 24.937891960144043, + 60.16777419352904 + ], + [ + 24.936089515686035, + 60.169033745694826 + ], + [ + 24.9384069442749, + 60.16984495711831 + ], + [ + 24.942440986633297, + 60.16715507391703 + ] + ] + } + } + ] +} diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 62fe778035..75f5d112ca 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -694,6 +694,8 @@ void QMapboxGL::addSource(const QString &sourceID, const QVariantMap ¶ms) using namespace mbgl::style; using namespace mbgl::style::conversion; + removeSource(sourceID); + Result> source = convert>(QVariant(params), sourceID.toStdString()); if (!source) { qWarning() << "Unable to add source:" << source.error().message.c_str(); @@ -705,7 +707,11 @@ void QMapboxGL::addSource(const QString &sourceID, const QVariantMap ¶ms) void QMapboxGL::removeSource(const QString& sourceID) { - d_ptr->mapObj->removeSource(sourceID.toStdString()); + auto sourceIDStdString = sourceID.toStdString(); + + if (d_ptr->mapObj->getSource(sourceIDStdString)) { + d_ptr->mapObj->removeSource(sourceIDStdString); + } } void QMapboxGL::addCustomLayer(const QString &id, -- cgit v1.2.1