From ea60d150e1be0da867d170ecab08930f133eab97 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 28 Jun 2013 04:34:28 +0200
Subject: [PATCH] api changes

---
 .../src/org/oscim/android/AndroidMapView.java   |  2 +-
 .../oscim/android/canvas/AndroidGraphics.java   | 17 +++++++++++++----
 .../oscim/android/canvas/AndroidGraphics.java   | 12 ++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/vtm-android/src/org/oscim/android/AndroidMapView.java b/vtm-android/src/org/oscim/android/AndroidMapView.java
index bc5f9b49..aa9278ef 100644
--- a/vtm-android/src/org/oscim/android/AndroidMapView.java
+++ b/vtm-android/src/org/oscim/android/AndroidMapView.java
@@ -63,7 +63,7 @@ public class AndroidMapView extends RelativeLayout implements MapRenderCallback
 		//System.loadLibrary("tessellate");
 
 		CanvasAdapter.g = AndroidGraphics.INSTANCE;
-		GLAdapter.INSTANCE = new AndroidGL20();
+		GLAdapter.g = new AndroidGL20();
 		Log.logger = new AndroidLog();
 	}
 
diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
index e2ac5260..aa449449 100644
--- a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.android.canvas;
 
+import java.io.IOException;
 import java.io.InputStream;
 
+import org.oscim.backend.BitmapUtils;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
@@ -31,10 +33,6 @@ import android.graphics.drawable.Drawable;
 public final class AndroidGraphics extends CanvasAdapter {
 	public static final AndroidGraphics INSTANCE = new AndroidGraphics();
 
-	//	public static android.graphics.Bitmap getAndroidBitmap(Bitmap bitmap) {
-	//		return ((AndroidBitmap) bitmap).bitmap;
-	//	}
-
 	public static android.graphics.Paint getAndroidPaint(Paint paint) {
 		return ((AndroidPaint) paint).mPaint;
 	}
@@ -48,6 +46,16 @@ public final class AndroidGraphics extends CanvasAdapter {
 		return new AndroidBitmap(inputStream);
 	}
 
+	@Override
+	public Bitmap loadBitmapAsset(String fileName) {
+		try {
+			return BitmapUtils.createBitmap(fileName);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
 	@Override
 	public int getColor(Color color) {
 		switch (color) {
@@ -114,4 +122,5 @@ public final class AndroidGraphics extends CanvasAdapter {
 
 		return new OverlayMarker(drawableToBitmap(drawable), place);
 	}
+
 }
diff --git a/vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java
index e2ac5260..e0bb945f 100644
--- a/vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.android.canvas;
 
+import java.io.IOException;
 import java.io.InputStream;
 
+import org.oscim.backend.BitmapUtils;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
@@ -114,4 +116,14 @@ public final class AndroidGraphics extends CanvasAdapter {
 
 		return new OverlayMarker(drawableToBitmap(drawable), place);
 	}
+
+	@Override
+	public Bitmap loadBitmapAsset(String fileName) {
+		try {
+			return BitmapUtils.createBitmap(fileName);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 }