diff options
| author | Keith Packard <keithp@keithp.com> | 2018-10-07 10:01:30 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2018-10-07 10:01:30 -0700 |
| commit | 5c957107ee5917d865eb866319f86cf8c109f212 (patch) | |
| tree | 41ad62be720a8c86d6775c2a3dfd502134344e35 /altosdroid | |
| parent | e4f4183ce206d4cb7bbc89e1065eb34b05cf11c4 (diff) | |
altosui/altosdroid: Disable offline map type selections
Our server only supports hybrid maps for now. If that changes, we can
re-add this support easily enough.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid')
| -rw-r--r-- | altosdroid/res/layout/map_preload.xml | 2 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml index 321e5ee3..4e60df2d 100644 --- a/altosdroid/res/layout/map_preload.xml +++ b/altosdroid/res/layout/map_preload.xml @@ -62,6 +62,7 @@ android:layout_height="wrap_content" android:text="@string/preload_types" /> +<!-- <CheckBox android:id="@+id/preload_hybrid" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -82,6 +83,7 @@ android:layout_height="wrap_content" android:text="@string/preload_terrain" /> +--> <TextView android:id="@+id/preload_min_zoom_label" android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java index 7bc9ab5c..e393b566 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java @@ -54,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; @@ -196,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() { @@ -318,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, |