Deployment 1.1.6

Deployment 1.1.6 (duplicated commits by accident - shouldnt affect any code or git blames)

Author: avicarie

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsl-map-publisher",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "HSL Map Publisher",
   "main": "index.js",
   "scripts": {

src/components/inlineSVG.js

@@ -1,28 +1,7 @@
-import React from 'react';
+import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
 
-const getIframeStyle = (src, fitToSize) => {
-  let style = { border: 'none', height: '100%', width: '100%' };
-
-  if (!fitToSize) return style;
-
-  const parser = new DOMParser();
-  const doc = parser.parseFromString(src, 'image/svg+xml');
-  const svg = doc.querySelector('svg');
-
-  if (!svg) return style;
-
-  const width = svg.getAttribute('width') || (svg.viewBox?.baseVal?.width ?? null);
-  const height = svg.getAttribute('height') || (svg.viewBox?.baseVal?.height ?? null);
-
-  if (!width || !height) return style;
-
-  style = { ...style, width: `${width}px`, height: `${height}px` };
-  return style;
-};
-
-const InlineSVG = ({ src, fitToSize = false, ...otherProps }) => {
-  const iframeStyle = getIframeStyle(src, fitToSize);
+const InlineSVG = ({ src, ...otherProps }) => {
   return (
     <div
       // eslint-disable-next-line react/no-danger
@@ -34,11 +13,6 @@ const InlineSVG = ({ src, fitToSize = false, ...otherProps }) => {
 
 InlineSVG.propTypes = {
   src: PropTypes.string.isRequired,
-  fitToSize: PropTypes.bool,
-};
-
-InlineSVG.defaultProps = {
-  fitToSize: false,
 };
 
 export default InlineSVG;

src/components/lineTimetable/lineTimetable.js

@@ -236,7 +236,8 @@ RouteDepartures.propTypes = {
 
 const checkForTrainRoutes = routes => {
   return routes.map(route => {
-    if (route.mode === 'RAIL') {
+    const { mode } = route;
+    if (mode === 'RAIL' || mode === 'SUBWAY') {
       return { ...route, routeIdParsed: shortenTrainParsedLineId(route.routeIdParsed) };
     }
     return route;

src/components/lineTimetable/lineTimetableContainer.js

@@ -294,7 +294,7 @@ const hoc = compose(
       // Fetch all variants
       const lineId = String(props.lineId || '')
         .trim()
-        .replace(/^(\d+)[A-Za-z]+$/, '$1');
+        .replace(/^([\dM]+)[A-Za-z]+$/, '$1');
 
       return {
         variables: {

src/components/map/stopMap.js

@@ -51,7 +51,6 @@ const LocationSymbol = props => (
 
 const getSalesPointIcon = type => (
   <InlineSVG
-    fitToSize
     src={type.toLowerCase() === 'myyntipiste' ? ticketSalesPointIcon : ticketMachineIcon}
   />
 );

src/components/stopPoster/adContainer.js

@@ -66,7 +66,7 @@ class AdContainer extends Component {
           this.root = ref;
         }}>
         {ads.slice(0, this.state.spaces).map((src, i) => (
-          <InlineSVG key={i} style={iconStyle} src={src} fitToSize />
+          <InlineSVG key={i} style={iconStyle} src={src} />
         ))}
       </div>
     );

src/components/stopPoster/stopPoster.js

@@ -238,14 +238,7 @@ class StopPoster extends Component {
       }
 
       if (this.state.hasColumnTimetable) {
-        this.setState({
-          hasColumnTimetable: false,
-        });
-        return;
-      }
-
-      if (this.state.hasRoutes) {
-        this.setState({ hasRoutes: false });
+        this.setState({ hasColumnTimetable: false });
         return;
       }
 
@@ -276,6 +269,11 @@ class StopPoster extends Component {
         return;
       }
 
+      if (this.state.hasRoutes) {
+        this.setState({ hasRoutes: false });
+        return;
+      }
+
       this.onError('Failed to remove layout overflow');
       return;
     }
@@ -285,9 +283,11 @@ class StopPoster extends Component {
       return;
     }
 
-    if (this.state.template && this.state.removedAds.length > 0) {
-      const { template } = this.state;
-      const svg = get(template, 'areas', []).find(t => t.key === 'map').slots[0];
+    const { template } = this.state;
+    const mapTemplateArea = get(template, 'areas', []).find(t => t.key === 'map');
+
+    if (template && this.state.removedAds.length > 0 && mapTemplateArea) {
+      const svg = mapTemplateArea.slots[0];
       //  If using svg postpone adsPhase untill we have mapHeight.
       if (!svg.image) {
         this.setState({ adsPhase: true });