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,51 +52,52 @@ 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_ {
.url_ {"maptiler://maps/hybrid"}, {.name_ {"Satellite"},
.drawBelow_ {"tunnel"}}, .url_ {"maptiler://maps/hybrid"},
{.name_ {"Streets"}, .drawBelow_ {"tunnel"}},
.url_ {"maptiler://maps/streets-v2"}, {.name_ {"Streets"},
.drawBelow_ {"aeroway"}}, .url_ {"maptiler://maps/streets-v2"},
{.name_ {"Streets Dark"}, .drawBelow_ {"aeroway"}},
.url_ {"maptiler://maps/streets-v2-dark"}, {.name_ {"Streets Dark"},
.drawBelow_ {"aeroway"}}, .url_ {"maptiler://maps/streets-v2-dark"},
{.name_ {"Basic"}, .drawBelow_ {"aeroway"}},
.url_ {"maptiler://maps/basic-v2"}, {.name_ {"Basic"},
.drawBelow_ {"railway_transit_tunnel"}}, .url_ {"maptiler://maps/basic-v2"},
{.name_ {"Bright"}, .drawBelow_ {"railway_transit_tunnel", "Transit tunnel"}},
.url_ {"maptiler://maps/bright-v2"}, {.name_ {"Bright"},
.drawBelow_ {"ferry"}}, .url_ {"maptiler://maps/bright-v2"},
{.name_ {"Dataviz"}, .drawBelow_ {"ferry"}},
.url_ {"maptiler://maps/dataviz"}, {.name_ {"Dataviz"},
.drawBelow_ {"aeroway"}}, .url_ {"maptiler://maps/dataviz"},
{.name_ {"Dataviz Dark"}, .drawBelow_ {"aeroway"}},
.url_ {"maptiler://maps/dataviz-dark"}, {.name_ {"Dataviz Dark"},
.drawBelow_ {"aeroway"}}, .url_ {"maptiler://maps/dataviz-dark"},
{.name_ {"Outdoor"}, .drawBelow_ {"aeroway"}},
.url_ {"maptiler://maps/outdoor-v2"}, {.name_ {"Outdoor"},
.drawBelow_ {"aeroway_runway"}}, .url_ {"maptiler://maps/outdoor-v2"},
{.name_ {"Swisstopo"}, .drawBelow_ {"aeroway_runway", "Aeroway"}},
.url_ {"maptiler://maps/ch-swisstopo-lbm"}, {.name_ {"Swisstopo"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .url_ {"maptiler://maps/ch-swisstopo-lbm"},
{.name_ {"Swisstopo Dark"}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
.url_ {"maptiler://maps/ch-swisstopo-lbm-dark"}, {.name_ {"Swisstopo Dark"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .url_ {"maptiler://maps/ch-swisstopo-lbm-dark"},
{.name_ {"Swisstopo Grey"}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
.url_ {"maptiler://maps/ch-swisstopo-lbm-grey"}, {.name_ {"Swisstopo Grey"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .url_ {"maptiler://maps/ch-swisstopo-lbm-grey"},
{.name_ {"Swisstopo Vivid"}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
.url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"}, {.name_ {"Swisstopo Vivid"},
.drawBelow_ {"pattern_landcover_vineyard"}}, .url_ {"maptiler://maps/ch-swisstopo-lbm-vivid"},
{.name_ {"Topo"}, .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
.url_ {"maptiler://maps/topo-v2"}, {.name_ {"Topo"},
.drawBelow_ {"aeroway_runway"}}, .url_ {"maptiler://maps/topo-v2"},
{.name_ {"Topo Dark"}, .drawBelow_ {"aeroway_runway", "Runway"}},
.url_ {"maptiler://maps/topo-v2-dark"}, {.name_ {"Topo Dark"},
.drawBelow_ {"aeroway_runway"}}, .url_ {"maptiler://maps/topo-v2-dark"},
{.name_ {"Winter"}, .drawBelow_ {"aeroway_runway", "Runway"}},
.url_ {"maptiler://maps/winter-v2"}, {.name_ {"Winter"},
.drawBelow_ {"aeroway_runway"}}}}}, .url_ {"maptiler://maps/winter-v2"},
.drawBelow_ {"aeroway_runway", "Aeroway"}}}}},
{MapProvider::Unknown, MapProviderInfo {}}}; {MapProvider::Unknown, MapProviderInfo {}}};
MapProvider GetMapProvider(const std::string& name) MapProvider GetMapProvider(const std::string& name)