diff --git a/app/component/itinerary.scss b/app/component/itinerary.scss
index 2f9701b47f..64a813f1b4 100644
--- a/app/component/itinerary.scss
+++ b/app/component/itinerary.scss
@@ -18,8 +18,8 @@ $itinerary-tab-switch-height: 48px;
&.bus-express {
@include getCircleSvg($bus-express-color, $fill);
}
- &.tram-local {
- @include getCircleSvg($tram-local-color, $fill);
+ &.speedtram {
+ @include getCircleSvg($speedtram-color, $fill);
}
&.airplane {
@include getCircleSvg($airplane-color, $fill);
diff --git a/app/component/map/VehicleMarkerContainer.js b/app/component/map/VehicleMarkerContainer.js
index 1cc251f01a..f888d79003 100644
--- a/app/component/map/VehicleMarkerContainer.js
+++ b/app/component/map/VehicleMarkerContainer.js
@@ -14,7 +14,7 @@ const MODES_WITH_ICONS = [
'rail',
'subway',
'ferry',
- 'tram-local',
+ 'speedtram',
];
function getVehicleIcon(
@@ -84,8 +84,8 @@ function VehicleMarkerContainer(props) {
let mode;
if (type === ExtendedRouteTypes.BusExpress) {
mode = 'bus-express';
- } else if (type === ExtendedRouteTypes.TramLocal) {
- mode = 'tram-local';
+ } else if (type === ExtendedRouteTypes.SpeedTram) {
+ mode = 'speedtram';
} else {
mode = message.mode;
}
diff --git a/app/component/map/popups/marker-popup.scss b/app/component/map/popups/marker-popup.scss
index 1610d58edb..1df195d654 100644
--- a/app/component/map/popups/marker-popup.scss
+++ b/app/component/map/popups/marker-popup.scss
@@ -74,8 +74,8 @@
.funicular-stop {
color: $funicular-color;
}
- .tram-local-stop {
- color: $tram-local-color;
+ .speedtram-stop {
+ color: $speedtram-color;
}
}
diff --git a/app/component/map/tile-layer/SelectStopRow.js b/app/component/map/tile-layer/SelectStopRow.js
index 7e24899b81..1f1f177c73 100644
--- a/app/component/map/tile-layer/SelectStopRow.js
+++ b/app/component/map/tile-layer/SelectStopRow.js
@@ -21,8 +21,8 @@ function SelectStopRow(
}
} else if (routes && type === 'TRAM' && config.useExtendedRouteTypes) {
const routesArray = JSON.parse(routes);
- if (routesArray.some(p => p.gtfsType === ExtendedRouteTypes.TramLocal)) {
- mode = 'tram-local';
+ if (routesArray.some(p => p.gtfsType === ExtendedRouteTypes.SpeedTram)) {
+ mode = 'speedtram';
}
}
const iconOptions = {};
@@ -63,9 +63,9 @@ function SelectStopRow(
iconOptions.iconId = 'icon-icon_funicular-stop-lollipop';
iconOptions.className = 'funicular-stop';
break;
- case 'tram-local':
- iconOptions.iconId = 'icon-icon_tram-local-stop-lollipop';
- iconOptions.className = 'tram-local-stop';
+ case 'speedtram':
+ iconOptions.iconId = 'icon-icon_speedtram-stop-lollipop';
+ iconOptions.className = 'speedtram-stop';
break;
case 'FERRY':
iconOptions.iconId = !isNull(code)
diff --git a/app/component/map/tile-layer/Stops.js b/app/component/map/tile-layer/Stops.js
index f78bdefd82..a7c45de36e 100644
--- a/app/component/map/tile-layer/Stops.js
+++ b/app/component/map/tile-layer/Stops.js
@@ -50,7 +50,7 @@ class Stops {
this.config.useExtendedRouteTypes
) {
const routes = JSON.parse(feature.properties.routes);
- if (routes.some(p => p.gtfsType === ExtendedRouteTypes.TramLocal)) {
+ if (routes.some(p => p.gtfsType === ExtendedRouteTypes.SpeedTram)) {
hasLocalTramRoute = true;
}
}
@@ -75,7 +75,7 @@ class Stops {
mode = 'bus-express';
}
if (hasLocalTramRoute) {
- mode = 'tram-local';
+ mode = 'speedtram';
}
drawStopIcon(
diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js
index c8a43054d0..a6dcbefc91 100644
--- a/app/configurations/config.hsl.js
+++ b/app/configurations/config.hsl.js
@@ -122,7 +122,7 @@ export default {
'mode-metro': '#CA4000',
'mode-citybike': '#f2b62d',
'mode-citybike-secondary': '#333333',
- 'mode-tram-local': '#007E79',
+ 'mode-speedtram': '#007E79',
},
},
getAutoSuggestIcons: {
diff --git a/app/constants.js b/app/constants.js
index 517adfad3b..d02fc1ca46 100644
--- a/app/constants.js
+++ b/app/constants.js
@@ -95,7 +95,7 @@ export const AlertEntityType = Object.freeze({
export const ExtendedRouteTypes = Object.freeze({
BusExpress: 702,
BusLocal: 704,
- TramLocal: 900,
+ SpeedTram: 900,
});
export const ParkTypes = {
diff --git a/app/translations.js b/app/translations.js
index afc462dcde..fe8a87bece 100644
--- a/app/translations.js
+++ b/app/translations.js
@@ -1488,6 +1488,7 @@ const translations = {
'skip-to-content': 'Skip to content',
slow: 'Slow',
'specify-location': 'Specify location',
+ speedtram: 'Jokeri Light Rail',
'splash-locating': 'Detecting location',
'splash-or-choose': 'or select your origin',
'splash-use-positioning': 'Use location services',
@@ -1577,7 +1578,6 @@ const translations = {
'track-short-no-num': 'Track',
traficom: 'Traficom',
tram: 'Tram',
- 'tram-local': 'Jokeri Light Rail',
'tram-with-route-number': 'Tram {routeNumber} {headSign}',
transfer: 'Transfer',
transfers: 'Number of transfers',
@@ -2623,6 +2623,7 @@ const translations = {
'skip-to-content': 'Siirry sisältöön',
slow: 'Hidas',
'specify-location': 'Määritä sijainti',
+ speedtram: 'Raide-Jokeri',
'splash-locating': 'Paikannetaan',
'splash-or-choose': 'tai valitse lähtöpaikaksi',
'splash-use-positioning': 'Käytä paikannusta',
@@ -2715,7 +2716,6 @@ const translations = {
'track-short-no-num': 'Raide',
traficom: 'Traficom',
tram: 'Raitiovaunu',
- 'tram-local': 'Raide-Jokeri',
'tram-with-route-number': 'Raitiovaunu {routeNumber} {headSign}',
transfer: 'Vaihto',
transfers: 'Vaihtojen määrä',
@@ -4543,6 +4543,7 @@ const translations = {
'skip-to-content': 'Till innehållet',
slow: 'Långsam',
'specify-location': 'Ange en plats',
+ speedtram: 'Spårjokern',
'splash-locating': 'Söker din plats...',
'splash-or-choose': 'eller välj en avfärdsplats',
'splash-please-allow-positioning':
@@ -4635,7 +4636,6 @@ const translations = {
'track-short-no-num': 'Spår',
traficom: 'Traficom',
tram: 'Spårvagn',
- 'tram-local': 'Spårjokern',
'tram-with-route-number': 'Spårvagn {routeNumber} {headSign}',
transfer: 'Byte',
transfers: 'Antal byten',
diff --git a/app/util/modeUtils.js b/app/util/modeUtils.js
index 1f8ca4ed75..f11121d21f 100644
--- a/app/util/modeUtils.js
+++ b/app/util/modeUtils.js
@@ -110,8 +110,8 @@ export const getRouteMode = route => {
return 'bus-express';
case ExtendedRouteTypes.BusLocal:
return 'bus-local';
- case ExtendedRouteTypes.TramLocal:
- return 'tram-local';
+ case ExtendedRouteTypes.SpeedTram:
+ return 'speedtram';
default:
return route.mode?.toLowerCase();
}
diff --git a/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json b/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
index 2ac598f10f..35269c31b0 100644
--- a/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
+++ b/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-autosuggest-panel",
- "version": "2.0.8",
+ "version": "2.0.9",
"description": "digitransit-component autosuggest-panel module",
"main": "index.js",
"files": [
@@ -28,8 +28,8 @@
"author": "Digitransit Authors",
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
- "@digitransit-component/digitransit-component-autosuggest": "^1.9.12",
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-autosuggest": "^1.9.13",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/sass": "^0.2.0",
"classnames": "2.2.6",
"i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-autosuggest/package.json b/digitransit-component/packages/digitransit-component-autosuggest/package.json
index a89bf96057..ee7cbf30e0 100644
--- a/digitransit-component/packages/digitransit-component-autosuggest/package.json
+++ b/digitransit-component/packages/digitransit-component-autosuggest/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-autosuggest",
- "version": "1.9.12",
+ "version": "1.9.13",
"description": "digitransit-component autosuggest module",
"main": "index.js",
"files": [
@@ -36,8 +36,8 @@
},
"peerDependencies": {
"@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
- "@digitransit-component/digitransit-component-suggestion-item": "^1.1.4",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
+ "@digitransit-component/digitransit-component-suggestion-item": "^1.1.5",
"@hsl-fi/sass": "^0.2.0",
"classnames": "2.2.6",
"i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-control-panel/package.json b/digitransit-component/packages/digitransit-component-control-panel/package.json
index da3041cba8..8ab4314ec9 100644
--- a/digitransit-component/packages/digitransit-component-control-panel/package.json
+++ b/digitransit-component/packages/digitransit-component-control-panel/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-control-panel",
- "version": "1.1.3",
+ "version": "1.1.4",
"description": "digitransit-component control-panel module",
"main": "index.js",
"files": [
@@ -29,7 +29,7 @@
"author": "Digitransit Authors",
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/sass": "~0.2.0",
"classnames": "2.2.6",
"i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-datetimepicker/package.json b/digitransit-component/packages/digitransit-component-datetimepicker/package.json
index c0be006b8f..1d9cd87359 100644
--- a/digitransit-component/packages/digitransit-component-datetimepicker/package.json
+++ b/digitransit-component/packages/digitransit-component-datetimepicker/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-datetimepicker",
- "version": "0.7.5",
+ "version": "0.7.6",
"description": "digitransit-component datetimepicker module",
"main": "index.js",
"files": [
@@ -29,7 +29,7 @@
"author": "Digitransit Authors",
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"i18next": "^19.3.3",
"lodash": "4.17.21",
"lodash-es": "4.17.21",
diff --git a/digitransit-component/packages/digitransit-component-favourite-bar/package.json b/digitransit-component/packages/digitransit-component-favourite-bar/package.json
index 5d63b0294a..1172792202 100644
--- a/digitransit-component/packages/digitransit-component-favourite-bar/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-bar/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-favourite-bar",
- "version": "1.1.4",
+ "version": "1.1.5",
"description": "digitransit-component favourite-bar module",
"main": "index.js",
"files": [
@@ -32,8 +32,8 @@
"@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.1.0"
},
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
- "@digitransit-component/digitransit-component-suggestion-item": "^1.1.4",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
+ "@digitransit-component/digitransit-component-suggestion-item": "^1.1.5",
"@hsl-fi/sass": "^0.2.0",
"@hsl-fi/shimmer": "0.1.2",
"classnames": "2.2.6",
diff --git a/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json b/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
index 718ab9a7fb..4ca1cc30da 100644
--- a/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-favourite-editing-modal",
- "version": "1.1.4",
+ "version": "1.1.5",
"description": "digitransit-component favourite-editing-modal module",
"main": "index.js",
"files": [
@@ -33,7 +33,7 @@
},
"peerDependencies": {
"@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/container-spinner": "0.3.1",
"@hsl-fi/modal": "^0.3.1",
"@hsl-fi/sass": "^0.2.0",
diff --git a/digitransit-component/packages/digitransit-component-favourite-modal/package.json b/digitransit-component/packages/digitransit-component-favourite-modal/package.json
index 06cee5f1f6..53eef8a6ed 100644
--- a/digitransit-component/packages/digitransit-component-favourite-modal/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-modal/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-favourite-modal",
- "version": "1.0.2",
+ "version": "1.0.3",
"description": "digitransit-component favourite-modal module",
"main": "index.js",
"files": [
@@ -29,7 +29,7 @@
"author": "Digitransit Authors",
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/modal": "^0.3.1",
"@hsl-fi/sass": "^0.2.0",
"classnames": "2.2.6",
diff --git a/digitransit-component/packages/digitransit-component-icon/package.json b/digitransit-component/packages/digitransit-component-icon/package.json
index f2bd24c408..2d6d27cfc1 100644
--- a/digitransit-component/packages/digitransit-component-icon/package.json
+++ b/digitransit-component/packages/digitransit-component-icon/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-icon",
- "version": "0.2.2",
+ "version": "1.0.0",
"description": "digitransit-component icon module",
"main": "index.js",
"files": [
diff --git a/digitransit-component/packages/digitransit-component-icon/src/assets/search-tram-local-stop-default.svg b/digitransit-component/packages/digitransit-component-icon/src/assets/search-speedtram-stop-default.svg
similarity index 100%
rename from digitransit-component/packages/digitransit-component-icon/src/assets/search-tram-local-stop-default.svg
rename to digitransit-component/packages/digitransit-component-icon/src/assets/search-speedtram-stop-default.svg
diff --git a/digitransit-component/packages/digitransit-component-icon/src/assets/tram-local.svg b/digitransit-component/packages/digitransit-component-icon/src/assets/speedtram.svg
similarity index 100%
rename from digitransit-component/packages/digitransit-component-icon/src/assets/tram-local.svg
rename to digitransit-component/packages/digitransit-component-icon/src/assets/speedtram.svg
diff --git a/digitransit-component/packages/digitransit-component-icon/src/index.js b/digitransit-component/packages/digitransit-component-icon/src/index.js
index 9221daed88..d9eaddcd24 100644
--- a/digitransit-component/packages/digitransit-component-icon/src/index.js
+++ b/digitransit-component/packages/digitransit-component-icon/src/index.js
@@ -39,7 +39,7 @@ import CautionWhite from './assets/caution_white_exclamation.svg';
import Trash from './assets/trash.svg';
import ModeBus from './assets/mode_bus.svg';
import ModeBusExpress from './assets/bus-express.svg';
-import ModeTramLocal from './assets/tram-local.svg';
+import ModeSpeedTram from './assets/speedtram.svg';
import ModeBusLocal from './assets/bus-local.svg';
import ModeRail from './assets/mode_rail.svg';
import ModeTram from './assets/mode_tram.svg';
@@ -60,7 +60,7 @@ import TramWaltti from './assets/tram-waltti.svg';
import Check from './assets/check.svg';
import SearchBusStopDefault from './assets/search-bus-stop-default.svg';
import SearchBusStopExpressDefault from './assets/search-bus-stop-express-default.svg';
-import SearchTramLocalStopDefault from './assets/search-tram-local-stop-default.svg';
+import SearchSpeedTramStopDefault from './assets/search-speedtram-stop-default.svg';
import SearchRailStopDefault from './assets/search-rail-stop-default.svg';
import SearchFerryDefault from './assets/search-ferry-default.svg';
import SearchFerryStopDefault from './assets/search-ferry-stop-default.svg';
@@ -124,7 +124,7 @@ const IconMap = style => {
'mode-bus': ,
'mode-bus-express': ,
'mode-bus-local': ,
- 'mode-tram-local': ,
+ 'mode-speedtram': ,
'mode-rail': ,
'mode-tram': ,
'mode-subway': ,
@@ -151,8 +151,8 @@ const IconMap = style => {
'search-bus-stop-express-default': (
),
- 'search-tram-local-stop-default': (
-
+ 'search-speedtram-stop-default': (
+
),
'search-rail-stop-default': ,
'search-ferry-default': ,
diff --git a/digitransit-component/packages/digitransit-component-suggestion-item/package.json b/digitransit-component/packages/digitransit-component-suggestion-item/package.json
index b9407508a8..2b4dcd8a15 100644
--- a/digitransit-component/packages/digitransit-component-suggestion-item/package.json
+++ b/digitransit-component/packages/digitransit-component-suggestion-item/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-suggestion-item",
- "version": "1.1.4",
+ "version": "1.1.5",
"description": "digitransit-component suggestion-item module",
"main": "index.js",
"files": [
@@ -32,7 +32,7 @@
"recompose": "0.30.0"
},
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/sass": " ^0.2.0",
"classnames": "2.2.6",
"i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js b/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
index 0a468eae33..f5f3073233 100644
--- a/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
+++ b/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
@@ -8,7 +8,7 @@ import styles from './helpers/styles.scss';
const BUS_EXPRESS = 702;
const BUS_LOCAL = 704;
-const TRAM_LOCAL = 900;
+const SPEEDTRAM = 900;
const getRouteMode = props => {
switch (props.type) {
@@ -16,8 +16,8 @@ const getRouteMode = props => {
return 'bus-local';
case BUS_EXPRESS:
return 'bus-express';
- case TRAM_LOCAL:
- return 'tram-local';
+ case SPEEDTRAM:
+ return 'speedtram';
default:
return props?.mode?.toLowerCase() || 'bus';
}
@@ -128,8 +128,8 @@ function getIconProperties(
{ icon: 'search-bus-stop-express-default', color: 'mode-bus-express' },
],
[
- 'TRAM-LOCAL-default',
- { icon: 'search-tram-local-stop-default', color: 'mode-tram-local' },
+ 'SPEEDTRAM-default',
+ { icon: 'search-speedtram-stop-default', color: 'mode-speedtram' },
],
[
'BUS-digitransit',
@@ -208,8 +208,8 @@ function getIconProperties(
}
} else if (modes.includes('BUS-EXPRESS') && modeSet === 'default') {
iconStr = [layerIcon.get('BUS-EXPRESS'.concat('-').concat(modeSet))];
- } else if (modes.includes('TRAM-LOCAL') && modeSet === 'default') {
- iconStr = [layerIcon.get('TRAM-LOCAL'.concat('-').concat(modeSet))];
+ } else if (modes.includes('SPEEDTRAM') && modeSet === 'default') {
+ iconStr = [layerIcon.get('SPEEDTRAM'.concat('-').concat(modeSet))];
} else {
iconStr = [layerIcon.get(mode.concat('-').concat(modeSet))];
}
diff --git a/digitransit-component/packages/digitransit-component-traffic-now-link/package.json b/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
index a376753957..fbd61b5f69 100644
--- a/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
+++ b/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
@@ -1,6 +1,6 @@
{
"name": "@digitransit-component/digitransit-component-traffic-now-link",
- "version": "0.2.2",
+ "version": "0.2.3",
"description": "digitransit-component traffic-now-link module",
"main": "index.js",
"files": [
@@ -29,7 +29,7 @@
"author": "Digitransit Authors",
"license": "(AGPL-3.0 OR EUPL-1.2)",
"peerDependencies": {
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@hsl-fi/sass": "^0.2.0",
"i18next": "^19.3.3",
"prop-types": "^15.7.2",
diff --git a/digitransit-component/packages/digitransit-component/package.json b/digitransit-component/packages/digitransit-component/package.json
index f8c7715159..bd59b3a68d 100644
--- a/digitransit-component/packages/digitransit-component/package.json
+++ b/digitransit-component/packages/digitransit-component/package.json
@@ -14,13 +14,13 @@
"docs": "node -r esm ../../scripts/generate-readmes"
},
"dependencies": {
- "@digitransit-component/digitransit-component-autosuggest": "^1.9.12",
- "@digitransit-component/digitransit-component-autosuggest-panel": "^2.0.8",
- "@digitransit-component/digitransit-component-control-panel": "^1.1.3",
- "@digitransit-component/digitransit-component-favourite-bar": "1.1.4",
- "@digitransit-component/digitransit-component-favourite-editing-modal": "^1.1.4",
- "@digitransit-component/digitransit-component-favourite-modal": "^1.0.2",
- "@digitransit-component/digitransit-component-icon": "^0.2.2",
+ "@digitransit-component/digitransit-component-autosuggest": "^1.9.13",
+ "@digitransit-component/digitransit-component-autosuggest-panel": "^2.0.9",
+ "@digitransit-component/digitransit-component-control-panel": "^1.1.4",
+ "@digitransit-component/digitransit-component-favourite-bar": "1.1.5",
+ "@digitransit-component/digitransit-component-favourite-editing-modal": "^1.1.5",
+ "@digitransit-component/digitransit-component-favourite-modal": "^1.0.3",
+ "@digitransit-component/digitransit-component-icon": "^1.0.0",
"@digitransit-component/digitransit-component-suggestion-item": "^1.1.4",
"@digitransit-component/digitransit-component-with-breakpoint": "^0.0.5"
},
diff --git a/sass/base/_helper-classes.scss b/sass/base/_helper-classes.scss
index bc77890d61..1db09baf50 100644
--- a/sass/base/_helper-classes.scss
+++ b/sass/base/_helper-classes.scss
@@ -16,8 +16,8 @@
.bus-express {
color: $bus-express-color;
}
-.tram-local {
- color: $tram-local-color;
+.speedtram {
+ color: $speedtram-color;
}
.map .call {
color: $white;
diff --git a/sass/themes/default/_theme.scss b/sass/themes/default/_theme.scss
index e8ae685138..5f54ea5c39 100644
--- a/sass/themes/default/_theme.scss
+++ b/sass/themes/default/_theme.scss
@@ -64,7 +64,7 @@ $nav-content-color: false;
$airplane-color: $livi-airplane-blue;
$bus-color: $livi-bus-blue;
$bus-express-color: $livi-bus-blue;
-$tram-local-color: $livi-tram-green;
+$speedtram-color: $livi-tram-green;
$tram-color: $livi-tram-green;
$metro-color: $livi-subway-orange;
$rail-color: $livi-rail-purple;
diff --git a/sass/themes/hsl/_theme.scss b/sass/themes/hsl/_theme.scss
index cbca2ecc37..5564fcee15 100644
--- a/sass/themes/hsl/_theme.scss
+++ b/sass/themes/hsl/_theme.scss
@@ -36,7 +36,7 @@ $top-bar-color: $primary-color;
$airplane-color: #0046ad;
$bus-color: $hsl-blue;
$bus-express-color: $hsl-bus-express;
-$tram-local-color: #007E79;
+$speedtram-color: #007E79;
$tram-color: $hsl-tram-green;
$metro-color: $hsl-metro-orange;
$rail-color: $hsl-rail-red;
diff --git a/sass/themes/matka/_theme.scss b/sass/themes/matka/_theme.scss
index 9c7aafe38d..c1cc0ee0df 100644
--- a/sass/themes/matka/_theme.scss
+++ b/sass/themes/matka/_theme.scss
@@ -24,7 +24,7 @@ $button-font-family: 'Montserrat', Arial, Georgia, sans-serif;
$bus-color: #007ac9;
$airplane-color: #0046ad;
$tram-color: #5E7921;
-$tram-local-color: #5E7921;
+$speedtram-color: #5E7921;
$metro-color: #CA4000;
$rail-color: #8c4799;
$ferry-color: #247C7B;
diff --git a/static/assets/svg-sprite.default.svg b/static/assets/svg-sprite.default.svg
index 0223dc3d0c..2dfcb8aff8 100644
--- a/static/assets/svg-sprite.default.svg
+++ b/static/assets/svg-sprite.default.svg
@@ -201,7 +201,7 @@
-
+
@@ -430,7 +430,7 @@
-
+
@@ -1164,7 +1164,7 @@
-
+
diff --git a/static/assets/svg-sprite.hsl.svg b/static/assets/svg-sprite.hsl.svg
index 3a2d6c993d..3e9c0859ff 100644
--- a/static/assets/svg-sprite.hsl.svg
+++ b/static/assets/svg-sprite.hsl.svg
@@ -92,7 +92,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
@@ -1149,7 +1149,7 @@
-
+
diff --git a/yarn.lock b/yarn.lock
index 17894527a6..3b2554380e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1822,12 +1822,12 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-autosuggest-panel@^2.0.8, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
+"@digitransit-component/digitransit-component-autosuggest-panel@^2.0.9, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel"
peerDependencies:
- "@digitransit-component/digitransit-component-autosuggest": ^1.9.12
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-autosuggest": ^1.9.13
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/sass": ^0.2.0
classnames: 2.2.6
i18next: ^19.3.3
@@ -1842,7 +1842,7 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-autosuggest@^1.9.12, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
+"@digitransit-component/digitransit-component-autosuggest@^1.9.13, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest"
dependencies:
@@ -1852,8 +1852,8 @@ __metadata:
"@hsl-fi/hooks": ^1.2.3
peerDependencies:
"@digitransit-component/digitransit-component-dialog-modal": ^0.3.4
- "@digitransit-component/digitransit-component-icon": ^0.2.2
- "@digitransit-component/digitransit-component-suggestion-item": ^1.1.4
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
+ "@digitransit-component/digitransit-component-suggestion-item": ^1.1.5
"@hsl-fi/sass": ^0.2.0
classnames: 2.2.6
i18next: ^19.3.3
@@ -1867,11 +1867,11 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-control-panel@^1.1.3, @digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel":
+"@digitransit-component/digitransit-component-control-panel@^1.1.4, @digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel"
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/sass": ~0.2.0
classnames: 2.2.6
i18next: ^19.3.3
@@ -1885,7 +1885,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-datetimepicker@workspace:digitransit-component/packages/digitransit-component-datetimepicker"
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
i18next: ^19.3.3
lodash: 4.17.21
lodash-es: 4.17.21
@@ -1913,14 +1913,14 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-favourite-bar@1.1.4, @digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar":
+"@digitransit-component/digitransit-component-favourite-bar@1.1.5, @digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar"
dependencies:
"@digitransit-search-util/digitransit-search-util-uniq-by-label": ^1.1.0
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
- "@digitransit-component/digitransit-component-suggestion-item": ^1.1.4
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
+ "@digitransit-component/digitransit-component-suggestion-item": ^1.1.5
"@hsl-fi/sass": ^0.2.0
"@hsl-fi/shimmer": 0.1.2
classnames: 2.2.6
@@ -1932,14 +1932,14 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-favourite-editing-modal@^1.1.4, @digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal":
+"@digitransit-component/digitransit-component-favourite-editing-modal@^1.1.5, @digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal"
dependencies:
"@digitransit-search-util/digitransit-search-util-uniq-by-label": ^1.1.0
peerDependencies:
"@digitransit-component/digitransit-component-dialog-modal": ^0.3.4
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/container-spinner": 0.3.1
"@hsl-fi/modal": ^0.3.1
"@hsl-fi/sass": ^0.2.0
@@ -1950,11 +1950,11 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-favourite-modal@^1.0.2, @digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal":
+"@digitransit-component/digitransit-component-favourite-modal@^1.0.3, @digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal"
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/modal": ^0.3.1
"@hsl-fi/sass": ^0.2.0
classnames: 2.2.6
@@ -1966,7 +1966,7 @@ __metadata:
languageName: unknown
linkType: soft
-"@digitransit-component/digitransit-component-icon@^0.2.2, @digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon":
+"@digitransit-component/digitransit-component-icon@^1.0.0, @digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon":
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon"
peerDependencies:
@@ -1982,7 +1982,7 @@ __metadata:
dependencies:
recompose: 0.30.0
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/sass": " ^0.2.0"
classnames: 2.2.6
i18next: ^19.3.3
@@ -1995,7 +1995,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component-traffic-now-link@workspace:digitransit-component/packages/digitransit-component-traffic-now-link"
peerDependencies:
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@hsl-fi/sass": ^0.2.0
i18next: ^19.3.3
prop-types: ^15.7.2
@@ -2019,13 +2019,13 @@ __metadata:
version: 0.0.0-use.local
resolution: "@digitransit-component/digitransit-component@workspace:digitransit-component/packages/digitransit-component"
dependencies:
- "@digitransit-component/digitransit-component-autosuggest": ^1.9.12
- "@digitransit-component/digitransit-component-autosuggest-panel": ^2.0.8
- "@digitransit-component/digitransit-component-control-panel": ^1.1.3
- "@digitransit-component/digitransit-component-favourite-bar": 1.1.4
- "@digitransit-component/digitransit-component-favourite-editing-modal": ^1.1.4
- "@digitransit-component/digitransit-component-favourite-modal": ^1.0.2
- "@digitransit-component/digitransit-component-icon": ^0.2.2
+ "@digitransit-component/digitransit-component-autosuggest": ^1.9.13
+ "@digitransit-component/digitransit-component-autosuggest-panel": ^2.0.9
+ "@digitransit-component/digitransit-component-control-panel": ^1.1.4
+ "@digitransit-component/digitransit-component-favourite-bar": 1.1.5
+ "@digitransit-component/digitransit-component-favourite-editing-modal": ^1.1.5
+ "@digitransit-component/digitransit-component-favourite-modal": ^1.0.3
+ "@digitransit-component/digitransit-component-icon": ^1.0.0
"@digitransit-component/digitransit-component-suggestion-item": ^1.1.4
"@digitransit-component/digitransit-component-with-breakpoint": ^0.0.5
peerDependencies: