diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9bb86ed..c323126 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,8 +28,6 @@
-
-
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..369f8eb
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,77 @@
+buildscript {
+ repositories {
+ google()
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.1.3'
+ }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 26
+ buildToolsVersion "27.0.3"
+
+ defaultConfig {
+ applicationId "dk.network42.osmfocus"
+ minSdkVersion 14
+ targetSdkVersion 19
+ versionName "0.1.1rc1"
+ versionCode 3
+ }
+
+ signingConfigs {
+ debug {
+ storeFile file("/path/to/debug.keystore")
+ storePassword "android"
+ keyAlias "androiddebugkey"
+ keyPassword "android"
+ }
+ release {
+ storeFile file("/path/to/debug.keystore")
+ storePassword "android"
+ keyAlias "androiddebugkey"
+ keyPassword "android"
+ }
+ }
+
+ buildTypes {
+ debug {
+ applicationIdSuffix ".debug"
+ versionNameSuffix "-debug"
+ signingConfig signingConfigs.debug
+ debuggable true
+ zipAlignEnabled false
+ minifyEnabled false
+ }
+ release {
+ versionNameSuffix "-release"
+ signingConfig signingConfigs.release
+ debuggable false
+ zipAlignEnabled true
+ minifyEnabled true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile "AndroidManifest.xml"
+ java.srcDirs = ['src']
+ res.srcDirs = ['res']
+ }
+ }
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support:support-v4:26.0.+' //compileSdkVersion
+}
+
+repositories {
+ google()
+ mavenCentral()
+ jcenter()
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..0d4a951
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..b6517bb
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..ad5db2a
--- /dev/null
+++ b/local.properties
@@ -0,0 +1 @@
+sdk.dir = /path/to/Android/Sdk
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..8162722
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'osm-focus'
diff --git a/src/dk/network42/osmfocus/MainActivity.java b/src/dk/network42/osmfocus/MainActivity.java
index 8ecef77..85809f5 100644
--- a/src/dk/network42/osmfocus/MainActivity.java
+++ b/src/dk/network42/osmfocus/MainActivity.java
@@ -35,6 +35,7 @@ import android.hardware.SensorManager;
import android.location.GpsSatellite;
import android.location.GpsStatus;
import android.location.Location;
+import android.location.LocationListener;
import android.location.LocationManager;
import android.os.AsyncTask;
import android.os.Build;
@@ -56,34 +57,27 @@ import android.view.ScaleGestureDetector;
import android.view.WindowManager;
import android.widget.Toast;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesClient;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-import com.google.android.gms.location.LocationClient;
-import com.google.android.gms.location.LocationListener;
-import com.google.android.gms.location.LocationRequest;
-
public class MainActivity extends Activity implements
- GooglePlayServicesClient.ConnectionCallbacks,
- GooglePlayServicesClient.OnConnectionFailedListener,
LocationListener, GpsStatus.Listener,
SensorEventListener {
- static final int CONNECTION_FAILURE_RESOLUTION_REQUEST = 9000;
static final int PREFERENCE_REQUEST = 9001;
static final int INVALIDATE_VIEW = 1000;
static final int POLL_NOTIFICATIONS = 1001;
+ private static final int LOCATION_INTERVAL = 1000; //ms
+ private static final float LOCATION_DISTANCE = 1f; //meters
+
+ public static final String userAgent = "OSMfocus";
+
private static final String TAG = "OsmFocusActivity";
public static final String PREFS_NAME = "OSMFocusPrefsFile";
LocationManager mLocationManager;
- LocationClient mLocationClient;
- LocationRequest mLocationRequest;
SensorManager sensorManager;
private Sensor sensorAccelerometer;
- private Sensor sensorMagneticField;
+ private Sensor sensorMagneticField;
private float[] valuesAccelerometer;
private float[] valuesMagneticField;
private float[] matrixR;
@@ -91,7 +85,7 @@ public class MainActivity extends Activity implements
private float[] matrixValues;
private MapView mapView;
double mPanLon, mPanLat;
- private OsmServer mOsmServer = new OsmServer(null, "Editor");
+ private OsmServer mOsmServer = new OsmServer(null, userAgent);
private GestureDetectorCompat mGestureDetector;
private ScaleGestureDetector mScaleGestureDetector;
private boolean mScaleInProgress = false;
@@ -196,30 +190,14 @@ public class MainActivity extends Activity implements
Location loc = getMostRecentKnownLocation();
if (loc != null)
this.onLocationChanged(loc);
-
- mLocationClient = new LocationClient(this, this, this);
- mLocationRequest = LocationRequest.create();
- mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
- mLocationRequest.setInterval(1000/*ms*/);
- mLocationRequest.setFastestInterval(500/*ms*/);
-
- //locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
- //if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
- // Intent intent = new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
- // startActivity(intent);
- //}
- //Criteria criteria = new Criteria();
- //mG.mLocProvider = locationManager.getBestProvider(criteria, false);
- //mG.mLocProvider = locationManager.GPS_PROVIDER;
- //Location location = locationManager.getLastKnownLocation(mG.mLocProvider);
- //if (location != null) {
- // Toast toast = Toast.makeText(getApplicationContext(), "Location provider "+mG.mLocProvider, Toast.LENGTH_SHORT);
- // toast.show();
- // //onLocationChanged(location);
- //}
- //Location location = new Location("FIXME");
- //Location location = mLocationClient.getLastLocation();
+ if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+ mLocationManager.requestLocationUpdates(
+ LocationManager.GPS_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
+ } else if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+ mLocationManager.requestLocationUpdates(
+ LocationManager.NETWORK_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
+ }
if (mG.mUseCompass) {
sensorManager = (SensorManager)getSystemService(SENSOR_SERVICE);
@@ -232,15 +210,6 @@ public class MainActivity extends Activity implements
matrixValues = new float[3];
}
- // Initialize the location fields
- //if (location != null) {
- // Log.d(TAG, "Provider " + mG.mLocProvider + " has been selected.");
- // onLocationChanged(location);
- //} else {
- //latituteField.setText("Location not available");
- //longitudeField.setText("Location not available");
- //}
-
//registerForContextMenu(mapView);
registerComponentCallbacks(new ComponentCallbacks2() {
@@ -277,7 +246,6 @@ public class MainActivity extends Activity implements
@Override
protected void onStart() {
super.onStart();
- mLocationClient.connect();
}
/*
@@ -285,10 +253,6 @@ public class MainActivity extends Activity implements
*/
@Override
protected void onStop() {
- if (mLocationClient.isConnected()) {
- mLocationClient.removeLocationUpdates(this);
- }
- mLocationClient.disconnect();
super.onStop();
}
@@ -315,39 +279,12 @@ public class MainActivity extends Activity implements
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
- case CONNECTION_FAILURE_RESOLUTION_REQUEST:
- /*
- * If the result code is Activity.RESULT_OK, try
- * to connect again
- */
- switch (resultCode) {
- case Activity.RESULT_OK:
- break;
- }
case PREFERENCE_REQUEST:
mG.update(getBaseContext());
mapView.postInvalidate();
break;
}
}
-
- private boolean servicesConnected() {
- int resultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(this);
- if (ConnectionResult.SUCCESS == resultCode) {
- Log.d("Location Updates", "Google Play services is available.");
- return true;
- } else {
- //int errorCode = GooglePlayServicesUtil.getErrorCode();
- Dialog errorDialog = GooglePlayServicesUtil.getErrorDialog(resultCode, this,
- CONNECTION_FAILURE_RESOLUTION_REQUEST);
- if (errorDialog != null) {
- errorDialog.show();
- } else {
- showOkDialog(this, "Something went wrong with Google Play Services");
- }
- return false;
- }
- }
public static void showOkDialog(Context context, String txt)
{
@@ -358,42 +295,7 @@ public class MainActivity extends Activity implements
AlertDialog dialog = builder.create();
dialog.show();
}
-
- @Override
- public void onConnected(Bundle dataBundle) {
- Log.d(TAG, "onConnected");
- mLocationClient.requestLocationUpdates(mLocationRequest, this);
- }
- @Override
- public void onDisconnected() {
- }
-
- @Override
- public void onConnectionFailed(ConnectionResult connectionResult) {
- if (connectionResult.hasResolution()) {
- try {
- // Start an Activity that tries to resolve the error
- connectionResult.startResolutionForResult(
- this,
- CONNECTION_FAILURE_RESOLUTION_REQUEST);
- /*
- * Thrown if Google Play services canceled the original
- * PendingIntent
- */
- } catch (IntentSender.SendIntentException e) {
- // Log the error
- e.printStackTrace();
- }
- } else {
- /*
- * If no resolution is available, display a dialog to the
- * user with the error.
- */
- //showErrorDialog(connectionResult.getErrorCode());
- }
- }
-
@Override
public boolean onTouchEvent(MotionEvent event){
boolean h = mScaleGestureDetector.onTouchEvent(event);
@@ -611,6 +513,21 @@ public class MainActivity extends Activity implements
}
}
+ @Override
+ public void onProviderDisabled(String provider) {
+ //Log.e(TAG, "onProviderDisabled: " + provider);
+ }
+
+ @Override
+ public void onProviderEnabled(String provider) {
+ //Log.e(TAG, "onProviderEnabled: " + provider);
+ }
+
+ @Override
+ public void onStatusChanged(String provider, int status, Bundle extras) {
+ //Log.e(TAG, "onStatusChanged: " + provider);
+ }
+
public void onGpsStatusChanged(int event) {
boolean statchg = false;
switch (event) {
diff --git a/src/dk/network42/osmfocus/OsmServer.java b/src/dk/network42/osmfocus/OsmServer.java
index 4d7fe4e..a26f7e4 100644
--- a/src/dk/network42/osmfocus/OsmServer.java
+++ b/src/dk/network42/osmfocus/OsmServer.java
@@ -19,7 +19,7 @@ public class OsmServer {
static private final int SERVER_CONNECT_TIMEOUT_MS = 30*1000;
static private final int API_TIMEOUT_MS = 10*1000;
static final int API_MAX_DOWNLOAD_DEGREES = (int) 1E7/4;
- static private final String DEFAULT_API_URL = "http://api.openstreetmap.org/api/"+API_VERSION+"/";
+ static private final String DEFAULT_API_URL = "https://api.openstreetmap.org/api/"+API_VERSION+"/";
private final String mApiUrl;
private final String mAgent;
@@ -44,7 +44,7 @@ public class OsmServer {
// top is the latitude of the top (northernmost) side of the bounding box.
//
// Example:
- // http://api.openstreetmap.org/api/0.6/map?bbox=11.54,48.14,11.543,48.145
+ // https://api.openstreetmap.org/api/0.6/map?bbox=11.54,48.14,11.543,48.145
//
// Error codes
// HTTP status code 400 (Bad Request)
diff --git a/src/dk/network42/osmfocus/OsmTile.java b/src/dk/network42/osmfocus/OsmTile.java
index 3432aea..730ef26 100644
--- a/src/dk/network42/osmfocus/OsmTile.java
+++ b/src/dk/network42/osmfocus/OsmTile.java
@@ -152,6 +152,7 @@ public class OsmTile {
//Log.d(TAG, "Loading tile "+tileurl);
URL url = new URL(tileurl);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestProperty("User-Agent", MainActivity.userAgent);
conn.setDoInput(true);
//Log.d(TAG, "Connect for tile download");
conn.connect();
diff --git a/src/dk/network42/osmfocus/OsmTileLayer.java b/src/dk/network42/osmfocus/OsmTileLayer.java
index 4bf50b4..8694ab9 100644
--- a/src/dk/network42/osmfocus/OsmTileLayer.java
+++ b/src/dk/network42/osmfocus/OsmTileLayer.java
@@ -43,9 +43,9 @@ public abstract class OsmTileLayer extends MapLayer {
static String urlFromType(int type) {
if (type==MapLayer.MAPTYPE_OSM) {
- return "http://a.tile.openstreetmap.org";
+ return "https://a.tile.openstreetmap.org";
} else if (type==MapLayer.MAPTYPE_OSMCYCLEMAP) {
- return "http://a.tile.opencyclemap.org/cycle";
+ return "http://a.tile.opencyclemap.org/cycle";
}
return "";
}