Merge pull request #90 from opentripplanner/dev

Patch release
opentripplanner · Jul 31, 2019 · 1998f84 · 1998f84
2 parents 47321e4 + e11b92f
commit 1998f84
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -9,6 +9,11 @@
   </head>
   <body>
     <div id="root"></div>
-    <script src="dist/index.js"></script>
+    <!--
+      Only one of the following js files is needed. For development
+      use example.js. For production use dist/index.js.
+    -->
+    <!-- <script src="dist/index.js"></script> -->
+    <script src="/example.js"></script>
   </body>
 </html>
diff --git a/lib/components/viewers/stop-viewer.js b/lib/components/viewers/stop-viewer.js
@@ -13,6 +13,7 @@ import { setMainPanelContent, toggleAutoRefresh } from '../../actions/ui'
 import { findStop, findStopTimesForStop } from '../../actions/api'
 import { forgetStop, rememberStop, setLocation } from '../../actions/map'
 import { routeComparator } from '../../util/itinerary'
+import { getShowUserSettings } from '../../util/state'
 import { formatDuration, formatStopTime, getTimeFormat } from '../../util/time'
 
 class StopViewer extends Component {
@@ -110,9 +111,10 @@ class StopViewer extends Component {
 
   render () {
     const {
-      stopData,
       hideBackButton,
       homeTimezone,
+      showUserSettings,
+      stopData,
       stopViewerArriving,
       timeFormat
     } = this.props
@@ -166,17 +168,20 @@ class StopViewer extends Component {
               ? <span>{stopData.name}</span>
               : <span>Loading Stop...</span>
             }
-            <Button
-              onClick={this._toggleFavorite}
-              bsSize='large'
-              style={{
-                color: this._isFavorite() ? 'yellow' : 'black',
-                padding: 0,
-                marginLeft: '5px'
-              }}
-              bsStyle='link'>
-              <Icon type={this._isFavorite() ? 'star' : 'star-o'} />
-            </Button>
+            {showUserSettings
+              ? <Button
+                onClick={this._toggleFavorite}
+                bsSize='large'
+                style={{
+                  color: this._isFavorite() ? 'yellow' : 'black',
+                  padding: 0,
+                  marginLeft: '5px'
+                }}
+                bsStyle='link'>
+                <Icon type={this._isFavorite() ? 'star' : 'star-o'} />
+              </Button>
+              : null
+            }
           </div>
           <div style={{ clear: 'both' }} />
         </div>
@@ -376,7 +381,11 @@ class PatternRow extends Component {
 
 const ONE_HOUR_IN_SECONDS = 3600
 
-function getHomeTime (homeTimezone) {
+/**
+ * @param  {string} [homeTimezone='America/New_York'] Timezone string
+ * @return {number} Current time in home timezone in seconds since midnight
+ */
+function getHomeTime (homeTimezone = 'America/New_York') {
   const now = moment()
   return now.tz(homeTimezone).diff(now.clone().startOf('day'), 'seconds')
 }
@@ -475,11 +484,13 @@ function getStatusLabel (delay) {
 // connect to redux store
 
 const mapStateToProps = (state, ownProps) => {
+  const showUserSettings = getShowUserSettings(state.otp)
   return {
     autoRefreshStopTimes: state.otp.user.autoRefreshStopTimes,
     favoriteStops: state.otp.user.favoriteStops,
     homeTimezone: state.otp.config.homeTimezone,
     viewedStop: state.otp.ui.viewedStop,
+    showUserSettings,
     stopData: state.otp.transitIndex.stops[state.otp.ui.viewedStop.stopId],
     stopViewerArriving: state.otp.config.language.stopViewerArriving,
     timeFormat: getTimeFormat(state.otp.config)