diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a4905fcb..dcdbeb29 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,6 +29,7 @@ + \ No newline at end of file diff --git a/assets/info.xml b/assets/info.xml index 6a03b6ee..9bb5d5e8 100644 --- a/assets/info.xml +++ b/assets/info.xml @@ -6,9 +6,10 @@ -

mapsforge logo
Version 0.2.4

-

This software is a part of the mapsforge project and distributed under the LGPL3 license.

-

Map data © OpenStreetMap contributors, CC-BY-SA.

-

Please report all bugs and feature requests either via our issue tracker or our public mapsforge-dev mailing list.

+

mapsforge logo
Version 0.2.1

+

OpenScienceMap is distributed under the LGPL3 license.

+

This software is based on mapsforge library 0.2.4.

+

Map data © OpenStreetMap contributors, still using CC-BY-SA.

+

Please report all bugs and feature requests via our issue tracker

\ No newline at end of file diff --git a/assets/mapsforge_logo.png b/assets/mapsforge_logo.png deleted file mode 100644 index 7e054869..00000000 Binary files a/assets/mapsforge_logo.png and /dev/null differ diff --git a/res/layout/activity_advanced_map_viewer.xml b/res/layout/activity_advanced_map_viewer.xml index 0bddfd17..2be2dc14 100644 --- a/res/layout/activity_advanced_map_viewer.xml +++ b/res/layout/activity_advanced_map_viewer.xml @@ -11,17 +11,17 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" /> - + android:visibility="gone" />--> \ No newline at end of file diff --git a/res/menu/options_menu.xml b/res/menu/options_menu.xml index bc29d587..965415e5 100644 --- a/res/menu/options_menu.xml +++ b/res/menu/options_menu.xml @@ -47,6 +47,9 @@ + @@ -58,9 +61,9 @@ android:showAsAction="never" android:title="@string/menu_mapfile"/> - + diff --git a/res/menu/options_menu_pre_honeycomb.xml b/res/menu/options_menu_pre_honeycomb.xml index bd8e33e0..6cc3be0e 100644 --- a/res/menu/options_menu_pre_honeycomb.xml +++ b/res/menu/options_menu_pre_honeycomb.xml @@ -48,6 +48,9 @@ + @@ -61,6 +64,9 @@ + diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index d6678156..3415ebf1 100755 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1,10 +1,10 @@ - + angloamerikanisch diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3d3ce7f4..95db533f 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1,11 +1,5 @@ - - Mapfile - PostGIS - OpenScienceMap - - hyvin pieni pieni diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b5e05653..da87b449 100755 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,10 +1,10 @@ - + minuscola diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f34e3ba5..ac47270d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,31 +1,37 @@ - - MAP_READER - POSTGIS_READER - PBMAP_READER - - POSTGIS_READER - - imperial - metric - - metric + + + + POSTGIS_READER + PBMAP_READER + + + PBMAP_READER + + + imperial + metric + + + metric + + + 0.7 + 0.85 + 1.0 + 1.3 + 1.6 + + + 1.0 + + + Map + Routes + Overlays + etc + - - 0.7 - 0.85 - 1.0 - 1.3 - 1.6 - - 1.0 - - - Map - Routes - Overlays - etc - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 264fa792..abbf7c44 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,8 +1,8 @@ - Mapfile - PostGIS + + PostGIS OpenScienceMap @@ -59,6 +59,7 @@ Preferences Render theme Default Theme + Tube Theme Select XML file … Screenshot JPEG (lossy) diff --git a/res/values/styles.xml b/res/values/styles.xml index 705ab3a2..f0c09695 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -3,7 +3,6 @@