voussoir
/
trkpt
1
0
Fork 0
Code Issues Packages Projects Releases Activity

changes in the way map center is saved for tracks after zoom or scroll

master
y20k 2020-08-05 18:01:45 +02:00
parent 2531a36f20
commit 60921a199b
No known key found for this signature in database
GPG Key ID: 824D4259F41FAFF6
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -11,8 +11,8 @@ android {
applicationId 'org.y20k.trackbook' applicationId 'org.y20k.trackbook'
minSdkVersion 25 minSdkVersion 25
targetSdkVersion 29 targetSdkVersion 29
versionCode 42 versionCode 43
versionName '2.0.5' versionName '2.0.6'
resConfigs "en", "da", "de", "fr", "hr", "id", "it", "ja", "nb-rNO", "nl", "sv", "zh-rCN" resConfigs "en", "da", "de", "fr", "hr", "id", "it", "ja", "nb-rNO", "nl", "sv", "zh-rCN"
} }

36
app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt
View File

@ -32,6 +32,9 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.osmdroid.api.IGeoPoint import org.osmdroid.api.IGeoPoint
import org.osmdroid.api.IMapController import org.osmdroid.api.IMapController
import org.osmdroid.events.MapListener
import org.osmdroid.events.ScrollEvent
import org.osmdroid.events.ZoomEvent
import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.tileprovider.tilesource.TileSourceFactory
import org.osmdroid.util.GeoPoint import org.osmdroid.util.GeoPoint
import org.osmdroid.views.MapView import org.osmdroid.views.MapView
@ -50,7 +53,7 @@ import kotlin.math.roundToInt
/* /*
* TrackFragmentLayoutHolder class * TrackFragmentLayoutHolder class
*/ */
data class TrackFragmentLayoutHolder(private var context: Context, private var markerListener: MapOverlayHelper.MarkerListener, private var inflater: LayoutInflater, private var container: ViewGroup?, var track: Track) { data class TrackFragmentLayoutHolder(private var context: Context, private var markerListener: MapOverlayHelper.MarkerListener, private var inflater: LayoutInflater, private var container: ViewGroup?, var track: Track): MapListener {
/* Define log tag */ /* Define log tag */
private val TAG: String = LogHelper.makeLogTag(TrackFragmentLayoutHolder::class.java) private val TAG: String = LogHelper.makeLogTag(TrackFragmentLayoutHolder::class.java)
@ -99,6 +102,7 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m
// basic map setup // basic map setup
controller = mapView.controller controller = mapView.controller
mapView.addMapListener(this)
mapView.isTilesScaledToDpi = true mapView.isTilesScaledToDpi = true
mapView.setTileSource(TileSourceFactory.MAPNIK) mapView.setTileSource(TileSourceFactory.MAPNIK)
mapView.setMultiTouchControls(true) mapView.setMultiTouchControls(true)
@ -176,11 +180,7 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m
/* Saves zoom level and center of this map */ /* Saves zoom level and center of this map */
fun saveViewStateToTrack() { fun saveViewStateToTrack() {
val center: IGeoPoint = mapView.mapCenter if (track.latitude != 0.0 && track.longitude != 0.0) {
if (center.latitude != 0.0 && center.longitude != 0.0) {
track.latitude = center.latitude
track.longitude = center.longitude
track.zoomLevel = mapView.zoomLevelDouble
GlobalScope.launch { FileHelper.saveTrackSuspended(track, false) } GlobalScope.launch { FileHelper.saveTrackSuspended(track, false) }
} }
} }
@ -274,4 +274,28 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m
} }
/* Overrides onZoom from MapListener */
override fun onZoom(event: ZoomEvent?): Boolean {
if (event == null) {
return false
} else {
track.zoomLevel = event.zoomLevel
return true
}
}
/* Overrides onScroll from MapListener */
override fun onScroll(event: ScrollEvent?): Boolean {
if (event == null) {
return false
} else {
val center: IGeoPoint = mapView.mapCenter
track.latitude = center.latitude
track.longitude = center.longitude
return true
}
}
} }