diff --git a/app/src/main/java/it/reyboz/bustorino/backend/gtfs/LivePositionUpdate.kt b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/LivePositionUpdate.kt
index d6728e5..4f304a5 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/gtfs/LivePositionUpdate.kt
+++ b/app/src/main/java/it/reyboz/bustorino/backend/gtfs/LivePositionUpdate.kt
@@ -1,66 +1,71 @@
 /*
 	BusTO  - Backend components
     Copyright (C) 2023 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.backend.gtfs
 
 import com.google.transit.realtime.GtfsRealtime.VehiclePosition
 
 /**
  * General data class for the live position update
  * Used in both the GTFS and MaTO services
  */
 data class LivePositionUpdate(
     val tripID: String, //tripID WITHOUT THE "gtt:" prefix
     val startTime: String?,
     val startDate: String?,
     val routeID: String, // routeID DOES NOT HAVE THE "gtt:" PREFIX
     val vehicle: String,
 
     var latitude: Double,
     var longitude: Double,
     var bearing: Float?,
     //the timestamp IN SECONDS
     val timestamp: Long,
 
     val nextStop: String?,
 
     /*val vehicleInfo: VehicleInfo,
     val occupancyStatus: OccupancyStatus?,
     val scheduleRelationship: ScheduleRelationship?
      */
     //var tripInfo: TripAndPatternWithStops?,
 ){
     constructor(position: VehiclePosition) : this(
         position.trip.tripId,
         position.trip.startTime,
         position.trip.startDate,
         position.trip.routeId,
         position.vehicle.label,
 
         position.position.latitude.toDouble(),
         position.position.longitude.toDouble(),
         position.position.bearing,
         position.timestamp,
         null
     )
 
     fun getLineGTFSFormat(): String{
         return "gtt:$routeID"
     }
+
+    fun hasTripId(): Boolean{
+        val r = tripID.isEmpty() || tripID == "null"
+        return !r
+    }
 }
 
 
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
index 203372d..915b4f3 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
@@ -1,1231 +1,1261 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2025 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
 import android.Manifest
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context.LOCATION_SERVICE
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.location.Location
 import android.location.LocationManager
 import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.gson.JsonObject
 import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.FiveTNormalizer
 import it.reyboz.bustorino.backend.LivePositionTripPattern
 import it.reyboz.bustorino.backend.LivePositionsServiceStatus
 import it.reyboz.bustorino.backend.Stop
+import it.reyboz.bustorino.backend.VehicleClassInfo
 import it.reyboz.bustorino.backend.VehicleUtils
 import it.reyboz.bustorino.backend.gtfs.GtfsUtils
 import it.reyboz.bustorino.backend.gtfs.LivePositionUpdate
 import it.reyboz.bustorino.backend.utils
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.gtfs.TripAndPatternWithStops
 import it.reyboz.bustorino.map.MapLibreLocationEngine
 import it.reyboz.bustorino.map.MapLibreUtils
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider
 import it.reyboz.bustorino.util.Permissions
 import it.reyboz.bustorino.util.ViewUtils
 import it.reyboz.bustorino.viewmodels.LivePositionsViewModel
 import it.reyboz.bustorino.viewmodels.MapStateViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.maplibre.android.MapLibre
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.engine.LocationEngineCallback
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.location.engine.LocationEngineResult
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
 import org.maplibre.android.style.layers.Property.TEXT_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.TEXT_ROTATION_ALIGNMENT_VIEWPORT
 import org.maplibre.android.style.layers.PropertyFactory
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonSource
 import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 import org.maplibre.geojson.Point
 import kotlin.time.Duration.Companion.milliseconds
 
 abstract class GeneralMapLibreFragment: ScreenBaseFragment(), OnMapReadyCallback {
     protected var map: MapLibreMap? = null
     protected var shownStopInBottomSheet : Stop? = null
     //protected var savedMapStateOnPause : Bundle? = null
 
 
     protected var fragmentListener: CommonFragmentListener? = null
 
     // Declare a variable for MapView
     protected var mapView: MapView? = null
     protected lateinit var mapStyle: Style
     protected lateinit var stopsSource: GeoJsonSource
     protected lateinit var busesSource: GeoJsonSource
     protected lateinit var selectedStopSource: GeoJsonSource
     protected lateinit var selectedBusSource: GeoJsonSource //= GeoJsonSource(SEL_BUS_SOURCE)
 
     protected lateinit var sharedPreferences: SharedPreferences
     protected lateinit var bottomSheetBehavior: BottomSheetBehavior<ConstraintLayout>
 
     protected var locationEngine: MapLibreLocationEngine? = null
     protected var locationProvider: FusedNativeLocationProvider? = null
 
     protected var shownToastNoPosition = false
     protected var locationEnabledOnDevice = true
     protected var busLayerStarted = false
 
     //TODO ACTIVATE THIS
     private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener(){ pref, key ->
         /*when(key){
             SettingsFragment.LIBREMAP_STYLE_PREF_KEY -> reloadMap()
         }
 
          */
         if(key == SettingsFragment.LIBREMAP_STYLE_PREF_KEY){
             Log.d(DEBUG_TAG,"ASKING RELOAD OF MAP")
 
             //reloadMap()
         }
     }
 
     /**
      * What to do when requesting the permission, when it's ok, initialize the map location component
      */
     protected val positionRequestResponder = registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions(), ActivityResultCallback{ res ->
             if(!(res.containsKey(PERM_LOC_COARSE)&&res.containsKey(PERM_LOC_FINE))){
                 Log.e(DEBUG_TAG, "Location request does not have the correct keys")
             } else if(res[PERM_LOC_COARSE]!! && res[PERM_LOC_FINE]!!){
                 //permission OK, init map location
                 val mMap = map
                 if(mMap == null){
                     Log.w(DEBUG_TAG, "Location request completed, but map is null!")
                 }else{
                     initializeMapLocationComponent(mMap,requireContext(), null)
                 }
             } else{
                 // PERMISSION DENIED
                 // TODO find better way to show the necessity of the permission
                 if(shouldShowRequestPermissionRationale(PERM_LOC_FINE))
                     Toast.makeText(requireContext(),
                         R.string.enable_position_message_map, Toast.LENGTH_SHORT).show()
             }
         }
     )
     //Bottom sheet behavior in GeneralMapLibreFragment
     protected var bottomLayout: ConstraintLayout? = null
     protected lateinit var stopTitleTextView: TextView
     protected lateinit var stopNumberTextView: TextView
     protected lateinit var linesPassingTextView: TextView
     protected lateinit var extraBottomTextView: TextView
     protected lateinit var linesBottomTextView: TextView
     protected lateinit var arrivalsCard: CardView
     protected lateinit var directionsCard: CardView
     protected lateinit var bottomrightImage: ImageView
     protected lateinit var locationComponent: LocationComponent
     protected lateinit var busPositionsIconButton: ImageButton
     protected lateinit var vehicleIcon: ImageView
+    protected lateinit var warningTripIcon: ImageView
+    private lateinit var loadingTripIcon: ImageView
 
     protected var lastLocation : Location? = null
 
 
     private var lastMapStyle =""
 
     //BUS POSITIONS
     protected val updatesByVehDict = HashMap<String, LivePositionTripPattern>(5)
     protected val animatorsByVeh = HashMap<String, ValueAnimator>()
     protected var vehShowing: String? = null
     protected var lastUpdateTime:Long = -2
     protected var jobUpdate: Job? = null
 
     //private val lifecycleOwnerLiveData = viewLifecycleOwnerLiveData
 
 
     //extra items to use the LibreMap
     protected var symbolManager : SymbolManager? = null
     protected var stopActiveSymbol: Symbol? = null
     protected var stopsLayerStarted = false
     protected val livePositionsViewModel : LivePositionsViewModel by activityViewModels()
 
     //private lateinit var symbolManager: SymbolManager
     protected val mapStateViewModel: MapStateViewModel by viewModels()
     protected var locationInitialized = false
     protected var mapInitialized = false
     protected var receivedFirstLocation = false
 
 
     //location callback to decide if to zoom to the user position
     @SuppressLint("MissingPermission")
     protected val mapLibreLocationCallback = object : LocationEngineCallback<LocationEngineResult> {
         override fun onSuccess(result: LocationEngineResult) {
             val location: Location? = result.lastLocation
             Log.d(DEBUG_TAG, "Received location $location")
             location?.let {
                 //check timing of the location
                 val currentTime = System.currentTimeMillis()
                 val discard = (currentTime - it.time) > 90 * 1000.0  // discard if it is Older than 60 seconds
                 if(!discard) {
                     if (!receivedFirstLocation) {
                         onFirstReceivedLocation(it)
                     }
                     receivedFirstLocation = true
                 }
             }
 
             if(receivedFirstLocation){
                 //remove this listener once we have received the location
                 locationEngine?.removeLocationUpdates(this)
             }
 
         }
 
         override fun onFailure(exception: Exception) {
             Log.e(DEBUG_TAG, "Error in getting position: ${exception.message}")
         }
     }
 
     protected val deviceLocationStatusListener = FusedNativeLocationProvider.LocationStatusListener { isEnabled ->
         mapStateViewModel.locationDeviceEnabled.value = isEnabled
         if(locationEnabledOnDevice && !isEnabled && locationInitialized) {
             warnLocationNotEnabledOnDevice()
             //setMapLocationEnabled(false)
         }
         locationEnabledOnDevice = isEnabled
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         //sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
 
         //init map
         MapLibre.getInstance(requireContext())
 
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         //TODO: Re-create map when this preference changes
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onCreateView lastMapStyle: $lastMapStyle")
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     protected fun initBottomSheet(view: View){
         val bottomSheet = view.findViewById<ConstraintLayout>(R.id.bottom_sheet)
         bottomLayout = bottomSheet
         stopTitleTextView = view.findViewById(R.id.stopTitleTextView)
         stopNumberTextView = view.findViewById(R.id.stopNumberTextView)
         linesPassingTextView = view.findViewById(R.id.descriptionTextView)
         arrivalsCard = view.findViewById(R.id.arrivalsCardButton)
         directionsCard = view.findViewById(R.id.directionsCardButton)
         vehicleIcon = view.findViewById(R.id.vehicleIcon)
+        loadingTripIcon = view.findViewById(R.id.downloadingIcon)
+        warningTripIcon = view.findViewById(R.id.warningIconTrip)
         linesBottomTextView = view.findViewById(R.id.linesBottomTextView)
         linesBottomTextView.text = getString(R.string.lines_fill, "")
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
 
+        //set onclick listener for warning trip icon
+        warningTripIcon.setOnClickListener {
+            showToastMessage(R.string.no_trip_info_warning, true)
+        }
+        loadingTripIcon.setOnClickListener { showToastMessage(R.string.downloading_trip_info, true) }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         //init bottom sheet
         initBottomSheet(view)
 
         bottomrightImage = view.findViewById(R.id.rightmostImageView)
         extraBottomTextView = view.findViewById(R.id.extraBottomTextView)
 
     }
 
     override fun onResume() {
         super.onResume()
         mapView?.onResume()
         val newMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onResume newMapStyle: $newMapStyle, lastMapStyle: $lastMapStyle")
         // TODO: reload style if user changed preferences
         //if(newMapStyle!=lastMapStyle){
         //    reloadMap()
         //}
         if(busLayerStarted)
             updatePositionsIcons(false)
     }
 
     override fun onLowMemory() {
         mapView?.onLowMemory()
         super.onLowMemory()
     }
 
     override fun onStart() {
         super.onStart()
         mapView?.onStart()
     }
 
     override fun onDestroy() {
         mapView?.onDestroy()
         Log.d(DEBUG_TAG, "Destroyed mapView Fragment!!")
         busLayerStarted = false
         super.onDestroy()
     }
 
     override fun onStop() {
         locationProvider?.removeListener(deviceLocationStatusListener)
         mapView?.onStop()
         super.onStop()
     }
 
     override fun onPause() {
         jobUpdate?.cancel()
         mapView?.onPause()
         super.onPause()
     }
 
 
     override fun onDestroyView() {
         bottomLayout = null
         mapInitialized = false
         locationInitialized = false
         super.onDestroyView()
     }
 
     protected fun warnLocationNotEnabledOnDevice(){
         context?.let{
             Toast.makeText(it,R.string.enable_location_message,Toast.LENGTH_SHORT).show()
         }
     }
 
     protected fun reloadMap(){
         /*map?.let {
             Log.d("GeneralMapFragment", "RELOADING MAP")
             //save map state
             savedMapStateOnPause = saveMapStateInBundle()
 
             onMapDestroy()
             //Destroy and recreate MAP
             mapView.onDestroy()
             mapView.onCreate(null)
             mapView.getMapAsync(this)
         }
 
          */
     }
 
     //For extra stuff to do when the map is destroyed
     abstract fun onMapDestroy()
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if(context is CommonFragmentListener){
             fragmentListener = context
         } else throw RuntimeException("$context must implement CommonFragmentListener")
 
     }
 
     protected fun stopToGeoJsonFeature(s: Stop): Feature{
         return Feature.fromGeometry(
             Point.fromLngLat(s.longitude!!, s.latitude!!),
             JsonObject().apply {
                 addProperty("id", s.ID)
                 addProperty("name", s.stopDefaultName)
                 //addProperty("routes", s.routesThatStopHereToString()) // Add routes array to JSON object
             }
         )
     }
     protected fun isPointInsideVisibleRegion(p: LatLng, other: Boolean): Boolean{
         val bounds = map?.projection?.visibleRegion?.latLngBounds
         var inside = other
         bounds?.let { inside = it.contains(p) }
         return inside
     }
 
     protected fun isPointInsideVisibleRegion(lat: Double, lon: Double, other: Boolean): Boolean{
         val p = LatLng(lat, lon)
         return isPointInsideVisibleRegion(p, other)
     }
 
 
     protected fun removeVehiclesData(vehs: List<String>){
         for(v in vehs){
             if (updatesByVehDict.contains(v)) {
                 updatesByVehDict.remove(v)
                 if (animatorsByVeh.contains(v)){
                     animatorsByVeh[v]?.cancel()
                     animatorsByVeh.remove(v)
                 }
             }
             if (vehShowing==v){
                 hideStopOrBusBottomSheet()
             }
         }
     }
 
     // Hide the bottom sheet and remove extra symbol
     protected open fun hideStopOrBusBottomSheet(){
         if (stopActiveSymbol!=null){
             symbolManager?.delete(stopActiveSymbol)
             stopActiveSymbol = null
         }
         if(!showOpenStopWithSymbolLayer()){
             selectedStopSource.setGeoJson(FeatureCollection.fromFeatures(ArrayList<Feature>()))
         }
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
         //isBottomSheetShowing = false
 
         //reset states
         shownStopInBottomSheet = null
         if (vehShowing!=null){
             //we are hiding a vehicle
             vehShowing = null
             updatePositionsIcons(true)
         }
         extraBottomTextView.visibility = View.GONE
 
     }
 
     protected fun initSymbolManager(mapReady: MapLibreMap , style: Style){
         val sm = SymbolManager(mapView!!, mapReady, style)
         sm.iconAllowOverlap = true
         sm.textAllowOverlap = false
         sm.addClickListener { _ ->
             if (stopActiveSymbol != null) {
                 hideStopOrBusBottomSheet()
                 return@addClickListener true
             } else
                 return@addClickListener false
         }
         symbolManager = sm
     }
 
     /**
      * Change the icon indicating the status of the live Positions
      */
     protected fun setBusPositionsIcon(enabled: Boolean, error: Boolean){
         val ctx = requireContext()
         if(!enabled)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_inactive))
         else if(error)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_notworking))
         else
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_active))
 
     }
 
 
     abstract fun onMapLocationComponentInitialized()
 
     @SuppressLint("MissingPermission")
     protected fun setLocationComponentEnabled(enabled: Boolean): Boolean{
         var changed = false
         map?.apply {
             if(locationComponent.isLocationComponentEnabled !=enabled)
             locationComponent.isLocationComponentEnabled= enabled
         changed = true}
         Log.d(DEBUG_TAG, "Asked to set location component enabled: $enabled, changed: $changed")
         mapStateViewModel.locationUserActive.value = enabled
 
 
         return changed
     }
 
     @SuppressLint("MissingPermission")
     protected fun initializeMapLocationComponent(map: MapLibreMap, context: Context, style: Style?){
         val mStyle = style ?: map.style
         if(locationInitialized){
             Log.w(DEBUG_TAG, "trying to initialize Location Component, but it is already done")
             return
         }
         mStyle?.let{ style ->
             locationComponent = map.locationComponent
 
             val locProvider = FusedNativeLocationProvider(context)
             locProvider.addListener(deviceLocationStatusListener)
             locationEngine = MapLibreLocationEngine(locProvider)
             locationProvider = locProvider
             val options = LocationComponentActivationOptions.builder(context, style)
                 .useDefaultLocationEngine(false)
                 .locationEngine(locationEngine)
                 .build()
             locationComponent.activateLocationComponent(options)
 
             if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Initializing location, request initial position")
             startInitialPositionRequest()
 
             if(!locationEnabledOnDevice){
                 warnLocationNotEnabledOnDevice()
             }else {
                 setLocationComponentEnabled(true)
             }
             locationInitialized = true
             onMapLocationComponentInitialized()
         }
     }
 
     @SuppressLint("MissingPermission")
     protected fun startInitialPositionRequest(){
         locationEngine?.requestLocationUpdates(LocationEngineRequest.Builder(500).setDisplacement(20.0f).build(),
             mapLibreLocationCallback, null)
 
     }
     protected fun stopInitialPositionRequest(){
         locationEngine?.removeLocationUpdates(mapLibreLocationCallback)
     }
 
+    protected fun showVehClassInfo(vehInfo: VehicleClassInfo){
+        val print = "${vehInfo.type.getName()}: ${vehInfo.name}"
+        makeToast(print)
+    }
+
 
     /**
      * Update function for the bus positions
      * Takes the processed updates and saves them accordingly
      * Unified version that works with both fragments
      *
      * @param incomingData Map of updates with optional trip and pattern information
      * @param hasVehicleTracking If true, checks if vehShowing is updated and calls callback (default: true)
      * @param trackVehicleCallback Optional callback to show vehicle details when vehShowing is updated
      */
     protected fun updateBusPositionsInMap(
         incomingData: HashMap<String, Pair<LivePositionUpdate,TripAndPatternWithStops?>>,
         hasVehicleTracking: Boolean = true,
         trackVehicleCallback: ((String) -> Unit)? = null
     ) {
+        //TODO: Eventually change this (incomingData should be keyed by vehicle)
         val vehsNew = HashSet(incomingData.values.map { up -> up.first.vehicle })
         val vehsOld = HashSet(updatesByVehDict.keys)
 
         Log.d(DEBUG_TAG, "In fragment, have ${incomingData.size} updates to show")
 
         var countUpds = 0
         var createdVehs = 0
 
         for (upsWithTrp in incomingData.values) {
             val newPos = upsWithTrp.first
             val patternStops = upsWithTrp.second
             val vehID = newPos.vehicle
 
             // Validate coordinates
             if (!vehsOld.contains(vehID)) {
                 if (newPos.latitude <= 0 || newPos.longitude <= 0) {
                     Log.w(DEBUG_TAG, "Update ignored for veh $vehID on line ${newPos.routeID}, lat: ${newPos.latitude}, lon ${newPos.longitude}")
                     continue
                 }
             }
 
             if (vehsOld.contains(vehID)) {
                 // Changing the location of an existing bus
                 val oldPosData = updatesByVehDict[vehID]!!
                 val oldPos = oldPosData.posUpdate
                 val oldPattern = oldPosData.pattern
 
                 var avoidShowingUpdateBecauseIsImpossible = false
 
                 // Check for impossible route changes
                 if (oldPos.routeID != newPos.routeID) {
                     val dist = LatLng(oldPos.latitude, oldPos.longitude).distanceTo(
                         LatLng(newPos.latitude, newPos.longitude)
                     )
                     val speed = dist * 3.6 / (newPos.timestamp - oldPos.timestamp) // km/h
                     Log.w(DEBUG_TAG, "Vehicle $vehID changed route from ${oldPos.routeID} to ${newPos.routeID}, distance: $dist, speed: $speed")
                     if (speed > 120 || speed < 0) {
                         avoidShowingUpdateBecauseIsImpossible = true
                     }
                 }
 
                 if (avoidShowingUpdateBecauseIsImpossible) {
                     Log.w(DEBUG_TAG, "Update for vehicle $vehID skipped")
                     continue
                 }
 
                 // Check if position actually changed
                 val samePosition = (oldPos.latitude == newPos.latitude) &&
                         (oldPos.longitude == newPos.longitude)
 
                 val setPattern = (oldPattern == null) && (patternStops != null)
 
                 // Copy old bearing if new one is missing
                 if (newPos.bearing == null && oldPos.bearing != null) {
                     newPos.bearing = oldPos.bearing
                 }
 
                 if (!samePosition || setPattern) {
                     val newOrOldPosInBounds = isPointInsideVisibleRegion(
                         newPos.latitude, newPos.longitude, true
                     ) || isPointInsideVisibleRegion(oldPos.latitude, oldPos.longitude, true)
 
                     if (newOrOldPosInBounds) {
                         // Update pattern data if available
                         patternStops?.let {
                             updatesByVehDict[vehID]!!.pattern = it.pattern
                         }
                         // Animate the position change
                         animateNewPositionMove(newPos)
                     } else {
                         // Update position without animation
                         updatesByVehDict[vehID] = LivePositionTripPattern(
                             newPos,
                             patternStops?.pattern
                         )
                     }
                 }
                 countUpds++
             } else {
                 // New vehicle - create entry
                 updatesByVehDict[vehID] = LivePositionTripPattern(
                     newPos,
                     patternStops?.pattern
                 )
                 createdVehs++
             }
 
             // Update vehicle details if this is the shown/tracked vehicle
             if (hasVehicleTracking && vehShowing?.isNotEmpty() == true && vehID == vehShowing) {
                 trackVehicleCallback?.invoke(vehID)
             }
         }
 
         // Remove old positions
         Log.d(DEBUG_TAG, "Updated $countUpds vehicles, created $createdVehs vehicles")
         vehsOld.removeAll(vehsNew)
 
         // Clean up stale vehicles (not updated for 2 minutes)
         val currentTimeStamp = System.currentTimeMillis() / 1000
         for (vehID in vehsOld) {
             val posData = updatesByVehDict[vehID]!!
             if (currentTimeStamp - posData.posUpdate.timestamp > 2 * 60) {
                 // Remove the bus
                 updatesByVehDict.remove(vehID)
                 // Cancel and remove animator if exists
                 animatorsByVeh[vehID]?.cancel()
                 animatorsByVeh.remove(vehID)
             }
         }
 
         // Update UI
         updatePositionsIcons(false)
     }
 
     /**
      * Shared bottom sheet setup. The [onDirectionsClick] lambda is called when
      * directionsCard is tapped; it receives the pattern code (empty string when
      * no pattern is available) so each subclass can navigate as it sees fit.
      */
     protected fun showVehicleTripInBottomSheet(
         veh: String,
         onDirectionsClick: (patternCode: String, veh: String) -> Unit
     ) {
         val data = updatesByVehDict[veh] ?: run {
             Log.w(DEBUG_TAG, "Asked to show vehicle $veh, but it's not present in the updates")
             return
         }
         bottomLayout?.let {
             val lineName = FiveTNormalizer.fixShortNameForDisplay(
                 GtfsUtils.getLineNameFromGtfsID(data.posUpdate.routeID), false
             )
             val pat = data.pattern
+            val update = data.posUpdate
+
             if (pat != null) {
                 stopTitleTextView.text = pat.headsign
                 stopTitleTextView.visibility = View.VISIBLE
                 stopNumberTextView.text = getString(R.string.line_fill_towards, lineName)
+                loadingTripIcon.visibility = View.GONE
             } else {
                 stopTitleTextView.visibility = View.GONE
                 stopNumberTextView.text = getString(R.string.line_fill, lineName)
+                loadingTripIcon.visibility = if (update.hasTripId()) View.VISIBLE else View.GONE
             }
             directionsCard.setOnClickListener {
                 onDirectionsClick(pat?.code ?: "", veh)
             }
             directionsCard.visibility = View.VISIBLE
             bottomrightImage.setImageDrawable(
                 ResourcesCompat.getDrawable(resources, R.drawable.ic_magnifying_glass, activity?.theme)
             )
             // if you change this, remember to change the color of the vehicleIcon
             val colorBlue = ResourcesCompat.getColor(resources, R.color.bus_marker_color_selected, activity?.theme)
             ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorBlue))
             linesPassingTextView.text = getString(R.string.vehicle_fill, data.posUpdate.vehicle)
             linesPassingTextView.gravity = Gravity.CENTER_VERTICAL
             linesBottomTextView.visibility = View.GONE
             arrivalsCard.visibility = View.GONE
 
             extraBottomTextView.text = getString(R.string.updated_fill,  utils.unixTimestampToLocalTime(data.posUpdate.timestamp))
             extraBottomTextView.visibility = View.VISIBLE
-            val update = data.posUpdate
             val vehInfo = VehicleUtils.getTypeForLabel(update.vehicle)
             if(vehInfo == null){
                 vehicleIcon.visibility = View.GONE
+                linesPassingTextView.setOnClickListener {  } //empty click listener
             } else{
                 val ico = when(vehInfo.type){
                     VehicleUtils.VehicleType.BUS -> R.drawable.ic_bus
                     VehicleUtils.VehicleType.ELECTRIC_BUS -> R.drawable.ic_bus_electric_filled
                     VehicleUtils.VehicleType.TRAM -> R.drawable.ic_tram_material
                 }
                 vehicleIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, ico, activity?.theme))
                 vehicleIcon.visibility = View.VISIBLE
 
                 vehicleIcon.setOnClickListener {
-                    val print = "${vehInfo.type.getName()}: ${vehInfo.name}"
-                    makeToast(print)
+                    showVehClassInfo(vehInfo)
                 }
+                linesPassingTextView.setOnClickListener { showVehClassInfo(vehInfo) }
+            }
+            if (!update.hasTripId()){
+                warningTripIcon.visibility = View.VISIBLE
+            } else{
+                warningTripIcon.visibility = View.GONE
             }
 
         }
         vehShowing = veh
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
         updatePositionsIcons(true)
         Log.d(DEBUG_TAG, "Shown vehicle $veh in bottom sheet")
     }
 
     /**
      * Update the bus positions displayed on the map, from the existing data
      *
      * @param forced If true, forces immediate update ignoring the 100ms throttle
      */
     protected fun updatePositionsIcons(forced: Boolean) {
         // Avoid frequent updates - throttle to max once per 60ms
         val currentTime = System.currentTimeMillis()
         val isStarted = (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED))
         if(forced){
             // if we're running a forced update, cancel the pending one
             jobUpdate?.apply{
                 cancel()
                 //Log.d(DEBUG_TAG, "Cancelled update")
             }
 
         }
         else if (currentTime - lastUpdateTime < 100) {
             // Schedule delayed update
             if(viewLifecycleOwnerLiveData.value != null) {
                 jobUpdate?.cancel()
                 jobUpdate = viewLifecycleOwner.lifecycleScope.launch {
                     delay(100.milliseconds)
                     //Log.d(DEBUG_TAG, "Running update from delayed")
                     updatePositionsIcons(false)
                 }
                 //Log.d(DEBUG_TAG, "Cancelled previous job, delaying update")
             }
             return
         }
         if(!isStarted){
             Log.w(DEBUG_TAG, "fragment is not started, ")
         }
 
         val busFeatures = ArrayList<Feature>()
         val selectedBusFeatures = ArrayList<Feature>()
 
         for (dat in updatesByVehDict.values) {
             val pos = dat.posUpdate
             val point = Point.fromLngLat(pos.longitude, pos.latitude)
 
             val newFeature = Feature.fromGeometry(
                 point,
                 JsonObject().apply {
                     addProperty("veh", pos.vehicle)
                     addProperty("trip", pos.tripID)
                     addProperty("bearing", pos.bearing ?: 0.0f)
                     addProperty("line", pos.routeID.substringBeforeLast('U'))
                 }
             )
 
             // Separate selected vehicle from others
             if (vehShowing?.isNotEmpty() == true && vehShowing == dat.posUpdate.vehicle) {
                 selectedBusFeatures.add(newFeature)
                 //Log.d(DEBUG_TAG, "Update position for bus $vehShowing")
                 //TODO: Recenter the map on the vehicle
             } else {
                 busFeatures.add(newFeature)
             }
         }
 
         busesSource.setGeoJson(FeatureCollection.fromFeatures(busFeatures))
         selectedBusSource.setGeoJson(FeatureCollection.fromFeatures(selectedBusFeatures))
 
         lastUpdateTime = System.currentTimeMillis()
     }
 
     /**
      * Animates the transition of a vehicle from its current position to a new position
      * This is the tricky part - we need to set the new positions with the data and redraw them all
      *
      * @param positionUpdate The new position update to animate to
      */
     protected fun animateNewPositionMove(positionUpdate: LivePositionUpdate) {
         val vehID = positionUpdate.vehicle
 
         // Check if vehicle exists in our tracking dictionary
         if (vehID !in updatesByVehDict.keys) {
             return
         }
 
         val currentUpdate = updatesByVehDict[vehID] ?: run {
             Log.e(DEBUG_TAG, "Have to run animation for veh $vehID but not in the dict")
             return
         }
 
         // Cancel any current animation for this vehicle
         animatorsByVeh[vehID]?.cancel()
 
         val posUp = currentUpdate.posUpdate
         val currentPos = LatLng(posUp.latitude, posUp.longitude)
         val newPos = LatLng(positionUpdate.latitude, positionUpdate.longitude)
 
         // Create animator for smooth transition
         val valueAnimator = ValueAnimator.ofObject(
             MapLibreUtils.LatLngEvaluator(),
             currentPos,
             newPos
         )
 
         valueAnimator.addUpdateListener { animation ->
             val latLng = animation.animatedValue as LatLng
 
             // Update position during animation
             updatesByVehDict[vehID]?.let { update ->
                 update.posUpdate.latitude = latLng.latitude
                 update.posUpdate.longitude = latLng.longitude
                 updatePositionsIcons(false)
             } ?: run {
                 Log.w(DEBUG_TAG, "The bus position to animate has been removed, but the animator is still running!")
             }
         }
 
         // Set the new position as current but keep old coordinates for animation start
         positionUpdate.latitude = posUp.latitude
         positionUpdate.longitude = posUp.longitude
         updatesByVehDict[vehID]!!.posUpdate = positionUpdate
 
         // Configure and start animation
         valueAnimator.duration = 300
         valueAnimator.interpolator = LinearInterpolator()
         valueAnimator.start()
 
         // Store animator for potential cancellation
         animatorsByVeh[vehID] = valueAnimator
     }
 
     /// STOP OPENING
     abstract fun showOpenStopWithSymbolLayer(): Boolean
     /**
      * Update the bottom sheet with the stop information
      */
     protected fun openStopInBottomSheet(stop: Stop){
         bottomLayout?.let {
 
             //lay.findViewById<TextView>(R.id.stopTitleTextView).text ="${stop.ID} - ${stop.stopDefaultName}"
             val stopName = stop.stopUserName ?: stop.stopDefaultName
             stopTitleTextView.text = stopName//stop.stopDefaultName
             stopNumberTextView.text = getString(R.string.stop_fill,stop.ID)
             stopTitleTextView.visibility = View.VISIBLE
 
             val string_show = if (stop.numRoutesStopping==0) ""
             else stop.routesThatStopHereToString() //requireContext().getString(R.string.lines_fill, stop.routesThatStopHereToString())
             linesPassingTextView.text = string_show
             linesPassingTextView.visibility = View.VISIBLE
+            linesPassingTextView.setOnClickListener {  } //empty click listener (needed when switching from vehicle)
+
             linesPassingTextView.gravity = Gravity.TOP
             linesBottomTextView.visibility =View.VISIBLE
 
             //SET ON CLICK LISTENER
             arrivalsCard.setOnClickListener{
                 fragmentListener?.requestArrivalsForStopID(stop.ID)
             }
 
             arrivalsCard.visibility = View.VISIBLE
             directionsCard.visibility = View.VISIBLE
 
             directionsCard.setOnClickListener {
                 ViewUtils.openStopInOutsideApp(stop, context)
             }
+
             context?.let {
                 val colorIcon = ViewUtils.getColorFromTheme(it, R.attr.colorAccent)//ResourcesCompat.getColor(resources,R.attr.colorAccent,activity?.theme)
                 ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorIcon))
             }
 
             bottomrightImage.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.navigation_right,  activity?.theme))
-
+            // icons for the vehicles
             vehicleIcon.visibility = View.GONE
+            warningTripIcon.visibility = View.GONE
+            loadingTripIcon.visibility = View.GONE
 
         }
         //add stop marker
         if (stop.latitude!=null && stop.longitude!=null) {
             Log.d(DEBUG_TAG, "Showing stop: ${stop.ID}")
 
             if (showOpenStopWithSymbolLayer()) {
                 stopActiveSymbol = symbolManager?.create(
                     SymbolOptions()
                         .withLatLng(LatLng(stop.latitude!!, stop.longitude!!))
                         .withIconImage(STOP_ACTIVE_IMG)
                         .withIconAnchor(ICON_ANCHOR_CENTER)
                 )
             } else {
                 val list = ArrayList<Feature>()
                 list.add(stopToGeoJsonFeature(stop))
                 selectedStopSource.setGeoJson(
                     FeatureCollection.fromFeatures(list)
                 )
             }
 
         }
         Log.d(DEBUG_TAG, "Shown stop $stop in bottom sheet")
         shownStopInBottomSheet = stop
 
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
     }
 
 
 
     protected fun stopAnimations(){
         for(anim in animatorsByVeh.values){
             anim.cancel()
         }
     }
 
     protected fun addImagesStyle(style: Style){
         style.addImage(
             STOP_IMAGE_ID,
             ResourcesCompat.getDrawable(resources,R.drawable.bus_stop_new, activity?.theme)!!)
 
         style.addImage(STOP_ACTIVE_IMG, ResourcesCompat.getDrawable(resources, R.drawable.bus_stop_new_highlight, activity?.theme)!!)
         style.addImage("ball",ResourcesCompat.getDrawable(resources, R.drawable.ball, activity?.theme)!!)
         style.addImage(BUS_IMAGE_ID,ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
         style.addImage(BUS_SEL_IMAGE_ID, ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon_sel, activity?.theme)!!)
         val polyIconArrow = ResourcesCompat.getDrawable(resources, R.drawable.arrow_up_box_fill, activity?.theme)!!
         style.addImage(POLY_ARROW, polyIconArrow)
 
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?){
         //determine default layer
 
         val layerAbove = if (lastMapStyle == MapLibreUtils.STYLE_OSM_RASTER){
            "osm-raster"
         } else// if (lastMapStyle == MapLibreUtils.STYLE_VERSATILES_ECLIPSE_JSON){
             "symbol-transit-airfield"
         /*} else {
             //
             "poi_park"
         }
 
          */
         initStopsLayer(style, stopsFeatures, layerAbove)
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?, stopsLayerAbove: String){
 
 
         stopsSource = GeoJsonSource(STOPS_SOURCE_ID,stopsFeatures ?: FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(stopsSource)
 
 
         // Stops layer
         val stopsLayer = SymbolLayer(STOPS_LAYER_ID, STOPS_SOURCE_ID)
         stopsLayer.withProperties(
             PropertyFactory.iconImage(STOP_IMAGE_ID),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true)
             )
 
         style.addLayerAbove(stopsLayer, stopsLayerAbove ) //"label_country_1") this with OSM Bright
 
 
         selectedStopSource = GeoJsonSource(SEL_STOP_SOURCE, FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(selectedStopSource)
 
         val selStopLayer = SymbolLayer(SEL_STOP_LAYER, SEL_STOP_SOURCE)
         selStopLayer.withProperties(
             PropertyFactory.iconImage(STOP_ACTIVE_IMG),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
 
             )
         style.addLayerAbove(selStopLayer, STOPS_LAYER_ID)
 
         stopsLayerStarted = true
     }
 
     /**
      * Setup the Map Layers
      */
     protected fun setupBusLayer(style: Style, withLabels: Boolean =false, busIconsScale: Float = 1.0f) {
         // Buses source
         busesSource = GeoJsonSource(BUSES_SOURCE_ID)
         style.addSource(busesSource)
         //style.addImage("bus_symbol",ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
 
         selectedBusSource = GeoJsonSource(SEL_BUS_SOURCE)
         style.addSource(selectedBusSource)
 
         // Buses layer
         val busesLayer = SymbolLayer(BUSES_LAYER_ID, BUSES_SOURCE_ID).apply {
             withProperties(
                 PropertyFactory.iconImage(BUS_IMAGE_ID),
                 PropertyFactory.iconSize(busIconsScale),
                 PropertyFactory.iconAllowOverlap(true),
                 PropertyFactory.iconIgnorePlacement(true),
                 PropertyFactory.iconRotate(Expression.get("bearing")),
                 PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
 
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
         style.addLayerAbove(busesLayer, STOPS_LAYER_ID)
 
         val selectedBusLayer = SymbolLayer(SEL_BUS_LAYER, SEL_BUS_SOURCE).apply {
             withProperties(
             PropertyFactory.iconImage(BUS_SEL_IMAGE_ID),
             PropertyFactory.iconSize(busIconsScale),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconRotate(Expression.get("bearing")),
             PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
 
         style.addLayerAbove(selectedBusLayer, BUSES_LAYER_ID)
         busLayerStarted = true
     }
     /**
      * Method used for enabling / disabling the location from the buttons
      */
     protected fun switchUserLocationStatus(view: View?){
         val enabled = if(locationInitialized) locationComponent.isLocationComponentEnabled else false
         val context = context ?: return
         if(enabled) {
             if(!receivedFirstLocation){
                 //use case: the user has decided to disable the location before the first position arrived
                 stopInitialPositionRequest()
             }
             // we have to disable it
             setMapLocationEnabled(false)
         }
         else if(deviceHasLocationProvider()) {
             if(Permissions.bothLocationPermissionsGranted(context)){
                 if(!locationEnabledOnDevice){
                     warnLocationNotEnabledOnDevice()
                 } else{
                     setMapLocationEnabled(true)
                 }
             } else{
                 Log.d(DEBUG_TAG, "Requesting permissions to show location")
                 Permissions.getInstance(context).checkRequestLocationPermissions(requireActivity(), positionRequestResponder)
             }
         } else{
             context.let {
                 Toast.makeText(it, R.string.no_gps_on_device, Toast.LENGTH_SHORT).show()
             }
             //adjust ui
             setLocationIconEnabled(false)
         }
 
     }
 
     /**
      * Set the map location component enabled
      */
     @SuppressLint("MissingPermission")
     protected fun setMapLocationEnabled(enabled: Boolean){
         Log.d(DEBUG_TAG, "Setting map location enabled: $enabled")
         map?.locationComponent?.isLocationComponentEnabled = enabled
         //map?.cameraPosition =
         mapStateViewModel.locationUserActive.value = enabled
         onMapLocationEnabled(enabled)
     }
 
     /**
      * Function to run at the first time the fragment is opened
      * Check if we have the permissions, and then initialize the map location component
      * If we don't have it, request the permission
      */
     protected fun checkInitMapLocation(mapReady: MapLibreMap,style: Style, context: Context) {
         //enable location
         val hasGps = deviceHasLocationProvider()
         val permissions = Permissions.getInstance(context)
         if(hasGps) {
             if (Permissions.bothLocationPermissionsGranted(context)) {
                 Log.d(DEBUG_TAG, "Have got the location permission, init location component")
                 initializeMapLocationComponent(mapReady, context, style)
             }else {
                 var req = false
                 activity?.let{
                     req = permissions.checkRequestLocationPermissions(it, positionRequestResponder)
                 }
 
                 if(!req) {
                     setMapLocationEnabled(false)
                 }
 
             }
         }
     }
 
     /**
      * Set the UI elements showing that the user location is disabled
      */
     abstract fun onMapLocationEnabled(active: Boolean)
 
     /**
      * Helper function to actually set the icon
      */
     abstract fun setLocationIconEnabled(enabled: Boolean)
 
     /**
      * Called when we receive the first fix on the user location
      */
     abstract fun onFirstReceivedLocation(location: Location)
 
     protected fun isBottomSheetShowing(): Boolean {
         return bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED
     }
 
     protected fun deviceHasLocationProvider(): Boolean{
         val locManager = requireContext().getSystemService(LOCATION_SERVICE) as LocationManager
         return locManager.allProviders.isNotEmpty()
     }
 
     /**
      * Update automatically the icon when the live position service changes status
      */
     protected fun observeStatusLivePositions(){
         livePositionsViewModel.serviceStatus.observe(viewLifecycleOwner){ status ->
             //if service is active, update the bus positions icon
             when(status) {
                 LivePositionsServiceStatus.OK ->
                     setBusPositionsIcon(true, error = false)
 
                 LivePositionsServiceStatus.NO_POSITIONS -> setBusPositionsIcon(true, error = true)
 
                 else -> setBusPositionsIcon( true, error = true)
             }
         }
     }
 
     /**
      * Clear all buses from the map
      */
     protected fun clearAllBusPositionsInMap(){
         for ((k, anim) in animatorsByVeh){
             anim.cancel()
         }
         animatorsByVeh.clear()
         updatesByVehDict.clear()
         updatePositionsIcons(forced = false)
     }
 
     protected fun setCameraPosition(latitude: Double, longitude: Double, zoom: Double) {
         map?.cameraPosition = CameraPosition.Builder()
             .target(LatLng(latitude, longitude))
             .zoom(zoom)
             .build()
     }
 
     protected fun showToastLocation(enabled: Boolean){
         val textid = if (enabled) R.string.location_enabled  else R.string.location_disabled
         context?.let{
             Toast.makeText(it,textid,Toast.LENGTH_SHORT).show()
         }
     }
 
 
 
 
     companion object{
         private const val DEBUG_TAG="GeneralMapLibreFragment"
 
         const val BUSES_SOURCE_ID = "buses-source"
         const val BUSES_LAYER_ID = "buses-layer"
 
         const val SEL_STOP_SOURCE="selected-stop-source"
         const val SEL_STOP_LAYER = "selected-stop-layer"
 
         const val SEL_BUS_SOURCE = "sel_bus_source"
         const val SEL_BUS_LAYER = "sel_bus_layer"
 
         const val KEY_LOCATION_ENABLED="location_enabled"
 
 
         protected const val STOPS_SOURCE_ID = "stops-source"
         protected const val STOPS_LAYER_ID = "stops-layer"
 
         protected const val STOP_IMAGE_ID = "stop-img"
         protected const val STOP_ACTIVE_IMG = "stop_active_img"
         protected const val BUS_IMAGE_ID = "bus_symbol"
         protected const val BUS_SEL_IMAGE_ID = "sel_bus_symbol"
 
         protected const val POLYLINE_LAYER = "polyline-layer"
         protected const val POLYLINE_SOURCE = "polyline-source"
 
         protected const val POLY_ARROWS_LAYER = "arrows-layer"
         protected const val POLY_ARROWS_SOURCE = "arrows-source"
         protected const val POLY_ARROW ="poly-arrow-img"
 
         private const val PERM_LOC_COARSE = Manifest.permission.ACCESS_COARSE_LOCATION
         private const val PERM_LOC_FINE = Manifest.permission.ACCESS_FINE_LOCATION
 
         //TODO: this is hardcoded, make it modifiable by the user
         protected const val MAX_DIST_KM = 90.0
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt
index b8703e8..a3114ac 100644
--- a/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt
+++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt
@@ -1,489 +1,496 @@
 /*
 	BusTO  - ViewModel components
     Copyright (C) 2023 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.viewmodels
 
 import android.app.Application
 import android.util.Log
 import androidx.lifecycle.*
 import androidx.preference.PreferenceManager
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.android.volley.DefaultRetryPolicy
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.Fetcher
 import it.reyboz.bustorino.backend.LivePositionsServiceStatus
 import it.reyboz.bustorino.backend.NetworkVolleyManager
 import it.reyboz.bustorino.backend.gtfs.GtfsRtPositionsRequest
 import it.reyboz.bustorino.backend.gtfs.GtfsUtils
 import it.reyboz.bustorino.backend.gtfs.LivePositionUpdate
 import it.reyboz.bustorino.backend.mato.MQTTMatoClient
 import it.reyboz.bustorino.backend.mato.PositionsMap
 import it.reyboz.bustorino.data.GtfsRepository
 import it.reyboz.bustorino.data.MatoPatternsDownloadWorker
 import it.reyboz.bustorino.data.MatoTripsDownloadWorker
 import it.reyboz.bustorino.data.gtfs.MatoPattern
 import it.reyboz.bustorino.data.gtfs.TripAndPatternWithStops
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
 import androidx.core.content.edit
 import androidx.lifecycle.MutableLiveData
 import kotlin.text.contains
 
 typealias FullPositionUpdatesMap = HashMap<String, Pair<LivePositionUpdate, TripAndPatternWithStops?>>
 typealias FullPositionUpdate = Pair<LivePositionUpdate, TripAndPatternWithStops?>
 
 class LivePositionsViewModel(application: Application): AndroidViewModel(application) {
 
     private val gtfsRepo = GtfsRepository(application)
 
     //chain of LiveData objects: raw positions -> tripsIDs -> tripsAndPatternsInDB -> positions with patterns
     //this contains the raw positions updates received from the service
     private val positionsToBeMatchedLiveData = MutableLiveData<ArrayList<LivePositionUpdate>>()
     private val netVolleyManager = NetworkVolleyManager.getInstance(application)
 
 
     private var mqttClient = MQTTMatoClient()
 
     private var lineListening = ""
     private var lastTimeMQTTUpdatedPositions: Long = 0
 
     private val gtfsRtRequestRunning = MutableLiveData<Boolean>(false)
 
     private val lastFailedTripsRequest = HashMap<String, Date>()
     private val workManager = WorkManager.getInstance(application)
 
     private var lastRequestedDownloadTrips = MutableLiveData<List<String>>()
 
     //INPUT FILTER FOR LINE
     private var gtfsLineToFilterPos = MutableLiveData<Pair<String,MatoPattern?>>()
 
     var serviceStatus = MutableLiveData(LivePositionsServiceStatus.CONNECTING)
 
     private val sharedPrefs =  PreferenceManager.getDefaultSharedPreferences(application)
     private val keySourcePositions = application.getString(R.string.pref_positions_source)
     private val LIVE_POS_PREF_MQTT : String
     private val LIVE_POS_PREF_GTFSRT :String
     val useMQTTPositionsLiveData: MutableLiveData<Boolean>
 
     init {
         sharedPrefs.registerOnSharedPreferenceChangeListener { shp, key ->
             if(key == keySourcePositions) {
                 val newV = shp.getString(keySourcePositions, LIVE_POS_PREF_MQTT)
                 useMQTTPositionsLiveData.postValue(newV.equals(LIVE_POS_PREF_MQTT))
                 Log.d(DEBUG_TI, "Changed position source to: $newV")
             }
 
         }
         LIVE_POS_PREF_MQTT = application.getString(R.string.positions_source_mqtt)
         LIVE_POS_PREF_GTFSRT = application.getString(R.string.positions_source_gtfsrt)
         useMQTTPositionsLiveData = MutableLiveData(isMQTTPositionsSelected())
     }
 
     private fun isMQTTPositionsSelected(): Boolean{
         val source = sharedPrefs.getString(keySourcePositions, LIVE_POS_PREF_MQTT)
         val useMQTT=source == LIVE_POS_PREF_MQTT
         Log.d(DEBUG_TI, "Init positions, source: $source, isMQTT: $useMQTT")
         return useMQTT
     }
 
     /**
      * Switch provider of live positions from MQTT to GTFSRT and viceversa
      */
     fun switchPositionsSource(){
         val usingMQTT = useMQTTPositionsLiveData.value!!
         //code that was in the MapLibreFragment
         useMQTTPositionsLiveData.value = !usingMQTT
         sharedPrefs.edit(commit = true) {
             putString(
                 keySourcePositions,
                 if (usingMQTT) LIVE_POS_PREF_GTFSRT else LIVE_POS_PREF_MQTT
             )
         }
         Log.d(DEBUG_TI, "Switched positions source in ViewModel, now using MQTT: ${!usingMQTT}")
         serviceStatus.value = LivePositionsServiceStatus.CONNECTING
     }
 
     var isLastWorkResultGood =  workManager
         .getWorkInfosForUniqueWorkLiveData(MatoTripsDownloadWorker.TAG_TRIPS).map { it ->
             if (it.isEmpty()) return@map false
             var res = true
             if(it[0].state == WorkInfo.State.FAILED){
                 val currDate = Date()
                 res =  false
                 lastRequestedDownloadTrips.value?.let { trips->
                     for(tr in trips){
                         lastFailedTripsRequest[tr] = currDate
                     }
                 }
 
             }
             return@map res
     }
     /**
      * Responder to the MQTT Client
      */
     private val matoPositionListener = object: MQTTMatoClient.Companion.MQTTMatoListener{
 
         override fun onUpdateReceived(it: PositionsMap) {
             val mupds = ArrayList<LivePositionUpdate>()
             if(lineListening==MQTTMatoClient.LINES_ALL){
                 for(sdic in it.values){
                     for(update in sdic.values){
                         mupds.add(update)
                     }
                 }
             } else{
                 //we're listening to one
                 if (it.containsKey(lineListening.trim()) ){
                     for(up in it[lineListening]?.values!!){
                         mupds.add(up)
                     }
                 }
             }
             //avoid updating the positions too often (limit to 0.5 seconds)
             val time = System.currentTimeMillis()
             if(lastTimeMQTTUpdatedPositions == (0.toLong()) || (time-lastTimeMQTTUpdatedPositions)>500){
                 positionsToBeMatchedLiveData.postValue(mupds)
                 lastTimeMQTTUpdatedPositions = time
             }
             //we have received an update, so set the status to OK
             serviceStatus.postValue(LivePositionsServiceStatus.OK)
         }
 
         override fun onStatusUpdate(status: LivePositionsServiceStatus) {
             serviceStatus.postValue(status)
         }
 
     }
 
     //find the trip IDs in the updates
     private val tripsIDsInUpdates = positionsToBeMatchedLiveData.map { it ->
         //Log.d(DEBUG_TI, "Updates map has keys ${upMap.keys}")
         it.map { pos -> "gtt:"+pos.tripID }.filter{ s->
             !(s.contains("null") || s.trim() =="gtt:")
         }
 
     }
     // get the trip IDs in the DB
     private val gtfsTripsPatternsInDB = tripsIDsInUpdates.switchMap {
         //Log.i(DEBUG_TI, "tripsIds in updates: ${it.size}")
         gtfsRepo.gtfsDao.getTripPatternStops(it)
     }
     //trip IDs to query, which are not present in the DB
     //REMEMBER TO OBSERVE THIS IN THE MAP
     val tripsGtfsIDsToQuery: LiveData<List<String>> = gtfsTripsPatternsInDB.map { tripswithPatterns ->
         val tripNames=tripswithPatterns.map { twp-> twp.trip.tripID }
         Log.i(DEBUG_TI, "Have ${tripswithPatterns.size} trips in the DB")
         if (tripsIDsInUpdates.value!=null)
             return@map tripsIDsInUpdates.value!!.filter { !(
                     tripNames.contains(it) || it.contains("null") || it =="gtt:"
                     )}.distinct()
         else {
             Log.e(DEBUG_TI,"Got results for gtfsTripsInDB but not tripsIDsInUpdates??")
             return@map ArrayList<String>()
         }
     }
 
     /**
      * This livedata object contains the final updates with patterns present in the DB
      */
     val updatesWithTripAndPatterns = gtfsTripsPatternsInDB.map { tripPatterns->
-        //TODO: Change the mapping in the final updates, I don't know why the key is the tripID and not the vehicle ID
-        Log.i(DEBUG_TI, "Mapping trips and patterns")
-        val mdict = HashMap<String,FullPositionUpdate>()
+        //Integrate trips and patterns
+        //Log.i(DEBUG_TI, "Mapping trips and patterns")
+        //val mdict = HashMap<String,FullPositionUpdate>()
+        val upsByVeh = HashMap<String, FullPositionUpdate>()
         //missing patterns
         val routesToDownload = HashSet<String>()
         if(positionsToBeMatchedLiveData.value!=null)
             for(update in positionsToBeMatchedLiveData.value!!){
+                if(!update.hasTripId()){
+                    //when there is no trip information
+                    upsByVeh[update.vehicle] = Pair(update, null)
+                    continue
+                }
 
-                val trID:String = update.tripID
+                val trID = update.tripID
+                val veh = update.vehicle
                 var found = false
                 for(trip in tripPatterns){
                     if (trip.pattern == null){
                         //pattern is null, which means we have to download
                         // the pattern data from MaTO
                         routesToDownload.add(trip.trip.routeID)
                     }
                     if (trip.trip.tripID == "gtt:$trID"){
                         found = true
                         //insert directly
-                        mdict[trID] = Pair(update,trip)
+                        upsByVeh[veh] = Pair(update,trip)
                         break
                     }
                 }
                 if (!found){
                     //Log.d(DEBUG_TI, "Cannot find pattern ${tr}")
                     //give the update anyway
-                    mdict[trID] = Pair(update,null)
+                    upsByVeh[veh] = Pair(update,null)
                 }
             }
         //have to request download of missing Patterns
         if (routesToDownload.isNotEmpty()){
             Log.d(DEBUG_TI, "Have ${routesToDownload.size} missing patterns from the DB: $routesToDownload")
             //downloadMissingPatterns (ArrayList(routesToDownload))
             MatoPatternsDownloadWorker.downloadPatternsForRoutes(routesToDownload.toList(), getApplication())
         }
 
-        return@map mdict
+        return@map upsByVeh
     }
 
     fun clearOldPositionsUpdates(){
         //RETURN if the map is null
         val positionsOld = positionsToBeMatchedLiveData.value ?: return
 
         val currentTimeSecs = (System.currentTimeMillis() / 1000 )
         val updatedList = ArrayList<LivePositionUpdate>()
         for (up in positionsOld){
             //If the time has passed, remove it
             if (currentTimeSecs - up.timestamp <= MAX_MINUTES_CLEAR_POSITIONS*60) //TODO decide time limit in minutes
                 updatedList.add(up)
         }
         val diff = positionsOld.size - updatedList.size
         Log.d(DEBUG_TI, "Removed ${diff} positions marked as old")
         // Re-trigger all the LiveData chain
         positionsToBeMatchedLiveData.value = updatedList
     }
 
     fun clearAllPositions(){
         positionsToBeMatchedLiveData.postValue(ArrayList())
         Log.d(DEBUG_TI, "Cleared all positions in LivePositionsViewModel")
     }
 
     //OBSERVE THIS TO GET THE LOCATION UPDATES FILTERED
     val filteredLocationUpdates = MediatorLiveData<Pair<FullPositionUpdatesMap, List<String>>>()
     init {
         filteredLocationUpdates.addSource(updatesWithTripAndPatterns){
             filteredLocationUpdates.postValue(filterUpdatesForGtfsLine(it, gtfsLineToFilterPos.value!!))
         }
 
         filteredLocationUpdates.addSource(gtfsLineToFilterPos){
             Log.d(DEBUG_TI, "line to filter change to: ${gtfsLineToFilterPos.value}")
             updatesWithTripAndPatterns.value?.let{
                 ups-> filteredLocationUpdates.postValue(filterUpdatesForGtfsLine(ups, it))
                 //Log.d(DEBUG_TI, "Set ${ups.size} updates as new value for filteredLocation")
             }
         }
 
     }
     private fun clearFilteredPositions(){
         filteredLocationUpdates.postValue(Pair(HashMap(), ArrayList<String>()))
     }
     fun setGtfsLineToFilterPos(line: String, pattern: MatoPattern?){
         clearFilteredPositions()
         gtfsLineToFilterPos.value = Pair(line, pattern)
     }
 
     private fun filterUpdatesForGtfsLine(updates: FullPositionUpdatesMap,
                                          linePatt: Pair<String, MatoPattern?>):
             Pair<HashMap<String,FullPositionUpdate>, List<String>>{
         val gtfsLineId = linePatt.first
         val pattern = linePatt.second
-        val updsForTripId = HashMap<String, Pair<LivePositionUpdate, TripAndPatternWithStops?>>()
+        val updsByVeh = HashMap<String, Pair<LivePositionUpdate, TripAndPatternWithStops?>>()
         val vehicleOnWrongDirection = mutableListOf<String>()
 
         //supporting the eventual null case when there is no need to filter
         if (gtfsLineId == "ALL"){
             //copy the dict
-            for ((tripId, pair) in updates.entries) {
-                updsForTripId[tripId] = pair
+            for ((vehicle, pair) in updates.entries) {
+                updsByVeh[vehicle] = pair
             }
         } else {
 
             val filtdLineID = GtfsUtils.stripGtfsPrefix(gtfsLineId)
             //filter buses with direction, show those only with the same direction
             val directionId = pattern?.directionId ?: -100
             val numUpds = updates.entries.size
             Log.d(
                 DEBUG_TI,
                 "Got $numUpds updates, using MQTT: ${useMQTTPositionsLiveData.value}, pattern ${pattern?.name}"
             )
             // cannot understand where this is used
             //val patternsDirections = HashMap<String,Int>()
-            for ((tripId, pair) in updates.entries) {
+            for ((veh, pair) in updates.entries) {
                 //remove trips with wrong line
                 val posUp = pair.first
                 val vehicle = pair.first.vehicle
-                if (pair.first.routeID != filtdLineID)
+                if (posUp.routeID != filtdLineID)
                     continue
 
                 if (directionId != -100 && pair.second != null && pair.second?.pattern != null) {
                     val dir = pair.second!!.pattern!!.directionId
 
                     if (dir == directionId) {
                         //add the trip
-                        updsForTripId[tripId] = pair
+                        updsByVeh[veh] = pair
                         //Log.d(DEBUG_TI, "Add vehicle ${pair.first.vehicle}, route ${pair.first.routeID}")
                     } else {
                         vehicleOnWrongDirection.add(vehicle)
                     }
-                    //patternsDirections[tripId] = dir ?: -10
+                    //patternsDirections[veh] = dir ?: -10
                 } else {
-                    updsForTripId[tripId] = pair
-                    //Log.d(DEBUG_TAG, "No pattern for tripID: $tripId")
-                    //patternsDirections[tripId] = -10
+                    updsByVeh[veh] = pair
+                    //Log.d(DEBUG_TAG, "No pattern for tripID: $veh")
+                    //patternsDirections[veh] = -10
                 }
             }
         }
-        Log.d(DEBUG_TI, "Filtered updates are ${updsForTripId.keys.size}") // Original updates directs: $patternsDirections\n
+        Log.d(DEBUG_TI, "Filtered updates are ${updsByVeh.keys.size}") // Original updates directs: $patternsDirections\n
 
-        return  Pair(updsForTripId, vehicleOnWrongDirection)
+        return  Pair(updsByVeh, vehicleOnWrongDirection)
     }
 
 
     fun requestMatoPosUpdates(line: String){
         lineListening = line
         viewModelScope.launch {
             mqttClient.startAndSubscribe(line,matoPositionListener, getApplication())
             //clear old positions (useful when we are coming back to the map after some time)
             mqttClient.clearOldPositions(MAX_MINUTES_CLEAR_POSITIONS)
         }
 
 
         //updatePositions(1000)
     }
 
     fun stopMatoUpdates(){
         viewModelScope.launch {
             val tt = System.currentTimeMillis()
             mqttClient.stopMatoRequests(matoPositionListener)
             val time = System.currentTimeMillis() -tt
             Log.d(DEBUG_TI, "Took $time ms to unsubscribe")
         }
 
     }
 
     fun retriggerPositionUpdate(){
         if(positionsToBeMatchedLiveData.value!=null){
             positionsToBeMatchedLiveData.postValue(positionsToBeMatchedLiveData.value)
         }
     }
     //Gtfs Real time
     private val gtfsPositionsReqListener = object: GtfsRtPositionsRequest.Companion.RequestListener{
         override fun onResponse(response: ArrayList<LivePositionUpdate>?) {
             Log.i(DEBUG_TI,"Got response from the GTFS RT server")
             if (response == null){
                 serviceStatus.postValue(LivePositionsServiceStatus.ERROR_CONNECTION)
             }
             else response.let { it:ArrayList<LivePositionUpdate> ->
                 val ss: LivePositionsServiceStatus
                 if (it.size == 0) {
                     Log.w(DEBUG_TI,"No position updates from the GTFS RT server")
                     ss = LivePositionsServiceStatus.NO_POSITIONS
                 } else {
                     //Log.i(DEBUG_TI, "Posting value to positionsLiveData")
                     viewModelScope.launch { positionsToBeMatchedLiveData.postValue(it) }
                     ss = LivePositionsServiceStatus.OK
                 }
                 serviceStatus.postValue(ss)
             }
             gtfsRtRequestRunning.postValue(false)
         }
 
     }
 
     /**
      * Listener for the errors in downloading positions from GTFS RT
      */
     private val positionRequestErrorListener = GtfsRtPositionsRequest.Companion.ErrorListener {
         Log.e(DEBUG_TI, "Could not download the update", it)
         gtfsRtRequestRunning.postValue(false)
         if(it is GtfsRtPositionsRequest.RequestError){
             val status = when(it.result) {
                 Fetcher.Result.OK -> LivePositionsServiceStatus.OK
                 Fetcher.Result.PARSER_ERROR -> LivePositionsServiceStatus.ERROR_PARSING_RESPONSE
                 Fetcher.Result.SERVER_ERROR_404 -> LivePositionsServiceStatus.ERROR_NETWORK_RESPONSE
                 Fetcher.Result.SERVER_ERROR -> LivePositionsServiceStatus.ERROR_NETWORK_RESPONSE
                 Fetcher.Result.CONNECTION_ERROR -> LivePositionsServiceStatus.ERROR_CONNECTION
                 else -> LivePositionsServiceStatus.ERROR_CONNECTION
             }
             serviceStatus.postValue(status)
         } else
             serviceStatus.postValue(LivePositionsServiceStatus.ERROR_NETWORK_RESPONSE)
     }
 
     fun requestGTFSUpdates(){
         if(gtfsRtRequestRunning.value == null || !gtfsRtRequestRunning.value!!) {
             val request = GtfsRtPositionsRequest(positionRequestErrorListener, gtfsPositionsReqListener)
             request.setRetryPolicy(
                 DefaultRetryPolicy(1000,10,DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)
             )
             netVolleyManager.requestQueue.add(request)
             Log.i(DEBUG_TI, "Requested GTFS realtime position updates")
             gtfsRtRequestRunning.value = true
         }
 
     }
 
     fun requestDelayedGTFSUpdates(timems: Long){
         viewModelScope.launch {
             delay(timems)
             requestGTFSUpdates()
         }
     }
 
     override fun onCleared() {
         //stop the MQTT Service
         Log.d(DEBUG_TI, "Clearing the live positions view model, stopping the mqttClient")
         mqttClient.disconnect()
         super.onCleared()
     }
     //Request trips download
     fun downloadTripsFromMato(trips: List<String>): Boolean{
         if(trips.isEmpty())
             return false
         var shouldContinue = false
         val currentDateTime = Date().time
 
         for (tr in trips){
             if (!lastFailedTripsRequest.containsKey(tr)){
                 shouldContinue = true
                 break
             } else{
                 //Log.i(DEBUG_TI, "Last time the trip has failed is ${lastFailedTripsRequest[tr]}")
                 if ((lastFailedTripsRequest[tr]!!.time - currentDateTime) > MAX_TIME_RETRY){
                     shouldContinue =true
                     break
                 }
             }
         }
         if (shouldContinue) {
             //if one trip
             val workRequ =MatoTripsDownloadWorker.requestMatoTripsDownload(trips, getApplication(), "BusTO-MatoTripsDown")
             workRequ?.let { req ->
                 Log.d(DEBUG_TI, "Enqueueing new work, saving work info")
                 lastRequestedDownloadTrips.postValue(trips)
                 //isLastWorkResultGood =
             }
         } else{
             Log.w(DEBUG_TI, "Requested to fetch data for ${trips.size} trips but they all have failed before in the last $MAX_MINUTES_RETRY mins")
         }
         return shouldContinue
     }
 
     companion object{
         private const val DEBUG_TI = "BusTO-LivePosViewModel"
         private const val MAX_MINUTES_RETRY = 3
         private const val MAX_TIME_RETRY = MAX_MINUTES_RETRY*60*1000 //3 minutes (in milliseconds)
 
         public const val MAX_MINUTES_CLEAR_POSITIONS = 10
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_round_downloading.xml b/app/src/main/res/drawable/ic_round_downloading.xml
new file mode 100644
index 0000000..30a1590
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_downloading.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.33,3.55c-0.94,-0.6 -1.99,-1.04 -3.12,-1.3a0.998,0.998 0,0 0,-1.21 0.98c0,0.45 0.3,0.87 0.74,0.97c0.91,0.2 1.77,0.56 2.53,1.05c0.39,0.25 0.89,0.17 1.22,-0.16c0.45,-0.45 0.38,-1.2 -0.16,-1.54M20.77,11c0.64,0 1.13,-0.59 0.98,-1.21c-0.26,-1.12 -0.7,-2.17 -1.3,-3.12c-0.34,-0.54 -1.1,-0.61 -1.55,-0.16c-0.32,0.32 -0.4,0.83 -0.16,1.22c0.49,0.77 0.85,1.62 1.05,2.53a1,1 0,0 0,0.98 0.74m-1.87,6.49c0.45,0.45 1.21,0.38 1.55,-0.15c0.6,-0.94 1.04,-1.99 1.3,-3.11c0.14,-0.62 -0.35,-1.21 -0.98,-1.21c-0.45,0 -0.87,0.3 -0.97,0.74c-0.2,0.91 -0.57,1.76 -1.05,2.53c-0.25,0.37 -0.17,0.88 0.15,1.2M13,20.77c0,0.64 0.59,1.13 1.21,0.98c1.12,-0.26 2.17,-0.7 3.11,-1.3c0.54,-0.34 0.61,-1.1 0.16,-1.55c-0.32,-0.32 -0.83,-0.4 -1.21,-0.15c-0.76,0.49 -1.61,0.85 -2.53,1.05c-0.44,0.1 -0.74,0.51 -0.74,0.97M13,12L13,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4L9.41,12c-0.89,0 -1.34,1.08 -0.71,1.71l2.59,2.59c0.39,0.39 1.02,0.39 1.41,0l2.59,-2.59c0.63,-0.63 0.18,-1.71 -0.71,-1.71zM11,20.77c0,0.64 -0.59,1.13 -1.21,0.99C5.33,20.75 2,16.77 2,12s3.33,-8.75 7.79,-9.75a0.998,0.998 0,0 1,1.21 0.98c0,0.46 -0.31,0.87 -0.76,0.97C6.67,5 4,8.19 4,12s2.67,7 6.24,7.8c0.45,0.1 0.76,0.51 0.76,0.97"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_warning_larger.xml b/app/src/main/res/drawable/ic_round_warning_larger.xml
new file mode 100644
index 0000000..d7e9a57
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_warning_larger.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.777,21.287H20.223c1.682,0 2.73,-1.824 1.889,-3.276l-8.223,-14.208c-0.841,-1.452 -2.938,-1.452 -3.779,0L1.887,18.011c-0.841,1.452 0.207,3.276 1.889,3.276M12,13.642c-0.601,0 -1.092,-0.491 -1.092,-1.092v-2.184c0,-0.601 0.491,-1.092 1.092,-1.092 0.601,0 1.092,0.491 1.092,1.092v2.184c0,0.601 -0.491,1.092 -1.092,1.092m1.092,4.368h-2.184v-2.184h2.184z"
+      android:strokeWidth="1.09208"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/include_map_bottom_sheet.xml b/app/src/main/res/layout/include_map_bottom_sheet.xml
index c49b9f5..63ffb40 100644
--- a/app/src/main/res/layout/include_map_bottom_sheet.xml
+++ b/app/src/main/res/layout/include_map_bottom_sheet.xml
@@ -1,196 +1,237 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:paddingTop="3dp"
         android:orientation="vertical"
         android:background="@drawable/bottom_sheet_background"
         android:elevation="8dp"
         android:padding="13dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:behavior_hideable="true"
         app:behavior_peekHeight="4dp"
         android:clickable="true"
         android:focusable="true">
 
     <TextView
             android:id="@+id/stopNumberTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="17sp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:fontFamily="@font/lato_regular"
 
     />
 
     <TextView
             android:id="@+id/stopTitleTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="19sp"
             app:layout_constraintTop_toBottomOf="@id/stopNumberTextView"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginTop="4dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:fontFamily="@font/lato_bold"
     />
     <androidx.constraintlayout.widget.Barrier
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/belowBarrier"
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="stopTitleTextView"
     />
     <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content"
                   android:orientation="horizontal"
                   app:layout_constraintStart_toStartOf="parent"
                   android:layout_marginStart="10dp"
                   android:layout_marginTop="5dp"
                   app:layout_constraintTop_toBottomOf="@id/stopTitleTextView"
                   android:id="@+id/bottomLinearLayout"
-                    app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
+                  app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
                   android:layout_marginEnd="10dp"
-
     >
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:text="@string/lines"
                   android:layout_marginEnd="1dp"
                   android:id="@+id/linesBottomTextView"
                   android:fontFamily="@font/lato_regular"
                   android:textSize="15sp"
+                  android:gravity="center_vertical"
         />
         <TextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:minHeight="24dp"
+                android:minHeight="26dp"
                 android:textSize="15sp"
                 android:text="32119"
-                android:gravity="top"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
+                android:gravity="center_vertical"
                 android:fontFamily="@font/lato_regular"
         />
         <ImageView
                 android:layout_width="33dp"
-                android:layout_height="24dp"
+                android:layout_height="26dp"
                 android:id="@+id/vehicleIcon"
-                android:layout_marginStart="1dp"
+                android:layout_marginStart="2dp"
                 android:src="@drawable/ic_bus_electric_filled"
                 app:tint="@color/blue_700"
 
         />
-    </LinearLayout>
 
+        <ImageView android:layout_width="30dp"
+                   android:layout_height="26dp"
+                   android:id="@+id/downloadingIcon"
+                   android:src="@drawable/ic_round_downloading"
+                   app:tint="?colorPrimary"
+                   android:layout_marginStart="2dp"
+                   android:visibility="gone"
+        />
+        <ImageView android:layout_width="30dp"
+                   android:layout_height="26dp"
+                   android:id="@+id/warningIconTrip"
+                   android:src="@drawable/ic_round_warning_larger"
+                   app:tint="@color/yellow_warning"
+                   android:layout_marginStart="2dp"
+                   android:visibility="gone"
+        />
+    </LinearLayout>
 
 
     <TextView
             android:id="@+id/extraBottomTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="13sp"
             app:layout_constraintTop_toBottomOf="@id/bottomLinearLayout"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:layout_marginTop="5dp"
             android:text="Updated at "
             android:fontFamily="@font/lato_regular"
             android:visibility="gone"
     />
+    <!--
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:id="@+id/warningLayout"
+                  android:layout_marginStart="10dp"
+                  android:layout_marginTop="5dp"
+                  app:layout_constraintTop_toBottomOf="@id/extraBottomTextView"
+                  app:layout_constraintStart_toStartOf="parent"
+                  app:layout_constraintEnd_toEndOf="@id/btnClose"
+    >
+
+        <TextView
+                android:id="@+id/warningMessageTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="40dp"
+                android:textSize="15sp"
+                android:text="@string/no_trip_info_warning"
+                android:gravity="center_vertical"
+                android:layout_marginEnd="10dp"
+                android:layout_marginStart="5dp"
+                android:fontFamily="@font/lato_regular"
+        />
+
+    </LinearLayout>
+    -->
     <androidx.cardview.widget.CardView
             android:id="@+id/arrivalsCardButton"
             android:layout_width="50sp"
             android:layout_height="50sp"
             android:layout_marginStart="5sp"
             android:layout_marginEnd="6sp"
             app:cardCornerRadius="25sp"
             app:cardElevation="2dp"
             android:clickable="true"
             android:focusable="true"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@id/directionsCardButton"
             android:layout_toStartOf="@id/directionsCardButton"
             android:backgroundTint="?android:attr/colorAccent"
             android:foreground="?selectableItemBackground">
 
         <ImageView
                 android:layout_width="30sp"
                 android:layout_height="30sp"
                 android:layout_gravity="center"
                 app:tint="@android:color/white"
                 app:srcCompat="@drawable/ic_baseline_departure_board_24" />
 
     </androidx.cardview.widget.CardView>
 
     <androidx.cardview.widget.CardView
             android:id="@+id/directionsCardButton"
             android:layout_width="50sp"
             android:layout_height="50sp"
             android:layout_marginStart="5sp"
             android:layout_marginEnd="5sp"
             app:cardCornerRadius="25sp"
             app:cardElevation="2dp"
             android:clickable="true"
             android:focusable="true"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:foreground="?selectableItemBackground"
             android:backgroundTint="?android:attr/colorAccent"
     >
 
         <ImageView
                 android:id="@+id/rightmostImageView"
                 android:layout_width="30sp"
                 android:layout_height="30sp"
                 android:layout_gravity="center"
                 app:tint="@android:color/white"
                 app:srcCompat="@drawable/navigation_right" />
 
     </androidx.cardview.widget.CardView>
 
 
     <!-- Additional details -->
 
     <!-- Close button -->
     <ImageView
             android:layout_width="30sp"
             android:layout_height="30sp"
             app:srcCompat="@drawable/baseline_close_16"
             android:id="@+id/btnClose"
             android:layout_marginTop="15dp"
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="5dp"
             android:layout_marginStart="10dp"
             android:layout_below="@id/directionsCardButton"
             app:layout_constraintTop_toBottomOf="@id/directionsCardButton"
             android:layout_alignParentEnd="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             android:foreground="?selectableItemBackground"
             app:layout_constraintBottom_toTopOf="@id/bottomBarrier"
     />
     <androidx.constraintlayout.widget.Barrier
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/bottomBarrier"
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="btnClose,extraBottomTextView"
             app:layout_constraintBottom_toBottomOf="parent"
     />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c6ed47d..682c36d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,267 +1,270 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">Codice QR</string>
     <string name="scan_qr_code_stop">Scansiona codice QR alla fermata</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="next">Prossimo</string>
     <string name="previous">Precedente</string>
     <string name="title_barcode_scanner_install">Necessaria app per leggere i codici QR</string>
     <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR, ma non è stata trovata sul dispositivo. Vuoi installare Binary Eye?</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="searching_arrivals_fmt">Ricerca arrivi da %1$s</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages_fill">Fermata: %1$s</string>
     <string name="passages">Fermata:</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
     <string name="urban_lines">Linee urbane</string>
     <string name="extraurban_lines">Linee extraurbane</string>
     <string name="turist_lines">Linee turistiche</string>
     <string name="direction_duep">Direzione:</string>
     <string name="no_lines_found">Nessuna linea in questa categoria</string>
     <string name="no_lines_found_query">Nessuna linea corrisponde alla ricerca</string>
     <string name="search_box_lines_suggestion_filter">Filtra per nome</string>
     <string name="line_fill">Linea %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="line_fill_towards">Linea %1$s, direzione:</string>
     <string name="stop_fill">Fermata %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="vehicle_fill">Matricola %1$s</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code trovato, riprova</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_donate">Donazioni</string>
     <string name="action_about">Informazioni sull\'app</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Vai alla wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="action_open_line">Mostra linea</string>
     <string name="action_show_direction">Vedi direzione</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b> 12:56*</b> Orario in tempo reale\n<b> 12:56</b> Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario. \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo</string>
     <string name="hint_button">OK!</string>
     <string name="about_history_top"><![CDATA["<h1>Benvenuto!</h1>\n        \n        <p>Grazie per aver scelto BusTO, un\'app <b>open source</b> e <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>!</p>\n        <p>BusTO rispetta la tua <b>privacy</b> non raccogliendo nessun dato sull\'utilizzo, ed è <b>leggera</b> e senza <b>pubblicità</b>!</p>\n        <br>\n        <p>Qui puoi trovare più informazioni e link riguardo al progetto.</p>\n\t\t<br>\n        <h2>Schermata iniziale</h2>\n        <p>Se vuoi rivedere la schermata iniziale, usa il pulsante qui sotto:</b>"]]></string>
     <string name="about_channel"><![CDATA[
         <h2>Notizie e aggiornamenti</h2>
         <p>Nel canale Telegram puoi trovare informazioni sugli ultimi aggiornamenti dell\'app</p>
         ]]></string>
     <string name="about_how"><![CDATA["<h2>Ma come funziona?</h2>\n        <p>Quest\'app ottiene i passaggi dei bus, le fermate e altre informazioni utili unendo dati forniti dal sito <b>www.gtt.to.it</b>, <i>www.5t.torino.it</i>, <b>muoversiatorino.it</b> \"per uso personale\" e altre fonti Open Data (aperto.comune.torino.it).</p>\n        <br>\n\t\t<p>Ingredienti:<br>\n\t\t- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>\n\t\t- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>\n\t\t- <b>Silviu Chiriac</b> designer del logo 2021.<br>\n\t\t- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>\n\t\t- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>\n\t\t- <b>Valerio Bozzolan</b> attuale manutentore.<br>\n\t\t- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>\n\t\t- <b>JSoup</b> libreria per \"<i>web scaping</i>\".<br>\n\t\t- <b>Google</b> icone e librerie di supporto e design.<br>\n\t\t- Altre icone da <b>Bootstrap</b>, <b>Feather</b>, <b>Remix</b> e <b>Hero Icons</b><br>\n\t\t- Tutti i contributori e i beta tester!\n\t\t</p>
     \n<br><p>Se vuoi avere più informazioni o donare per supportare lo sviluppo dell\'app, usa i pulsanti qui sotto!</p>"]]></string>
     <string name="about_history_bottom"><![CDATA[<h2>Licenze</h2>\n\t\t<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3</i> (https://www.gnu.org/licenses/gpl-3.0.html).\n\t\tCiò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan e agli altri autori del codice dell\'app.\n\t\t</p>\n\n\t\t<br>\n\t\t<h2>Note</h2>\n\t\t<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia sul suo funzionamento attuale e/o futuro.</p>\n\t\t<p>Tutti i dati utilizzati dall\'app provengono <b>direttamente</b> da GTT o da simili agenzie pubbliche: se trovi che sono inesatti per qualche motivo, ti invitiamo a rivolgerti a loro.</p>\n\t\t<p>Buon utilizzo! :)</p>]]></string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
     <string name="near_me_title">Vicino a me</string>
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database…</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Lancia aggiornamento manuale del database</string>
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enable_position_message_nearby">Consenti l\'accesso alla posizione per mostrare le fermate vicine</string>
     <string name="enable_location_message">Abilitare la posizione sul dispositivo</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Canale telegram</string>
     <string name="show_introduction">Mostra introduzione</string>
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
     <string name="enable_position">Attiva o disattiva posizione</string>
     <string name="location_enabled">Posizione attivata</string>
     <string name="location_disabled">Posizione disattivata</string>
     <string name="map_location_disabled_device">La posizione è disabilitata sul dispositivo</string>
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
     <string name="arrival_times_choice_title">Fonti orari di arrivo</string>
     <string name="arrival_times_choice_explanation">Scegli le fonti di orari da usare</string>
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
     <string name="no_passages_title">Nessun passaggio per le linee:</string>
     <string name="default_notification_channel_description">Canale default delle notifiche</string>
     <string name="database_notification_channel">Operazioni sul database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
     <string name="live_position_service_name">BusTO - posizioni in tempo reale</string>
     <string name="live_positions_notification_channel">Posizioni in tempo reale</string>
     <string name="live_positions_notification_channel_desc">Attività del servizio delle posizioni in tempo reale</string>
     <string name="mqtt_notification_text">Servizio posizioni MaTO in tempo reale attivo</string>
     <string name="db_trips_download_message">Download dei trip dal server MaTO</string>
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio!</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse:</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
     <string name="downloading_data_mato">Download dati dal server MaTO</string>
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string name="directions_capitalize_no_change">Non cambiare</string>
     <string name="directions_capitalize_everything">Tutto in maiuscolo</string>
     <string name="directions_capitalize_first_letter">Solo prima lettera maiuscola</string>
     <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
     <string name="pref_experimental_msg">Abilita esperimenti</string>
     <string name="pref_shown_startup">Schermata da mostrare all\'avvio</string>
     <string name="pref_shown_startup_def_desc">Tocca per cambiare</string>
     <string name="positions_source_pref_title">Fonte posizioni in tempo reale di bus e tram</string>
     <string name="positions_source_mato_descr">MaTO (aggiornate più spesso, può avere errori)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (aggiornato meno frequentemente, posizioni più controllate)</string>
     <string name="favorites_line_add">Linea aggiunta ai preferiti</string>
     <string name="favorites_line_remove">Linea rimossa dai preferiti</string>
     <string name="favorites_lines">Preferite</string>
     <!-- lines -->
     <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
     <string name="map_style_pref_title">Stile della mappa</string>
     <string name="map_style_versatiles">Versatiles (vettoriale)</string>
     <string name="map_style_legacy_raster">OSM Legacy (raster, più leggera)</string>
     <string name="remove_all_trips">Rimuovi i dati dei trip (libera spazio)</string>
     <string name="all_trips_removed">Tutti i trip GTFS sono rimossi dal database</string>
     <!-- tutorial -->
     <string name="tutorial_action">Mostra introduzione</string>
     <string name="tutorial_first"><![CDATA[Grazie per aver installato BusTO, l\'app gratuita, libera e <b>open source</b> per il trasporto pubblico di Torino. Stai usando un\'app <b>indipendente</b>, senza pubblicità e senza nessun tracciamento.]]></string>
     <string name="tutorial_search"><![CDATA[Puoi cercare gli orari d\'arrivo ad una fermata inserendo il numero nella casella di ricerca.<br>
 Se ti trovi a una fermata, puoi scansionare il codice QR presente sulla palina toccando l\'icona a sinistra della barra di ricerca.]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Una volta trovata una fermata, puoi aggiungerla ai <b>preferiti</b> toccando la stella a fianco del nome.]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[Con la posizione abilitata, puoi vedere le <b>fermate più vicine</b> a te direttamente nella schermata principale...]]>
     </string>
     <string name="tutorial_map">
         <![CDATA[...oppure puoi trovarle sulla mappa, assieme alle <b>posizioni in tempo reale</b> dei bus e tram (in <font color="#2F59CC">blu</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[Scopri il percorso e le fermate della linea che preferisci, insieme alle posizioni in tempo reale dei bus/tram che la servono. Ricorda di scegliere la direzione che ti interessa!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[Tutte queste funzioni si trovano nel menu laterale.<br>
 Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su <b>Informazioni</b> per sapere di più sull\'app e il team di sviluppo.]]>
     </string>
     <string name="close_tutorial">Capito, chiudi introduzione</string>
     <string name="close_tutorial_short">Chiudi introduzione</string>
     <string name="tutorial_permissions"><![CDATA[
          L\'app usa le notifiche per fornire informazioni sullo stato delle attività.
          Tocca il bottone per abilitarle.
         ]]></string>
     <string name="grant_location_permission">Abilita accesso alla posizione</string>
     <string name="location_permission_granted">Accesso alla posizione abilitato</string>
     <string name="location_permission_not_granted">Accesso alla posizione non consentito dall\'utente</string>
     <string name="grant_notification_permission">Abilita notifiche</string>
     <string name="notification_permission_granted">Notifiche abilitate</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup e ripristino</string>
     <string name="saved_data">Dati salvati</string>
     <string name="backup_title">Backup</string>
     <string name="restore_title">Ripristino</string>
     <string name="backup_completed_toast">Backup completato</string>
     <string name="backup_restore_pref_description">Salva o ripristina i dati</string>
     <string name="btn_backup_message">Salva backup</string>
     <string name="btn_load_backup_message">Importa i dati dal backup</string>
     <string name="data_imported_backup">Backup importato</string>
     <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
     <string name="load_file_favorites">Importa preferiti dal backup</string>
     <string name="load_preferences">Importa preferenze dal backup</string>
     <string name="no_map_app_to_show_stop">Nessuna app disponibile per mostrare la fermata!</string>
     <string name="destination_unknown">Destinazione sconosciuta</string>
     <string name="showing_same_direction">Direzione già selezionata</string>
     <string name="too_far_not_showing_location">Sei troppo lontano, posizione nascosta</string>
     <string name="destination_loading">Caricamento destinazione…</string>
     <string name="hello_blank_fragment">Ciao fragment vuoto</string>
     <string name="live_positions_msg_ok">Il servizio delle posizioni funziona normalmente</string>
     <string name="live_positions_msg_no_positions">Nessuna posizione ricevuta</string>
     <string name="live_positions_msg_connection_error">Errore nella connessione al server</string>
     <string name="live_positions_msg_parsing_error">Errore nel parsing della risposta</string>
     <string name="live_positions_msg_network_error">Errore: risposta dal server inaspettata</string>
     <string name="live_positions_msg_connecting">In connessione...</string>
     <string name="live_positions_dialog_provider_text">Fonte posizioni in tempo reale:</string>
     <string name="live_positions_switch_provider">Cambia fonte</string>
     <string name="live_positions_preference_switch_clear_title">Rimuovi posizioni sulla mappa quando si cambia fonte delle posizioni in tempo reale</string>
     <string name="updated_fill">Aggiornato: %1$s</string>
     <string name="no_alerts_in_your_language_fill">Nessun avviso nella tua lingua, mostrati in %1$s</string>
     <string name="italian">Italiano</string>
     <string name="english">Inglese</string>
     <string name="alert_line_fill">Avvisi per la linea %1$s:</string>
     <string name="checking_alerts_update">Controllo degli avvisi disponibili in corso</string>
     <string name="no_gps_on_device">Servizio GPS non trovato sul dispositivo!</string>
     <string name="downloading_alerts_message">Download dati avvisi in tempo reale</string>
     <string name="no_permission_dialog_title">Permesso mancante</string>
     <string name="no_permission_dialog_text_location">Per usare questa funzionalità, l\'app necessita dell\'accesso alla posizione, che ora può essere dato solo dalle impostazioni di sistema.</string>
     <string name="no_permission_dialog_open">Apri le impostazioni</string>
     <string name="back_again_to_close">Premi ancora \"indietro\" per uscire dall\'app</string>
     <!-- Theme -->
     <string name="day_night_theme_set_light">Chiaro</string>
     <string name="day_night_theme_set_dark">Scuro</string>
     <string name="day_night_theme_keep_system">Segui il sistema</string>
     <string name="pref_theme_day_night_title">Imposta tema scuro o chiaro</string>
+
+    <string name="no_trip_info_warning">Nessuna informazione trasmessa sulla direzione o sul viaggio del veicolo.</string>
+    <string name="downloading_trip_info">Download in corso delle informazioni sul viaggio</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3c9bf34..ad71962 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,102 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <color name="orange_500">#ff9800</color>
     <color name="orange_600">#E77D13</color>
     <color name="orange_700">#F57C00</color>
     <color name="orange_750">#f57200</color>
     <color name="orange_750_l45">#e66b00</color>
     <color name="orange_700_40light">#cc6600</color>
     <color name="orange_700_30light">#994d00</color>
     <color name="orange_700_L35">#b35900</color>
     <color name="blue_500">#2196F3</color>
     <color name="blue_500_night">#0b6fc1</color>
 
     <color name="blue_620">#2a65e8</color>
     <color name="blue_700">#2060dd</color>
     <color name="brown_vd">#8A4247</color><!-- #1976D2 -->
     <color name="dialog_background">#FFF3E0</color>
     <color name="orange_background">#fff5e5</color>
     <!-- night color, from 50 to 44 luminosity -->
     <color name="orange_500_night">#e08700</color>
 
     <!-- night color, to 41 luminosity -->
     <color name="orange_700_night">#d16900</color>
 
     <color name="blue_mid_2">#2378e8</color>
     <color name="blue_c_or_700">#0079f5</color>
     <color name="teal_dark">#2a968b</color>
     <color name="blue_comp_500">#0067ff</color>
 
     <color name="blue_extra">#2F59CC</color>
     <color name="brown_mattone">#CC5E43</color>
     <color name="olivegreen">#548017</color>
     <color name="forest_green">#228b22</color>
     <color name="green_extra">#0ABA34</color>
 
     <color name="OLD_teal_500">#009688</color>
     <color name="teal_500">#00a38d</color>
     <color name="teal_500_night">#009480</color>
     <color name="teal_500_proposal">#00a887</color>
     <color name="teal_300">#4DB6AC</color>
     <color name="teal_200">#80cbc4</color>
     <color name="teal_900">#008175</color>
     <color name="grey_100">#F5F5F5</color>
     <color name="grey_200">#dddddd</color>
     <color name="grey_050">#f8f8f8</color>
     <color name="grey_400">#bababa</color>
     <color name="grey_500">#acacac</color>
     <color name="grey_600">#757575</color>
     <color name="grey_700">#444</color>
     <color name="grey_800">#353535</color>
     <color name="grey_900">#303030</color>
 
     <color name="grey_L95">#f2f2f2</color>
 
     <!--<color name="white">#FFFFFF</color>
     <color name="accent">#009688</color>-->
     <color name="metro_red">#DE0908</color>
     <color name="red_darker">#b30000</color>
     <color name="red_orange">#dd441f</color>
     <color name="red_dark">#b30d0d</color>
     <color name="orange_icons">#f15000</color>
     <color name="orange_icons_10light">#f2621a</color>
     <color name="orange_icons_20light">#f47333</color>
     <color name="blue_extraurbano">#2060DD</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="black_900">#1c1c1c</color>
     <color name="black_800">#3f3f3f</color>
 
     <color name="line_pattern_color">@color/blue_mid_2</color><!-- 2e8df0-->
 
     <color name="line_drawn_poly">@color/red_dark</color>
 
     <color name="bus_marker_color">@color/blue_extra</color>
     <color name="bus_marker_color_selected">#3089e8</color>
     <color name="light_blue_600">#FF039BE5</color>
     <color name="light_blue_900">#FF01579B</color>
     <color name="light_blue_A200">#FF40C4FF</color>
     <color name="light_blue_A400">#FF00B0FF</color>
     <color name="black_overlay">#66000000</color>
     <color name="black_icon_text">#555</color>
     <color name="text_secondary_night">#cccccc</color>
 
     <color name="card_border">@color/grey_500</color>
     <color name="colorTransparent">#00000000</color>
     <color name="orange_700_display">@color/orange_700</color>
     <color name="message_background_on_black">@color/grey_200</color>
     <color name="card_background">@color/grey_050</color>
     <color name="separator">@color/grey_200</color>
 
     <color name="urban_bus_bg">@color/orange_500</color>
     <color name="extraurban_bus_bg">@color/blue_extraurbano</color>
     <color name="metro_bg">@color/metro_red</color>
     <color name="map_icon_background_active">@color/orange_icons_10light</color>
     <color name="map_icon_background_inactive">@color/grey_400</color>
     <color name="alerts_color_button">@color/orange_750_l45</color>
     <color name="color_text_grey">@color/grey_700</color>
     <color name="lines_nearby_color">@color/blue_700</color>
     <color name="stop_number_color">@color/light_blue_900</color>
 
+    <color name="yellow_warning">#fbb504</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20acdfe..3d627d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,420 +1,422 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_name_gitpull" translatable="false">BusTO git</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Barcode scanner app is needed</string>
     <!-- make nice message indicating that we like this app and want to install it if clicking OK-->
     <string name="message_install_barcode_scanner">This functionality requires another app to scan the QR codes, which has not been found on the device. We suggest using Binary Eye, which
         is open source software, would you like to install it now?
     </string>
 
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop has this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages_fill">Arrivals at: %1$s</string>
     <string name="passages">Arrivals at:</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
     <string name="no_lines_found">No lines found in this category</string>
     <string name="no_lines_found_query">No lines match the searched name</string>
 
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line %1$s</string>
     <string name="line_fill_towards">Line %1$s towards:</string>
     <string name="stop_fill">Stop %1$s</string>
     <string name="vehicle_fill">Vehicle %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, retry</string>
     <string name="scan_qr_code_stop">Scan QR code at the bus stop</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About the app</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Open the wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">Favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">About the app</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
     <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
         <br>
         <h2>Introductory tutorial</h2>
         <p>If you want to see the introduction again, use the button below:</p>
         ]]></string>
     <string name="about_channel">
         <![CDATA[
     <h2>News and Updates</h2>
     <p>On the Telegram channel, you can find information about the latest app updates</p>
     ]]></string>
     <string name="about_how">
         <![CDATA[
     <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<br>
 		- <b>Fabio Mazza</b>, current senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, designer of the 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, previous senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer and infrastructure (sponsor).<br>
 		- <b>Marco Gagino</b>, contributor and first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
         - <b>Google</b> for icons and support and design libraries.<br>
         - Other icons from <b>Bootstrap</b>, <b>Feather</b>, <b>Remix</b> and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
 		 <p>If you want more detailed information, or want to donate money to support the development, use the buttons below!</p>
     ]]></string>
     <string name="about_history_bottom">
         <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="action_open_line">Show line details</string>
     <string name="action_show_direction">Show full direction</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
 
     <!-- used as generic title for "show what is near me" -->
     <string name="near_me_title">Near me</string>
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby arrivals</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="searching_arrivals_indefinite">Loading arrival times</string>
     <string name="no_stops_nearby_arrivals">No stops nearby to search arrival times for</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enable_location_message">Please enable location on the device</string>
     <string name="no_gps_on_device">No GPS receiver found on the device!</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
     <string name="show_introduction">Show introduction</string>
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="searching_arrivals_fmt">Loading arrivals from %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service
     </string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_home_text">Home</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="search_box_lines_suggestion_filter">Filter by name</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
     <string name="downloading_alerts_message">Downloading realtime alerts data</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>@string/directions_capitalize_no_change</item>
         <item>@string/directions_capitalize_everything</item>
         <item>@string/directions_capitalize_first_letter</item>
     </string-array>
     <string name="directions_capitalize_no_change">Do not change arrivals directions</string>
     <string name="directions_capitalize_everything">Capitalize everything</string>
     <string name="directions_capitalize_first_letter">Capitalize only first letter</string>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_home_text</item>
         <item>@string/near_me_title</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
 
 
     <string name="day_night_theme_set_light">Light</string>
     <string name="day_night_theme_set_dark">Dark</string>
     <string name="day_night_theme_keep_system">Change it with the system</string>
 
     <!-- title used in the preferences screen -->
     <string name="pref_theme_day_night_title">Set dark or light theme</string>
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <string name="positions_source_mato_descr">MaTO (updated more frequently, might have errors)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (less frequently updated, more accurate)</string>
     <array name="positions_source_sel">
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
     <string name="too_far_not_showing_location">"You are too far, not showing your position</string>
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
     <array name="map_style_pref_categories">
         <item>@string/map_style_versatiles</item>
         <item>@string/map_style_legacy_raster</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
     <string name="no_permission_dialog_title">Missing permission</string>
     <!-- If more permissions are needed, adapt this string to make if "fillable" -->
     <string name="no_permission_dialog_text_location">To use this functionality, the application needs access to the location, which now can only be granted in the system settings.</string>
     <string name="no_permission_dialog_open">Open settings</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
     <!-- Title of the top section for the backup -->
     <string name="backup_title">Backup</string>
     <!-- Title of the bottom section - for restoring data -->
     <string name="restore_title">Restore</string>
     <!-- String in the settings screen to describe the action that can be performed -->
     <string name="backup_restore_pref_description">Backup or restore data</string>
     <string name="saved_data">Data saved</string>
     <string name="backup_completed_toast">Backup completed</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <string name="no_map_app_to_show_stop">No map app present to show the stop!</string>
     <string name="showing_same_direction">Direction is already shown</string>
     <string name="destination_loading">Loading destination…</string>
     <string name="destination_unknown">Destination unknown</string>
     <!-- LIVE POSITIONS DIALOG -->
     <string name="live_positions_msg_ok">Service for positions working normally</string>
     <string name="live_positions_msg_no_positions">No positions received</string>
     <string name="live_positions_msg_connection_error">Error connecting to the server</string>
     <string name="live_positions_msg_parsing_error">Error parsing the server response</string>
     <string name="live_positions_msg_network_error">Error: network response is not as expected</string>
     <string name="live_positions_msg_connecting">Connecting...</string>
     <string name="positions_source_mato_short" translatable="false">MaTO</string>
     <string name="positions_source_gtfsrt_short" translatable="false">GTFS RT</string>
     <string name="live_positions_dialog_provider_text">Live positions source:</string>
     <string name="live_positions_switch_provider">Switch source</string>
     <string name="live_positions_preference_switch_clear_title">Clear bus positions when switching live positions
         source
     </string>
 
     <string name="updated_fill">Updated: %1$s</string>
     <string name="alert_line_fill">Alerts for line %1$s:</string>
     <string name="alert_stop_fill">Alerts for stop %1$s:</string>
     <string name="no_alerts_in_your_language_fill">No alerts in your language, showing in %1$s</string>
     <string name="italian">Italian</string>
     <string name="english">English</string>
     <string name="checking_alerts_update">Checking new alerts now</string>
     <string name="back_again_to_close">Press back again to close the app</string>
     <string name="action_donate">Donate</string>
 
+    <string name="no_trip_info_warning">No information on the direction or trip of the vehicle was transmitted.</string>
+    <string name="downloading_trip_info">Downloading trip information…</string>
 </resources>