- 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
This commit is contained in:
Hannes Janetzek
2012-09-03 00:13:13 +02:00
parent 78e39af35a
commit 1a27f56313
61 changed files with 2779 additions and 2076 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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">