Merge pull request #12 from julianrojas87/dev

Adjust quiet route checking
julianrojas87 · Nov 25, 2020 · 12c5e39 · 12c5e39
2 parents fb62245 + 10fc272
commit 12c5e39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/RoutesInfo.js b/src/components/RoutesInfo.js
@@ -65,7 +65,7 @@ export class RoutesInfo extends Component {
 
 
     formatValues = values => {
-        if (values) {
+        if (values || values === false) {
             const res = [];
             if (Array.isArray(values)) {
                 for (const v of values) {

diff --git a/src/utils/Utils.js b/src/utils/Utils.js
@@ -480,12 +480,13 @@ function checkCompatibility(t, vehicle, store, includesVehicle) {
     }
 
     // Noise restrictions
-    const nrs = track[ERA.isQuiteRoute] && vehicle[ERA.operationalRestriction] === 'http://era.europa.eu/concepts/restrictions#2.2.7';
+    const nrs = track['http://era.europa.eu/ns#isQuietRoute'] === 'true' 
+        && vehicle[ERA.operationalRestriction] !== 'http://era.europa.eu/concepts/restrictions#2.7.7';
     report[ERA.operationalRestriction] = {
         predicates: [ERA.operationalRestriction, ERA.isQuiteRoute],
         compatible: nrs,
         values: {
-            track: track[ERA.isQuiteRoute],
+            track: track['http://era.europa.eu/ns#isQuietRoute'],
             vehicle: vehicle[ERA.operationalRestriction]
         }
     }