From 027a952187c2ea92daec6e1821c992f7c09dfa63 Mon Sep 17 00:00:00 2001 From: Julian Rojas Date: Wed, 25 Nov 2020 20:51:00 +0100 Subject: [PATCH] Fix quiet route predicate + bigger ERA logo --- src/components/MainLayout.js | 2 +- src/styles/Styles.js | 6 +++--- src/utils/NameSpaces.js | 2 +- src/utils/Utils.js | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/MainLayout.js b/src/components/MainLayout.js index 91a522f..3fc3b89 100644 --- a/src/components/MainLayout.js +++ b/src/components/MainLayout.js @@ -601,7 +601,7 @@ class MainLayout extends Component {
- ERA Route Compatibility Check + Route Compatibility Check
diff --git a/src/styles/Styles.js b/src/styles/Styles.js index a5e789b..f4fed38 100644 --- a/src/styles/Styles.js +++ b/src/styles/Styles.js @@ -15,8 +15,8 @@ export { }; export const ERALogo = styled.img` - width: 80px; - height: 50px; + width: 115px; + height: 70px; z-index: 9000; `; @@ -80,7 +80,7 @@ export const sideBar = { export const sidebarHeader = { padding: 18, fontSize: 22, - height: 56, + height: 70, background: '#004494', color: ' #fff', whiteSpace: 'nowrap', diff --git a/src/utils/NameSpaces.js b/src/utils/NameSpaces.js index 3071667..a0c51d4 100644 --- a/src/utils/NameSpaces.js +++ b/src/utils/NameSpaces.js @@ -53,7 +53,7 @@ export const ERA = { vehicleSeries: 'http://era.europa.eu/ns#vehicleSeries', vehicleNumber: 'http://era.europa.eu/ns#vehicleNumber', vehicleType: 'http://era.europa.eu/ns#vehicleType', - isQuiteRoute: 'http://era.europa.eu/ns#isQuiteRoute', + isQuietRoute: 'http://era.europa.eu/ns#isQuietRoute', operationalRestriction: 'http://era.europa.eu/ns#operationalRestriction' } diff --git a/src/utils/Utils.js b/src/utils/Utils.js index c7647f4..edb4555 100644 --- a/src/utils/Utils.js +++ b/src/utils/Utils.js @@ -480,13 +480,13 @@ function checkCompatibility(t, vehicle, store, includesVehicle) { } // Noise restrictions - const nrs = track['http://era.europa.eu/ns#isQuietRoute'] === 'true' + const nrs = track[ERA.isQuietRoute] === 'true' && vehicle[ERA.operationalRestriction] !== 'http://era.europa.eu/concepts/restrictions#2.7.7'; report[ERA.operationalRestriction] = { - predicates: [ERA.operationalRestriction, ERA.isQuiteRoute], + predicates: [ERA.operationalRestriction, ERA.isQuietRoute], compatible: nrs, values: { - track: track['http://era.europa.eu/ns#isQuietRoute'], + track: track[ERA.isQuietRoute], vehicle: vehicle[ERA.operationalRestriction] } }