Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-07-19 11:48:53 +02:00
commit 55bd617071
11 changed files with 139 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-ar/strings.xml
View file

@ -1322,7 +1322,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="amenity_type_historic">تاريخي</string>
<string name="amenity_type_landuse">استخدام الاراضي</string>
<string name="amenity_type_leisure">وقت الفراغ</string>
<string name="amenity_type_man_made">من صنع الانسان</string>
<string name="amenity_type_man_made">من صنع الإنسان</string>
<string name="amenity_type_military">عسكري</string>
<string name="amenity_type_natural">طبيعي</string>
<string name="amenity_type_office">مكتب</string>

16
OsmAnd/res/values-be/phrases.xml
View file

@ -907,4 +907,20 @@
<string name="poi_crane">Кран</string>
<string name="poi_country">Краіна</string>
<string name="poi_cutline">Прасека</string>
<string name="poi_enforcement_toll">Кантроль:аплата</string>
<string name="poi_enforcement_maxspeed">Патрабаванне:максімальная хуткасць</string>
<string name="poi_enforcement_maxheight">Патрабаванне:максімальная вышыня</string>
<string name="poi_enforcement_mindistance">Патрабаванне:мінімальная адлегласць</string>
<string name="poi_enforcement_check">Патрабаванне:кантроль</string>
<string name="poi_enforcement_access">Патрабаванне:доступ</string>
<string name="poi_enforcement_traffic_signals">Патрабаванне:святлафоры</string>
<string name="poi_fee">Аплата</string>
<string name="poi_disused">Невыкарыстоўваемы</string>
<string name="poi_abandoned">Закінуты</string>
<string name="poi_maxweight">Максімальная вага</string>
<string name="poi_maxheight">Максімальная вышыня</string>
<string name="poi_service_times">Гадзіны абслугоўвання</string>
</resources>

2
OsmAnd/res/values-fr/phrases.xml
View file

@ -915,4 +915,6 @@
<string name="poi_bus_trap">Passe à bus</string>
<string name="poi_rwn_ref">Réseau régional de randonnée pédestre</string>
<string name="poi_country">Pays</string>
<string name="poi_fee">Tarif</string>
</resources>

19
OsmAnd/res/values-hr/strings.xml
View file

@ -48,7 +48,7 @@
<string name="map_widget_distancemeasurement">Mjerenje udaljenosti</string>
<string name="map_widget_audionotes">Zvučni zapisi</string>
<string name="audionotes_plugin_description">Zabilježi zvučne/video zapise tijekom putovanja</string>
<string name="audionotes_plugin_description">Audio/Video dodatak pruža mogućnost da zabilježite fotografiju ili video tokom puta, koristeći gumb na zaslonu karte, ili izravno u kontekstnom izborniku za bilo koje mjesto na karti.</string>
<string name="download_select_map_types">Ostale karte</string>
<string name="download_roads_only_item">Samo ceste</string>
<string name="download_regular_maps">Regularne karte</string>
@ -595,7 +595,7 @@
\n\t* EGM96 geoid offset correction for GPS altitude readings "
</string>
<string name="osmand_srtm_short_description_80_chars">OsmAnd dodatak za offline slojnice</string>
<string name="srtm_plugin_name">Dodatak za Slojnice</string>
<string name="srtm_plugin_name">Slojnice</string>
<string name="tip_recent_changes_1_0_0_t">"Promjene u 1.0.0:
\n\t* Poboljšana navigacija: brža i preciznija, do 250 km
@ -708,7 +708,7 @@
<string name="loading_builds">Učitavanje OsmAnd nadogradnji-…</string>
<string name="select_build_to_install">Odaberite jednu od OsmAnd nadogradnji za instalaciju</string>
<string name="contribution_activity">Instalirajte verziju</string>
<string name="application_dir">Mapa za pohranu</string>
<string name="application_dir">Mapa za pohranu podataka</string>
<string name="osmand_net_previously_installed">Instalirana je prethodna inačica OsmAnd aplikacije. Svi offline podaci će biti podržani od strane nove inačice aplikacije. Ali Favorite treba izvesti iz stare aplikacije i kasnije uvesti u novu.</string>
<string name="specified_dir_doesnt_exist">Ne mogu pronaći određenu mapu.</string>
@ -1332,8 +1332,8 @@
<string name="osmo_use_https">Koristiti HTTPS</string>
<string name="lock_screen_request_explanation">%1$s treba dozvolu za isključivanje zaslona za značajku uštede energije.</string>
<string name="rendering_attr_currentTrackColor_name">Trenutna boja GPX traga</string>
<string name="rendering_attr_currentTrackWidth_name">Trenutna širina GPX traga</string>
<string name="rendering_attr_currentTrackColor_name">Boja GPX traga</string>
<string name="rendering_attr_currentTrackWidth_name">Širina GPX traga</string>
<string name="rendering_value_red_name">Crvena</string>
<string name="rendering_value_translucent_red_name">Prozirna crvena</string>
<string name="rendering_value_translucent_orange_name">Prozirna narančasta</string>
@ -1349,7 +1349,7 @@
<string name="rendering_value_translucent_blue_name">Prozirna plava</string>
<string name="rendering_value_purple_name">Ljubičasta</string>
<string name="rendering_value_translucent_purple_name">Prozirna ljubičasta</string>
<string name="restart_is_required">Kako bi se primijenile promjene, potrebno je ponovno pokretanje aplikacije.</string>
<string name="restart_is_required">Kako bi se u potpunosti primijenile promjene, potrebno je ponovno pokrenuti aplikaciju.</string>
<string name="light_theme">Svijetla</string>
<string name="dark_theme">Tamna</string>
<string name="lang_bn">Bengalski</string>
@ -1549,4 +1549,11 @@
<string name="route_descr_destination">Odredište</string>
<string name="download_wikipedia_maps">Wikipedia</string>
<string name="close_changeset">Zatvori promjene</string>
<string name="lang_pms"/>
<string name="storage_directory_default">Unutarnja memorija</string>
<string name="confirm_usage_speed_cameras">U mnogim zemljama (Njemačka, Francuska, Italija, i druge) Korištenje upozorenja za nadolazeće uređaje za mjerenje brzine nije dopušteno zakonom. OsmAnd ne preuzima nikakvu odgovornost ako kršite zakon. Molimo kliknite da samo ako ste sigurni da želite koristiti ovu značajku.</string>
<string name="osmand_parking_overdue">zakasnio</string>
<string name="osmo_plugin_name">OsMo (OSM Monitoring)</string>
<string name="watch">Prikaži</string>
<string name="download_tab_local">Lokalno</string>
</resources>

3
OsmAnd/res/values-ml/phrases.xml
View file

@ -4,4 +4,7 @@
<string name="poi_natural">നാച്ചുറല്‍</string>
<string name="poi_seamark">നോട്ടിക്കല്‍</string>
<string name="poi_osmwiki">വിക്കിപീഡിയ</string>
<string name="poi_kiosk">കിയോസ്ക്</string>
<string name="poi_medical_supply">മെഡിക്കല്‍ സ്ടോര്‍</string>
<string name="poi_mobile_phone">സെല്‍ഫോണ്‍ കട</string>
</resources>

21
OsmAnd/res/values-mr/phrases.xml
View file

@ -17,4 +17,23 @@
<string name="poi_air_transport">वायु परिवहन</string>
<string name="poi_water_transport">जल परिवहन</string>
<string name="poi_power">उर्जा</string>
</resources>
<string name="poi_sport">क्रिडा</string>
<string name="poi_craft">कला</string>
<string name="poi_natural">नैसर्गिक</string>
<string name="poi_bakery">बेकरी</string>
<string name="poi_alcohol">मद्य</string>
<string name="poi_chocolate">चॉकलेट दुकान</string>
<string name="poi_coffee">कॉफी दुकान</string>
<string name="poi_mall">मॉल</string>
<string name="poi_butcher">मांस</string>
<string name="poi_tea">चहाचे दुकान</string>
<string name="poi_wine">वाइन दुकान</string>
<string name="poi_bicycle">सायकल दुकान</string>
<string name="poi_clothes">कपड्याचे दुकान</string>
<string name="poi_child_clothes">मुलांचे कपडे</string>
<string name="poi_computer">कॉम्प्युटर दुकान</string>
<string name="poi_curtain">पडद्याचे दुकान</string>
<string name="poi_florist">फुलांचे दुकान</string>
<string name="poi_furniture">फर्निचर</string>
</resources>

8
OsmAnd/res/values-ro/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
<string name="tip_recent_changes_1_0_0_t">Modificări în versiunea 1.0.0 :
\n\t* Rutare îmbunătățită, mai rapidă și mai exactă (până la 250 km)
\n\t* Posibilitate afișare hartă exclusiv pentru drumuri
@ -1673,4 +1674,7 @@
<string name="index_name_gb">Europa - Marea Britanie</string>
<string name="calculate_osmand_route_without_internet">Se calculează segment de traseu OsmAnd fără Internet</string>
<string name="routing_attr_short_way_description">Utilizaţi drumul cel mai scurt</string>
</resources>
<string name="rendering_value_default13_name">Implicit(13)</string>
<string name="rendering_value_defaultTranslucentCyan_name">Implicit(cyan transparent)</string>
<string name="rendering_attr_currentTrackColor_name">Culoare GPX</string>
</resources>

63
OsmAnd/res/values-sc/phrases.xml
View file

@ -767,4 +767,65 @@
<string name="poi_music">Butega de mùsica</string>
<string name="poi_games">Giogos</string>
<string name="poi_video_games">Videogiogos</string>
</resources>
<string name="poi_cheese">Butega de casu</string>
<string name="poi_chocolate">Tziculateria</string>
<string name="poi_pasta">Butega de pasta</string>
<string name="poi_pastry">Pastisseria</string>
<string name="poi_camera">Càmeras e lentes</string>
<string name="poi_candles">Butega de candelas</string>
<string name="poi_fashion">Butega de moda</string>
<string name="poi_free_flying">Artìculos pro Freefly (paracadutismu)</string>
<string name="poi_furnace">Butega de calorìferos</string>
<string name="poi_garden_furniture">Butega de artìculos pro su giardinu</string>
<string name="poi_leather">Butega de còrgiu</string>
<string name="poi_tyres">Butega de pneumàticos</string>
<string name="poi_watches">Butega de relògios</string>
<string name="poi_swimming_pool_shop">Artìculos pro piscinas</string>
<string name="poi_model">Modellos a iscala</string>
<string name="poi_trophy">Trofeos, prèmios</string>
<string name="poi_pyrotechnics">Pirotècnica</string>
<string name="poi_weapons">Armeria</string>
<string name="poi_observation_tower">Turre de osservatzione</string>
<string name="poi_conservation">Àrea amparada</string>
<string name="poi_crane">Grue</string>
<string name="poi_country">Istadu</string>
<string name="poi_cabin">Cabina</string>
<string name="poi_religious">Àrea religiosa</string>
<string name="poi_village_green">Àrea birde comune de sa bidda</string>
<string name="poi_money_lender">Imprestadinare</string>
<string name="poi_tree">Àrbore</string>
<string name="poi_cycle_barrier">Barriera pro bitzicletas</string>
<string name="poi_motorcycle_barrier">Barriera pro mototzicletas</string>
<string name="poi_block">Isoladu (bighinadu)</string>
<string name="poi_bus_trap">Trampa pro postales</string>
<string name="poi_general_barrier">Barriera genèrica</string>
<string name="poi_height_restrictor">Limitadore de artària</string>
<string name="poi_turnstile">Tornellu</string>
<string name="poi_barrier_entrance">Intrada</string>
<string name="poi_entrance_main">Intrada printzipale</string>
<string name="poi_entrance">Intrada</string>
<string name="poi_entrance_exit">Essida</string>
<string name="poi_opening_hours">Oràrios de abertura</string>
<string name="poi_description">Descritzione</string>
<string name="poi_phone">Telèfonu</string>
<string name="poi_website">Giassu/situ web</string>
<string name="poi_service_times">Oràrios de servìtziu</string>
<string name="poi_maxheight">Artària màssima</string>
<string name="poi_maxweight">Pesu màssimu</string>
<string name="poi_abandoned">Abbandonadu</string>
<string name="poi_disused">Foras de usu (disusadu)</string>
<string name="poi_operator">Operadore</string>
<string name="poi_brand">Marca</string>
<string name="poi_enforcement_traffic_signals">Controllu: semàforos</string>
<string name="poi_enforcement_maxspeed">Controllu: lestresa màssima</string>
<string name="poi_enforcement_maxheight">Controllu: artària màssima</string>
<string name="poi_enforcement_mindistance">Controllu: distàntzia mìnima</string>
<string name="poi_enforcement_check">Controllu: ispetziones</string>
<string name="poi_enforcement_access">Controllu: atzessu</string>
<string name="poi_enforcement_toll">Controllu: pedàgiu</string>
</resources>

8
OsmAnd/res/values-sk/phrases.xml
View file

@ -910,4 +910,10 @@
<string name="poi_enforcement_access">Vynútenie:prístup</string>
<string name="poi_enforcement_toll">Vynútenie:mýto</string>
</resources>
<string name="poi_country">Krajina</string>
<string name="poi_enforcement_mindistance">Vynútenie:minimálna vzdialenosť</string>
<string name="poi_enforcement_maxspeed">Vynútenie:maximálna rýchlosť</string>
<string name="poi_fee">Poplatok</string>
<string name="poi_opening_hours">Otváracie hodiny</string>
</resources>

5
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -1,3 +1,4 @@
package net.osmand.plus;
import java.io.BufferedInputStream;
@ -305,9 +306,9 @@ public class GPXUtilities {
// 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods.
if(speedCount > 0) {
if(timeMoving > 0){
avgSpeed = (float) (totalDistanceMoving / timeMoving * 1000);
avgSpeed = (float)totalDistanceMoving / (float)timeMoving * 1000f;
} else {
avgSpeed = (float) (totalSpeedSum / speedCount);
avgSpeed = (float)totalSpeedSum / (float)speedCount;
}
} else {
avgSpeed = -1;

12
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -123,19 +123,19 @@ public class OsmAndFormatter {
ApplicationMode am = settings.getApplicationMode();
float kmh = metersperseconds * 3.6f;
if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
if (kmh >= 10 || am.hasFastSpeed()) {
// case of car
// e.g. car case and for high-speeds: Display rounded to 1 km/h (5% precision at 20 km/h)
if (kmh >= 20 || am.hasFastSpeed()) {
return ((int) Math.round(kmh)) + " " + ctx.getString(R.string.km_h);
}
int kmh10 = (int) (kmh * 10f);
// calculate 2.0 km/h instead of 2 km/h in order to not stress UI text lengh
// for smaller values display 1 decimal digit x.y km/h, (0.5% precision at 20 km/h)
int kmh10 = (int) Math.round(kmh * 10f);
return (kmh10 / 10f) + " " + ctx.getString(R.string.km_h);
} else {
float mph = kmh * METERS_IN_KILOMETER / METERS_IN_ONE_MILE;
if (mph >= 10) {
if (mph >= 20 || am.hasFastSpeed()) {
return ((int) Math.round(mph)) + " " + ctx.getString(R.string.mile_per_hour);
} else {
int mph10 = (int) (mph * 10f);
int mph10 = (int) Math.round(mph * 10f);
return (mph10 / 10f) + " " + ctx.getString(R.string.mile_per_hour);
}
}