diff --git a/app/i18n/messages/en.json b/app/i18n/messages/en.json
index 1ea35cf57..0c996a914 100644
--- a/app/i18n/messages/en.json
+++ b/app/i18n/messages/en.json
@@ -427,7 +427,7 @@
"ResourceIcons.free": "Free of charge",
"ResourceInfo.additionalInfoTitle": "Additional information about the premises",
"ResourceInfo.equipmentHeader": "Equipment available at the premises",
- "ResourceInfo.serviceMapLink": "Search route on Service Map",
+ "ResourceInfo.serviceMapLink": "View location on Service Map",
"ResourceInfo.webSiteLink": "Premise website",
"ResourceInfo.loginMessage": "You must log in to reserve these premises.",
"ResourceInfo.reservationTitle": "Reservation information",
diff --git a/app/i18n/messages/fi.json b/app/i18n/messages/fi.json
index 4cc2216c3..0081c5347 100644
--- a/app/i18n/messages/fi.json
+++ b/app/i18n/messages/fi.json
@@ -427,7 +427,7 @@
"ResourceIcons.free": "Maksuton",
"ResourceInfo.additionalInfoTitle": "Tilan lisätiedot",
"ResourceInfo.equipmentHeader": "Tilan varusteet",
- "ResourceInfo.serviceMapLink": "Katso reitti Palvelukartasta",
+ "ResourceInfo.serviceMapLink": "Katso sijanti Palvelukartasta",
"ResourceInfo.webSiteLink": "Toimipisteen Nettisivut",
"ResourceInfo.loginMessage": "Sinun täytyy kirjautua sisään, jotta voit tehdä varauksen tähän tilaan.",
"ResourceInfo.reservationTitle": "Varauksen tiedot",
diff --git a/app/i18n/messages/sv.json b/app/i18n/messages/sv.json
index 281f71cae..aa1d56269 100644
--- a/app/i18n/messages/sv.json
+++ b/app/i18n/messages/sv.json
@@ -430,7 +430,7 @@
"ResourceInfo.additionalInfoTitle": "Ytterligare information",
"ResourceInfo.equipmentHeader": "Utrustning",
"ResourceInfo.webSiteLink": "Lokalets webbsida",
- "ResourceInfo.serviceMapLink": "Reseplanering i Servicekartan",
+ "ResourceInfo.serviceMapLink": "Se plats på Servicekartan",
"ResourceInfo.loginMessage": "För att kunna boka detta utrymme måste du logga in.",
"ResourceInfo.reservationTitle": "Bokningsinformation",
"ResourceInfo.reserveTitle": "Boka utrymme",
diff --git a/app/utils/__tests__/unitUtils.spec.js b/app/utils/__tests__/unitUtils.spec.js
index 6960c0a51..2be790a9a 100644
--- a/app/utils/__tests__/unitUtils.spec.js
+++ b/app/utils/__tests__/unitUtils.spec.js
@@ -7,7 +7,7 @@ describe('Utils: unitUtils', () => {
test('returns correct url when unit has mapServiceId defined and current language is sv', () => {
const unit = { mapServiceId: '123' };
const currentLanguage = 'sv';
- const expected = 'https://servicekarta.turku.fi/unit/123#!route-details';
+ const expected = 'https://palvelukartta.turku.fi/sv/unit/123';
expect(getServiceMapUrl(unit, currentLanguage)).toBe(expected);
});
@@ -15,7 +15,7 @@ describe('Utils: unitUtils', () => {
test('returns correct url when unit has mapServiceId defined and current language is fi', () => {
const unit = { mapServiceId: '123' };
const currentLanguage = 'fi';
- const expected = 'https://palvelukartta.turku.fi/unit/123#!route-details';
+ const expected = 'https://palvelukartta.turku.fi/fi/unit/123';
expect(getServiceMapUrl(unit, currentLanguage)).toBe(expected);
});
@@ -23,15 +23,15 @@ describe('Utils: unitUtils', () => {
test('returns correct url when unit has mapServiceId defined and current language is en', () => {
const unit = { mapServiceId: '123' };
const currentLanguage = 'en';
- const expected = 'https://servicemap.turku.fi/unit/123#!route-details';
+ const expected = 'https://palvelukartta.turku.fi/en/unit/123';
expect(getServiceMapUrl(unit, currentLanguage)).toBe(expected);
});
- test('returns finnish url when unit has mapServiceId defined but language code is not one of the defined ones', () => {
+ test('returns base url when unit has mapServiceId defined but language code is not one of the defined ones', () => {
const unit = { mapServiceId: '123' };
const currentLanguage = 'test';
- const expected = 'https://palvelukartta.turku.fi/unit/123#!route-details';
+ const expected = 'https://palvelukartta.turku.fi/unit/123';
expect(getServiceMapUrl(unit, currentLanguage)).toBe(expected);
});
diff --git a/app/utils/unitUtils.js b/app/utils/unitUtils.js
index e625285e9..b3cc6e14b 100644
--- a/app/utils/unitUtils.js
+++ b/app/utils/unitUtils.js
@@ -14,13 +14,13 @@ function getServiceMapUrl(unit, currentLanguage) {
switch (currentLanguage) {
case 'sv':
- return `https://servicekarta.turku.fi/unit/${unit.mapServiceId}#!route-details`;
+ return `https://palvelukartta.turku.fi/sv/unit/${unit.mapServiceId}`;
case 'fi':
- return `https://palvelukartta.turku.fi/unit/${unit.mapServiceId}#!route-details`;
+ return `https://palvelukartta.turku.fi/fi/unit/${unit.mapServiceId}`;
case 'en':
- return `https://servicemap.turku.fi/unit/${unit.mapServiceId}#!route-details`;
+ return `https://palvelukartta.turku.fi/en/unit/${unit.mapServiceId}`;
default:
- return `https://palvelukartta.turku.fi/unit/${unit.mapServiceId}#!route-details`;
+ return `https://palvelukartta.turku.fi/unit/${unit.mapServiceId}`;
}
}