remove unsupported map tile factories - maps

src/main/scala/peregin/gpv/gui/TelemetryPanel.scala

@@ -5,7 +5,7 @@ import java.io.File
 import javax.swing.ImageIcon
 import org.jdesktop.swingx.mapviewer.DefaultTileFactory
 import peregin.gpv.Setup
-import peregin.gpv.gui.map.{AltitudePanel, MapPanel, MapQuestTileFactory, MicrosoftTileFactory, SwissTileFactory}
+import peregin.gpv.gui.map.{AltitudePanel, MapPanel, MapQuestTileFactory, MicrosoftTileFactory}
 import peregin.gpv.model.{Mode, Telemetry}
 import peregin.gpv.util.{Io, Logging, Timed}
 
@@ -26,7 +26,7 @@ class TelemetryPanel(openGpsData: File => Unit) extends MigPanel("ins 2", "", "[
   }
   val mapChooser = new ComboBox(Seq(
     TileOption("Aerial (Microsoft)", new MicrosoftTileFactory),
-    TileOption("Open Street Map", new MapQuestTileFactory)
+    //TileOption("MapQuest", new MapQuestTileFactory),
   ))
   private val mapType = new MigPanel("ins 0", "", "[grow, fill]") {
     add(new Label("Map Type"), "wrap")

src/main/scala/peregin/gpv/gui/map/MapQuestTileFactory.scala

@@ -5,17 +5,13 @@ import org.jdesktop.swingx.mapviewer.{DefaultTileFactory, TileFactoryInfo}
 // open street map
 class MapQuestTileFactory extends DefaultTileFactory(new MapQuestTileInfo)
 
-object MapQuestTileInfo {
-  val maxZoom = 17
-}
-class MapQuestTileInfo extends TileFactoryInfo(1,
-  MapQuestTileInfo.maxZoom - 2, MapQuestTileInfo.maxZoom, 256, true, true,
-  "http://otile1.mqcdn.com/tiles/1.0.0/osm",
-  "x", "y", "z") {
-
-  override def getTileUrl(x: Int, y: Int, zoom: Int): String = {
-    val z = MapQuestTileInfo.maxZoom - zoom
-    s"${this.baseURL}/$z/$x/$y.png"
-  }
-
-}
+class MapQuestTileInfo extends TileFactoryInfo(
+  0, // Minimum zoom level
+  17, // Maximum zoom level
+  2, // Total zoom level count
+  256, // Tile size in pixels
+  true, // X axis is tiled
+  true, // Y axis is tiled
+  "https://otile1.mqcdn.com/tiles/1.0.0/osm/", // Base tile URL
+  "x", "y", "z" // Tile URL parameters
+);