Adapting OBP Tutorial to osmdroid 5.2

MKergall · May 8, 2016 · d93ecad · d93ecad
1 parent 59347f6
commit d93ecad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/OSMBonusPackTuto/build.gradle b/OSMBonusPackTuto/build.gradle
@@ -29,15 +29,15 @@ repositories {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-//    compile project(":OSMBonusPack")
+    compile project(":OSMBonusPack")
 
     //including using JitPack:
-    compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:v5.7'
+//    compile 'com.github.MKergall.osmbonuspack:OSMBonusPack:v5.8'
 
     // including as local lib
     /*
-    compile(name: 'osmbonuspack_v5.7', ext: 'aar')
-    compile 'org.osmdroid:osmdroid-android:5.1@aar'
+    compile(name: 'osmbonuspack_v5.8', ext: 'aar')
+    compile 'org.osmdroid:osmdroid-android:5.2@aar'
     compile "com.android.support:support-v4:23.1.1"
     compile 'org.apache.commons:commons-lang3:3.3.2'
     compile 'com.google.code.gson:gson:2.4'

diff --git a/OSMBonusPackTuto/src/main/java/com/example/osmbonuspacktuto/MainActivity.java b/OSMBonusPackTuto/src/main/java/com/example/osmbonuspacktuto/MainActivity.java
@@ -31,25 +31,25 @@
 import org.osmdroid.bonuspack.location.NominatimPOIProvider;
 import org.osmdroid.bonuspack.location.OverpassAPIProvider;
 import org.osmdroid.bonuspack.location.POI;
-import org.osmdroid.bonuspack.overlays.BasicInfoWindow;
-import org.osmdroid.bonuspack.overlays.FolderOverlay;
 import org.osmdroid.bonuspack.overlays.GroundOverlay;
-import org.osmdroid.bonuspack.overlays.InfoWindow;
-import org.osmdroid.bonuspack.overlays.MapEventsOverlay;
-import org.osmdroid.bonuspack.overlays.MapEventsReceiver;
-import org.osmdroid.bonuspack.overlays.Marker;
-import org.osmdroid.bonuspack.overlays.Marker.OnMarkerDragListener;
-import org.osmdroid.bonuspack.overlays.MarkerInfoWindow;
-import org.osmdroid.bonuspack.overlays.Polygon;
-import org.osmdroid.bonuspack.overlays.Polyline;
 import org.osmdroid.bonuspack.routing.OSRMRoadManager;
 import org.osmdroid.bonuspack.routing.Road;
 import org.osmdroid.bonuspack.routing.RoadManager;
 import org.osmdroid.bonuspack.routing.RoadNode;
+import org.osmdroid.events.MapEventsReceiver;
 import org.osmdroid.util.BoundingBoxE6;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
+import org.osmdroid.views.overlay.FolderOverlay;
+import org.osmdroid.views.overlay.MapEventsOverlay;
+import org.osmdroid.views.overlay.Marker;
+import org.osmdroid.views.overlay.Marker.OnMarkerDragListener;
 import org.osmdroid.views.overlay.Overlay;
+import org.osmdroid.views.overlay.Polygon;
+import org.osmdroid.views.overlay.Polyline;
+import org.osmdroid.views.overlay.infowindow.BasicInfoWindow;
+import org.osmdroid.views.overlay.infowindow.InfoWindow;
+import org.osmdroid.views.overlay.infowindow.MarkerInfoWindow;
 
 import java.util.ArrayList;