From 3878ad2c8f820bec522978b4b32a46eb1008aacb Mon Sep 17 00:00:00 2001 From: MKer Date: Sun, 15 Nov 2015 18:56:18 +0100 Subject: [PATCH] Upgrade to osmdroid 5.0.1 --- MapsForgeForOsmdroid/build.gradle | 3 +- OSMBonusPack/build.gradle | 1 - .../org/osmdroid/bonuspack/kml/HotSpot.java | 25 ++--- .../bonuspack/utils/BonusPackHelper.java | 33 +++++-- OSMBonusPackTuto/build.gradle | 10 +- OSMNavigator/build.gradle | 5 +- OSMNavigator/src/main/AndroidManifest.xml | 27 +++++- .../com/osmnavigator/KmlStylesActivity.java | 14 +-- .../com/osmnavigator/KmlTreeActivity.java | 7 +- .../src/main/res/layout/items_list.xml | 11 ++- OSMNavigator/src/main/res/layout/main.xml | 8 ++ .../src/main/res/menu/option_menu.xml | 94 ++++++++++--------- .../src/main/res/values-fr/strings.xml | 13 +++ OSMNavigator/src/main/res/values/strings.xml | 13 +++ 14 files changed, 170 insertions(+), 94 deletions(-) diff --git a/MapsForgeForOsmdroid/build.gradle b/MapsForgeForOsmdroid/build.gradle index 579969a1..3e8c41c8 100644 --- a/MapsForgeForOsmdroid/build.gradle +++ b/MapsForgeForOsmdroid/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 15 - buildToolsVersion "22.0.1" + buildToolsVersion "23.0.0" defaultConfig { minSdkVersion 10 @@ -22,5 +22,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'org.osmdroid:osmdroid-android:5.0.1@aar' - //compile 'org.slf4j:slf4j-android:1.6.1-RC1' } diff --git a/OSMBonusPack/build.gradle b/OSMBonusPack/build.gradle index b05f787e..4719be0f 100644 --- a/OSMBonusPack/build.gradle +++ b/OSMBonusPack/build.gradle @@ -23,7 +23,6 @@ dependencies { compile "com.android.support:support-v4:22.2.0" compile 'org.osmdroid:osmdroid-android:5.0.1@aar' - //compile 'org.slf4j:slf4j-android:1.6.1-RC1' compile 'org.apache.commons:commons-lang3:3.3.2' compile 'com.google.code.gson:gson:2.3' } diff --git a/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/HotSpot.java b/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/HotSpot.java index 16b7ab46..1df3b18d 100644 --- a/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/HotSpot.java +++ b/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/kml/HotSpot.java @@ -2,6 +2,7 @@ import android.os.Parcel; import android.os.Parcelable; + import java.io.IOException; import java.io.Writer; @@ -20,18 +21,6 @@ public static enum Units { public float mx, my; public Units mXUnits, mYUnits; - public static final Creator CREATOR = new Creator() { - @Override - public HotSpot createFromParcel(Parcel in) { - return new HotSpot(in); - } - - @Override - public HotSpot[] newArray(int size) { - return new HotSpot[size]; - } - }; - public Units getUnits(String sUnits){ if ("fraction".equals(sUnits)) return Units.fraction; @@ -103,6 +92,18 @@ public void writeAsKML(Writer writer){ out.writeInt(mYUnits.ordinal()); } + public static final Creator CREATOR = new Creator() { + @Override + public HotSpot createFromParcel(Parcel in) { + return new HotSpot(in); + } + + @Override + public HotSpot[] newArray(int size) { + return new HotSpot[size]; + } + }; + public HotSpot(Parcel in){ mx = in.readFloat(); my = in.readFloat(); diff --git a/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/utils/BonusPackHelper.java b/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/utils/BonusPackHelper.java index 98a4d09e..ef718836 100644 --- a/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/utils/BonusPackHelper.java +++ b/OSMBonusPack/src/main/java/org/osmdroid/bonuspack/utils/BonusPackHelper.java @@ -1,5 +1,13 @@ package org.osmdroid.bonuspack.utils; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.os.Build; + +import org.apache.http.NameValuePair; +import org.osmdroid.util.BoundingBoxE6; + import java.io.BufferedReader; import java.io.FilterInputStream; import java.io.IOException; @@ -8,13 +16,6 @@ import java.net.URL; import java.util.HashMap; import java.util.List; -import org.apache.http.NameValuePair; -import org.osmdroid.util.BoundingBoxE6; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.os.Build; /** Useful functions and common constants. * @author M.Kergall @@ -75,6 +76,24 @@ public static String requestStringFromUrl(String url, String userAgent) { String result = readStream(connection); connection.close(); return result; + /* try moving to HttpURLConnection ... + URL uUrl; + HttpURLConnection urlConnection; + try { + uUrl = new URL(url); + urlConnection = (HttpURLConnection) uUrl.openConnection(); + } catch (Exception e) { + return null; + } + try { + urlConnection.getInputStream(); + String result = readStream(in); + finally{ + urlConnection.disconnect(); + } + } catch { + } + */ } /** sends an http request, and returns the whole content result in a String. diff --git a/OSMBonusPackTuto/build.gradle b/OSMBonusPackTuto/build.gradle index d1973031..e45cd4c9 100644 --- a/OSMBonusPackTuto/build.gradle +++ b/OSMBonusPackTuto/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 15 - buildToolsVersion "22.0.1" + buildToolsVersion "23.0.0" defaultConfig { applicationId "com.example.osmbonuspacktuto" @@ -28,13 +28,11 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) -// - //compile(name: 'osmbonuspack_v5.4', ext: 'aar') - compile project(":OSMBonusPack") - //compile 'org.osmdroid:osmdroid-android:5.0.1' - //compile 'org.slf4j:slf4j-android:1.6.1-RC1' + compile(name: 'osmbonuspack_v5.5', ext: 'aar') + //compile project(":OSMBonusPack") + compile 'org.osmdroid:osmdroid-android:5.0.1@aar' compile "com.android.support:support-v4:22.2.0" compile 'org.apache.commons:commons-lang3:3.3.2' compile 'com.google.code.gson:gson:2.3' diff --git a/OSMNavigator/build.gradle b/OSMNavigator/build.gradle index 75b55e3c..301dc1db 100644 --- a/OSMNavigator/build.gradle +++ b/OSMNavigator/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 15 - buildToolsVersion "22.0.1" + buildToolsVersion "23.0.0" defaultConfig { applicationId "com.osmnavigator" @@ -24,7 +24,4 @@ dependencies { compile project(":OSMBonusPack") compile project(":MapsForgeForOsmdroid") - - //compile 'org.osmdroid:osmdroid-android:4.3' - //compile 'org.slf4j:slf4j-android:1.6.1-RC1' } diff --git a/OSMNavigator/src/main/AndroidManifest.xml b/OSMNavigator/src/main/AndroidManifest.xml index 5cc0f39a..cf1f5a59 100644 --- a/OSMNavigator/src/main/AndroidManifest.xml +++ b/OSMNavigator/src/main/AndroidManifest.xml @@ -46,9 +46,22 @@ - - - + + + + + + diff --git a/OSMNavigator/src/main/java/com/osmnavigator/KmlStylesActivity.java b/OSMNavigator/src/main/java/com/osmnavigator/KmlStylesActivity.java index 0c796c53..c6e6c42d 100644 --- a/OSMNavigator/src/main/java/com/osmnavigator/KmlStylesActivity.java +++ b/OSMNavigator/src/main/java/com/osmnavigator/KmlStylesActivity.java @@ -1,9 +1,5 @@ package com.osmnavigator; -import java.util.ArrayList; -import java.util.HashMap; -import org.osmdroid.bonuspack.kml.Style; -import org.osmdroid.bonuspack.kml.StyleSelector; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -18,11 +14,17 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; +import org.osmdroid.bonuspack.kml.Style; +import org.osmdroid.bonuspack.kml.StyleSelector; + +import java.util.ArrayList; +import java.util.HashMap; + public class KmlStylesActivity extends Activity { /* request codes */ - public static final int KML_STYLES_REQUEST = 4; - public static final int KML_STYLE_REQUEST = 5; + public static final int KML_STYLES_REQUEST = 100; + public static final int KML_STYLE_REQUEST = 101; KmlStyleListAdapter mListAdapter; ListView mListView; diff --git a/OSMNavigator/src/main/java/com/osmnavigator/KmlTreeActivity.java b/OSMNavigator/src/main/java/com/osmnavigator/KmlTreeActivity.java index 741a97cd..4a1b7348 100644 --- a/OSMNavigator/src/main/java/com/osmnavigator/KmlTreeActivity.java +++ b/OSMNavigator/src/main/java/com/osmnavigator/KmlTreeActivity.java @@ -1,7 +1,5 @@ package com.osmnavigator; -import org.osmdroid.bonuspack.kml.KmlFeature; -import org.osmdroid.bonuspack.kml.KmlFolder; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -20,10 +18,13 @@ import android.widget.ListView; import android.widget.Spinner; +import org.osmdroid.bonuspack.kml.KmlFeature; +import org.osmdroid.bonuspack.kml.KmlFolder; + public class KmlTreeActivity extends Activity { /* request codes */ - public static final int KML_TREE_REQUEST = 3; + public static final int KML_TREE_REQUEST = 200; KmlListAdapter mListAdapter; ListView mListView; diff --git a/OSMNavigator/src/main/res/layout/items_list.xml b/OSMNavigator/src/main/res/layout/items_list.xml index a669937b..6ce9b0ed 100644 --- a/OSMNavigator/src/main/res/layout/items_list.xml +++ b/OSMNavigator/src/main/res/layout/items_list.xml @@ -9,10 +9,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center|clip_vertical" - android:layout_marginBottom="10dp" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="10dp" + android:layout_marginBottom="5dp" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp" + android:layout_marginTop="5dp" android:orientation="vertical" android:background="#FFFFFF" android:padding="10dp" > @@ -27,7 +27,8 @@ + android:layout_height="fill_parent"/> + \ No newline at end of file diff --git a/OSMNavigator/src/main/res/layout/main.xml b/OSMNavigator/src/main/res/layout/main.xml index 9da046aa..3222ffa1 100644 --- a/OSMNavigator/src/main/res/layout/main.xml +++ b/OSMNavigator/src/main/res/layout/main.xml @@ -113,6 +113,14 @@ android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" android:background="@drawable/btn_tracking_off" /> + +