xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- add compass

Browse Source 
- add 'fix orientation' option
- bugfix segv in limitLoadQueue
- remove redundant MapController
- refactor out Location stuff from TileMap
This commit is contained in:
Hannes Janetzek
2012-09-11 04:06:59 +02:00
parent baa40ed9ea
commit 53636cff30
16 changed files with 756 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/activity_advanced_map_viewer.xml → res/layout/activity_tilemap.xml
View File

@@ -3,25 +3,24 @@
android:id="@+id/mainView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:windowActionBarOverlay="true"
>
android:windowActionBarOverlay="true" >
<org.mapsforge.android.MapView
android:id="@+id/mapView"
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_alignParentBottom="true"
android:layout_marginRight="10dip"
android:layout_alignParentRight="true"
android:layout_marginBottom="10dip"
android:layout_marginRight="10dip"
android:background="@drawable/snap_to_position"
android:textOff=""
android:textOn=""
android:visibility="gone" />-->
android:visibility="gone" />
</RelativeLayout>

10
res/menu/options_menu.xml
View File

@@ -22,10 +22,18 @@
<item
android:id="@+id/menu_position_map_center"
android:title="@string/menu_position_map_file_center"/>
<item
android:id="@+id/menu_rotation_enable"
android:title="@string/menu_rotation_enable"/>
<item
android:id="@+id/menu_rotation_disable"
android:title="@string/menu_rotation_disable"/>
<item
android:id="@+id/menu_compass_enable"
android:title="@string/menu_compass_enable"/>
<item
android:id="@+id/menu_compass_disable"
android:title="@string/menu_compass_disable"/>
</menu>
</item>
<item

210
res/values/strings.xml
View File

@@ -1,108 +1,114 @@
<?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_scale_bar_unit_values">
<item>Imperial</item>
<item>Metric</item>
</string-array>
<string-array name="preferences_map_generator_values">
<string-array name="preferences_text_scale_values">
<item>tiny</item>
<item>small</item>
<item>normal</item>
<item>large</item>
<item>huge</item>
</string-array>
<!-- <item>Mapfile</item> -->
<!-- <item>PostGIS</item> -->
<item>OpenScienceMap</item>
</string-array>
<string-array name="preferences_scale_bar_unit_values">
<item>Imperial</item>
<item>Metric</item>
</string-array>
<string-array name="preferences_text_scale_values">
<item>tiny</item>
<item>small</item>
<item>normal</item>
<item>large</item>
<item>huge</item>
</string-array>
<string name="application_name">OpenScienceMap</string>
<string name="cancel">Cancel</string>
<string name="error">Error</string>
<string name="error_last_location_unknown">The last location is unknown</string>
<string name="file_invalid">The selected file is invalid.</string>
<string name="file_select">Please select a file.</string>
<string name="file_size_byte">byte</string>
<string name="file_size_bytes">bytes</string>
<string name="file_size_kb">kB</string>
<string name="file_size_mb">MB</string>
<string name="file_size_gb">GB</string>
<string name="go_to_position">Go to position</string>
<string name="info_map_file_area">Area</string>
<string name="info_map_file_comment">Comment</string>
<string name="info_map_file_created_by">Created by</string>
<string name="info_map_file_date">Date</string>
<string name="info_map_file_debug">Debug information</string>
<string name="info_map_file_debug_no">not included</string>
<string name="info_map_file_debug_yes">included</string>
<string name="info_map_file_language_preference">Language preference</string>
<string name="info_map_file_name">File</string>
<string name="info_map_file_size">File size</string>
<string name="info_map_file_start_position">Start position</string>
<string name="info_map_file_start_zoom_level">Start zoom level</string>
<string name="info_map_file_version">Version</string>
<string name="latitude">Latitude</string>
<string name="longitude">Longitude</string>
<string name="menu_info">Info</string>
<string name="menu_info_map_file">Map file properties</string>
<string name="menu_info_about">About this software</string>
<string name="menu_mapfile">Map file</string>
<string name="menu_position">Position</string>
<string name="menu_rotation_enable">Enable rotation</string>
<string name="menu_compass_enable">Enable compass</string>
<string name="menu_rotation_disable">Disable rotation</string>
<string name="menu_compass_disable">Disable compass</string>
<string name="menu_position_enter_coordinates">Enter coordinates</string>
<string name="menu_position_last_known">Last known location</string>
<string name="menu_position_map_file_center">Map file center</string>
<string name="menu_position_my_location_enable">Show my location</string>
<string name="menu_position_my_location_disable">Remove my location</string>
<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>
<string name="menu_screenshot_png">PNG (lossless)</string>
<string name="no_location_provider_available">No location source available</string>
<string name="ok">OK</string>
<string name="preferences_debug">Debug settings</string>
<string name="preferences_general">General settings</string>
<string name="preferences_cache_persistence">Cache persistence</string>
<string name="preferences_cache_persistence_desc">Keep cached images on exit</string>
<string name="preferences_cache_size">External storage</string>
<string name="preferences_cache_size_desc">Adjust the size of the cache</string>
<string name="preferences_cache_size_value">%.1f MB</string>
<string name="preferences_fullscreen">Full screen mode</string>
<string name="preferences_fullscreen_desc">Hide the status bar</string>
<string name="preferences_fix_orientation">Fix screen orientation</string>
<string name="preferences_fix_orientation_desc">Fix screen orientation</string>
<string name="preferences_map">Map settings</string>
<string name="preferences_map_view_mode">Map mode</string>
<string name="preferences_map_view_mode_desc">Select the operating mode</string>
<string name="preferences_move_speed">Move speed</string>
<string name="preferences_move_speed_desc">Adjust the move speed of the map</string>
<string name="preferences_move_speed_value">%d %% move speed</string>
<string name="preferences_scale_bar_unit">Scale bar unit</string>
<string name="preferences_scale_bar_unit_desc">Select the unit for the map scale bar</string>
<string name="preferences_show_fps_counter">Frame rate</string>
<string name="preferences_show_fps_counter_desc">Enable frames per second counter</string>
<string name="preferences_show_scale_bar">Map scale bar</string>
<string name="preferences_show_scale_bar_desc">Show the scale of the map</string>
<string name="preferences_show_tile_coordinates">Tile coordinates</string>
<string name="preferences_show_tile_coordinates_desc">Show coordinates on tiles</string>
<string name="preferences_show_unmatched_ways">Draw unmatched ways</string>
<string name="preferences_show_tile_frames">Tile boundaries</string>
<string name="preferences_show_tile_frames_desc">Draw tile boundaries</string>
<string name="preferences_disable_polygons">Disable Polygon rendering</string>
<string name="preferences_show_water_tiles_desc">Highlight tiles which have the water flag set</string>
<string name="preferences_text_scale">Font size</string>
<string name="preferences_text_scale_desc">Select the text size of map labels</string>
<string name="preferences_wake_lock">Stay awake</string>
<string name="preferences_wake_lock_desc">Stop the screen from dimming</string>
<string name="snap_to_location_enabled">Snap to position is activated</string>
<string name="snap_to_location_disabled">Snap to position is disabled</string>
<string name="unit_symbol_kilometer">&#160;km</string>
<string name="unit_symbol_meter">&#160;m</string>
<string name="zoomLevel">Zoom level</string>
<string name="menu_options">Options</string>
<string name="application_name">OpenScienceMap</string>
<string name="cancel">Cancel</string>
<string name="error">Error</string>
<string name="error_last_location_unknown">The last location is unknown</string>
<string name="file_invalid">The selected file is invalid.</string>
<string name="file_select">Please select a file.</string>
<string name="file_size_byte">byte</string>
<string name="file_size_bytes">bytes</string>
<string name="file_size_kb">kB</string>
<string name="file_size_mb">MB</string>
<string name="file_size_gb">GB</string>
<string name="go_to_position">Go to position</string>
<string name="info_map_file_area">Area</string>
<string name="info_map_file_comment">Comment</string>
<string name="info_map_file_created_by">Created by</string>
<string name="info_map_file_date">Date</string>
<string name="info_map_file_debug">Debug information</string>
<string name="info_map_file_debug_no">not included</string>
<string name="info_map_file_debug_yes">included</string>
<string name="info_map_file_language_preference">Language preference</string>
<string name="info_map_file_name">File</string>
<string name="info_map_file_size">File size</string>
<string name="info_map_file_start_position">Start position</string>
<string name="info_map_file_start_zoom_level">Start zoom level</string>
<string name="info_map_file_version">Version</string>
<string name="latitude">Latitude</string>
<string name="longitude">Longitude</string>
<string name="menu_info">Info</string>
<string name="menu_info_map_file">Map file properties</string>
<string name="menu_info_about">About this software</string>
<string name="menu_mapfile">Map file</string>
<string name="menu_position">Position</string>
<string name="menu_rotation_enable">Enable rotation</string>
<string name="menu_position_enter_coordinates">Enter coordinates</string>
<string name="menu_position_last_known">Last known location</string>
<string name="menu_position_map_file_center">Map file center</string>
<string name="menu_position_my_location_enable">Show my location</string>
<string name="menu_position_my_location_disable">Remove my location</string>
<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>
<string name="menu_screenshot_png">PNG (lossless)</string>
<string name="no_location_provider_available">No location source available</string>
<string name="ok">OK</string>
<string name="preferences_debug">Debug settings</string>
<string name="preferences_general">General settings</string>
<string name="preferences_cache_persistence">Cache persistence</string>
<string name="preferences_cache_persistence_desc">Keep cached images on exit</string>
<string name="preferences_cache_size">External storage</string>
<string name="preferences_cache_size_desc">Adjust the size of the cache</string>
<string name="preferences_cache_size_value">%.1f MB</string>
<string name="preferences_fullscreen">Full screen mode</string>
<string name="preferences_fullscreen_desc">Hide the status bar</string>
<string name="preferences_map">Map settings</string>
<string name="preferences_map_view_mode">Map mode</string>
<string name="preferences_map_view_mode_desc">Select the operating mode</string>
<string name="preferences_move_speed">Move speed</string>
<string name="preferences_move_speed_desc">Adjust the move speed of the map</string>
<string name="preferences_move_speed_value">%d %% move speed</string>
<string name="preferences_scale_bar_unit">Scale bar unit</string>
<string name="preferences_scale_bar_unit_desc">Select the unit for the map scale bar</string>
<string name="preferences_show_fps_counter">Frame rate</string>
<string name="preferences_show_fps_counter_desc">Enable frames per second counter</string>
<string name="preferences_show_scale_bar">Map scale bar</string>
<string name="preferences_show_scale_bar_desc">Show the scale of the map</string>
<string name="preferences_show_tile_coordinates">Tile coordinates</string>
<string name="preferences_show_tile_coordinates_desc">Show coordinates on tiles</string>
<string name="preferences_show_unmatched_ways">Draw unmatched ways</string>
<string name="preferences_show_tile_frames">Tile boundaries</string>
<string name="preferences_show_tile_frames_desc">Draw tile boundaries</string>
<string name="preferences_disable_polygons">Disable Polygon rendering</string>
<string name="preferences_show_water_tiles_desc">Highlight tiles which have the water flag set</string>
<string name="preferences_text_scale">Font size</string>
<string name="preferences_text_scale_desc">Select the text size of map labels</string>
<string name="preferences_wake_lock">Stay awake</string>
<string name="preferences_wake_lock_desc">Stop the screen from dimming</string>
<string name="snap_to_location_enabled">Snap to position is activated</string>
<string name="snap_to_location_disabled">Snap to position is disabled</string>
<string name="unit_symbol_kilometer">&#160;km</string>
<string name="unit_symbol_meter">&#160;m</string>
<string name="zoomLevel">Zoom level</string>
<string name="menu_options">Options</string>
</resources>

95
res/xml/preferences.xml
View File

@@ -1,40 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/menu_preferences">
<PreferenceCategory android:title="@string/preferences_map">
<!-- <CheckBoxPreference android:title="@string/preferences_show_scale_bar" android:summary="@string/preferences_show_scale_bar_desc"
android:key="showScaleBar" /> -->
<!-- <ListPreference android:title="@string/preferences_scale_bar_unit" android:summary="@string/preferences_scale_bar_unit_desc"
android:entryValues="@array/preferences_scale_bar_unit_keys" android:entries="@array/preferences_scale_bar_unit_values"
android:key="scaleBarUnit" android:defaultValue="@string/preferences_scale_bar_unit_default" android:dependency="showScaleBar" /> -->
<ListPreference android:title="@string/preferences_map_view_mode" android:summary="@string/preferences_map_view_mode_desc"
android:entryValues="@array/preferences_map_database_keys" android:entries="@array/preferences_map_generator_values"
android:key="mapDatabase" android:defaultValue="@string/preferences_map_database_default" />
<!-- <ListPreference android:title="@string/preferences_text_scale" android:summary="@string/preferences_text_scale_desc"
android:entryValues="@array/preferences_text_scale_keys" android:entries="@array/preferences_text_scale_values"
android:key="textScale" android:defaultValue="@string/preferences_text_scale_default" /> -->
</PreferenceCategory>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/menu_preferences" >
<PreferenceCategory android:title="@string/preferences_general">
<CheckBoxPreference android:title="@string/preferences_fullscreen" android:summary="@string/preferences_fullscreen_desc"
android:key="fullscreen" />
<CheckBoxPreference android:title="@string/preferences_wake_lock" android:summary="@string/preferences_wake_lock_desc"
android:key="wakeLock" />
<!-- <CheckBoxPreference android:title="@string/preferences_cache_persistence" android:summary="@string/preferences_cache_persistence_desc"
<PreferenceCategory android:title="@string/preferences_map" >
<!--
<CheckBoxPreference android:title="@string/preferences_show_scale_bar" android:summary="@string/preferences_show_scale_bar_desc"
android:key="showScaleBar" />
-->
<!--
<ListPreference android:title="@string/preferences_scale_bar_unit" android:summary="@string/preferences_scale_bar_unit_desc"
android:entryValues="@array/preferences_scale_bar_unit_keys" android:entries="@array/preferences_scale_bar_unit_values"
android:key="scaleBarUnit" android:defaultValue="@string/preferences_scale_bar_unit_default" android:dependency="showScaleBar" />
-->
<ListPreference
android:defaultValue="@string/preferences_map_database_default"
android:entries="@array/preferences_map_generator_values"
android:entryValues="@array/preferences_map_database_keys"
android:key="mapDatabase"
android:summary="@string/preferences_map_view_mode_desc"
android:title="@string/preferences_map_view_mode" />
<!--
<ListPreference android:title="@string/preferences_text_scale" android:summary="@string/preferences_text_scale_desc"
android:entryValues="@array/preferences_text_scale_keys" android:entries="@array/preferences_text_scale_values"
android:key="textScale" android:defaultValue="@string/preferences_text_scale_default" />
-->
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_general" >
<CheckBoxPreference
android:key="fullscreen"
android:summary="@string/preferences_fullscreen_desc"
android:title="@string/preferences_fullscreen" />
<CheckBoxPreference
android:key="fixOrientation"
android:summary="@string/preferences_fix_orientation"
android:title="@string/preferences_fix_orientation_desc" />
<CheckBoxPreference
android:key="wakeLock"
android:summary="@string/preferences_wake_lock_desc"
android:title="@string/preferences_wake_lock" />
<!--
<CheckBoxPreference android:title="@string/preferences_cache_persistence" android:summary="@string/preferences_cache_persistence_desc"
android:key="cachePersistence" />
<de.sfb.pampa.preferences.CacheSizePreference
android:title="@string/preferences_cache_size" android:summary="@string/preferences_cache_size_desc" android:key="cacheSize" />
<de.sfb.pampa.preferences.MoveSpeedPreference
android:title="@string/preferences_move_speed" android:summary="@string/preferences_move_speed_desc" android:key="moveSpeed" /> -->
</PreferenceCategory>
android:title="@string/preferences_move_speed" android:summary="@string/preferences_move_speed_desc" android:key="moveSpeed" />
-->
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_debug" >
<!--
<CheckBoxPreference android:title="@string/preferences_show_fps_counter" android:summary="@string/preferences_show_fps_counter_desc"
android:key="showFpsCounter" />
-->
<CheckBoxPreference
android:key="drawTileFrames"
android:summary="@string/preferences_show_tile_frames_desc"
android:title="@string/preferences_show_tile_frames" />
<CheckBoxPreference
android:key="drawUnmatchedWays"
android:summary="@string/preferences_show_unmatched_ways"
android:title="@string/preferences_show_unmatched_ways" />
<CheckBoxPreference
android:key="disablePolygons"
android:summary="@string/preferences_disable_polygons"
android:title="@string/preferences_disable_polygons" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_debug">
<!-- <CheckBoxPreference android:title="@string/preferences_show_fps_counter" android:summary="@string/preferences_show_fps_counter_desc"
android:key="showFpsCounter" /> -->
<CheckBoxPreference android:title="@string/preferences_show_tile_frames" android:summary="@string/preferences_show_tile_frames_desc"
android:key="drawTileFrames" />
<CheckBoxPreference android:title="@string/preferences_show_unmatched_ways" android:summary="@string/preferences_show_unmatched_ways"
android:key="drawUnmatchedWays" />
<CheckBoxPreference android:title="@string/preferences_disable_polygons" android:summary="@string/preferences_disable_polygons"
android:key="disablePolygons" />
</PreferenceCategory>
</PreferenceScreen>