Merge issue 419 and master

DataExtractionOSM/src/net/osmand/data/index/batch.xml

@@ -428,6 +428,11 @@
 		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
 			<region name="australia-oceania" esize=""/>
 		</regions>
-									
+				
+		<!-- NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
+		<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia"  skip="true">
+			<region name="new-zealand" esize=""/>
+		</regions>
+							
 	</process>
 </batch_process> 

OsmAnd/res/values-sk/strings.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
+	<string name="tip_day_night_mode">Denný/Nočný režim</string>
+	<string name="tip_day_night_mode_t">Môžete zmeniť vzhľad mapy, podľa toho, či používate Osmand cez deň(jasné svetelné podmienky) alebo v noci(tmavé svetelné podmienky).
+	\nKeď jazdíte v noci, je bezpečnejšie, keď sú farby mapy tmavšie, pretože nie ste tak oslepovaný ako s jasnejšími farbami na displeji.
+	\n\tMôžete nastaviť ako meniť režim cez \'Hlavné menu\'->\'Nastavenia\'->\'vzhľad mapy\'->\'Denný/nočný režim\'.
+	\nMožnosti sú:
+	\n\t"Východ/Západ slnka" - automatický režim, ovládaný polohou slnka(štandardný)
+	\n\t"Deň" - vždy použiť denný režim
+	\n\t"Noc" - vždy použiť nočný režim 
+	\n\t"Svetelný senzor" - vzhľad mapy je ovládaný svetelným senzorom Vášho zariadenia(iba ak je dostupný)</string>	
 	<string name="tip_location_sharing">Zdieľanie umiestnenia</string>
 	<string name="tip_location_sharing_t">Objavili ste nejaké zaujímavé miesto na Vašom výlete a chcete zdieľať jeho pozíciu s Vašimi priateľmi alebo rodinou?
 	\nOsmAnd Vám umožňuje jednoducho zdieľať hodcijaké umiestnenie chcete.
@@ -110,7 +119,7 @@ Cieľový bod je hlavne používaný na meranie vzdialenosti a napredovanú navi
 	<string name="poi_filter_for_tourists">Pre turistov</string>
 	<string name="poi_filter_fuel">Palivo</string>
 	<string name="poi_filter_namefinder">Online hľadač mien</string>
-	<string name="reading_cached_tiles">Čítajú sa dlaždice zo zásobníka...</string>
+	<string name="reading_cached_tiles">Načítavajú sa dlaždice zo zásobníka...</string>
 	<string name="version_index_is_big_for_memory">Index \'\'{0}\'\' sa nezmestil do pamäti</string>
 	<string name="version_index_is_not_supported">Verzia indexu \'\'{0}\'\' nie je podporovaná</string>
 	
@@ -137,7 +146,7 @@ Cieľový bod je hlavne používaný na meranie vzdialenosti a napredovanú navi
 
 <string name="daynight_mode_day">Denný režim</string>
 <string name="daynight_mode_night">Nočný režim</string>
-<string name="daynight_mode_auto">Automaticky</string>
+<string name="daynight_mode_auto">Východ/Západ slnka</string>
 <string name="daynight_mode_sensor">Svetelný senzor</string>
 <string name="daynight_descr">Vybrať medzi denným/nočným režimom</string>
 <string name="daynight">Denný/nočný režim</string>
@@ -293,8 +302,8 @@ Cieľový bod je hlavne používaný na meranie vzdialenosti a napredovanú navi
 <string name="opening_hours_not_supported">Formát otváracích hodín nie je podporovaný na úpravu</string>
 <string name="add_new_rule">Pridať nové pravidlo</string>
 <string name="transport_Routes">Cesty</string>
-<string name="transport_Stop">Zastaviť</string>
-<string name="transport_stops">zastávky</string>
+<string name="transport_Stop">Zastávka</string>
+<string name="transport_stops">Zastávky</string>
 
 <string name="transport_search_after">Hľadať cestu po</string> 
 <string name="transport_search_before">Hľadať cestu pred</string>
@@ -385,7 +394,7 @@ Cieľový bod je hlavne používaný na meranie vzdialenosti a napredovanú navi
 <string name="go_back_to_osmand">Ísť späť na OsmAnd mapu</string>
 <string name="close">Zavrieť</string>
 <string name="loading_data">Načítavajú sa údaje</string>
-<string name="reading_indexes">Čítajú sa indexy...</string>
+<string name="reading_indexes">Načítavajú sa indexy...</string>
 <string name="previous_run_crashed">Predošlé spustenie aplikácie zlyhalo. Záznamový súbor je v {0}. Prosím, oznámte to a priložte záznamový súbor.</string>
 <string name="saving_gpx_tracks">Ukladajú sa GPX stopy na SD kartu...</string>
 <string name="finished_task">Dokončené</string>

OsmAnd/res/values/strings.xml

@@ -2,8 +2,17 @@
 <resources>
 	<string name="level_to_switch_vector_raster_descr">Max zoom level to use vector rendering instead of raster</string>
 	<string name="level_to_switch_vector_raster">Zoom vector level</string>
+	<string name="tip_day_night_mode">Day/Night Mode</string>
+	<string name="tip_day_night_mode_t">You can switch map appearance according usage of Osmand in day(shiny light conditions) or night(dark light conditions).
+	\nWhen you are driving in night, is safer when the map colors are darker, because you are not so dazzled like with brighter colors on the display.
+	\n\tYou can set policy of mode switching in \'Main Menu\'->\'Settings\'->\'Map appearance\'->\'Day/night mode\'.
+	\nChoices are:
+	\n\t"Sunrise/Sunset" - automatic mode, controlled by position of sun(default)
+	\n\t"Day" - always use day mode
+	\n\t"Night" - always use night mode 
+	\n\t"Light sensor" - map appearance is controlled by light sensor of your device(only if available)</string>	
 	<string name="tip_location_sharing">Location sharing</string>
-	<string name="tip_location_sharing_t">Do you find some interresting place on your trip and want to share it\'s location with your friends or family?
+	<string name="tip_location_sharing_t">Do you find some interesting place on your trip and want to share it\'s location with your friends or family?
 	\nOsmAnd affords you to easily share any location you want.
 	\n\tYou can do that in \'Map context menu\'->\'Share location\' menu.
 	\nThen you should select way to share your location. The choices are: E-Mail, SMS or just copy location coordinates  to clipboard.</string>

OsmAnd/src/net/osmand/plus/activities/TipsAndTricksActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 public class TipsAndTricksActivity {
 	private int[][] tipNamesAndDescriptions = new int[][] {
+			{R.string.tip_day_night_mode,R.string.tip_day_night_mode_t},
 			{R.string.tip_location_sharing,R.string.tip_location_sharing_t},
 			{R.string.tip_favorites,R.string.tip_favorites_t},
 			{R.string.tip_osm_improve,R.string.tip_osm_improve_t},

OsmAnd/src/net/osmand/plus/render/RenderingIcons.java

@@ -21,13 +21,16 @@ public class RenderingIcons {
 		icons.put("airport", R.drawable.h_airport); //$NON-NLS-1$
 		icons.put("alpine_hut", R.drawable.h_alpine_hut); //$NON-NLS-1$
 		icons.put("amenity_court", R.drawable.h_amenity_court); //$NON-NLS-1$
+		icons.put("arts_centre", R.drawable.g_amenity_arts_centre); //$NON-NLS-1$
 		icons.put("atm", R.drawable.h_atm); //$NON-NLS-1$
 		icons.put("bank", R.drawable.h_bank); //$NON-NLS-1$
 		icons.put("bar", R.drawable.h_bar); //$NON-NLS-1$
 		icons.put("beach", R.drawable.h_beach); //$NON-NLS-1$
+		icons.put("bench", R.drawable.g_amenity_bench); //$NON-NLS-1$
 		icons.put("biergarten", R.drawable.h_biergarten); //$NON-NLS-1$
-		icons.put("bollard", R.drawable.h_bollard); //$NON-NLS-1$
 		icons.put("bicycle_rental", R.drawable.h_bicycle_rental); //$NON-NLS-1$
+		icons.put("bollard", R.drawable.h_bollard); //$NON-NLS-1$
+		icons.put("books", R.drawable.g_shop_books); //$NON-NLS-1$
 		icons.put("bus_station", R.drawable.h_bus_station); //$NON-NLS-1$
 		icons.put("bus_stop_small", R.drawable.h_bus_stop_small); //$NON-NLS-1$
 		icons.put("bus_stop", R.drawable.h_bus_stop); //$NON-NLS-1$
@@ -36,17 +39,25 @@ public class RenderingIcons {
 		icons.put("camp_site", R.drawable.h_camp_site); //$NON-NLS-1$
 		icons.put("car_sharing", R.drawable.h_car_sharing); //$NON-NLS-1$
 		icons.put("caravan_park", R.drawable.h_caravan_park); //$NON-NLS-1$
+		icons.put("casino", R.drawable.g_tourist_casino); //$NON-NLS-1$
+		icons.put("castle", R.drawable.g_historic_castle); //$NON-NLS-1$
 		icons.put("cave_entrance", R.drawable.h_cave_entrance); //$NON-NLS-1$
 		icons.put("chair_lift", R.drawable.h_chair_lift); //$NON-NLS-1$
 		icons.put("chalet", R.drawable.h_chalet); //$NON-NLS-1$
 		icons.put("cinema", R.drawable.h_cinema); //$NON-NLS-1$
 		icons.put("cliff", R.drawable.h_cliff); //$NON-NLS-1$
 		icons.put("cliff2", R.drawable.h_cliff2); //$NON-NLS-1$
+		icons.put("computer", R.drawable.g_shop_computer); //$NON-NLS-1$
+		icons.put("confectionery", R.drawable.g_shop_confectionery); //$NON-NLS-1$
+		icons.put("courthouse", R.drawable.g_amenity_courthouse); //$NON-NLS-1$
 		icons.put("danger", R.drawable.h_danger); //$NON-NLS-1$
 		icons.put("department_store", R.drawable.h_department_store); //$NON-NLS-1$
+		icons.put("do_it_yourself", R.drawable.g_shop_diy); //$NON-NLS-1$
 		icons.put("drinking_water", R.drawable.h_drinking_water); //$NON-NLS-1$
 		icons.put("embassy", R.drawable.h_embassy); //$NON-NLS-1$
 		icons.put("emergency_phone", R.drawable.h_emergency_phone); //$NON-NLS-1$
+		icons.put("entrance", R.drawable.g_barrier_entrance); //$NON-NLS-1$
+		icons.put("exchange", R.drawable.g_money_exchange); //$NON-NLS-1$
 		icons.put("fast_food", R.drawable.h_fast_food); //$NON-NLS-1$
 		icons.put("fire_station", R.drawable.h_fire_station); //$NON-NLS-1$
 		icons.put("forest", R.drawable.h_forest); //$NON-NLS-1$
@@ -59,18 +70,24 @@ public class RenderingIcons {
 		icons.put("grave_yard", R.drawable.h_grave_yard); //$NON-NLS-1$
 		icons.put("guest_house", R.drawable.h_guest_house); //$NON-NLS-1$
 		icons.put("florist", R.drawable.h_florist); //$NON-NLS-1$
+		icons.put("fountain", R.drawable.g_amenity_fountain); //$NON-NLS-1$
+		icons.put("garden_centre", R.drawable.g_shop_garden_centre); //$NON-NLS-1$
 		icons.put("halt", R.drawable.h_halt); //$NON-NLS-1$
 		icons.put("helipad", R.drawable.h_helipad); //$NON-NLS-1$
 		icons.put("hospital", R.drawable.h_hospital); //$NON-NLS-1$
 		icons.put("hostel", R.drawable.h_hostel); //$NON-NLS-1$
 		icons.put("hotel", R.drawable.h_hotel); //$NON-NLS-1$
+		icons.put("ice_cream", R.drawable.g_food_ice_cream); //$NON-NLS-1$
 		icons.put("information", R.drawable.h_information); //$NON-NLS-1$
+		icons.put("jewelry", R.drawable.g_shop_jewelry); //$NON-NLS-1$
+		icons.put("kiosk", R.drawable.g_shop_kiosk); //$NON-NLS-1$
 		icons.put("level_crossing", R.drawable.h_level_crossing); //$NON-NLS-1$
 		icons.put("level_crossing2", R.drawable.h_level_crossing2); //$NON-NLS-1$
 		icons.put("library", R.drawable.h_library); //$NON-NLS-1$
 		icons.put("liftgate", R.drawable.h_liftgate); //$NON-NLS-1$
 		icons.put("lighthouse", R.drawable.h_lighthouse); //$NON-NLS-1$
 		icons.put("lock_gate", R.drawable.h_lock_gate); //$NON-NLS-1$
+		icons.put("marketplace", R.drawable.g_amenity_marketplace); //$NON-NLS-1$
 		icons.put("marsh", R.drawable.h_marsh); //$NON-NLS-1$
 		icons.put("mast", R.drawable.h_mast); //$NON-NLS-1$
 		icons.put("memorial", R.drawable.h_memorial); //$NON-NLS-1$
@@ -78,10 +95,13 @@ public class RenderingIcons {
 		icons.put("mini_roundabout", R.drawable.h_mini_roundabout); //$NON-NLS-1$
 		icons.put("mud", R.drawable.h_mud); //$NON-NLS-1$
 		icons.put("museum", R.drawable.h_museum); //$NON-NLS-1$
+		icons.put("music", R.drawable.g_shop_music); //$NON-NLS-1$
 		icons.put("nr", R.drawable.h_nr); //$NON-NLS-1$
+		icons.put("optician", R.drawable.g_health_optician); //$NON-NLS-1$
 		icons.put("orchard", R.drawable.h_orchard); //$NON-NLS-1$
 		icons.put("parking", R.drawable.h_parking); //$NON-NLS-1$
 		icons.put("peak", R.drawable.h_peak); //$NON-NLS-1$
+		icons.put("shop_pet", R.drawable.g_shop_pet); //$NON-NLS-1$
 		icons.put("pharmacy", R.drawable.h_pharmacy); //$NON-NLS-1$
 		icons.put("picnic_site", R.drawable.h_picnic_site); //$NON-NLS-1$
 		icons.put("place_of_worship", R.drawable.h_place_of_worship); //$NON-NLS-1$
@@ -110,17 +130,22 @@ public class RenderingIcons {
 		icons.put("shop_hairdresser", R.drawable.h_shop_hairdresser); //$NON-NLS-1$
 		icons.put("shop_supermarket", R.drawable.h_shop_supermarket); //$NON-NLS-1$
 		icons.put("slipway", R.drawable.h_slipway); //$NON-NLS-1$
+		icons.put("sports_centre", R.drawable.g_leisure_sports_centre); //$NON-NLS-1$
 		icons.put("spring", R.drawable.h_spring); //$NON-NLS-1$
 		icons.put("station_small", R.drawable.h_station_small); //$NON-NLS-1$
 		icons.put("station", R.drawable.h_station); //$NON-NLS-1$
 		icons.put("subway_entrance", R.drawable.h_subway_entrance); //$NON-NLS-1$
+		icons.put("taxi", R.drawable.g_transport_taxi); //$NON-NLS-1$
 		icons.put("telephone", R.drawable.h_telephone); //$NON-NLS-1$
 		icons.put("theatre", R.drawable.h_theatre); //$NON-NLS-1$
 		icons.put("toilets", R.drawable.h_toilets); //$NON-NLS-1$
+		icons.put("toys", R.drawable.g_shop_toys); //$NON-NLS-1$
 		icons.put("traffic_light", R.drawable.h_traffic_light); //$NON-NLS-1$
 		icons.put("highway_ford", R.drawable.h_highway_ford); //$NON-NLS-1$
 		icons.put("tree", R.drawable.h_tree); //$NON-NLS-1$
 		icons.put("tree2", R.drawable.h_tree2); //$NON-NLS-1$
+		icons.put("university", R.drawable.g_amenity_university); //$NON-NLS-1$
+		icons.put("vending_machine", R.drawable.g_amenity_vending_machine); //$NON-NLS-1$
 		icons.put("viewpoint", R.drawable.h_viewpoint); //$NON-NLS-1$
 		icons.put("vineyard", R.drawable.h_vineyard); //$NON-NLS-1$
 		icons.put("volcano", R.drawable.h_volcano); //$NON-NLS-1$