fix: mapping from waytypes to waytype

TheGreatRefrigerator · TheGreatRefrigerator · commit 5c0eeb63d8de · 2025-04-22T11:24:59.000+02:00
- change translations to singular as well see GIScience/openrouteservice#1579
diff --git a/cypress/fixtures/build-map-data.js b/cypress/fixtures/build-map-data.js
@@ -302,7 +302,7 @@ const buildMapData = {
               }
               ]
             },
-            'waytypes': {
+            'waytype': {
               'values': [
                 [
                   0,
diff --git a/cypress/fixtures/map-view-data.js b/cypress/fixtures/map-view-data.js
@@ -2502,7 +2502,7 @@ let routes = [
           }
           ]
         },
-        'waytypes': {
+        'waytype': {
           'values': [
             [
               0,
@@ -4394,7 +4394,7 @@ let rawData = {
               }
             ]
           },
-          'waytypes': {
+          'waytype': {
             'values': [
               [
                 0,
diff --git a/cypress/fixtures/ors-route.geojson b/cypress/fixtures/ors-route.geojson
@@ -183,7 +183,7 @@
               }
             ]
           },
-          "waytypes": {
+          "waytype": {
             "values": [
               [0, 727, 1],
               [727, 728, 2],
diff --git a/cypress/fixtures/ors-route.json b/cypress/fixtures/ors-route.json
@@ -1012,7 +1012,7 @@
               }
             ]
           },
-          "waytypes": {
+          "waytype": {
             "values": [
               [0, 3, 7],
               [3, 14, 3],
@@ -2966,7 +2966,7 @@
               }
             ]
           },
-          "waytypes": {
+          "waytype": {
             "values": [
               [0, 5, 7],
               [5, 18, 3],
@@ -4845,7 +4845,7 @@
                 }
               ]
             },
-            "waytypes": {
+            "waytype": {
               "values": [
                 [0, 3, 7],
                 [3, 14, 3],
@@ -6798,7 +6798,7 @@
                 }
               ]
             },
-            "waytypes": {
+            "waytype": {
               "values": [
                 [0, 5, 7],
                 [5, 18, 3],
diff --git a/docs/en-translation-source-merged.json b/docs/en-translation-source-merged.json
@@ -96,7 +96,7 @@
     "steepness": "Steepness",
     "surface": "Surface",
     "roadaccessrestrictions": "Road access restrictions",
-    "waytypes": "Way types",
+    "waytype": "Way type",
     "suitability": "Suitability",
     "waycategory": "Way category",
     "tollways": "Tollways",
diff --git a/src/fragments/forms/settings/Settings.vue b/src/fragments/forms/settings/Settings.vue
@@ -56,7 +56,7 @@
                     <v-checkbox class="pt-0 top-0" v-model="mapSettingsTransient.surface"
                       :label="$t('global.surface')"></v-checkbox>
                     <v-checkbox class="pt-0 top-0" v-model="mapSettingsTransient.waytype"
-                      :label="$t('global.waytypes')"></v-checkbox>
+                      :label="$t('global.waytype')"></v-checkbox>
 
                     <v-checkbox class="pt-0 top-0" v-model="mapSettingsTransient.tollways"
                       :label="$t('global.tollways')"></v-checkbox>
diff --git a/src/fragments/map-view/map-view.js b/src/fragments/map-view/map-view.js
@@ -186,7 +186,7 @@ export default {
       focusedPlace: null, // the place that must be focused among the ones visible on the map view (for search mode)
       highlightedRoutePointIndex: null, // a point on the route that must be highlighted (a Leaflet latLng)
       isAltitudeModalOpen: false,
-      extraInfo: null, // Extra route info (waytypes, surface, steepness etc)
+      extraInfo: null, // Extra route info (waytype, surface, steepness etc)
       featuresJustFitted: false,
       localAvoidPolygons: null,
       mapDataViewChangeDebounceTimeoutId: null
diff --git a/src/i18n/translations/cs-cz/global.js b/src/i18n/translations/cs-cz/global.js
@@ -96,7 +96,7 @@ export default {
     steepness: 'Strmost',
     surface: 'Povrch',
     roadaccessrestrictions: 'Omezení přístupu na silnice',
-    waytypes: 'Typy cest',
+    waytype: 'Typy cest',
     suitability: 'Vhodnost',
     waycategory: 'Kategorie cest',
     tollways: 'Mýtné brány',
diff --git a/src/i18n/translations/de-de/global.js b/src/i18n/translations/de-de/global.js
@@ -95,7 +95,7 @@ export default {
     steepness: 'Steilheit',
     surface: 'Oberfläche',
     roadaccessrestrictions: 'Straßen Zugangsbeschränkung',
-    waytypes: 'Weg Arten',
+    waytype: 'Weg Art',
     suitability: 'Eignung',
     waycategory: 'Wegkategorie',
     tollways: 'Mautstraßen',
diff --git a/src/i18n/translations/en-us/global.js b/src/i18n/translations/en-us/global.js
@@ -96,7 +96,7 @@ export default {
     steepness: 'Steepness',
     surface: 'Surface',
     roadaccessrestrictions: 'Road access restrictions',
-    waytypes: 'Way types',
+    waytype: 'Way type',
     suitability: 'Suitability',
     waycategory: 'Way category',
     tollways: 'Tollways',
diff --git a/src/i18n/translations/es-es/global.js b/src/i18n/translations/es-es/global.js
@@ -95,7 +95,7 @@ export default {
     steepness: 'Inclinación',
     surface: 'Superfície',
     roadaccessrestrictions: 'Restricciones de acceso por carretera',
-    waytypes: 'tipos de camino',
+    waytype: 'tipo de camino',
     suitability: 'Adecuación',
     waycategory: 'Categoria de camino',
     tollways: 'Peajes',
diff --git a/src/i18n/translations/fr-fr/global.js b/src/i18n/translations/fr-fr/global.js
@@ -95,7 +95,7 @@ export default {
     'steepness': 'Inclinaison',
     'surface': 'Surface',
     'roadaccessrestrictions': 'Restrictions d\'accès à la route',
-    'waytypes': 'Types de voie',
+    'waytype': 'Type de voie',
     'suitability': 'pertinence',
     'waycategory': 'Catégorie de voie',
     'tollways': 'Péages',
diff --git a/src/i18n/translations/hu-hu/global.js b/src/i18n/translations/hu-hu/global.js
@@ -95,7 +95,7 @@ export default {
     'steepness': 'Meredekség',
     'surface': 'Felszín',
     'roadaccessrestrictions': 'Behajtási korlátozások',
-    'waytypes': 'Úttípusok',
+    'waytype': 'Út típusa',
     'suitability': 'Alkalmasság',
     'waycategory': 'Útkategória',
     'tollways': 'Fizetős utak',
diff --git a/src/i18n/translations/it-it/global.js b/src/i18n/translations/it-it/global.js
@@ -95,7 +95,7 @@ export default {
     'steepness': 'Ripidezza',
     'surface': 'Superficie',
     'roadaccessrestrictions': 'Restrizioni d\'accesso alla strada',
-    'waytypes': 'Tipo di percorsi',
+    'waytype': 'Tipo di percorsi',
     'suitability': 'adeguatezza',
     'waycategory': 'Categoria di via',
     'tollways': 'Pedaggios',
diff --git a/src/i18n/translations/pt-br/global.js b/src/i18n/translations/pt-br/global.js
@@ -95,7 +95,7 @@ export default {
     steepness: 'Inclinação',
     surface: 'Superfície',
     roadaccessrestrictions: 'Road access restrictions',
-    waytypes: 'tipos de caminho',
+    waytype: 'tipo de caminho',
     suitability: 'Adequação',
     waycategory: 'Categoria do caminho',
     tollways: 'Pedágios',
diff --git a/src/i18n/translations/ro-ro/global.js b/src/i18n/translations/ro-ro/global.js
@@ -96,7 +96,7 @@ export default {
     'noise': 'Zgomot',
     'steepness': 'Abrupt',
     'surface': 'Suprafață',
-    'waytypes': 'Tipuri de căi',
+    'waytype': 'Tipul de căi',
     'suitability': 'Adecvare',
     'waycategory': 'Categoria Calea',
     'tollways': 'Autostrăzi cu taxă',
diff --git a/src/resources/ors-dictionary.js b/src/resources/ors-dictionary.js
@@ -1,5 +1,5 @@
 const orsDictionary = {
-  waytypes: [
+  waytype: [
     'unknown', // at position 0
     'stateRoad', // at position 1
     'road', // at position 2
@@ -107,7 +107,7 @@ const orsDictionary = {
     '10': '10'
   },
   colors: {
-    waytypes: [
+    waytype: [
       // 11 colors accessed by index
       '#AFEEEE',
       '#40E0D0',

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ const buildMapData = {`
`302`	`302`	`}`
`303`	`303`	`]`
`304`	`304`	`},`
`305`		`- 'waytypes': {`
	`305`	`+ 'waytype': {`
`306`	`306`	`'values': [`
`307`	`307`	`[`
`308`	`308`	`0,`
Original file line number	Diff line number	Diff line change
`@@ -2502,7 +2502,7 @@ let routes = [`
`2502`	`2502`	`}`
`2503`	`2503`	`]`
`2504`	`2504`	`},`
`2505`		`- 'waytypes': {`
	`2505`	`+ 'waytype': {`
`2506`	`2506`	`'values': [`
`2507`	`2507`	`[`
`2508`	`2508`	`0,`
`@@ -4394,7 +4394,7 @@ let rawData = {`
`4394`	`4394`	`}`
`4395`	`4395`	`]`
`4396`	`4396`	`},`
`4397`		`- 'waytypes': {`
	`4397`	`+ 'waytype': {`
`4398`	`4398`	`'values': [`
`4399`	`4399`	`[`
`4400`	`4400`	`0,`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@`
`183`	`183`	`}`
`184`	`184`	`]`
`185`	`185`	`},`
`186`		`- "waytypes": {`
	`186`	`+ "waytype": {`
`187`	`187`	`"values": [`
`188`	`188`	`[0, 727, 1],`
`189`	`189`	`[727, 728, 2],`
Original file line number	Diff line number	Diff line change
`@@ -1012,7 +1012,7 @@`
`1012`	`1012`	`}`
`1013`	`1013`	`]`
`1014`	`1014`	`},`
`1015`		`- "waytypes": {`
	`1015`	`+ "waytype": {`
`1016`	`1016`	`"values": [`
`1017`	`1017`	`[0, 3, 7],`
`1018`	`1018`	`[3, 14, 3],`
`@@ -2966,7 +2966,7 @@`
`2966`	`2966`	`}`
`2967`	`2967`	`]`
`2968`	`2968`	`},`
`2969`		`- "waytypes": {`
	`2969`	`+ "waytype": {`
`2970`	`2970`	`"values": [`
`2971`	`2971`	`[0, 5, 7],`
`2972`	`2972`	`[5, 18, 3],`
`@@ -4845,7 +4845,7 @@`
`4845`	`4845`	`}`
`4846`	`4846`	`]`
`4847`	`4847`	`},`
`4848`		`- "waytypes": {`
	`4848`	`+ "waytype": {`
`4849`	`4849`	`"values": [`
`4850`	`4850`	`[0, 3, 7],`
`4851`	`4851`	`[3, 14, 3],`
`@@ -6798,7 +6798,7 @@`
`6798`	`6798`	`}`
`6799`	`6799`	`]`
`6800`	`6800`	`},`
`6801`		`- "waytypes": {`
	`6801`	`+ "waytype": {`
`6802`	`6802`	`"values": [`
`6803`	`6803`	`[0, 5, 7],`
`6804`	`6804`	`[5, 18, 3],`