From bf3fd762eda0d72845fd0a828c54e558f6a7e92a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 20 Nov 2020 09:39:30 +0200 Subject: e-bike: use mapboxgl plugin for map data The mapbox plugin is using deprecated Mapbox classic style API that is no longer available (QTBUG-87828). Switch to using mapboxgl plugin for map data, but keep using mapbox for the georouting. Fixes: QTBUG-88640 Change-Id: I98d94950d22271f5d93a550b4c3c0ca556de1506 Reviewed-by: Lassi Lehikoinen --- basicsuite/ebike-ui/NaviPage.qml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'basicsuite') diff --git a/basicsuite/ebike-ui/NaviPage.qml b/basicsuite/ebike-ui/NaviPage.qml index e059e68..0b6c3e3 100644 --- a/basicsuite/ebike-ui/NaviPage.qml +++ b/basicsuite/ebike-ui/NaviPage.qml @@ -431,7 +431,7 @@ Page { RouteModel { id: routeModel - plugin: map.plugin + plugin: mapbox query: routeQuery onStatusChanged: { if (status === RouteModel.Ready) { @@ -626,14 +626,22 @@ Page { Plugin { id: mapboxgl - name: "mapbox" + name: "mapboxgl" PluginParameter { name: "mapbox.access_token" value: "pk.eyJ1IjoibWFwYm94NHF0IiwiYSI6ImNpd3J3eDE0eDEzdm8ydHM3YzhzajlrN2oifQ.keEkjqm79SiFDFjnesTcgQ" } PluginParameter { - name: "mapbox.mapping.map_id" - value: "mapbox.run-bike-hike" + name: "mapboxgl.mapping.additional_style_urls" + value: "mapbox://styles/mapbox/outdoors-v11" + } + } + Plugin { + id: mapbox + name: "mapbox" + PluginParameter { + name: "mapbox.access_token" + value: "pk.eyJ1IjoibWFwYm94NHF0IiwiYSI6ImNpd3J3eDE0eDEzdm8ydHM3YzhzajlrN2oifQ.keEkjqm79SiFDFjnesTcgQ" } } -- cgit v1.2.3