include local grid details in legend

wuan · Jan 20, 2025 · 742bd3b · 742bd3b
1 parent 2b3cce5
commit 742bd3b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/app/src/main/java/org/blitzortung/android/app/view/LegendView.kt b/app/src/main/java/org/blitzortung/android/app/view/LegendView.kt
@@ -187,11 +187,22 @@ class LegendView @JvmOverloads constructor(
 
     private val regionName: String
         get() {
-            val regionNumber = strikesOverlay!!.parameters.region
 
-            for ((index, regionNumberString) in resources.getStringArray(R.array.regions_values).withIndex()) {
-                if (regionNumber == Integer.parseInt(regionNumberString)) {
-                    return resources.getStringArray(R.array.regions)[index]
+            val strikesOverlay = strikesOverlay
+
+            if (strikesOverlay != null) {
+                val regionNumber = strikesOverlay.parameters.region
+                val dataArea = strikesOverlay.parameters.dataArea
+
+                for ((index, regionNumberString) in resources.getStringArray(R.array.regions_values).withIndex()) {
+                    if (regionNumber == Integer.parseInt(regionNumberString)) {
+                        val detail = if (regionNumber < 0) {
+                            " ($dataArea)"
+                        } else {
+                            ""
+                        }
+                        return resources.getStringArray(R.array.regions)[index] + detail
+                    }
                 }
             }
 

diff --git a/app/src/main/java/org/blitzortung/android/data/MainDataHandler.kt b/app/src/main/java/org/blitzortung/android/data/MainDataHandler.kt
@@ -412,6 +412,7 @@ class MainDataHandler @Inject constructor(
         return if (event != null) {
             val mapView = event.source as OwnMapView
             val updated = updateLocation(mapView.boundingBox)
+//            Log.v(LOG_TAG, "MainDataHandler.onScroll() update: $updated")
             ensureUpdate(updated, mapView)
         } else {
             false
@@ -424,6 +425,7 @@ class MainDataHandler @Inject constructor(
             val updateAutoGridSize = updateAutoGridSize(event.zoomLevel)
             val updateLocation = updateLocation(mapView.boundingBox, updateAutoGridSize)
             val updated = updateLocation || updateAutoGridSize
+//            Log.v(LOG_TAG, "MainDataHandler.onZoom() update: $updated (location: $updateLocation, autoGrid: $updateAutoGridSize)")
             ensureUpdate(updated, mapView)
         } else {
             false