Bimba.git

diff --git a/app/src/main/java/ml/adamsprogs/bimba/StopActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/StopActivity.kt
index fec00e38ef21786cd40a5b42f300e898b136793b..5e222f87419a924e16dcb24c9a3a083865c658fb 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/StopActivity.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/StopActivity.kt
@@ -25,6 +25,8 @@     private var timetableType = "departure"
     private var sectionsPagerAdapter: SectionsPagerAdapter? = null
     private var viewPager: ViewPager? = null
     private lateinit var timetable: Timetable
+    private val today = Calendar.getInstance()
+    private lateinit var tabLayout: TabLayout
 
     override fun onCreate(savedInstanceState: Bundle?) { //todo select current mode
         super.onCreate(savedInstanceState)
@@ -42,7 +44,7 @@         timetable = Timetable(this)
         supportActionBar?.title = timetable.getStopName(stopId) ?: "Stop"
 
         viewPager = findViewById(R.id.container) as ViewPager
-        val tabLayout = findViewById(R.id.tabs) as TabLayout
+        tabLayout = findViewById(R.id.tabs) as TabLayout
 
         sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, createDepartures())
 
@@ -50,6 +52,8 @@         viewPager!!.adapter = sectionsPagerAdapter
         viewPager!!.addOnPageChangeListener(TabLayout.TabLayoutOnPageChangeListener(tabLayout))
         tabLayout.addOnTabSelectedListener(TabLayout.ViewPagerOnTabSelectedListener(viewPager))
 
+        selectTodayPage()
+
         val fab = findViewById(R.id.fab) as FloatingActionButton
         fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
@@ -58,7 +62,7 @@             //todo favourites
         }
     }
 
-    fun createDepartures(): HashMap<String, ArrayList<Departure>> {
+    private fun createDepartures(): HashMap<String, ArrayList<Departure>> {
         val departures = timetable.getStopDepartures(stopId)
         val moreDepartures = timetable.getStopDepartures(stopId)
         val rolledDepartures = HashMap<String, ArrayList<Departure>>()
@@ -76,7 +80,7 @@
         return rolledDepartures
     }
 
-    fun filterDepartures(departures: List<Departure>?): ArrayList<Departure> {
+    private fun filterDepartures(departures: List<Departure>?): ArrayList<Departure> {
         val filtered = ArrayList<Departure>()
         val lines = HashMap<String, Int>()
         val now = Calendar.getInstance()
@@ -98,6 +102,13 @@         }
         return filtered
     }
 
+    private fun selectTodayPage() {
+        when (today.get(Calendar.DAY_OF_WEEK)) {
+            Calendar.SATURDAY -> tabLayout.getTabAt(1)?.select()
+            Calendar.SUNDAY -> tabLayout.getTabAt(2)?.select()
+            else -> tabLayout.getTabAt(0)?.select()
+        }
+    }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_stop, menu)




diff --git a/research/datasources.md b/research/datasources.md
index 20a66df2c1fbfc301ed7fde011e763d0743a55dc..036bb5a1103d736d9aaae601923ed6ccc9bb46b3 100644
--- a/research/datasources.md
+++ b/research/datasources.md
@@ -7,3 +7,5 @@ * real-time timetable: http://egov.psnc.pl/node/29#przystanki
 * wireless: http://egov.psnc.pl/node/29#wireless_poznan
 * tourism: http://egov.psnc.pl/node/29#turystyka
 
+# Tube drawing
+* https://github.com/johnwalley/d3-tube-map