Merge github

This commit is contained in:
Miel Truyen 2023-04-10 02:06:42 +02:00
parent 91ec87bb49
commit 88dd860053
16 changed files with 64 additions and 344 deletions

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ quickstart.log
# imput / output data
data/*
data.backup/*
# generated source files
build/*

View File

@ -63,7 +63,7 @@
"iata"
]
],
"order": 190
"order": 185
}
]
}

View File

@ -157,7 +157,7 @@
"taxiway"
]
],
"order": 191
"order": 186
},
{
"id": "airport_gate",
@ -197,7 +197,7 @@
"gate"
]
],
"order": 192
"order": 187
}
]
}

View File

@ -59,8 +59,8 @@ tables:
type: member_index
- name: role
type: member_role
- name: type
type: member_type
# - name: type
# type: member_type
- key: boundary_type
name: boundary_type
type: string

View File

@ -1,287 +1,3 @@
{
"layers": [
{
"id": "boundary_3",
"type": "line",
"source": "openmaptiles",
"source-layer": "boundary",
"minzoom": 3,
"layout": {
"line-join": "round",
"visibility": "visible"
},
"paint": {
"line-color": "#845283",
"line-width": {
"base": 1,
"stops": [
[
4,
0.4
],
[
5,
0.7
],
[
12,
1.6
]
]
},
"line-opacity": {
"stops": [
[
3,
0.5
],
[
10,
1
]
]
},
"line-dasharray": [
5,
3
]
},
"metadata": {},
"filter": [
"all",
[
"in",
"admin_level",
3,
4
],
[
"==",
"maritime",
0
]
],
"order": 146
},
{
"id": "boundary_2",
"type": "line",
"source": "openmaptiles",
"source-layer": "boundary",
"minzoom": 0,
"layout": {
"line-cap": "round",
"line-join": "round",
"visibility": "visible"
},
"paint": {
"line-color": "#a37da1",
"line-width": {
"base": 1,
"stops": [
[
3,
0.5
],
[
5,
1.2
],
[
12,
3
]
]
},
"line-opacity": 1
},
"metadata": {},
"filter": [
"all",
[
"==",
"admin_level",
2
],
[
"==",
"maritime",
0
],
[
"==",
"disputed",
0
]
],
"order": 147
},
{
"id": "boundary_2_disputed",
"type": "line",
"source": "openmaptiles",
"source-layer": "boundary",
"minzoom": 0,
"layout": {
"line-cap": "round",
"line-join": "round",
"visibility": "visible"
},
"paint": {
"line-color": "#a37da1",
"line-width": {
"base": 1,
"stops": [
[
3,
0.3
],
[
5,
1.2
],
[
12,
3
]
]
},
"line-opacity": 1,
"line-dasharray": [
4,
3
]
},
"metadata": {},
"filter": [
"all",
[
"==",
"admin_level",
2
],
[
"==",
"disputed",
1
],
[
"==",
"maritime",
0
]
],
"order": 148
},
{
"id": "boundary_2_disputed_maritime",
"type": "line",
"source": "openmaptiles",
"source-layer": "boundary",
"minzoom": 0,
"layout": {
"line-cap": "round",
"line-join": "round",
"visibility": "visible"
},
"paint": {
"line-color": "rgba(129, 125, 163, 1)",
"line-width": {
"base": 1,
"stops": [
[
3,
0.5
],
[
5,
1.2
],
[
12,
3
]
]
},
"line-opacity": 1,
"line-dasharray": [
4,
3
]
},
"metadata": {},
"filter": [
"all",
[
"==",
"admin_level",
2
],
[
"==",
"disputed",
1
],
[
"==",
"maritime",
1
]
],
"order": 149
},
{
"id": "boundary_2_maritime",
"type": "line",
"source": "openmaptiles",
"source-layer": "boundary",
"minzoom": 4,
"layout": {
"line-cap": "round",
"line-join": "round",
"visibility": "visible"
},
"paint": {
"line-color": "#a37da1",
"line-width": {
"base": 1,
"stops": [
[
3,
0.5
],
[
5,
1.2
],
[
12,
3
]
]
},
"line-opacity": 1
},
"metadata": {},
"filter": [
"all",
[
"==",
"admin_level",
2
],
[
"==",
"disputed",
0
],
[
"==",
"maritime",
1
]
],
"order": 150
}
]
"layers": []
}

View File

@ -34,7 +34,7 @@
"text-halo-color": "rgba(255,255,255,0.8)",
"text-halo-width": 1
},
"order": 154
"order": 149
}
]
}

View File

@ -0,0 +1,3 @@
{
"layers": []
}

View File

@ -46,7 +46,7 @@
"cliff"
]
],
"order": 197
"order": 192
}
]
}

View File

@ -105,7 +105,7 @@
2
]
],
"order": 195
"order": 190
}
]
}

View File

@ -86,7 +86,7 @@
"borough"
]
],
"order": 193
"order": 188
},
{
"id": "place_village",
@ -129,7 +129,7 @@
"village"
]
],
"order": 198
"order": 193
},
{
"id": "place_town",
@ -177,7 +177,7 @@
"town"
]
],
"order": 199
"order": 194
},
{
"id": "place_state",
@ -228,7 +228,7 @@
3
]
],
"order": 200
"order": 195
},
{
"id": "place_city",
@ -311,7 +311,7 @@
1
]
],
"order": 201
"order": 196
},
{
"id": "place_capital",
@ -396,7 +396,7 @@
2
]
],
"order": 202
"order": 197
},
{
"id": "country_other",
@ -449,7 +449,7 @@
"iso_a2"
]
],
"order": 203
"order": 198
},
{
"id": "country_3",
@ -518,7 +518,7 @@
"iso_a2"
]
],
"order": 204
"order": 199
},
{
"id": "country_2",
@ -587,7 +587,7 @@
"iso_a2"
]
],
"order": 205
"order": 200
},
{
"id": "country_1",
@ -656,7 +656,7 @@
"iso_a2"
]
],
"order": 206
"order": 201
}
]
}

View File

@ -24,7 +24,7 @@ layer:
'jewelry', 'kiosk', 'locksmith', 'lamps', 'mall', 'massage', 'motorcycle', 'mobile_phone',
'newsagent', 'optician', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'shoes', 'sports',
'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency',
'watches', ''weapons', 'wholesale']
'watches', 'weapons', 'wholesale' ]
optician:
subclass: [ 'optician' ]
toys:

View File

@ -75,7 +75,7 @@
"artwork"
]
],
"order": 155
"order": 150
},
{
"id": "poi_shop-z15",
@ -139,7 +139,7 @@
"supermarket"
]
],
"order": 156
"order": 151
},
{
"id": "poi_waste",
@ -197,7 +197,7 @@
"toilets"
]
],
"order": 157
"order": 152
},
{
"id": "poi_cemetery",
@ -253,7 +253,7 @@
"cemetery"
]
],
"order": 158
"order": 153
},
{
"id": "poi_school",
@ -312,7 +312,7 @@
"school"
]
],
"order": 159
"order": 154
},
{
"id": "poi_outdoor",
@ -367,7 +367,7 @@
"gate"
]
],
"order": 160
"order": 155
},
{
"id": "poi_parking",
@ -433,7 +433,7 @@
"parking"
]
],
"order": 161
"order": 156
},
{
"id": "poi_golf",
@ -488,7 +488,7 @@
"golf"
]
],
"order": 162
"order": 157
},
{
"id": "poi_sport",
@ -544,7 +544,7 @@
"water_park"
]
],
"order": 163
"order": 158
},
{
"id": "poi_ferry",
@ -604,7 +604,7 @@
"ferry_terminal"
]
],
"order": 164
"order": 159
},
{
"id": "poi_food",
@ -664,7 +664,7 @@
"restaurant"
]
],
"order": 165
"order": 160
},
{
"id": "poi_water",
@ -719,7 +719,7 @@
"ice_rink"
]
],
"order": 166
"order": 161
},
{
"id": "poi_public",
@ -786,7 +786,7 @@
"books"
]
],
"order": 167
"order": 162
},
{
"id": "poi_cultural",
@ -855,7 +855,7 @@
"gallery"
]
],
"order": 168
"order": 163
},
{
"id": "poi_attraction",
@ -910,7 +910,7 @@
"attraction"
]
],
"order": 169
"order": 164
},
{
"id": "poi_car",
@ -979,7 +979,7 @@
"fuel"
]
],
"order": 170
"order": 165
},
{
"id": "poi_health",
@ -1037,7 +1037,7 @@
"veterinary"
]
],
"order": 171
"order": 166
},
{
"id": "poi_hospital",
@ -1103,7 +1103,7 @@
"hospital"
]
],
"order": 172
"order": 167
},
{
"id": "poi_campsite",
@ -1158,7 +1158,7 @@
"campsite"
]
],
"order": 173
"order": 168
},
{
"id": "poi_accommodation",
@ -1225,7 +1225,7 @@
"campsite"
]
],
"order": 174
"order": 169
},
{
"id": "poi_place_of_worship",
@ -1289,7 +1289,7 @@
"place_of_worship"
]
],
"order": 175
"order": 170
},
{
"id": "poi_busstop",
@ -1350,7 +1350,7 @@
"bus"
]
],
"order": 176
"order": 171
},
{
"id": "poi_bus",
@ -1410,7 +1410,7 @@
"bus_stop"
]
],
"order": 177
"order": 172
},
{
"id": "poi_harbor",
@ -1460,7 +1460,7 @@
"harbor"
]
],
"order": 178
"order": 173
},
{
"id": "poi_mall",
@ -1519,7 +1519,7 @@
"mall"
]
],
"order": 179
"order": 174
},
{
"id": "poi_train",
@ -1578,7 +1578,7 @@
"railway"
]
],
"order": 180
"order": 175
},
{
"id": "park-local",
@ -1638,7 +1638,7 @@
"park"
]
],
"order": 194
"order": 189
},
{
"id": "poi_zoo",
@ -1698,7 +1698,7 @@
"zoo"
]
],
"order": 196
"order": 191
}
]
}

View File

@ -7730,7 +7730,7 @@
"path"
]
],
"order": 181
"order": 176
},
{
"id": "road_oneway",
@ -7780,7 +7780,7 @@
"service"
]
],
"order": 182
"order": 177
},
{
"id": "road_oneway_opposite",
@ -7831,7 +7831,7 @@
"service"
]
],
"order": 183
"order": 178
}
]
}

View File

@ -34,7 +34,7 @@
"ferry"
]
],
"order": 184
"order": 179
},
{
"id": "road_label",
@ -81,7 +81,7 @@
"ferry"
]
],
"order": 185
"order": 180
},
{
"id": "highway-shield-tertiary",
@ -160,7 +160,7 @@
"ref"
]
],
"order": 186
"order": 181
},
{
"id": "highway-shield-secondary",
@ -239,7 +239,7 @@
"ref"
]
],
"order": 187
"order": 182
},
{
"id": "highway-shield-primary",
@ -318,7 +318,7 @@
"ref"
]
],
"order": 188
"order": 183
},
{
"id": "highway-shield-motorway",
@ -400,7 +400,7 @@
"ref"
]
],
"order": 189
"order": 184
}
]
}

View File

@ -31,7 +31,7 @@
"LineString"
]
],
"order": 152
"order": 147
},
{
"id": "water_name_point",
@ -68,7 +68,7 @@
"ocean"
]
],
"order": 153
"order": 148
}
]
}

View File

@ -367,7 +367,7 @@
"LineString"
]
],
"order": 151
"order": 146
}
]
}