From a8d00a6f4352df233e9f65396fceee3b5799f4a7 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Fri, 26 Feb 2021 19:43:55 +0100
Subject: [PATCH] MapsForge: use v3 JAR from c-geo, add User-Agent

---
 res/layout/mapview.xml     |  2 +-
 src/MapAct.scala           | 14 ++++++--------
 src/OsmTileDownloader.java |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/res/layout/mapview.xml b/res/layout/mapview.xml
index c19915a..83d1166 100644
--- a/res/layout/mapview.xml
+++ b/res/layout/mapview.xml
@@ -4,7 +4,7 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
-<org.mapsforge.android.maps.MapView
+<org.mapsforge.v3.android.maps.MapView
 	android:id="@+id/mapview"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
diff --git a/src/MapAct.scala b/src/MapAct.scala
index c39d99a..7109d0f 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -12,15 +12,15 @@ import _root_.android.os.{Build, Bundle}
 import _root_.android.util.Log
 import _root_.android.view.{KeyEvent, Menu, MenuItem, View}
 import _root_.android.widget.Toast
-import _root_.org.mapsforge.android.maps._
-import _root_.org.mapsforge.core.{GeoPoint, Tile}
-import _root_.org.mapsforge.android.maps.overlay.{ItemizedOverlay, OverlayItem}
+import _root_.org.mapsforge.v3.android.maps._
+import _root_.org.mapsforge.v3.core.{GeoPoint, Tile}
+import _root_.org.mapsforge.v3.android.maps.overlay.{ItemizedOverlay, OverlayItem}
 
 import _root_.scala.collection.mutable.ArrayBuffer
 import _root_.java.io.File
 import _root_.java.util.ArrayList
 
-import org.mapsforge.android.maps.mapgenerator.{MapGeneratorFactory, MapGeneratorInternal}
+import org.mapsforge.v3.android.maps.mapgenerator.{MapGeneratorFactory, MapGeneratorInternal}
 
 // to make scala-style iterating over arraylist possible
 import scala.collection.JavaConversions._
@@ -43,6 +43,7 @@ class MapAct extends MapActivity with MapMenuHelper {
 		setContentView(R.layout.mapview)
 		mapview.setBuiltInZoomControls(true)
 		mapview.getOverlays().add(staoverlay)
+		mapview.setTextScale(getResources().getDisplayMetrics().density)
 
 		startLoading()
 	}
@@ -121,10 +122,7 @@ class MapAct extends MapActivity with MapMenuHelper {
 				Toast.makeText(this, getString(R.string.mapfile_error, mapfile), Toast.LENGTH_SHORT).show()
 			val map_source = MapGeneratorInternal.MAPNIK
 			val map_gen = new OsmTileDownloader()
-			//TODO in later mapsforge:
-			//map_gen match {
-			//	case map_gen_tile : TileDownloader => map_gen_tile.setUserAgent("APRSdroid")
-			//}
+			map_gen.setUserAgent(getString(R.string.build_version))
 			mapview.setMapGenerator(map_gen)
 		}
 		val themefile = new File(prefs.getString("themefile", android.os.Environment.getExternalStorageDirectory() + "/aprsdroid.xml"))
diff --git a/src/OsmTileDownloader.java b/src/OsmTileDownloader.java
index c959c6f..40d7815 100644
--- a/src/OsmTileDownloader.java
+++ b/src/OsmTileDownloader.java
@@ -1,7 +1,7 @@
 package org.aprsdroid.app;
 
-import org.mapsforge.android.maps.mapgenerator.tiledownloader.TileDownloader;
-import org.mapsforge.core.Tile;
+import org.mapsforge.v3.android.maps.mapgenerator.tiledownloader.TileDownloader;
+import org.mapsforge.v3.core.Tile;
 
 public class OsmTileDownloader extends TileDownloader {
 	private static final String HOST_NAME = "tile.openstreetmap.org";