Bimba.git

diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt
index ab41284587c6f57fb0ba39a013e76f8ccf190389..35ba1348dcc65e4da149fabe8ca54732cbf3f998 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/Api.kt
@@ -65,29 +65,34 @@ 	val params = mutableMapOf("q" to query)
 	if (limit != null) {
 		params["limit"] = limit.toString()
 	}
-	return request(server, "queryables", params, cm, arrayOf(1u))
+	return request(server, "queryables", params, cm, arrayOf(1u), null)
 }
 
 suspend fun locateQueryables(cm: ConnectivityManager, server: Server, near: PositionV1): Result {
-	return request(server, "queryables", mapOf("near" to near.toString()), cm, arrayOf(1u))
+	return request(server, "queryables", mapOf("near" to near.toString()), cm, arrayOf(1u), null)
 }
 
 suspend fun getLocatablesIn(
 	cm: ConnectivityManager, server: Server, bl: PositionV1, tr: PositionV1
 ): Result {
 	return request(
-		server, "locatables", mapOf("lb" to bl.toString(), "rt" to tr.toString()), cm, arrayOf(1u)
+		server,
+		"locatables",
+		mapOf("lb" to bl.toString(), "rt" to tr.toString()),
+		cm,
+		arrayOf(1u),
+		null
 	)
 }
 
 suspend fun getDepartures(
-	cm: ConnectivityManager, server: Server, stop: String, line: String? = null
+	cm: ConnectivityManager, server: Server, feedID: String, stop: String, line: String? = null
 ): Result {
 	val params = mutableMapOf("code" to stop)
 	if (line != null) {
 		params["line"] = line
 	}
-	return request(server, "departures", params, cm, arrayOf(1u))
+	return request(server, "departures", params, cm, arrayOf(1u), feedID)
 }
 
 suspend fun rawRequest(
@@ -131,11 +136,12 @@ 	server: Server,
 	resource: String,
 	params: Map<String, String>,
 	cm: ConnectivityManager,
-	responseVersion: Array<UInt>
+	responseVersion: Array<UInt>,
+	feeds: String?
 ): Result {
 	return withContext(Dispatchers.IO) {
 		val url = URL( // todo [3.1] scheme, host, path, constructed query
-			"${server.apiPath}/${server.feeds}/$resource${
+			"${server.apiPath}/${feeds?.ifEmpty { server.feeds } ?: server.feeds}/$resource${
 				params.map {
 					"${it.key}=${
 						URLEncoder.encode(




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/HomeFragment.kt b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/HomeFragment.kt
index e52278a89138a79ec2e541347f421c6af6000ea8..fc0fb193b4865bb66654a39eebbce989761c97d4 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/HomeFragment.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/home/HomeFragment.kt
@@ -77,6 +77,7 @@ 				is Stop -> {
 					val intent = Intent(activity, DeparturesActivity::class.java).apply {
 						putExtra("code", it.code)
 						putExtra("name", it.name)
+						putExtra("feedID", it.feedID)
 					}
 					startActivity(intent)
 				}




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapViewModel.kt b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapViewModel.kt
index 87e4c42fd45e211bd5c8a54c700a5cd63fea54fb..87c96df07b95db0132b064943c29da4937b52df5 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapViewModel.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/dashboard/ui/map/MapViewModel.kt
@@ -115,6 +115,7 @@ 			content.findViewById(R.id.departures_button).setOnClickListener {
 				val intent = Intent(ctx, DeparturesActivity::class.java).apply {
 					putExtra("code", stop.code)
 					putExtra("name", stop.name)
+					putExtra("feedID", stop.feedID)
 				}
 				startActivity(intent)
 			}




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
index 7d5de6075ae12ef87050206d3da39cf15077bae8..dcc35603de637a86aafa0e1d0890ca3283b3912a 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt
@@ -76,20 +76,37 @@ 		}
 	}
 
 	private fun getCode(): String {
-		@Suppress("SpellCheckingInspection")
-		return when (intent?.action) {
+		@Suppress("SpellCheckingInspection") return when (intent?.action) {
 			Intent.ACTION_VIEW -> intent?.data?.getQueryParameter("przystanek") ?: ""
 			null -> intent?.extras?.getString("code") ?: ""
 			else -> ""
 		}
 	}
 
+	private fun getFeedID(): String {
+		return when (intent?.action) {
+			Intent.ACTION_VIEW -> {
+				return when (intent?.data?.host) {
+					"www.peka.poznan.pl" -> "poznan_ztm"
+					else -> ""
+				}
+			}
+
+			null -> {
+				intent?.extras?.getString("feedID") ?: ""
+			}
+
+			else -> ""
+		}
+	}
+
 	private fun getDepartures() {
 		val cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 		MainScope().launch {
 			try {
 				val repository = OnlineRepository()
-				val stopDepartures = repository.getDepartures(cm, getCode(), null, this@DeparturesActivity)
+				val stopDepartures =
+					repository.getDepartures(cm, getFeedID(), getCode(), null, this@DeparturesActivity)
 				updateItems(stopDepartures!!.departures, stopDepartures.stop)
 				openBottomSheet?.departureID()?.let { adapter.get(it) }?.let { openBottomSheet?.update(it) }
 			} catch (e: ErrorResponseError) {
@@ -126,8 +143,7 @@
 			binding.errorText.text = getString(R.string.no_departures)
 			binding.errorImage.setImageDrawable(
 				AppCompatResources.getDrawable(
-					this,
-					R.drawable.error_search
+					this, R.drawable.error_search
 				)
 			)
 		} else {




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
index e9045957685fd267c4d97a4cf2aff334adaf5da4..4cdcd2894b818f790edd4146aadbb36e1592fe28 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/Interfaces.kt
@@ -14,6 +14,7 @@
 interface Repository {
 	suspend fun getDepartures(
 		cm: ConnectivityManager,
+		feedID: String,
 		stop: String,
 		line: String?,
 		context: Context




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
index 2a5eaa9f37a4b8d12e22b34305f0b4bebb7450b8..9c19fe0c80e031a4ee9860d434403b56a8e78609 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/repo/OnlineRepository.kt
@@ -27,11 +27,12 @@ // todo add feedID
 class OnlineRepository : Repository {
 	override suspend fun getDepartures(
 		cm: ConnectivityManager,
+		feedID: String,
 		stop: String,
 		line: String?,
 		context: Context
 	): StopDepartures? {
-		val result = xyz.apiote.bimba.czwek.api.getDepartures(cm, Server.get(context), stop, line)
+		val result = xyz.apiote.bimba.czwek.api.getDepartures(cm, Server.get(context), feedID, stop, line)
 		if (result.error != null) {
 			if (result.stream != null) {
 				val response = withContext(Dispatchers.IO) { ErrorResponse.unmarshal(result.stream) }




diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
index 8e05512b78625496aba53970f9753d91914412d9..96cf5b6e439569eabb825d831bc3c103d2e295c1 100644
--- a/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
+++ b/app/src/main/java/xyz/apiote/bimba/czwek/search/ResultsActivity.kt
@@ -52,9 +52,11 @@ 				is Stop -> {
 					val intent = Intent(this, DeparturesActivity::class.java).apply {
 						putExtra("code", it.code)
 						putExtra("name", it.name)
+						putExtra("feedID", it.feedID)
 					}
 					startActivity(intent)
 				}
+
 				is Line -> {
 					TODO("[3.1] start line graph activity")
 				}
@@ -71,6 +73,7 @@ 			Mode.MODE_LOCATION -> {
 				supportActionBar?.title = getString(R.string.stops_nearby)
 				locate()
 			}
+
 			Mode.MODE_POSITION -> {
 				val query = intent.extras?.getString("query")
 				val lat = intent.extras?.getDouble("lat")
@@ -78,6 +81,7 @@ 				val lon = intent.extras?.getDouble("lon")
 				supportActionBar?.title = getString(R.string.stops_near_code, query)
 				getQueryablesByLocation(Position(lat!!, lon!!), this)
 			}
+
 			Mode.MODE_SEARCH -> {
 				val query = intent.extras?.getString("query")!!
 				supportActionBar?.title = getString(R.string.results_for, query)