diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt index f57c04f3..58847900 100644 --- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt +++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/MapOsmFragment.kt @@ -5,6 +5,7 @@ import android.graphics.ColorMatrix import android.graphics.ColorMatrixColorFilter import android.graphics.Paint import android.os.Bundle +import android.util.Log import android.view.View import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment @@ -177,9 +178,10 @@ class MapOsmFragment : Fragment(R.layout.fragment_map_osm) { else if (lat < -85.05) lat = -85.05 if (lon > 180.0) lon -= 360.0 - val satItem = SatItem(it.tle.name, it.tle.name, GeoPoint(lat, lon), it) - satItem.markerHotspot = OverlayItem.HotspotPlace.CENTER - items.add(satItem) + SatItem(it.tle.name, it.tle.name, GeoPoint(lat, lon), it).apply { + markerHotspot = OverlayItem.HotspotPlace.CENTER + items.add(this) + } } val listener = object : ItemizedIconOverlay.OnItemGestureListener { @@ -197,13 +199,18 @@ class MapOsmFragment : Fragment(R.layout.fragment_map_osm) { return@withContext ItemizedIconOverlay(items, icon, listener, mainActivity) } - private fun setSatDetails(pass: SatPass) { - binding.mapView.overlays[1] = getSatTrack(pass) - binding.mapView.overlays[2] = getSatFootprint(pass) -// showSatInfo(pass) + private fun setSatDetails(satPass: SatPass) { + setSatInfo(satPass) + binding.mapView.overlays[1] = getSatTrack(satPass) + binding.mapView.overlays[2] = getSatFootprint(satPass) binding.mapView.invalidate() } + private fun setSatInfo(satPass: SatPass) { + val satPos = satPass.predictor.getSatPos(dateNow) + Log.d("myTag", satPos.toString()) + } + private fun getSatTrack(pass: SatPass): Overlay { val period = (24 * 60 / pass.tle.meanmo).toInt() val positions = pass.predictor.getPositions(dateNow, 20, 0, period * 3) diff --git a/app/src/main/res/layout/fragment_map_osm.xml b/app/src/main/res/layout/fragment_map_osm.xml index 48e9ff2c..c479d738 100644 --- a/app/src/main/res/layout/fragment_map_osm.xml +++ b/app/src/main/res/layout/fragment_map_osm.xml @@ -2,6 +2,7 @@ @@ -15,13 +16,65 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 51469a07..392e8678 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -25,6 +25,7 @@ #242424 #080808 #CC000000 + #66000000 #D50000 #FFE082 #80FFE082 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d3a3cfc1..bed19483 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -134,6 +134,24 @@ 17sp + + + + + +