rename raster baselength parameter

Author: wuan

app/src/main/java/org/blitzortung/android/app/AppService.kt

@@ -87,8 +87,8 @@ class AppService : Service(), OnSharedPreferenceChangeListener {
 
     override fun onCreate() {
         AndroidInjection.inject(this)
-        Log.i(Main.LOG_TAG, "AppService.onCreate() ${LogUtil.timestamp}")
         super.onCreate()
+        Log.i(Main.LOG_TAG, "AppService.onCreate() ${LogUtil.timestamp}")
 
         preferences.registerOnSharedPreferenceChangeListener(this)
         onSharedPreferenceChanged(preferences, PreferenceKey.ALERT_ENABLED, PreferenceKey.BACKGROUND_QUERY_PERIOD)

app/src/main/java/org/blitzortung/android/app/view/LegendView.kt

@@ -191,9 +191,9 @@ class LegendView @JvmOverloads constructor(
 
     private val rasterString: String
         get() {
-            val minDistance = strikesOverlay?.rasterParameters?.minDistance
-            return if (minDistance != null) {
-                "%.0f %s".format(minDistance, context.getString(R.string.unit_km))
+            val baselength = strikesOverlay?.rasterParameters?.baselength
+            return if (baselength != null) {
+                "%.0f %s".format(baselength / 1000.0, context.getString(R.string.unit_km))
             } else {
                 context.getString(R.string.not_available)
             }

app/src/main/java/org/blitzortung/android/data/beans/RasterParameters.kt

@@ -30,7 +30,7 @@ data class RasterParameters(
         val latitudeDelta: Double,
         val longitudeBins: Int,
         val latitudeBins: Int,
-        val minDistance: Float? = null) {
+        val baselength: Int? = null) {
 
     val rectCenterLongitude: Double = longitudeStart + longitudeDelta * longitudeBins / 2.0
 

app/src/main/java/org/blitzortung/android/data/provider/standard/DataBuilder.kt

@@ -43,15 +43,15 @@ internal class DataBuilder {
     }
 
     @Throws(JSONException::class)
-    fun createRasterParameters(response: JSONObject, minDistance: Float): RasterParameters {
+    fun createRasterParameters(response: JSONObject, baselength: Int): RasterParameters {
         return RasterParameters(
                 longitudeStart = response.getDouble("x0"),
                 latitudeStart = response.getDouble("y1"),
                 longitudeDelta = response.getDouble("xd"),
                 latitudeDelta = response.getDouble("yd"),
                 longitudeBins = response.getInt("xc"),
                 latitudeBins = response.getInt("yc"),
-                minDistance = minDistance)
+                baselength = baselength)
     }
 
     @Throws(JSONException::class)

app/src/main/java/org/blitzortung/android/data/provider/standard/JsonRpcDataProvider.kt

@@ -83,8 +83,8 @@ class JsonRpcDataProvider @Inject constructor(
         return result.copy(strikes = strikes, updated = if (isIncremental) strikes.size else -1)
     }
 
-    private fun addRasterData(response: JSONObject, result: ResultEvent, minDistance: Float): ResultEvent {
-        val rasterParameters = dataBuilder.createRasterParameters(response, minDistance)
+    private fun addRasterData(response: JSONObject, result: ResultEvent, baselength: Int): ResultEvent {
+        val rasterParameters = dataBuilder.createRasterParameters(response, baselength)
         val referenceTimestamp = getReferenceTimestamp(response)
 
         val strikesArray = response.get("r") as JSONArray
@@ -163,8 +163,7 @@ class JsonRpcDataProvider @Inject constructor(
                 } else {
                     client.call(serviceUrl, "get_strikes_grid", intervalDuration, rasterBaselength, intervalOffset, region, countThreshold)
                 }
-                val minDistance = rasterBaselength / 1000f
-                resultVar = addRasterData(response, resultVar, minDistance)
+                resultVar = addRasterData(response, resultVar, rasterBaselength)
                 resultVar = addStrikesHistogram(response, resultVar)
             } catch (e: Exception) {
                 throw RuntimeException(e)