Merge pull request #121 from bcgov/qa

Update to 0.0.20

Author: dkelsey

config/layer-display.json

@@ -36,7 +36,7 @@
                     ]
                 },
                 {
-                    "id": "dangerous-goods-routes",
+                    "id": "dangerous-goods-restrictions",
                     "class": "smk-inline-legend",
                     "isVisible": false
                 },
@@ -64,7 +64,7 @@
                 { 
                     "type": "folder",
                     "title": "Height Restrictions",
-                    "isVisible": false,
+                    "isVisible": true,
                     "isExpanded": true,
                     "items": [                
                         { "id": "overhead-structure-with-height-marker", "isVisible": true, "class": "smk-inline-legend" },
@@ -83,7 +83,7 @@
                         { "id": "cardlock", "isVisible": false, "class": "smk-inline-legend" },
                         { "id": "truck-parking", "isVisible": false, "class": "smk-inline-legend" },
                         { "id": "port-of-vancouver-facilities-terminals", "isVisible": false, "class": "smk-inline-legend" },
-                        { "id": "industrial-area", "isVisible": false, "class": "smk-inline-legend" },
+                        { "id": "industrial-area", "isVisible": true, "class": "smk-inline-legend" },
                         { "id": "downtown-vancouver", "isVisible": false, "class": "smk-inline-legend" },
                         {
                             "type": "group",

config/map.json

@@ -109,8 +109,19 @@
           "truckRoute": false,
           "vehicleType": false
       },
-      "apiKey": "11dd756f680c47b5aef5093d95543738",
+      "routePlannerService": {
+        "url": "https://router.api.gov.bc.ca/",
+        "apiKey": "11dd756f680c47b5aef5093d95543738"
+      },
+      "geocoderService": {
+        "url": "https://geocoder.api.gov.bc.ca/",
+        "parameter": {
+          "maxDistance": 50,
+          "locationMode": "input"
+        }
+      },
       "truck": true,
+      "criteria": "fastest",
       "segmentLayers": [
         {
             "id": "@potential",
@@ -201,7 +212,8 @@
       "position": "toolbar",
       "title": "Reports and Notices",
       "icon": "warning",
-      "order": 99
+      "order": 99,
+      "useComponent": true
     }
   ]
 }

config/test-services.json

@@ -0,0 +1,19 @@
+{
+  "tools": [
+    {
+      "type": "directions",
+      "routePlannerService": {
+        "# url": "https://ssl.refractions.net/ols/router/",
+        "url": "https://routertst.pathfinder.gov.bc.ca/",
+        "apiKey": "11dd756f680c47b5aef5093d95543738"
+      },
+      "geocoderService": {
+        "url": "https://geocodertst.api.gov.bc.ca/",
+        "parameter": {
+          "maxDistance": 50,
+          "locationMode": "input"
+        }
+      }
+    }
+  ]
+}

fragments/disclaimer.html

@@ -5,15 +5,18 @@ <h1><span class="translink-logo"></span>Truck Route Planner</h1>
 
     <section>
         <p>
-            This website (the Truck Route Planner (TRP) Beta) and all of the information it contains are provided "as is" without warranty of any kind, whether express or implied. 
+            This website (the Truck Route Planner (TRP)) and all of the information it contains are provided "as is" without warranty of any kind, whether express or implied.
             All implied warranties, including, without limitation, implied warranties of merchantability, fitness for a particular purpose, and non-infringement, are hereby expressly disclaimed.
         </p>
         <p>
-            Links and references to any other websites are provided for information only and listing shall not be taken as endorsement of any kind. 
-            TransLink is not responsible for the content or reliability of the linked websites and does not endorse the content, products, services or views expressed within them.
+            Links and references to any other websites are provided for information only and listing shall not be taken as endorsement of any kind.
+            TransLink or any of its partners or stakeholders (including, without limitation, the Province of BC) are not responsible for the content or reliability of the linked websites and do not endorse the content, products, services or views expressed within them.
+        </p>
+        <p>    
+            Under no circumstances will TransLink or any of its partners or stakeholders (including, without limitation, the Province of BC) be liable to any person or business entity for any direct, indirect, special, incidental, consequential, or other damage based on any use of this website or any other website to which this site is linked, including, without limitation, any lost profits, business interruption, or loss of programs or information, even if TransLink or any of its partners or stakeholders (including, without limitation, the Province of BC) have been specifically advised.
         </p>
         <p>
-            Under no circumstances will TransLink be liable to any person or business entity for any direct, indirect, special, incidental, consequential, or other damage based on any use of this website or any other website to which this site is linked, including, without limitation, any lost profits, business interruption, or loss of programs or information, even if TransLink has been specifically advised.
+            TransLink and the Province of BC, in their sole discretion, may at any time without notice revise the content and features of this website and the terms and conditions of its use, or terminate this website at any time, for any reason, without any notice and without any liability to any person or business entity.
         </p>
         <img src="images/no_mobile_icon.svg" class="warningImage" alt="Graphic warning to discourage using mobile devices">
         <p>

fragments/glossary.html

@@ -12,5 +12,10 @@
             A route, or a portion of a route, that may not comply with municipal truck route bylaws and may not be suitable for a vehicle with the default or user-entered vehicle parameters. 
             The driver and/or carrier is responsible for ensuring the default vehicle parameters or user-entered vehicle parameters are an accurate representation of the actual vehicle, for verifying all clearances and restrictions on the route, and for ensuring the vehicle is operated in compliance with all applicable municipal bylaws and provincial and federal regulations.                        
         </dd>
+
+        <dt>Heavy Truck</dt>
+        <dd>
+            A motor vehicle with a licensed gross vehicle weight (LGVW) greater than 11,794 kg (26,000 lb).
+        </dd>
     </dl>
 </section>

fragments/report-direction-notification.html

@@ -1,4 +1,4 @@
 <p>
     <span>{{ direction.name || direction.text }}, {{ segment.locality }}:</span>
-    <span v-html="notification.message"></span>
+    <span v-html="message"></span>
 </p>

fragments/report-not-heavy-truck.html

@@ -1,12 +1,8 @@
-<template v-if="municipalities.length > 0">
+<div v-if="municipalities.length > 0">
     <p>
         Based on the GVW and axle count, your vehicle is not considered to be a heavy truck in the following municipalities: 
     </p>
     <ul class="municipalities">
         <li v-for="muni in municipalities">{{ muni }}</li>
     </ul> 
-    <p>
-        The driver and/or carrier is responsible for ensuring the default vehicle parameters or user-entered vehicle parameters are an accurate representation of the actual vehicle, for verifying all clearances and restrictions on the route, and for ensuring the vehicle is operated in compliance with all applicable municipal bylaws and provincial and federal regulations. 
-        <a href="[LINK to Municipal and Provincial contact information]">LINK to Municipal and Provincial contact information</a>
-    </p>
-</template>
+</div>

fragments/report-oversize.html

@@ -0,0 +1,9 @@
+<div>
+    <p>
+        Based on the vehicle parameters you entered, you may require a municipal and/or Provincial permit to operate this vehicle. 
+        The driver and/or carrier is responsible for ensuring the default vehicle parameters or user-entered vehicle parameters are an accurate representation of the actual vehicle, for verifying all clearances and restrictions on the route, and for ensuring the vehicle is operated in compliance with all applicable municipal bylaws and provincial and federal regulations. 
+    </p>
+    <p>
+        <activate-tool id="bespoke--contacts" title="Link to Municipal and Provincial contact information">Municipal and Provincial contact information</activate-tool>
+    </p>
+</div>

fragments/report-truck.html

@@ -0,0 +1,8 @@
+<div>
+    <p>
+        The driver and/or carrier is responsible for ensuring the default vehicle parameters or user-entered vehicle parameters are an accurate representation of the actual vehicle, for verifying all clearances and restrictions on the route, and for ensuring the vehicle is operated in compliance with all applicable municipal bylaws and provincial and federal regulations.        
+    </p>
+    <p>
+        <activate-tool id="bespoke--contacts" title="Link to Municipal and Provincial contact information">Municipal and Provincial contact information</activate-tool>
+    </p>
+</div>

fragments/reports.html

@@ -1,8 +1,7 @@
 <section class="trp-reports">
     <div class="trp-report" 
-        v-bind:class="[ r.type ]"
         v-for="r in reports"
-        v-if="r.message"
-        v-html="r.message"
+        v-bind:class="[ r.type ]"
+        v-bind:is="r.component"
     ></div>
 </section>

index.html

@@ -136,7 +136,8 @@ <h3 id="package-build-date" title="?">
             'smk-container-sel': "#smk-map-frame",
             'smk-config': [ 
                 './layers/cardlock/config.json',
-                './layers/dangerous-goods-routes/config.json',
+                // './layers/dangerous-goods-routes/config.json',
+                './layers/dangerous-goods-restrictions/config.json',
                 './layers/downtown-vancouver/config.json',
                 './layers/industrial-area/config.json',
                 './layers/inspection-station/config.json',
@@ -227,8 +228,8 @@ <h3 id="package-build-date" title="?">
                         el: el,
                         data: {
                             vehicleTypes: JSON.parse( JSON.stringify( TRP.vehicleTypes ) ), 
-                            vehicleIndex: null,
-                            configIndex: null,
+                            vehicleIndex: tool.trp && tool.trp.vehicleIndex,
+                            configIndex: tool.trp && tool.trp.configIndex,
                         },
                         computed: {
                             vehicleStyle: function () {
@@ -266,24 +267,36 @@ <h3 id="package-build-date" title="?">
                                 tool.truckWeight = config.weight
                                 tool.oversize = config.oversize 
 
+                                tool.trp = {
+                                    vehicleIndex: this.vehicleIndex,
+                                    configIndex: this.configIndex
+                                }
+
                                 Vue.nextTick( function () {
                                     smk.$tool[ 'directions' ].findRoute()
                                 } )
                             },
                         }
                     } )
 
-                    vm.selectVehicle( 0 )
+                    if ( !tool.trp ) {
+                        vm.selectVehicle( 0 )
+                    }
 
                     smk.on( tool.id, {
                         'change': function ( ev ) {
                             var config = vm.$data.vehicleTypes[ vm.$data.vehicleIndex ].configs[ vm.$data.configIndex ]
-
+                            
                             tool.oversize = config.oversize 
                                         || config.height < tool.truckHeight
                                         || config.width < tool.truckWidth
                                         || config.length < tool.truckLength
                                         || config.weight < tool.truckWeight
+
+                            tool.trp = {
+                                vehicleIndex: vm.$data.vehicleIndex,
+                                configIndex: vm.$data.configIndex
+                            }
                         }
                     } )
                 } )
@@ -308,7 +321,8 @@ <h3 id="package-build-date" title="?">
                         if ( !reports || reports.length == 0 ) return
 
                         smk.$tool[ 'bespoke--reports' ].status = 'ready'
-                        routingReports = response.reports = reports
+                        response.reports = JSON.parse( JSON.stringify( reports ) )
+                        routingReports = reports
                     } )
                 }
             } )
@@ -334,9 +348,17 @@ <h3 id="package-build-date" title="?">
             SMK.HANDLER.set( 'bespoke--reports', 'activated', function ( smk, tool, el ) {
                 // debugger
                 include( [ { url: './fragments/reports.html' }, { url: './fragments/reports.css' } ], 'bespoke--reports' ).then( function ( inc ) {
-                    el.innerHTML = htmlTemplate( inc[ 'bespoke--reports.reports-html' ], {
-                        reports: routingReports 
-                    } )
+                    tool.component = {
+                        template: inc[ 'bespoke--reports.reports-html' ],
+                        data: function () {
+                            return {
+                                reports: routingReports.map( function ( r ) {
+                                    r.component.data = function () { return r.component.dataObj }
+                                    return r
+                                } ) 
+                            }
+                        }
+                    } 
                 } ) 
             } )
 
@@ -346,6 +368,7 @@ <h3 id="package-build-date" title="?">
         function htmlTemplate( template, data ) {
             return ( new Vue( { template: '<div>' + template + '</div>', data: data } ) ).$mount().$el.innerHTML
         }
+        
     </script>