Merge pull request #1198 from City-of-Helsinki/develop

Release v2.0.29
City-of-Helsinki · Nov 14, 2024 · 094f0aa · 094f0aa
2 parents 61b7cec + 815c0c2
commit 094f0aa
Show file tree

Hide file tree

Showing 21 changed files with 1,624 additions and 964 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,9 +11,6 @@
 # production
 /build
 
-# external translations
-/src/i18n/externalTranslations
-
 # misc
 .DS_Store
 .env
@@ -29,5 +26,3 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-
-municipalities.json
diff --git a/browserTests/generic/mapTest.js b/browserTests/generic/mapTest.js
@@ -34,7 +34,7 @@ fixture`Search unit geometry test`
   });
 
 test('Unit geometry is drawn on map', async (t) => {
-  const polygon = Selector('.leaflet-pane .leaflet-overlay-pane').find('canvas');
+  const polygon = Selector('.leaflet-pane .leaflet-overlay-pane').find('svg');
   const listItem = Selector('#paginatedList-Toimipisteet-results li[role="link"]').nth(0);
   await t
     .click(listItem)
@@ -48,7 +48,7 @@ fixture`Unit page geometry test`
   });
 
 test('Unit geometry is drawn on map', async (t) => {
-  const polygon = Selector('.leaflet-pane .leaflet-overlay-pane').find('canvas');
+  const polygon = Selector('.leaflet-pane .leaflet-overlay-pane').find('svg');
   await t
     .expect(polygon.exists).ok();
 });
diff --git a/browserTests/views/embeddedViewsTest.js b/browserTests/views/embeddedViewsTest.js
@@ -107,7 +107,7 @@ const loadingIndicator = Selector('[data-sm="LoadingIndicator"]');
   // Division url
   test.page`${getBaseUrl()}/fi/embed/division/kunta:helsinki/kaupunginosa:029?level=all`
   ('Division url shows units and area correctly', async (t) => {
-    const district = Selector('.leaflet-pane .leaflet-overlay-pane').find('canvas').exists;
+    const district = Selector('.leaflet-pane .leaflet-overlay-pane').find('svg').exists;
 
     await t
       .expect(loadingIndicator.exists).notOk('should load data')

diff --git a/browserTests/views/searchTest.js b/browserTests/views/searchTest.js
@@ -435,7 +435,7 @@ test('Should override accessibility settings', async(t) => {
   const senseChips = Selector(settingsMenuPanel).find(`${sensesDropdown} ${settingChip}`);
   const mobilityInput = Selector(settingsMenuPanel).find(`${mobilityDropdown} input`);
   await t
-    .navigateTo(`${bathUrl}&accessibility_setting=visual_impairment,reduced_mobility,colour_blind`)
+    .navigateTo(`${bathUrl}&accessibility_setting=visually_impaired,reduced_mobility,colour_blind`)
     .click(settingsMenuButton)
     .expect(senseChips.count).eql(2)
     .expect(senseChips.withText('Minun on vaikea erottaa värejä').exists).ok()

diff --git a/config/default.js b/config/default.js
@@ -161,32 +161,27 @@ if (typeof settings.SLOW_FETCH_MESSAGE_TIMEOUT === 'undefined') {
   settings.SLOW_FETCH_MESSAGE_TIMEOUT = 3000;
 }
 
-let municipalities;
-try {
-  municipalities = require('./municipalities.json');
-} catch(e) {
-  municipalities = {
-    fi: {
-      espoo: 'Espoo',
-      helsinki: 'Helsinki',
-      kauniainen: 'Kauniainen',
-      vantaa: 'Vantaa',
-      kirkkonummi: 'Kirkkonummi'
-    },
-    en: {
-      espoo: 'Espoo',
-      helsinki: 'Helsinki',
-      kauniainen: 'Kauniainen',
-      vantaa: 'Vantaa',
-      kirkkonummi: 'Kirkkonummi'
-    },
-    sv: {
-      espoo: 'Esbo',
-      helsinki: 'Helsingfors',
-      kauniainen: 'Grankulla',
-      vantaa: 'Vanda',
-      kirkkonummi: 'Kyrkslätt'
-    }
+const municipalities = {
+  fi: {
+    espoo: 'Espoo',
+    helsinki: 'Helsinki',
+    kauniainen: 'Kauniainen',
+    vantaa: 'Vantaa',
+    kirkkonummi: 'Kirkkonummi'
+  },
+  en: {
+    espoo: 'Espoo',
+    helsinki: 'Helsinki',
+    kauniainen: 'Kauniainen',
+    vantaa: 'Vantaa',
+    kirkkonummi: 'Kirkkonummi'
+  },
+  sv: {
+    espoo: 'Esbo',
+    helsinki: 'Helsingfors',
+    kauniainen: 'Grankulla',
+    vantaa: 'Vanda',
+    kirkkonummi: 'Kyrkslätt'
   }
 }
 /**