Update layer ordering definitions for MapTiler updates

This commit is contained in:
Dan Paulat 2023-07-14 00:23:21 -05:00
parent d694764fa1
commit 5612806e07

View file

@ -42,7 +42,7 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
.drawBelow_ {mapboxDrawBelow_}}, .drawBelow_ {mapboxDrawBelow_}},
{.name_ {"Satellite"}, {.name_ {"Satellite"},
.url_ {"mapbox://styles/mapbox/satellite-v9"}, .url_ {"mapbox://styles/mapbox/satellite-v9"},
.drawBelow_ {mapboxDrawBelow_}}, .drawBelow_ {"com.mapbox.annotations.points"}},
{.name_ {"Satellite Streets"}, {.name_ {"Satellite Streets"},
.url_ {"mapbox://styles/mapbox/satellite-streets-v11"}, .url_ {"mapbox://styles/mapbox/satellite-streets-v11"},
.drawBelow_ {mapboxDrawBelow_}}}}}, .drawBelow_ {mapboxDrawBelow_}}}}},
@ -52,7 +52,8 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
.cacheDbName_ {"maptiler-cache.db"}, .cacheDbName_ {"maptiler-cache.db"},
.settingsTemplate_ { .settingsTemplate_ {
QMapLibreGL::Settings::SettingsTemplate::MapTilerSettings}, QMapLibreGL::Settings::SettingsTemplate::MapTilerSettings},
.mapStyles_ {{.name_ {"Satellite"}, .mapStyles_ {
{.name_ {"Satellite"},
.url_ {"maptiler://maps/hybrid"}, .url_ {"maptiler://maps/hybrid"},
.drawBelow_ {"tunnel"}}, .drawBelow_ {"tunnel"}},
{.name_ {"Streets"}, {.name_ {"Streets"},
@ -63,7 +64,7 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
.drawBelow_ {"aeroway"}}, .drawBelow_ {"aeroway"}},
{.name_ {"Basic"}, {.name_ {"Basic"},
.url_ {"maptiler://maps/basic-v2"}, .url_ {"maptiler://maps/basic-v2"},
.drawBelow_ {"railway_transit_tunnel"}}, .drawBelow_ {"railway_transit_tunnel", "Transit tunnel"}},
{.name_ {"Bright"}, {.name_ {"Bright"},
.url_ {"maptiler://maps/bright-v2"}, .url_ {"maptiler://maps/bright-v2"},
.drawBelow_ {"ferry"}}, .drawBelow_ {"ferry"}},
@ -75,28 +76,28 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
.drawBelow_ {"aeroway"}}, .drawBelow_ {"aeroway"}},
{.name_ {"Outdoor"}, {.name_ {"Outdoor"},
.url_ {"maptiler://maps/outdoor-v2"}, .url_ {"maptiler://maps/outdoor-v2"},
.drawBelow_ {"aeroway_runway"}}, .drawBelow_ {"aeroway_runway", "Aeroway"}},
{.name_ {"Swisstopo"}, {.name_ {"Swisstopo"},
.url_ {"maptiler://maps/ch-swisstopo-lbm"}, .url_ {"maptiler://maps/ch-swisstopo-lbm"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
{.name_ {"Swisstopo Dark"}, {.name_ {"Swisstopo Dark"},
.url_ {"maptiler://maps/ch-swisstopo-lbm-dark"}, .url_ {"maptiler://maps/ch-swisstopo-lbm-dark"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
{.name_ {"Swisstopo Grey"}, {.name_ {"Swisstopo Grey"},
.url_ {"maptiler://maps/ch-swisstopo-lbm-grey"}, .url_ {"maptiler://maps/ch-swisstopo-lbm-grey"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
{.name_ {"Swisstopo Vivid"}, {.name_ {"Swisstopo Vivid"},
.url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"}, .url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
{.name_ {"Topo"}, {.name_ {"Topo"},
.url_ {"maptiler://maps/topo-v2"}, .url_ {"maptiler://maps/topo-v2"},
.drawBelow_ {"aeroway_runway"}}, .drawBelow_ {"aeroway_runway", "Runway"}},
{.name_ {"Topo Dark"}, {.name_ {"Topo Dark"},
.url_ {"maptiler://maps/topo-v2-dark"}, .url_ {"maptiler://maps/topo-v2-dark"},
.drawBelow_ {"aeroway_runway"}}, .drawBelow_ {"aeroway_runway", "Runway"}},
{.name_ {"Winter"}, {.name_ {"Winter"},
.url_ {"maptiler://maps/winter-v2"}, .url_ {"maptiler://maps/winter-v2"},
.drawBelow_ {"aeroway_runway"}}}}}, .drawBelow_ {"aeroway_runway", "Aeroway"}}}}},
{MapProvider::Unknown, MapProviderInfo {}}}; {MapProvider::Unknown, MapProviderInfo {}}};
MapProvider GetMapProvider(const std::string& name) MapProvider GetMapProvider(const std::string& name)