From fedea544f4ef05e37d98859374ecb7c864edcf56 Mon Sep 17 00:00:00 2001
From: Georg Lukas <georg@op-co.de>
Date: Wed, 21 Sep 2016 11:26:30 +0200
Subject: [PATCH] icons: use Hes' overlay letters

---
 src/MapAct.scala     | 14 ++++++++------
 src/SymbolView.scala | 27 +++++++--------------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/MapAct.scala b/src/MapAct.scala
index cc5ceb8..1cfa592 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -182,16 +182,18 @@ class StationOverlay(icons : Drawable, context : MapAct, db : StorageDatabase) e
 	override def size() = stations.size()
 	override def createItem(idx : Int) : Station = stations.get(idx)
 
-	def symbol2rect(symbol : String) : Rect = {
-		val alt_offset = if (symbol(0) == '/') 0 else symbolSize*6
-		val index = symbol(1) - 33
+	def symbol2rect(index : Int, page : Int) : Rect = {
 		// check for overflow
 		if (index < 0 || index >= 6*16)
 			return new Rect(0, 0, symbolSize, symbolSize)
+		val alt_offset = page*symbolSize*6
 		val y = (index / 16) * symbolSize + alt_offset
 		val x = (index % 16) * symbolSize
 		new Rect(x, y, x+symbolSize, y+symbolSize)
 	}
+	def symbol2rect(symbol : String) : Rect = {
+		symbol2rect(symbol(1) - 33, if (symbol(0) == '/') 0 else 1)
+	}
 
 	def symbolIsOverlayed(symbol : String) = {
 		(symbol(0) != '/' && symbol(0) != '\\')
@@ -275,9 +277,9 @@ class StationOverlay(icons : Drawable, context : MapAct, db : StorageDatabase) e
 				// then the bitmap
 				c.drawBitmap(iconbitmap, srcRect, destRect, null)
 				// and finally the bitmap overlay, if any
-				if (zoom >= 6 && symbolIsOverlayed(s.symbol)) {
-					c.drawText(s.symbol(0).toString(), p.x+1, p.y+ss/2+1, symbStrPaint)
-					c.drawText(s.symbol(0).toString(), p.x+1, p.y+ss/2+1, symbPaint)
+				if (symbolIsOverlayed(s.symbol)) {
+					// use page 2, overlay letters
+					c.drawBitmap(iconbitmap, symbol2rect(s.symbol(0)-33, 2), destRect, null)
 				}
 			}
 		}
diff --git a/src/SymbolView.scala b/src/SymbolView.scala
index 7465530..b4270a7 100644
--- a/src/SymbolView.scala
+++ b/src/SymbolView.scala
@@ -29,13 +29,15 @@ class SymbolView(context : Context, attrs : AttributeSet) extends ImageView(cont
 		invalidate()
 	}
 
-	def symbol2rect(symbol : String) : Rect = {
-		val alt_offset = if (symbol(0) == '/') 0 else symbolSize*6
-		val index = symbol(1) - 33
+	def symbol2rect(index : Int, page : Int) : Rect = {
+		val alt_offset = page*symbolSize*6
 		val y = (index / 16) * symbolSize + alt_offset
 		val x = (index % 16) * symbolSize
 		new Rect(x, y, x+symbolSize, y+symbolSize)
 	}
+	def symbol2rect(symbol : String) : Rect = {
+		symbol2rect(symbol(1) - 33, if (symbol(0) == '/') 0 else 1)
+	}
 
 	def symbolIsOverlayed(symbol : String) = {
 		(symbol(0) != '/' && symbol(0) != '\\')
@@ -46,30 +48,15 @@ class SymbolView(context : Context, attrs : AttributeSet) extends ImageView(cont
 		val srcRect = symbol2rect(symbol)
 		//android.util.Log.d("SymbolView", "x * y = " +  getWidth() + "*" + getHeight())
 		val destRect = new Rect(0, 0, getWidth(), getHeight())
-		val fontSize = getHeight()*3/4 - 1
 		val drawPaint = new Paint()
 		drawPaint.setAntiAlias(true)
 		drawPaint.setFilterBitmap(true)
 
 		canvas.drawBitmap(iconbitmap, srcRect, destRect, drawPaint)
 
-		val symbPaint = new Paint()
-		symbPaint.setColor(0xffffffff)
-		symbPaint.setTextAlign(Paint.Align.CENTER)
-		symbPaint.setTypeface(Typeface.MONOSPACE)
-		symbPaint.setTextSize(fontSize)
-		symbPaint.setAntiAlias(true)
-
-		val strokePaint = new Paint(symbPaint)
-		strokePaint.setColor(0xff000000)
-		strokePaint.setStyle(Paint.Style.STROKE)
-		strokePaint.setStrokeWidth(2)
-
 		if (symbolIsOverlayed(symbol)) {
-			val x = getWidth()/2
-			val y = getHeight()*3/4
-			canvas.drawText(symbol(0).toString(), x+1, y+1, strokePaint)
-			canvas.drawText(symbol(0).toString(), x+1, y+1, symbPaint)
+			// use page 2, overlay letters
+			canvas.drawBitmap(iconbitmap, symbol2rect(symbol(0)-33, 2), destRect, drawPaint)
 		}
 	}
 }