aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-01-31 11:08:28 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-01-31 11:08:28 +0000
commitffce660d3993b1f0d4d9e2cb1aa5cb2c5062989d (patch)
treed5241967b8c58e7e8d728c66737b0933249a4287
parentfb831b1e33d4b988b97e95493336e076c7f799ab (diff)
downloadsouthamptonuniversitymap-ffce660d3993b1f0d4d9e2cb1aa5cb2c5062989d.tar
southamptonuniversitymap-ffce660d3993b1f0d4d9e2cb1aa5cb2c5062989d.tar.gz
Changed tile provider to MapQuest.
-rw-r--r--gen/net/cbaines/suma/R.java10
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/about.xml4
-rw-r--r--src/net/cbaines/suma/AboutActivity.java3
-rw-r--r--src/net/cbaines/suma/SouthamptonUniversityMapActivity.java2
5 files changed, 16 insertions, 5 deletions
diff --git a/gen/net/cbaines/suma/R.java b/gen/net/cbaines/suma/R.java
index 12ec3d4..74f3f45 100644
--- a/gen/net/cbaines/suma/R.java
+++ b/gen/net/cbaines/suma/R.java
@@ -131,12 +131,12 @@ public final class R {
public static final int about_copyright_summary=0x7f07002e;
public static final int about_data=0x7f070035;
public static final int about_data_summary=0x7f070036;
- public static final int about_database=0x7f07003f;
- public static final int about_database_summary=0x7f070040;
+ public static final int about_database=0x7f070041;
+ public static final int about_database_summary=0x7f070042;
public static final int about_developer=0x7f070033;
public static final int about_developer_summary=0x7f070034;
- public static final int about_donate=0x7f070041;
- public static final int about_donate_summary=0x7f070042;
+ public static final int about_donate=0x7f070043;
+ public static final int about_donate_summary=0x7f070044;
public static final int about_help_message=0x7f070015;
public static final int about_license=0x7f07002f;
public static final int about_license_summary=0x7f070030;
@@ -144,6 +144,8 @@ public final class R {
public static final int about_map_data_summary=0x7f07003a;
public static final int about_map_icons=0x7f07003b;
public static final int about_map_icons_summary=0x7f07003c;
+ public static final int about_map_tiles=0x7f07003f;
+ public static final int about_map_tiles_summary=0x7f070040;
public static final int about_menu_instruction_text=0x7f070023;
public static final int about_osm_map=0x7f07003d;
public static final int about_osm_map_summary=0x7f07003e;
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef8d53d..ed72121 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -105,6 +105,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.<
<string name="about_map_icons_summary">From the "Map Icons Collection"</string>
<string name="about_osm_map">Map</string>
<string name="about_osm_map_summary">Using the OSMDroid Library</string>
+ <string name="about_map_tiles">Map Tiles</string>
+ <string name="about_map_tiles_summary">Tiles Courtesy of MapQuest</string>
<string name="about_database">Database</string>
<string name="about_database_summary">Using the ORMLite library.</string>
<string name="about_donate">Donate</string>
diff --git a/res/xml/about.xml b/res/xml/about.xml
index 59f6cef..f938b88 100644
--- a/res/xml/about.xml
+++ b/res/xml/about.xml
@@ -45,6 +45,10 @@
android:summary="@string/about_osm_map_summary"
android:title="@string/about_osm_map" />
<Preference
+ android:key="about_map_tiles"
+ android:summary="@string/about_map_tiles_summary"
+ android:title="@string/about_map_tiles" />
+ <Preference
android:key="about_database"
android:summary="@string/about_database_summary"
android:title="@string/about_database" />
diff --git a/src/net/cbaines/suma/AboutActivity.java b/src/net/cbaines/suma/AboutActivity.java
index 9c479c8..8a419db 100644
--- a/src/net/cbaines/suma/AboutActivity.java
+++ b/src/net/cbaines/suma/AboutActivity.java
@@ -39,6 +39,7 @@ public class AboutActivity extends PreferenceActivity {
private static final String KEY_ABOUT_MAP_DATA = "about_map_data";
private static final String KEY_ABOUT_MAP_ICONS = "about_map_icons";
private static final String KEY_ABOUT_OSM_MAP = "about_osm_map";
+ private static final String KEY_ABOUT_MAP_TILES = "about_map_tiles";
private static final String KEY_ABOUT_DATABASE = "about_database";
private static final String KEY_ABOUT_DONATE = "about_donate";
@@ -71,6 +72,8 @@ public class AboutActivity extends PreferenceActivity {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://mapicons.nicolasmollet.com/")));
} else if (KEY_ABOUT_OSM_MAP.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.openstreetmap.org/")));
+ } else if (KEY_ABOUT_MAP_TILES.equals(key)) {
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.mapquest.com/")));
} else if (KEY_ABOUT_DATABASE.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format("http://ormlite.com/"))));
} else if (KEY_ABOUT_DONATE.equals(key)) {
diff --git a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
index 5e8caa8..ae6786d 100644
--- a/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
+++ b/src/net/cbaines/suma/SouthamptonUniversityMapActivity.java
@@ -131,7 +131,7 @@ public class SouthamptonUniversityMapActivity extends OrmLiteBaseActivity<Databa
Log.i(TAG, "Finished setting content view " + (System.currentTimeMillis() - startTime));
mapView = (MapView) this.findViewById(R.id.mapview);
- mapView.setTileSource(TileSourceFactory.MAPNIK);
+ mapView.setTileSource(TileSourceFactory.MAPQUESTOSM);
mapView.setBuiltInZoomControls(true);
mapView.setMultiTouchControls(true);