Moved to OSMDroid 3.0.9.SNAPSHOT

cyclestreets · May 24, 2012 · c84a935 · c84a935
1 parent 6e444d7
commit c84a935
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.classpath b/.classpath
@@ -6,8 +6,9 @@
 	<classpathentry kind="lib" path="libs/httpmime-4.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/mapsforge-map-0.3.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="libs/mapsforge-map-reader-0.3.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="libs/osmdroid-android-3.0.8-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="libs/osmdroid-android-3.0.9-SNAPSHOT.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/libs/osmdroid-android-3.0.8-SNAPSHOT.jar → libs/osmdroid-android-3.0.9-SNAPSHOT.jar b/libs/osmdroid-android-3.0.8-SNAPSHOT.jar → libs/osmdroid-android-3.0.9-SNAPSHOT.jar
diff --git a/src/net/cyclestreets/views/CycleMapView.java b/src/net/cyclestreets/views/CycleMapView.java
@@ -244,7 +244,7 @@ private ITileSource mapRenderer()
                     "http://b.tile.opencyclemap.org/cycle/",
                     "http://c.tile.opencyclemap.org/cycle/");
     final OnlineTileSourceBase OPENSTREETMAP = new XYTileSource("CycleStreets-OSM",
-                    ResourceProxy.string.osmarender, 0, 17, 256, ".png",
+                    ResourceProxy.string.base, 0, 17, 256, ".png",
                     "http://a.tile.openstreetmap.org/",
                     "http://b.tile.openstreetmap.org/",
                     "http://c.tile.openstreetmap.org/");

diff --git a/src/org/mapsforge/android/maps/MapsforgeOSMTileSource.java b/src/org/mapsforge/android/maps/MapsforgeOSMTileSource.java
@@ -22,11 +22,18 @@ public class MapsforgeOSMTileSource implements ITileSource
   @SuppressWarnings("serial")
   static private class RenderTheme implements JobTheme 
   {
-    static private final String path = "/org/mapsforge/android/maps/rendertheme/osmarender/osmarender.xml";
+    static private final String path = "/org/mapsforge/android/maps/rendertheme/osmarender/";
+    static private final String file = "osmarender.xml";
+
+    //@Override
+    //public String getRelativePathPrefix() {
+    //  return path;
+    //}
 
     @Override
     public InputStream getRenderThemeAsStream() {
-      return getClass().getResourceAsStream(path);
+      final InputStream is = getClass().getResourceAsStream(path+file);
+      return is;
     }
   }