Skip to content

Commit 6e4c1b3

Browse files
committed
Add penkit ja pöydät filter (disabled by default)
1 parent 7542ffd commit 6e4c1b3

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
API_KEY_NLS: ${{ secrets.API_KEY_NLS }}
107107
TILESERVER_URL: ${{ secrets.TAMPERE_TILESERVER_URL }}
108108
CITIES: "'Kangasala','Lempäälä','Nokia','Orivesi','Pirkkala','Tampere','Vesilahti','Ylöjärvi'"
109-
DISABLED_LAYERS: "Roskikset"
109+
DISABLED_LAYERS: "Roskikset;Penkit ja pöydät"
110110
- name: Deploy app build to production S3 bucket
111111
if: startsWith(github.ref, 'refs/tags/release')
112112
run: aws s3 sync ./dist/ s3://${{ secrets.TAMPERE_AWS_BUCKET_NAME }} --delete

backend/lambda_functions/osm_loader/osm_loader.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class OSMLoader(BaseLoader):
5757
# Allow other tarmo_categories than the database default
5858
TAGS_TO_TARMO_CATEGORY = {
5959
"amenity": {
60-
"bench": "Penkit",
60+
"bench": "Penkit ja pöydät",
6161
"bbq": "Laavut, majat, ruokailu",
6262
"bicycle_parking": "Pysäköinti",
6363
"cafe": "Kahvilat ja kioskit",
@@ -79,13 +79,13 @@ class OSMLoader(BaseLoader):
7979
"hotel": "Leirintä ja majoitus",
8080
"motel": "Leirintä ja majoitus",
8181
"museum": "Nähtävyydet",
82-
"picnic_site": "Laavut, majat, ruokailu",
82+
"picnic_site": "Penkit ja pöydät",
8383
"viewpoint": "Nähtävyydet",
8484
"wilderness_hut": "Leirintä ja majoitus",
8585
},
8686
"leisure": {
8787
"bird_hide": "Ulkoilureitit",
88-
"picnic_table": "Laavut, majat, ruokailu",
88+
"picnic_table": "Penkit ja pöydät",
8989
"sauna": "Leirintä ja majoitus",
9090
},
9191
"shop": {

web/.env.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
API_KEY_NLS=<your-api-key>
22
TILESERVER_URL=http://localhost:7800
33
CITIES="'Kangasala','Lempäälä','Nokia','Orivesi','Pirkkala','Tampere','Vesilahti','Ylöjärvi'"
4-
DISABLED_LAYERS="Roskikset"
4+
DISABLED_LAYERS="Roskikset;Penkit ja pöydät"

web/public/img/bench-light.png

1.04 KB
Loading

web/src/components/style.ts

+8
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ toilet_image.src = `${getCategoryIcon("Vessat")}`;
107107
const recycle_image: HTMLImageElement = new Image(24, 24);
108108
recycle_image.src = `${getCategoryIcon("Roskikset")}`;
109109

110+
const bench_image: HTMLImageElement = new Image(24, 24);
111+
bench_image.src = `${getCategoryIcon("Penkit ja pöydät")}`;
112+
110113
/**
111114
* Images for all symbol layers
112115
*/
@@ -130,6 +133,7 @@ export const POINT_IMAGES = [
130133
["cafe", cafe_image],
131134
["toilet", toilet_image],
132135
["recycle", recycle_image],
136+
["bench", bench_image],
133137
];
134138

135139
/**
@@ -171,6 +175,8 @@ const SYMBOL_LAYOUT: SymbolLayout = {
171175
"toilet",
172176
"Roskikset",
173177
"recycle",
178+
"Penkit ja pöydät",
179+
"bench",
174180
/* In some categories (looking at you, parking) icons are determined by osm tags */
175181
/* We could also select icon based on type_name, but this will do for now */
176182
["get", "amenity"],
@@ -220,6 +226,8 @@ const COLOR_MATCH: Expression = [
220226
getCategoryColor("Vessat"),
221227
"Roskikset",
222228
getCategoryColor("Roskikset"),
229+
"Penkit ja pöydät",
230+
getCategoryColor("Penkit ja pöydät"),
223231
palette.primary.dark,
224232
]
225233

web/src/contexts/MapFiltersContext.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export const CATEGORY_FILTERS = Object.freeze({
2323
"Leirintä ja majoitus": true,
2424
"Kahvilat ja kioskit": true,
2525
"Vessat": true,
26-
"Roskikset": true
26+
"Roskikset": true,
27+
"Penkit ja pöydät": true
2728
});
2829

2930
/**

web/src/utils/utils.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ const possibleServiceCategories: Category[] = [
169169
category: "Roskikset",
170170
zoomThreshold: 14,
171171
},
172+
{
173+
name: "Penkit ja pöydät",
174+
category: "Penkit ja pöydät",
175+
zoomThreshold: 14,
176+
},
172177
{
173178
name: "Pysäköinti",
174179
category: "Pysäköinti",
@@ -224,7 +229,8 @@ export const getCategoryIcon = (category: string) =>
224229
"Leirintä ja majoitus": "img/cottage-light.png",
225230
"Kahvilat ja kioskit": "img/cafe-light.png",
226231
"Vessat": "img/toilet-light.png",
227-
"Roskikset": "img/recycle-light.png"
232+
"Roskikset": "img/recycle-light.png",
233+
"Penkit ja pöydät": "img/bench-light.png"
228234
}[category]);
229235

230236
/**
@@ -254,6 +260,7 @@ export const getCategoryColor = (category: string) =>
254260
"Kahvilat ja kioskit": "#c83e36",
255261
"Vessat": "#22437b",
256262
"Roskikset": "#22437b",
263+
"Penkit ja pöydät": "#22437b",
257264
}[category]);
258265

259266
/**
@@ -282,5 +289,6 @@ export const getCategoryPlural = (category: string) =>
282289
"Leirintä ja majoitus": "leirintä- ja majoituspaikkaa",
283290
"Kahvilat ja kioskit": "kahvilaa ja kioskia",
284291
"Vessat": "vessaa",
285-
"Roskikset": "roskista"
292+
"Roskikset": "roskista",
293+
"Penkit ja pöydät": "penkkiä ja pöytää"
286294
}[category]);

0 commit comments

Comments
 (0)