Switch to OpenMapTiles and fix country source

This commit is contained in:
Lukas Martinelli 2017-01-10 15:55:15 +01:00
parent c9c990c5b8
commit 9dfeb23307

View File

@ -3,7 +3,8 @@
"id": "osm-liberty",
"name": "OSM Liberty",
"metadata": {
"mapbox:type": "template"
"mapbox:type": "template",
"inspect": true
},
"sources": {
"natural_earth_shaded_relief": {
@ -14,9 +15,9 @@
],
"type": "raster"
},
"osm2vectortiles": {
"openmaptiles": {
"type": "vector",
"url": "https://osm2vectortiles.tileserver.com/v2.json"
"url": "https://free.tilehosting.com/data/v3.json?key=tXiQqN3lIgskyDErJCeY"
}
},
"sprite": "http://osm-liberty.lukasmartinelli.ch/sprites/osm-liberty",
@ -56,7 +57,7 @@
{
"id": "landuse_overlay_national_park",
"type": "fill",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse_overlay",
"filter": [
"==",
@ -72,7 +73,7 @@
"id": "landuse_residential",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse",
"filter": [
"==",
@ -102,7 +103,7 @@
"id": "landuse_park",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse",
"filter": [
"==",
@ -118,7 +119,7 @@
"id": "landuse_cemetery",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse",
"filter": [
"==",
@ -136,7 +137,7 @@
"id": "landuse_hospital",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse",
"filter": [
"==",
@ -151,7 +152,7 @@
"id": "landuse_school",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "landuse",
"filter": [
"==",
@ -166,7 +167,7 @@
"id": "waterway_river",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "waterway",
"filter": [
"==",
@ -197,7 +198,7 @@
"id": "waterway_stream_canal",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "waterway",
"filter": [
"in",
@ -229,7 +230,7 @@
"id": "water",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "water",
"paint": {
"fill-color": "rgb(158,189,255)"
@ -239,7 +240,7 @@
"id": "aeroway_fill",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "aeroway",
"minzoom": 11,
"filter": [
@ -256,7 +257,7 @@
"id": "aeroway_runway",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "aeroway",
"minzoom": 11,
"filter": [
@ -293,7 +294,7 @@
"id": "aeroway_taxiway",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "aeroway",
"minzoom": 11,
"filter": [
@ -330,7 +331,7 @@
"id": "tunnel_motorway_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -383,7 +384,7 @@
"id": "tunnel_service_track_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -431,7 +432,7 @@
"id": "tunnel_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -479,7 +480,7 @@
"id": "tunnel_street_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -539,7 +540,7 @@
"id": "tunnel_secondary_tertiary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -580,7 +581,7 @@
"id": "tunnel_trunk_primary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -628,7 +629,7 @@
"id": "tunnel_motorway_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -680,7 +681,7 @@
"id": "tunnel_path_pedestrian",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -753,7 +754,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -797,7 +798,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -845,7 +846,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -889,7 +890,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -933,7 +934,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -977,7 +978,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1021,7 +1022,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1045,7 +1046,7 @@
"id": "tunnel_major_rail",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1110,7 +1111,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1131,7 +1132,7 @@
"id": "building",
"type": "fill",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "building",
"paint": {
"fill-color": "hsl(35, 8%, 85%)",
@ -1154,7 +1155,7 @@
"id": "housenum_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "housenum_label",
"minzoom": 16,
"layout": {
@ -1189,7 +1190,7 @@
"id": "road_motorway_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 12,
"filter": [
@ -1240,7 +1241,7 @@
"id": "road_service_track_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1286,7 +1287,7 @@
"id": "road_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 13,
"filter": [
@ -1338,7 +1339,7 @@
"id": "road_street_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1408,7 +1409,7 @@
"id": "road_secondary_tertiary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1452,7 +1453,7 @@
"id": "road_trunk_primary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1504,7 +1505,7 @@
"id": "road_motorway_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 5,
"filter": [
@ -1555,7 +1556,7 @@
"id": "road_path_pedestrian",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 14,
"filter": [
@ -1633,7 +1634,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 12,
"filter": [
@ -1679,7 +1680,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1729,7 +1730,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 13,
"filter": [
@ -1777,7 +1778,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1831,7 +1832,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1878,7 +1879,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -1937,7 +1938,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"minzoom": 5,
"filter": [
@ -1964,7 +1965,7 @@
"id": "road_major_rail",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2029,7 +2030,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2050,7 +2051,7 @@
"id": "bridge_motorway_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2098,7 +2099,7 @@
"id": "bridge_service_track_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2142,7 +2143,7 @@
"id": "bridge_link_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2190,7 +2191,7 @@
"id": "bridge_street_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2250,7 +2251,7 @@
"id": "bridge_path_pedestrian_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2303,7 +2304,7 @@
"id": "bridge_secondary_tertiary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2344,7 +2345,7 @@
"id": "bridge_trunk_primary_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2392,7 +2393,7 @@
"id": "bridge_motorway_casing",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2439,7 +2440,7 @@
"id": "bridge_path_pedestrian",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2512,7 +2513,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2555,7 +2556,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2603,7 +2604,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2647,7 +2648,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2691,7 +2692,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2735,7 +2736,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2779,7 +2780,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2802,7 +2803,7 @@
"id": "bridge_major_rail",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2866,7 +2867,7 @@
}
},
"type": "line",
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road",
"filter": [
"all",
@ -2886,7 +2887,7 @@
"id": "admin_level_3",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "admin",
"filter": [
"all",
@ -2933,7 +2934,7 @@
"id": "admin_level_2",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "admin",
"filter": [
"all",
@ -2995,7 +2996,7 @@
"id": "admin_level_2_disputed",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "admin",
"filter": [
"all",
@ -3047,7 +3048,7 @@
"id": "admin_level_3_maritime",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "admin",
"filter": [
"all",
@ -3097,7 +3098,7 @@
"id": "admin_level_2_maritime",
"type": "line",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "admin",
"filter": [
"all",
@ -3141,7 +3142,7 @@
"id": "water_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "water_label",
"filter": [
"==",
@ -3166,7 +3167,7 @@
"id": "poi_label_4",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "poi_label",
"minzoom": 16,
"filter": [
@ -3178,7 +3179,7 @@
],
[
"==",
"scalerank",
"rank",
4
]
],
@ -3208,7 +3209,7 @@
"id": "poi_label_3",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "poi_label",
"minzoom": 15,
"filter": [
@ -3220,7 +3221,7 @@
],
[
"==",
"scalerank",
"rank",
3
]
],
@ -3250,7 +3251,7 @@
"id": "poi_label_2",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "poi_label",
"minzoom": 14,
"filter": [
@ -3262,7 +3263,7 @@
],
[
"==",
"scalerank",
"rank",
2
]
],
@ -3292,7 +3293,7 @@
"id": "rail_station_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "rail_station_label",
"layout": {
"icon-image": "{maki}-11",
@ -3321,7 +3322,7 @@
"id": "poi_label_1",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "poi_label",
"minzoom": 13,
"filter": [
@ -3333,7 +3334,7 @@
],
[
"==",
"scalerank",
"rank",
1
]
],
@ -3363,7 +3364,7 @@
"id": "airport_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "airport_label",
"minzoom": 11,
"filter": [
@ -3375,7 +3376,7 @@
],
[
"in",
"scalerank",
"rank",
1,
2,
3
@ -3407,7 +3408,7 @@
"id": "road_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road_label",
"filter": [
"!=",
@ -3449,7 +3450,7 @@
"id": "road_label_highway_shield",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "road_label",
"minzoom": 8,
"filter": [
@ -3491,7 +3492,7 @@
"id": "place_label_other",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "place_label",
"filter": [
"in",
@ -3534,7 +3535,7 @@
"id": "place_label_village",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "place_label",
"filter": [
"==",
@ -3571,7 +3572,7 @@
"id": "place_label_town",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "place_label",
"filter": [
"==",
@ -3626,7 +3627,7 @@
"id": "place_label_city",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "place_label",
"minzoom": 5,
"filter": [
@ -3682,7 +3683,7 @@
"id": "marine_label_line_4",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3728,7 +3729,7 @@
"id": "marine_label_4",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3775,7 +3776,7 @@
"id": "marine_label_line_3",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3821,7 +3822,7 @@
"id": "marine_label_point_3",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3868,7 +3869,7 @@
"id": "marine_label_line_2",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3914,7 +3915,7 @@
"id": "marine_label_point_2",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -3961,7 +3962,7 @@
"id": "marine_label_line_1",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -4007,7 +4008,7 @@
"id": "marine_label_point_1",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "marine_label",
"filter": [
"all",
@ -4059,7 +4060,7 @@
"id": "state_label",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source": "openmaptiles",
"source-layer": "state_label",
"maxzoom": 6,
"layout": {
@ -4088,53 +4089,23 @@
}
},
{
"id": "country_label_4",
"id": "country_3",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source-layer": "country_label",
"source": "openmaptiles",
"source-layer": "place",
"filter": [
">=",
"scalerank",
4
],
"layout": {
"text-field": "{name_en}",
"text-font": [
"Roboto Condensed Italic"
"all",
[
">=",
"rank",
3
],
"text-max-width": 6.25,
"text-size": {
"stops": [
[
4,
11
],
[
6,
15
]
]
},
"text-transform": "none"
},
"paint": {
"text-color": "#334",
"text-halo-blur": 1,
"text-halo-color": "rgba(255,255,255,0.8)",
"text-halo-width": 1
}
},
{
"id": "country_label_3",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source-layer": "country_label",
"filter": [
"==",
"scalerank",
3
[
"==",
"class",
"country"
]
],
"layout": {
"text-field": "{name_en}",
@ -4164,15 +4135,23 @@
}
},
{
"id": "country_label_2",
"id": "country_2",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source-layer": "country_label",
"source": "openmaptiles",
"source-layer": "place",
"filter": [
"==",
"scalerank",
2
"all",
[
"==",
"rank",
2
],
[
"==",
"class",
"country"
]
],
"layout": {
"text-field": "{name_en}",
@ -4202,15 +4181,23 @@
}
},
{
"id": "country_label_1",
"id": "country_1",
"type": "symbol",
"metadata": {},
"source": "osm2vectortiles",
"source-layer": "country_label",
"source": "openmaptiles",
"source-layer": "place",
"filter": [
"==",
"scalerank",
1
"all",
[
"==",
"rank",
1
],
[
"==",
"class",
"country"
]
],
"layout": {
"text-field": "{name_en}",