Merge pull request #13 from julianrojas87/dev

Fix quiet route predicate + bigger ERA logo
julianrojas87 · Nov 25, 2020 · 12cf19e · 12cf19e
2 parents 12c5e39 + 027a952
commit 12cf19e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/components/MainLayout.js b/src/components/MainLayout.js
@@ -601,7 +601,7 @@ class MainLayout extends Component {
                                 <div style={eraLogoWrapper}><ERALogo src={eraLogoPath}></ERALogo></div>
                                 <div style={sidebarHeader}>
                                     <Icon icon="logo-analytics" size="lg" style={{ verticalAlign: 0 }} />
-                                    <span style={{ marginLeft: 12 }}>ERA Route Compatibility Check</span>
+                                    <span style={{ marginLeft: 12 }}>Route Compatibility Check</span>
                                 </div>
                             </Sidenav.Header>
 

diff --git 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
@@ -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
@@ -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]
         }
     }