Skip to content

Commit 8b1e264

Browse files
tjgoforetjgofore
committed
fix: fix Vantaa parking area display
- Add all 6 parking types (parking_area, street_parking_area, park_and_ride_area, hgv_parking_area, hgv_street_parking_area, hgv_no_parking_area) + update tests - Add missing translation for street_parking_area type Refs: PL-153
1 parent a063c45 commit 8b1e264

5 files changed

Lines changed: 41 additions & 29 deletions

File tree

‎src/i18n/en.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export default {
118118
'area.list.natureConservation': 'Nature conservation',
119119
'area.list.parking': 'Parking',
120120
'area.list.parking_area': 'Parking areas',
121+
'area.list.street_parking_area': 'Street parking',
121122
'area.list.parking_payzone': 'Parking payment zones',
122123
'area.list.parking_payzone.plural': 'Parking payment zones',
123124
'area.list.education.finnish': 'Finnish school areas',

‎src/i18n/fi.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ export default {
114114
'area.list.natureConservation': 'Luonnonsuojelu',
115115
'area.list.parking': 'Pysäköinti',
116116
'area.list.parking_area': 'Pysäköintialueet',
117+
'area.list.street_parking_area': 'Kadunvarsipysäköinti',
117118
'area.list.parking_payzone': 'Maksuvyöhykkeet',
118119
'area.list.parking_payzone.plural': 'Maksuvyöhykkeet',
119120
'area.list.education.finnish': 'Suomenkieliset koulualueet',

‎src/i18n/sv.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ export default {
116116
'area.list.natureConservation': 'Naturskydd',
117117
'area.list.parking': 'Parkering',
118118
'area.list.parking_area': 'Parkeringsområden',
119+
'area.list.street_parking_area': 'Gatuparkering',
119120
'area.list.parking_payzone': 'Avgiftszoner',
120121
'area.list.parking_payzone.plural': 'Avgiftszoner',
121122
'area.list.education.finnish': 'Finska skolområden',

‎src/utils/__tests__/parking.test.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ describe('parking', () => {
358358
extra: { tyyppi: '12h-24h' },
359359
},
360360
output: {
361-
type: 'parking_area',
361+
type: 'parking_area,street_parking_area,park_and_ride_area',
362362
extra__tyyppi: '12h-24h',
363363
municipality: 'vantaa',
364364
},
@@ -370,7 +370,7 @@ describe('parking', () => {
370370
extra: { tyyppi: '2h-3h' },
371371
},
372372
output: {
373-
type: 'parking_area',
373+
type: 'parking_area,street_parking_area,park_and_ride_area',
374374
extra__tyyppi: '2h-3h',
375375
municipality: 'vantaa',
376376
},
@@ -382,7 +382,7 @@ describe('parking', () => {
382382
extra: { tyyppi: '4h-11h' },
383383
},
384384
output: {
385-
type: 'parking_area',
385+
type: 'parking_area,street_parking_area,park_and_ride_area',
386386
extra__tyyppi: '4h-11h',
387387
municipality: 'vantaa',
388388
},
@@ -394,7 +394,7 @@ describe('parking', () => {
394394
extra: { tyyppi: 'Ei rajoitusta' },
395395
},
396396
output: {
397-
type: 'parking_area',
397+
type: 'parking_area,street_parking_area,park_and_ride_area',
398398
extra__tyyppi: 'Ei rajoitusta',
399399
municipality: 'vantaa',
400400
},
@@ -406,7 +406,7 @@ describe('parking', () => {
406406
extra: { tyyppi: 'Lyhytaikainen' },
407407
},
408408
output: {
409-
type: 'parking_area',
409+
type: 'parking_area,street_parking_area,park_and_ride_area',
410410
extra__tyyppi: 'Lyhytaikainen',
411411
municipality: 'vantaa',
412412
},
@@ -418,7 +418,7 @@ describe('parking', () => {
418418
extra: { tyyppi: 'Maksullinen' },
419419
},
420420
output: {
421-
type: 'parking_area',
421+
type: 'parking_area,street_parking_area,park_and_ride_area',
422422
extra__tyyppi: 'Maksullinen',
423423
municipality: 'vantaa',
424424
},
@@ -430,7 +430,7 @@ describe('parking', () => {
430430
extra: { tyyppi: 'Muu' },
431431
},
432432
output: {
433-
type: 'parking_area',
433+
type: 'parking_area,street_parking_area,park_and_ride_area',
434434
extra__tyyppi: 'Muu',
435435
municipality: 'vantaa',
436436
},
@@ -442,7 +442,7 @@ describe('parking', () => {
442442
extra: { tyyppi: 'Varattu päivisin' },
443443
},
444444
output: {
445-
type: 'parking_area',
445+
type: 'parking_area,street_parking_area,park_and_ride_area',
446446
extra__tyyppi: 'Varattu päivisin',
447447
municipality: 'vantaa',
448448
},
@@ -455,7 +455,7 @@ describe('parking', () => {
455455
extra: { tyyppi: '12h-24h' },
456456
},
457457
output: {
458-
type: 'hgv_street_parking_area,hgv_parking_area',
458+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
459459
extra__tyyppi: '12h-24h',
460460
municipality: 'vantaa',
461461
},
@@ -467,7 +467,7 @@ describe('parking', () => {
467467
extra: { tyyppi: '4h-11h' },
468468
},
469469
output: {
470-
type: 'hgv_street_parking_area,hgv_parking_area',
470+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
471471
extra__tyyppi: '4h-11h',
472472
municipality: 'vantaa',
473473
},
@@ -479,7 +479,7 @@ describe('parking', () => {
479479
extra: { tyyppi: '2h-3h' },
480480
},
481481
output: {
482-
type: 'hgv_street_parking_area,hgv_parking_area',
482+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
483483
extra__tyyppi: '2h-3h',
484484
municipality: 'vantaa',
485485
},
@@ -491,7 +491,7 @@ describe('parking', () => {
491491
extra: { tyyppi: 'Ei rajoitusta' },
492492
},
493493
output: {
494-
type: 'hgv_street_parking_area,hgv_parking_area',
494+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
495495
extra__tyyppi: 'Ei rajoitusta',
496496
municipality: 'vantaa',
497497
},
@@ -503,7 +503,7 @@ describe('parking', () => {
503503
extra: { tyyppi: 'Lyhytaikainen' },
504504
},
505505
output: {
506-
type: 'hgv_street_parking_area,hgv_parking_area',
506+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
507507
extra__tyyppi: 'Lyhytaikainen',
508508
municipality: 'vantaa',
509509
},
@@ -515,7 +515,7 @@ describe('parking', () => {
515515
extra: { tyyppi: 'Maksullinen' },
516516
},
517517
output: {
518-
type: 'hgv_street_parking_area,hgv_parking_area',
518+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
519519
extra__tyyppi: 'Maksullinen',
520520
municipality: 'vantaa',
521521
},
@@ -527,7 +527,7 @@ describe('parking', () => {
527527
extra: { tyyppi: 'Muu' },
528528
},
529529
output: {
530-
type: 'hgv_street_parking_area,hgv_parking_area',
530+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
531531
extra__tyyppi: 'Muu',
532532
municipality: 'vantaa',
533533
},
@@ -539,7 +539,7 @@ describe('parking', () => {
539539
extra: { tyyppi: 'Varattu päivisin' },
540540
},
541541
output: {
542-
type: 'hgv_street_parking_area,hgv_parking_area',
542+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
543543
extra__tyyppi: 'Varattu päivisin',
544544
municipality: 'vantaa',
545545
},
@@ -552,7 +552,7 @@ describe('parking', () => {
552552
extra: { tyyppi: '12h-24h' },
553553
},
554554
output: {
555-
type: 'hgv_street_parking_area,hgv_parking_area',
555+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
556556
extra__tyyppi: '12h-24h',
557557
municipality: 'vantaa',
558558
},
@@ -564,7 +564,7 @@ describe('parking', () => {
564564
extra: { tyyppi: '4h-11h' },
565565
},
566566
output: {
567-
type: 'hgv_street_parking_area,hgv_parking_area',
567+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
568568
extra__tyyppi: '4h-11h',
569569
municipality: 'vantaa',
570570
},
@@ -576,7 +576,7 @@ describe('parking', () => {
576576
extra: { tyyppi: '2h-3h' },
577577
},
578578
output: {
579-
type: 'hgv_street_parking_area,hgv_parking_area',
579+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
580580
extra__tyyppi: '2h-3h',
581581
municipality: 'vantaa',
582582
},
@@ -588,7 +588,7 @@ describe('parking', () => {
588588
extra: { tyyppi: 'Ei rajoitusta' },
589589
},
590590
output: {
591-
type: 'hgv_street_parking_area,hgv_parking_area',
591+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
592592
extra__tyyppi: 'Ei rajoitusta',
593593
municipality: 'vantaa',
594594
},
@@ -600,7 +600,7 @@ describe('parking', () => {
600600
extra: { tyyppi: 'Lyhytaikainen' },
601601
},
602602
output: {
603-
type: 'hgv_street_parking_area,hgv_parking_area',
603+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
604604
extra__tyyppi: 'Lyhytaikainen',
605605
municipality: 'vantaa',
606606
},
@@ -612,7 +612,7 @@ describe('parking', () => {
612612
extra: { tyyppi: 'Maksullinen' },
613613
},
614614
output: {
615-
type: 'hgv_street_parking_area,hgv_parking_area',
615+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
616616
extra__tyyppi: 'Maksullinen',
617617
municipality: 'vantaa',
618618
},
@@ -624,7 +624,7 @@ describe('parking', () => {
624624
extra: { tyyppi: 'Muu' },
625625
},
626626
output: {
627-
type: 'hgv_street_parking_area,hgv_parking_area',
627+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
628628
extra__tyyppi: 'Muu',
629629
municipality: 'vantaa',
630630
},
@@ -636,7 +636,7 @@ describe('parking', () => {
636636
extra: { tyyppi: 'Varattu päivisin' },
637637
},
638638
output: {
639-
type: 'hgv_street_parking_area,hgv_parking_area',
639+
type: 'hgv_parking_area,hgv_street_parking_area,hgv_no_parking_area',
640640
extra__tyyppi: 'Varattu päivisin',
641641
municipality: 'vantaa',
642642
},

‎src/utils/parking.js‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,22 @@ export const parkingVantaaOtherTypes = [
2727
passengerCarParkAndRide,
2828
];
2929

30+
// Vantaa API type parameters
31+
const parkingVNTPassengerCarTypes = [
32+
'parking_area',
33+
'street_parking_area',
34+
'park_and_ride_area',
35+
];
3036
const parkingVNTHeavyTrafficTypes = [
31-
'hgv_street_parking_area',
3237
'hgv_parking_area',
38+
'hgv_street_parking_area',
39+
'hgv_no_parking_area',
3340
];
3441

3542
const VNT = 'vantaa';
3643
const HKI = 'helsinki';
37-
const PARKING_AREA = 'parking_area';
3844
const parkingVNTHeavyTrafficTypesParam = parkingVNTHeavyTrafficTypes.join(',');
45+
const parkingVNTPassengerCarTypesParam = parkingVNTPassengerCarTypes.join(',');
3946

4047
/**
4148
* This "area id" is a local (in frontend) invention used to identificate different areas. In other
@@ -55,7 +62,9 @@ export function resolveParkingAreaId(area) {
5562
if (parkingVantaaOtherTypes.includes(area.type)) {
5663
return area.type;
5764
}
58-
const suffix = area.type === PARKING_AREA ? 'passenger_car' : 'heavy_traffic';
65+
const suffix = parkingVNTPassengerCarTypes.includes(area.type)
66+
? 'passenger_car'
67+
: 'heavy_traffic';
5968
return `${area.extra.tyyppi}/${suffix}`;
6069
}
6170

@@ -64,7 +73,7 @@ export function resolveParamsForParkingFetch(areaId) {
6473
return { type: areaId, municipality: VNT };
6574
}
6675
if (parkingHelsinkiTypes.includes(areaId)) {
67-
return { type: PARKING_AREA, extra__class: areaId, municipality: HKI };
76+
return { type: 'parking_area', extra__class: areaId, municipality: HKI };
6877
}
6978
if (!areaId?.includes('/')) {
7079
return null;
@@ -74,7 +83,7 @@ export function resolveParamsForParkingFetch(areaId) {
7483
type:
7584
combinedType === 'heavy_traffic'
7685
? parkingVNTHeavyTrafficTypesParam
77-
: PARKING_AREA,
86+
: parkingVNTPassengerCarTypesParam,
7887
extra__tyyppi: tyyppi,
7988
municipality: VNT,
8089
};

0 commit comments

Comments
 (0)