X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FPreloadMapActivity.java;h=e393b566ba9362c3017603dfbe5eada5180c4810;hp=9dfc727ed2ee190369b0f628e20851c1edab9131;hb=4a257455b2dc57069c41e1845daf66239c5cbe1d;hpb=2ec7e14f0104e3a227ff566fa2fc1f6286ddd9d0

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 9dfc727e..e393b566 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,7 +42,7 @@ import android.location.LocationManager;
 import android.location.LocationListener;
 import android.location.Criteria;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_13.*;
 
 /**
  * This Activity appears as a dialog. It lists any paired devices and
@@ -53,10 +54,12 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
 	private ArrayAdapter<AltosLaunchSite> known_sites_adapter;
 
+/*
 	private CheckBox	hybrid;
 	private CheckBox	satellite;
 	private CheckBox	roadmap;
 	private CheckBox	terrain;
+*/
 
 	private Spinner		known_sites_spinner;
 	private Spinner		min_zoom;
@@ -195,17 +198,22 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		return r;
 	}
 
+/*
 	private int bit(CheckBox box, int value) {
 		if (box.isChecked())
 			return 1 << value;
 		return 0;
 	}
+*/
 
 	private int types() {
+/*
 		return (bit(hybrid, AltosMap.maptype_hybrid) |
 			bit(satellite, AltosMap.maptype_satellite) |
 			bit(roadmap, AltosMap.maptype_roadmap) |
 			bit(terrain, AltosMap.maptype_terrain));
+*/
+		return 1 << AltosMap.maptype_hybrid;
 	}
 
 	private void load() {
@@ -317,12 +325,14 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		latitude = (EditText) findViewById(R.id.preload_latitude);
 		longitude = (EditText) findViewById(R.id.preload_longitude);
 
+/*
 		hybrid = (CheckBox) findViewById(R.id.preload_hybrid);
 		satellite = (CheckBox) findViewById(R.id.preload_satellite);
 		roadmap = (CheckBox) findViewById(R.id.preload_roadmap);
 		terrain = (CheckBox) findViewById(R.id.preload_terrain);
 
 		hybrid.setChecked(true);
+*/
 
 		min_zoom = (Spinner) findViewById(R.id.preload_min_zoom);
 		add_numbers(min_zoom,