           (om/set-state! owner :google-directions-service google-directions-service)
           (gen-new-renderers owner transit-journey show-vehicle-icons)
           (gen-new-markers owner transit-journey)
-          (fit-map-to-markers (om/get-state owner :google-map) (om/get-state owner :all-markers)))))
+          (if (valid-journey? journey)
+            (fit-map-to-markers (om/get-state owner :google-map) (om/get-state owner :all-markers))))))
 
     ;; recompute the route upon journey update
     om/IDidUpdate

                                                              {:edit-key :address
                                                               :coords-key :coords
                                                               :className "address-fields" ;; TODO - rename className -> class
                                                               :placeholder-text "End address"}])]]]
              [:div {:class "inline fields"}
               [:div {:class "sixteen wide field"}
                [:div {:class "ui fluid input time-input"}
                 (om/build inputs/datetime-picker-input [(-> journey :start-place)
                                                         {:edit-key :time
                                                          :coords-key :coords
                                                          :className "time-fields" ;;TODO - rename className -> class
                                                          :placeholder-text "Start time"}])]
                [:div {:class "ui fluid input time-input"}
                 (om/build inputs/datetime-picker-input [(-> journey :start-place)
                                                         {:edit-key :time
                                                          :coords-key :coords
                                                          :className "time-fields" ;;TODO - rename className -> class
                                                          :placeholder-text "End time"}])]]]]]))))


;; Functions for the map view.

              [:div {:class "ui fourteen wide column row basic segment final-directions"}
               [:div {:class "fourteen wide column"}
                (om/build attraction-map-view [current-city journey transit-journey true])
                (if (valid-journey? journey)
                  (om/build attraction-map-legend-view transit-journey))]]
              [:div {:class "ui fourteen wide column row basic segment final-directions"}
               [:div {:class "fourteen wide column"}
                (if (valid-journey? journey)
                  (om/build transit-view transit-journey))]]]]))))
