Skip to content

Commit fa3dfe4

Browse files
author
Andy Townsend
committed
Extract fill name name for various leisure (such as golf courses)
at differet zooms, allowing the styling code to be simpler.
1 parent 8a45252 commit fa3dfe4

File tree

5 files changed

+198
-32
lines changed

5 files changed

+198
-32
lines changed

‎resources/changelog_svwd01.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Except as noted, all changes also apply to the [SVWD06 Android native display st
44

55
## As yet unreleased
66
Simplify style to show generic power generator names from vector 16, water power generator names from vector 14, and wind power generator names and icons from 14.
7+
Extract fill name name for various leisure (such as golf courses) at differet zooms, allowing the styling code to be simpler.
78

89
## 20/08/2025
910
Show clocks that are neither pedestal clocks nor clock towers.

‎resources/changelog_svwd08.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## As yet unreleased
44
Simplify style to show generic power generator names from vector 16, water power generator names from vector 14, and wind power generator names and icons from 14.
5+
Extract fill name name for various leisure (such as golf courses) at differet zooms, allowing the styling code to be simpler.
56

67
## 20/08/2025
78
Show clocks that are neither pedestal clocks nor clock towers.

‎resources/svwd01_style.json‎

Lines changed: 65 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@
15171517
}
15181518
},
15191519
{
1520-
"id": "land1-recreation_ground-fill-6-16",
1520+
"id": "land1-recreation_ground-fill",
15211521
"type": "fill",
15221522
"source": "someoneelse",
15231523
"source-layer": "land1",
@@ -2119,11 +2119,10 @@
21192119
}
21202120
},
21212121
{
2122-
"id": "land1-golf_course-fill-9",
2122+
"id": "land1-golf_course-fill",
21232123
"type": "fill",
21242124
"source": "someoneelse",
21252125
"source-layer": "land1",
2126-
"minzoom": 9,
21272126
"filter": [ "all", [ "in", "class", "leisure_golf_course" ] ],
21282127
"paint": {
21292128
"fill-antialias": true,
@@ -2143,11 +2142,10 @@
21432142
}
21442143
},
21452144
{
2146-
"id": "land1-stadium-fill-9",
2145+
"id": "land1-stadium-fill",
21472146
"type": "fill",
21482147
"source": "someoneelse",
21492148
"source-layer": "land1",
2150-
"minzoom": 9,
21512149
"filter": [ "all", [ "in", "class", "leisure_sports_centre",
21522150
"leisure_stadium" ] ],
21532151
"paint": {
@@ -2240,11 +2238,10 @@
22402238
}
22412239
},
22422240
{
2243-
"id": "land1-pitch-fill-9",
2241+
"id": "land1-pitch-fill",
22442242
"type": "fill",
22452243
"source": "someoneelse",
22462244
"source-layer": "land1",
2247-
"minzoom": 9,
22482245
"filter": [ "all", [ "in", "class", "leisure_pitch",
22492246
"leisure_dog_park" ] ],
22502247
"paint": {
@@ -2257,7 +2254,6 @@
22572254
"type": "line",
22582255
"source": "someoneelse",
22592256
"source-layer": "land1",
2260-
"minzoom": 9,
22612257
"filter": [ "all", [ "in", "class", "leisure_pitch",
22622258
"leisure_dog_park" ] ],
22632259
"paint": {
@@ -12324,11 +12320,10 @@
1232412320
}
1232512321
},
1232612322
{
12327-
"id": "land1-leisure-green-imagename-centroid-13",
12323+
"id": "land1-leisure-green-imagename-centroid",
1232812324
"type": "symbol",
1232912325
"source": "someoneelse",
1233012326
"source-layer": "land1",
12331-
"minzoom": 13,
1233212327
"filter": [ "all", [ "in", "class", "leisure_golf_course" ],
1233312328
[ "==", "$type", "Point" ] ],
1233412329
"layout": {
@@ -19220,6 +19215,66 @@
1922019215
"text-halo-width": 1
1922119216
}
1922219217
},
19218+
{
19219+
"id": "land1-leisuregreen--name-centroid-15",
19220+
"type": "symbol",
19221+
"source": "someoneelse",
19222+
"source-layer": "land1",
19223+
"minzoom": 15,
19224+
"filter": [ "all", [ "in", "class", "leisure_stadium",
19225+
"leisure_track",
19226+
"leisure_pitch" ],
19227+
[ ">", "way_area", 2584 ],
19228+
[ "==", "$type", "Point" ] ],
19229+
"layout": {
19230+
"text-anchor": "top",
19231+
"text-field": "{name}\n",
19232+
"text-font": [
19233+
"KlokanTech Noto Sans Regular"
19234+
],
19235+
"text-max-width": 14,
19236+
"text-offset": [ 0, 0.6 ],
19237+
"text-padding": 2,
19238+
"text-size": { "stops": [ [ 12, 10 ], [ 20, 30 ] ] },
19239+
"visibility": "visible"
19240+
},
19241+
"paint": {
19242+
"text-color": "#188b65",
19243+
"text-halo-blur": 0.5,
19244+
"text-halo-color": "#ffffff",
19245+
"text-halo-width": 1
19246+
}
19247+
},
19248+
{
19249+
"id": "land1-leisuregreen--name-centroid-14",
19250+
"type": "symbol",
19251+
"source": "someoneelse",
19252+
"source-layer": "land1",
19253+
"minzoom": 14,
19254+
"filter": [ "all", [ "in", "class", "leisure_stadium",
19255+
"leisure_track",
19256+
"leisure_pitch" ],
19257+
[ ">", "way_area", 12853 ],
19258+
[ "==", "$type", "Point" ] ],
19259+
"layout": {
19260+
"text-anchor": "top",
19261+
"text-field": "{name}\n",
19262+
"text-font": [
19263+
"KlokanTech Noto Sans Regular"
19264+
],
19265+
"text-max-width": 14,
19266+
"text-offset": [ 0, 0.6 ],
19267+
"text-padding": 2,
19268+
"text-size": { "stops": [ [ 12, 10 ], [ 20, 30 ] ] },
19269+
"visibility": "visible"
19270+
},
19271+
"paint": {
19272+
"text-color": "#188b65",
19273+
"text-halo-blur": 0.5,
19274+
"text-halo-color": "#ffffff",
19275+
"text-halo-width": 1
19276+
}
19277+
},
1922319278
{
1922419279
"id": "land1-theme_park-name-16",
1922519280
"type": "symbol",

‎resources/svwd06_style.json‎

Lines changed: 65 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@
15171517
}
15181518
},
15191519
{
1520-
"id": "land1-recreation_ground-fill-6-16",
1520+
"id": "land1-recreation_ground-fill",
15211521
"type": "fill",
15221522
"source": "someoneelse",
15231523
"source-layer": "land1",
@@ -2119,11 +2119,10 @@
21192119
}
21202120
},
21212121
{
2122-
"id": "land1-golf_course-fill-9",
2122+
"id": "land1-golf_course-fill",
21232123
"type": "fill",
21242124
"source": "someoneelse",
21252125
"source-layer": "land1",
2126-
"minzoom": 9,
21272126
"filter": [ "all", [ "in", "class", "leisure_golf_course" ] ],
21282127
"paint": {
21292128
"fill-antialias": true,
@@ -2143,11 +2142,10 @@
21432142
}
21442143
},
21452144
{
2146-
"id": "land1-stadium-fill-9",
2145+
"id": "land1-stadium-fill",
21472146
"type": "fill",
21482147
"source": "someoneelse",
21492148
"source-layer": "land1",
2150-
"minzoom": 9,
21512149
"filter": [ "all", [ "in", "class", "leisure_sports_centre",
21522150
"leisure_stadium" ] ],
21532151
"paint": {
@@ -2240,11 +2238,10 @@
22402238
}
22412239
},
22422240
{
2243-
"id": "land1-pitch-fill-9",
2241+
"id": "land1-pitch-fill",
22442242
"type": "fill",
22452243
"source": "someoneelse",
22462244
"source-layer": "land1",
2247-
"minzoom": 9,
22482245
"filter": [ "all", [ "in", "class", "leisure_pitch",
22492246
"leisure_dog_park" ] ],
22502247
"paint": {
@@ -2257,7 +2254,6 @@
22572254
"type": "line",
22582255
"source": "someoneelse",
22592256
"source-layer": "land1",
2260-
"minzoom": 9,
22612257
"filter": [ "all", [ "in", "class", "leisure_pitch",
22622258
"leisure_dog_park" ] ],
22632259
"paint": {
@@ -12324,11 +12320,10 @@
1232412320
}
1232512321
},
1232612322
{
12327-
"id": "land1-leisure-green-imagename-centroid-13",
12323+
"id": "land1-leisure-green-imagename-centroid",
1232812324
"type": "symbol",
1232912325
"source": "someoneelse",
1233012326
"source-layer": "land1",
12331-
"minzoom": 13,
1233212327
"filter": [ "all", [ "in", "class", "leisure_golf_course" ],
1233312328
[ "==", "$type", "Point" ] ],
1233412329
"layout": {
@@ -19220,6 +19215,66 @@
1922019215
"text-halo-width": 1
1922119216
}
1922219217
},
19218+
{
19219+
"id": "land1-leisuregreen--name-centroid-15",
19220+
"type": "symbol",
19221+
"source": "someoneelse",
19222+
"source-layer": "land1",
19223+
"minzoom": 15,
19224+
"filter": [ "all", [ "in", "class", "leisure_stadium",
19225+
"leisure_track",
19226+
"leisure_pitch" ],
19227+
[ ">", "way_area", 2584 ],
19228+
[ "==", "$type", "Point" ] ],
19229+
"layout": {
19230+
"text-anchor": "top",
19231+
"text-field": "{name}\n",
19232+
"text-font": [
19233+
"KlokanTech Noto Sans Regular"
19234+
],
19235+
"text-max-width": 14,
19236+
"text-offset": [ 0, 0.6 ],
19237+
"text-padding": 2,
19238+
"text-size": { "stops": [ [ 12, 10 ], [ 20, 30 ] ] },
19239+
"visibility": "visible"
19240+
},
19241+
"paint": {
19242+
"text-color": "#188b65",
19243+
"text-halo-blur": 0.5,
19244+
"text-halo-color": "#ffffff",
19245+
"text-halo-width": 1
19246+
}
19247+
},
19248+
{
19249+
"id": "land1-leisuregreen--name-centroid-14",
19250+
"type": "symbol",
19251+
"source": "someoneelse",
19252+
"source-layer": "land1",
19253+
"minzoom": 14,
19254+
"filter": [ "all", [ "in", "class", "leisure_stadium",
19255+
"leisure_track",
19256+
"leisure_pitch" ],
19257+
[ ">", "way_area", 12853 ],
19258+
[ "==", "$type", "Point" ] ],
19259+
"layout": {
19260+
"text-anchor": "top",
19261+
"text-field": "{name}\n",
19262+
"text-font": [
19263+
"KlokanTech Noto Sans Regular"
19264+
],
19265+
"text-max-width": 14,
19266+
"text-offset": [ 0, 0.6 ],
19267+
"text-padding": 2,
19268+
"text-size": { "stops": [ [ 12, 10 ], [ 20, 30 ] ] },
19269+
"visibility": "visible"
19270+
},
19271+
"paint": {
19272+
"text-color": "#188b65",
19273+
"text-halo-blur": 0.5,
19274+
"text-halo-color": "#ffffff",
19275+
"text-halo-width": 1
19276+
}
19277+
},
1922319278
{
1922419279
"id": "land1-theme_park-name-16",
1922519280
"type": "symbol",

0 commit comments

Comments
 (0)