Merge pull request #419 from opentripplanner/fix-vehicle-overlay

Bump vehicle overlay/base map

Author: landonreed

Diff for: lib/components/narrative/narrative-itineraries-errors.js

@@ -24,12 +24,13 @@ const IssueContents = styled.div`
 
 export default function NarrativeItinerariesErrors ({ errorMessages, errors }) {
   return errors.map((error, idx) => {
-    let icon
+    let icon = <Icon className='text-warning' type='exclamation-triangle' />
     if (error.network) {
       const CompanyIcon = getCompanyIcon(error.network)
-      icon = <CompanyIcon />
-    } else {
-      icon = <Icon className='text-warning' type='exclamation-triangle' />
+      // check if company icon exists to avoid rendering undefined
+      if (CompanyIcon) {
+        icon = <CompanyIcon />
+      }
     }
     return (
       <IssueContainer key={idx}>

Diff for: lib/util/state.js

@@ -471,20 +471,22 @@ export const getTransitiveData = createSelector(
   getOtpResponse,
   itineraryResponseExists,
   getItineraryToRender,
+  state => state.otp.config.companies,
   (state, props) => props.getTransitiveRouteLabel,
   (
     hasResponse,
     otpResponse,
     hasItineraryResponse,
     itineraryToRender,
+    companies,
     getTransitiveRouteLabel
   ) => {
     if (hasResponse) {
       if (hasItineraryResponse) {
         return itineraryToRender
           ? coreUtils.map.itineraryToTransitive(
             itineraryToRender,
-            null,
+            companies,
             getTransitiveRouteLabel
           )
           : null

Diff for: package.json

@@ -32,7 +32,7 @@
   "homepage": "https://github.com/opentripplanner/otp-react-redux#readme",
   "dependencies": {
     "@auth0/auth0-react": "^1.1.0",
-    "@opentripplanner/base-map": "^1.0.5",
+    "@opentripplanner/base-map": "^1.1.0",
     "@opentripplanner/core-utils": "^3.2.2",
     "@opentripplanner/endpoints-overlay": "^1.0.6",
     "@opentripplanner/from-to-location-picker": "^1.0.4",
@@ -52,7 +52,7 @@
     "@opentripplanner/trip-details": "^1.1.4",
     "@opentripplanner/trip-form": "^1.0.5",
     "@opentripplanner/trip-viewer-overlay": "^1.0.4",
-    "@opentripplanner/vehicle-rental-overlay": "^1.0.6",
+    "@opentripplanner/vehicle-rental-overlay": "^1.1.2",
     "blob-stream": "^0.1.3",
     "bootstrap": "^3.3.7",
     "bowser": "^1.9.3",

Diff for: yarn.lock

@@ -1545,30 +1545,15 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@opentripplanner/base-map@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-1.0.5.tgz#b4f92e4e848f340e30b1ed5c6d3a2338d6b8e017"
-  integrity sha512-4Ra/BPWV0laCiYLuqEPZaI5xQtfNbYbPl8bcysoD82m1ED3uqS/b8CW7i14ZsVVdfoXOZoI3b6QVAXfPzfxM1A==
+"@opentripplanner/base-map@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/base-map/-/base-map-1.1.0.tgz#7426c1f68db4e11e6e36f27a4ca34a88964e0392"
+  integrity sha512-tSPSfzv92IaS3LLWUQfsDSSOE6PyCrccMmungfZwbfbeZFgflNTT9Z5WS/Jju6KEbPJKI8NRX6Qi8/DI5ZWXOg==
   dependencies:
     "@opentripplanner/core-utils" "^3.0.4"
     prop-types "^15.7.2"
 
-"@opentripplanner/core-utils@^3.0.0", "@opentripplanner/core-utils@^3.0.4", "@opentripplanner/core-utils@^3.1.1", "@opentripplanner/core-utils@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-3.2.2.tgz#5d39b6a16670e7818cbe1a8784d26a6f9699bb4e"
-  integrity sha512-+mmIWbvAtVEfU5lJnxs+3/qxJqhZqJne1kpeobK3Do1pqMXIHs0MVY1cZjd2/SpjXoQy+BYBZUnJmbjgDOdY/w==
-  dependencies:
-    "@mapbox/polyline" "^1.1.0"
-    "@opentripplanner/geocoder" "^1.0.2"
-    "@turf/along" "^6.0.1"
-    bowser "^2.7.0"
-    lodash.isequal "^4.5.0"
-    moment "^2.24.0"
-    moment-timezone "^0.5.27"
-    prop-types "^15.7.2"
-    qs "^6.9.1"
-
-"@opentripplanner/core-utils@^3.2.1", "@opentripplanner/core-utils@^3.2.2":
+"@opentripplanner/core-utils@^3.0.0", "@opentripplanner/core-utils@^3.0.4", "@opentripplanner/core-utils@^3.1.1", "@opentripplanner/core-utils@^3.2.1", "@opentripplanner/core-utils@^3.2.2":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-3.2.2.tgz#5d39b6a16670e7818cbe1a8784d26a6f9699bb4e"
   integrity sha512-+mmIWbvAtVEfU5lJnxs+3/qxJqhZqJne1kpeobK3Do1pqMXIHs0MVY1cZjd2/SpjXoQy+BYBZUnJmbjgDOdY/w==
@@ -1757,10 +1742,10 @@
     "@opentripplanner/core-utils" "^3.0.4"
     prop-types "^15.7.2"
 
-"@opentripplanner/vehicle-rental-overlay@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/vehicle-rental-overlay/-/vehicle-rental-overlay-1.0.6.tgz#95f894181070c64fa176918cd6a6dd6b122e3d19"
-  integrity sha512-Ued2Q1S0CT5ZHDAYtO+B1rqX0p63KdFN6noDshaDtHc3y37XYQuI6mzFTUrkkRDRlWWOxu8qDB1ZdSYj5tJCKw==
+"@opentripplanner/vehicle-rental-overlay@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/vehicle-rental-overlay/-/vehicle-rental-overlay-1.1.2.tgz#04c670da35205c94786118cd5a8610190c26d71c"
+  integrity sha512-d36c79zj37Y9M+gDW5fE7RU3nVlGh68mIaKxAU3zlqY/jDsPHMjMltp+KRJwAhFVV19vnfMzriqjU6epRqBhwQ==
   dependencies:
     "@opentripplanner/core-utils" "^3.0.4"
     "@opentripplanner/from-to-location-picker" "^1.0.3"