- making oscimap default backend

- added about-screen
- added TreeTile for Tile lookup, dropping that HashMap
- using simple line-shader instead of std-derivatives one,
  about twice as faster here
- use distance calculation from MapRenderer - removing TileScheduler
- no need for MapGeneratorJob, pass MapTile directly to MapWorkers
- added two-finger tap gestures for zoom-in/out
- added tub/tron rendertheme
- started caching for oscimap
- add x/y coordinates to MapPosition, using it in MapRenderer
- create tag hash when needed
- no need for long tile coordinates max zoomlevel 31 should suffice

res/layout/activity_advanced_map_viewer.xml

@@ -11,17 +11,17 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
-    <ToggleButton
+   <!--  <ToggleButton
         android:id="@+id/snapToLocationView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
         android:layout_marginRight="10dip"
-        android:layout_marginTop="10dip"
+        android:layout_marginBottom="10dip"
         android:background="@drawable/snap_to_position"
         android:textOff=""
         android:textOn=""
-        android:visibility="gone" />
+        android:visibility="gone" />-->
 
 </RelativeLayout>

res/menu/options_menu.xml

@@ -47,6 +47,9 @@
                 <item
                     android:id="@+id/menu_render_theme_osmarender"
                     android:title="@string/menu_render_theme_osmarender"/>
+                   <item
+                    android:id="@+id/menu_render_theme_tronrender"
+                    android:title="@string/menu_render_theme_tronrender"/>
                 <item
                     android:id="@+id/menu_render_theme_select_file"
                     android:title="@string/menu_render_theme_select_file"/>
@@ -58,9 +61,9 @@
           
             android:showAsAction="never"
             android:title="@string/menu_mapfile"/>
-       <!--   <item
-                android:id="@+id/menu_info_map_file"
-                android:title="@string/menu_info_map_file"/> -->
+          <item
+            android:id="@+id/menu_info_about"
+            android:title="@string/menu_info_about"/>
     </menu>
 
     </item>

res/menu/options_menu_pre_honeycomb.xml

@@ -48,6 +48,9 @@
        <!--   <item
                 android:id="@+id/menu_info_map_file"
                 android:title="@string/menu_info_map_file"/> -->
+          <item
+            android:id="@+id/menu_info_about"
+            android:title="@string/menu_info_about"/>
     </menu>
 
     </item>
@@ -61,6 +64,9 @@
                 <item
                     android:id="@+id/menu_render_theme_osmarender"
                     android:title="@string/menu_render_theme_osmarender"/>
+                 <item
+                    android:id="@+id/menu_render_theme_tronrender"
+                    android:title="@string/menu_render_theme_tronrender"/>
                 <item
                     android:id="@+id/menu_render_theme_select_file"
                     android:title="@string/menu_render_theme_select_file"/>

res/values-de/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<string-array name="preferences_map_generator_values">
+	<!-- <string-array name="preferences_map_generator_values">
 	  <item>Mapfile</item>
 		<item>PostGIS</item>
 		<item>OpenScienceMap</item>
-	</string-array>
+	</string-array> -->
 
 	<string-array name="preferences_scale_bar_unit_values">
 		<item>angloamerikanisch</item>

res/values-fi/strings.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<string-array name="preferences_map_generator_values">
-	  <item>Mapfile</item>
-		<item>PostGIS</item>
-			<item>OpenScienceMap</item>
-	</string-array>
-
 	<string-array name="preferences_text_scale_values">
 		<item>hyvin pieni</item>
 		<item>pieni</item>

res/values-it/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<string-array name="preferences_map_generator_values">
+	<!-- <string-array name="preferences_map_generator_values">
 	  <item>Mapfile</item>
 		<item>PostGIS</item>
 			<item>OpenScienceMap</item>
-	</string-array>
+	</string-array> -->
 
 	<string-array name="preferences_text_scale_values">
 		<item>minuscola</item>

res/values/arrays.xml

@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-	<string-array name="preferences_map_database_keys">
-		<item>MAP_READER</item>
-		<item>POSTGIS_READER</item>
-		<item>PBMAP_READER</item>
-	</string-array>
-	<string name="preferences_map_database_default">POSTGIS_READER</string>
 
-	<string-array name="preferences_scale_bar_unit_keys">
-		<item>imperial</item>
-		<item>metric</item>
-	</string-array>
-	<string name="preferences_scale_bar_unit_default">metric</string>
+    <string-array name="preferences_map_database_keys">
+
+        <!-- <item>MAP_READER</item> -->
+        <item>POSTGIS_READER</item> 
+        <item>PBMAP_READER</item>
+    </string-array>
+
+    <string name="preferences_map_database_default">PBMAP_READER</string>
+
+    <string-array name="preferences_scale_bar_unit_keys">
+        <item>imperial</item>
+        <item>metric</item>
+    </string-array>
+
+    <string name="preferences_scale_bar_unit_default">metric</string>
+
+    <string-array name="preferences_text_scale_keys">
+        <item>0.7</item>
+        <item>0.85</item>
+        <item>1.0</item>
+        <item>1.3</item>
+        <item>1.6</item>
+    </string-array>
+
+    <string name="preferences_text_scale_default">1.0</string>
+
+    <string-array name="view_sections">
+        <item>Map</item>
+        <item>Routes</item>
+        <item>Overlays</item>
+        <item>etc</item>
+    </string-array>
 
-	<string-array name="preferences_text_scale_keys">
-		<item>0.7</item>
-		<item>0.85</item>
-		<item>1.0</item>
-		<item>1.3</item>
-		<item>1.6</item>
-	</string-array>
-	<string name="preferences_text_scale_default">1.0</string>
-	
-	<string-array name="view_sections">
-		<item>Map</item>
-		<item>Routes</item>
-		<item>Overlays</item>
-		<item>etc</item>
-	</string-array>
 </resources>

res/values/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
 	<string-array name="preferences_map_generator_values">
-	  <item>Mapfile</item>
-		<item>PostGIS</item>
+	<!--   <item>Mapfile</item> -->
+	 <item>PostGIS</item> 
 		<item>OpenScienceMap</item>
 	</string-array>
 
@@ -59,6 +59,7 @@
 	<string name="menu_preferences">Preferences</string>
 	<string name="menu_render_theme">Render theme</string>
 	<string name="menu_render_theme_osmarender">Default Theme</string>
+	<string name="menu_render_theme_tronrender">Tube Theme</string>
 	<string name="menu_render_theme_select_file">Select XML file …</string>
 	<string name="menu_screenshot">Screenshot</string>
 	<string name="menu_screenshot_jpeg">JPEG (lossy)</string>

res/values/styles.xml

@@ -3,7 +3,6 @@
 
     <style name="MyActionBar" parent="android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@drawable/action_bar</item>
-        <item name="android:windowActionBarOverlay">true</item>
     </style>
 
     <style name="Theme.TileMap" parent="android:style/Theme.Holo">