    "Lpep_dropoff_datetime"   [:basic-datetime  :dropoff-dt]
    "Store_and_fwd_flag"      [:keyword         :store-flag]
    "RateCodeID"              [:int             :rate-code-id]
-   "Pickup_longitude"        [:latlon          :pickup-lon      :skip-in-es]
-   "Pickup_latitude"         [:latlon          :pickup-lat      :skip-in-es]
-   "Dropoff_longitude"       [:latlon          :dropoff-lon     :skip-in-es]
-   "Dropoff_latitude"        [:latlon          :dropoff-lat     :skip-in-es]
+   "Pickup_longitude"        [:latlon          :pickup-lon]
+   "Pickup_latitude"         [:latlon          :pickup-lat]
+   "Dropoff_longitude"       [:latlon          :dropoff-lon]
+   "Dropoff_latitude"        [:latlon          :dropoff-lat]
    "Passenger_count"         [:int             :n-passengers]
    "Trip_distance"           [:float           :travel-km]
    "Fare_amount"             [:float           :paid-fare]

                                                  (if (pos? delta) delta (+ delta 24))))))))
             ;(update :pickup-time  to-int-str)
             ;(update :dropoff-time to-int-str)
              (#(assoc % :speed-kmph (if-let [travel-h (:travel-h %)] (round (/ (:travel-km %) travel-h)))))
              (#(if (< (dist (:dlat-km %) (:dlon-km %)) 0.2) (reduce dissoc % [:dlat-km :dlon-km]) %))
              drop-fields)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

   "Trip_type"               [:keyword         :trip-type]
   "Extra"                   nil
   
   ; These are generated, not part of CSV
   :company      [:keyword  :company]
   :pickup-pos   [:geopoint :pickup-pos]
   :dropoff-pos  [:geopoint :dropoff-pos]
   :dlat-km      [:float    :dlat-km]
