From d943b206fa008628ae1b2a83365c73a42871f3b2 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Thu, 16 Mar 2023 20:56:06 -0700 Subject: [PATCH] checkpoint --- .../java/org/y20k/trackbook/MapFragment.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/MapFragment.kt b/app/src/main/java/org/y20k/trackbook/MapFragment.kt index 32e43cd..17f9238 100644 --- a/app/src/main/java/org/y20k/trackbook/MapFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/MapFragment.kt @@ -81,7 +81,6 @@ class MapFragment : Fragment() private var current_position_overlays = ArrayList() private var currentTrackOverlay: SimpleFastPointOverlay? = null private lateinit var locationErrorBar: Snackbar - private lateinit var controller: IMapController private var zoomLevel: Double = Keys.DEFAULT_ZOOM_LEVEL private var homepoints_overlays = ArrayList() private lateinit var database_changed_listener: DatabaseChangedListener @@ -132,14 +131,13 @@ class MapFragment : Fragment() mapView.isLongClickable = true // basic map setup - controller = mapView.controller mapView.isTilesScaledToDpi = true mapView.isVerticalMapRepetitionEnabled = false mapView.setTileSource(TileSourceFactory.MAPNIK) mapView.setMultiTouchControls(true) mapView.zoomController.setVisibility(org.osmdroid.views.CustomZoomButtonsController.Visibility.NEVER) zoomLevel = PreferencesHelper.loadZoomLevel() - controller.setZoom(zoomLevel) + mapView.controller.setZoom(zoomLevel) if (AppThemeHelper.isDarkModeOn(requireActivity())) { @@ -229,11 +227,11 @@ class MapFragment : Fragment() } zoom_in_button.setOnClickListener { zoomLevel += 0.5 - controller.zoomTo(mapView.zoomLevelDouble + 0.5, 0) + mapView.controller.zoomTo(mapView.zoomLevelDouble + 0.5, 0) } zoom_out_button.setOnClickListener { zoomLevel -= 0.5 - controller.zoomTo(mapView.zoomLevelDouble - 0.5, 0) + mapView.controller.zoomTo(mapView.zoomLevelDouble - 0.5, 0) } requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) @@ -368,9 +366,13 @@ class MapFragment : Fragment() fun centerMap(location: Location, animated: Boolean = false) { val position = GeoPoint(location.latitude, location.longitude) - when (animated) { - true -> controller.animateTo(position) - false -> controller.setCenter(position) + if (animated) + { + mapView.controller.animateTo(position) + } + else + { + mapView.controller.setCenter(position) } continuous_auto_center = true }