From 18d9541d9b97f1cd073a9054ab1feafe177110ac Mon Sep 17 00:00:00 2001 From: PWRxPSYCHO Date: Sat, 27 Aug 2022 08:57:01 -0400 Subject: [PATCH] removed unused variables and imports --- .../java/com/geeksville/mesh/model/CustomTileSource.kt | 3 +++ app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/CustomTileSource.kt b/app/src/main/java/com/geeksville/mesh/model/CustomTileSource.kt index f6f915ea1..e7b680115 100644 --- a/app/src/main/java/com/geeksville/mesh/model/CustomTileSource.kt +++ b/app/src/main/java/com/geeksville/mesh/model/CustomTileSource.kt @@ -35,6 +35,9 @@ class CustomTileSource { val USGS_SAT: OnlineTileSourceBase = TileSourceFactory.USGS_SAT val DEFAULT_TILE_SOURCE: OnlineTileSourceBase = TileSourceFactory.DEFAULT_TILE_SOURCE + /** + * The order in this list must match that in the arrays.xml under map_styles + */ val mTileSources: List = listOf(MAPNIK, USGS_TOPO, USGS_SAT, ESRI_IMAGERY) diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt index 19a627dcd..45f055df0 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt @@ -25,11 +25,8 @@ import org.osmdroid.api.IMapController import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.ITileSource import org.osmdroid.tileprovider.tilesource.OnlineTileSourceBase -import org.osmdroid.tileprovider.tilesource.TileSourceFactory -import org.osmdroid.tileprovider.tilesource.TileSourcePolicy import org.osmdroid.util.BoundingBox import org.osmdroid.util.GeoPoint -import org.osmdroid.util.MapTileIndex import org.osmdroid.views.CustomZoomButtonsController import org.osmdroid.views.MapView import org.osmdroid.views.overlay.CopyrightOverlay @@ -44,14 +41,10 @@ class MapFragment : ScreenFragment("Map"), Logging { private lateinit var mPrefs: SharedPreferences private val model: UIViewModel by activityViewModels() - private lateinit var esriTileSource: OnlineTileSourceBase - private val defaultMinZoom = 1.5 private val nodeZoomLevel = 8.5 private val defaultZoomSpeed = 3000L private val prefsName = "org.andnav.osm.prefs" - private val prefsZoomLevelDouble = "prefsZoomLevelDouble" - private val prefsTileSource = "prefsTileSource" private val mapStyleId = "map_style_id" private val uiPrefs = "ui-prefs" private var nodePositions = listOf()