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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
GaidamakUA 2015-07-20 16:18:24 +03:00
commit f4da1ee2c9
30 changed files with 531 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -855,7 +855,7 @@ public class BinaryMapIndexReader {
}
}
if(req.numberOfVisitedObjects > 0) {
if(req.numberOfVisitedObjects > 0 && req.log) {
log.info("Search is done. Visit " + req.numberOfVisitedObjects + " objects. Read " + req.numberOfAcceptedObjects + " objects."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
log.info("Read " + req.numberOfReadSubtrees + " subtrees. Go through " + req.numberOfAcceptedSubtrees + " subtrees."); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
}
@ -1632,12 +1632,14 @@ public class BinaryMapIndexReader {
// TRACE INFO
public boolean log = true;
int numberOfVisitedObjects = 0;
int numberOfAcceptedObjects = 0;
int numberOfReadSubtrees = 0;
int numberOfAcceptedSubtrees = 0;
boolean interrupted = false;
protected SearchRequest(){
}

50
OsmAnd-java/src/net/osmand/map/OsmandRegions.java
View file

@ -156,6 +156,45 @@ public class OsmandRegions {
return t % 2 == 1;
}
public boolean intersect(BinaryMapDataObject bo, int lx, int ty, int rx, int by) {
int t = 0;
// 1. polygon in object
if(contain(bo, lx, ty)) {
return true;
}
// 2. object in polygon
if(bo.getPointsLength() == 0) {
return false;
}
if(bo.getPoint31XTile(0) >= lx && bo.getPoint31XTile(0) <= rx &&
bo.getPoint31YTile(0) >= ty && bo.getPoint31YTile(0) <= by ){
return true;
}
// 3. find intersection
for (int i = 1; i < bo.getPointsLength(); i++) {
int px = bo.getPoint31XTile(i - 1);
int x = bo.getPoint31XTile(i);
int py = bo.getPoint31YTile(i - 1);
int y = bo.getPoint31YTile(i);
if(x < lx && px < lx) {
continue;
} else if(x > rx && px > rx) {
continue;
} else if(y > by && py > by) {
continue;
} else if(y < ty && py < ty) {
continue;
}
long in = MapAlgorithms.calculateIntersection(px, py, x, y, lx, rx, by, ty);
if(in != -1) {
return true;
}
}
return false;
}
private List<BinaryMapDataObject> getCountries(int tile31x, int tile31y) {
HashSet<String> set = new HashSet<String>(quadTree.queryInBox(new QuadRect(tile31x, tile31y, tile31x, tile31y),
new ArrayList<String>()));
@ -250,6 +289,7 @@ public class OsmandRegions {
}
}
);
sr.log = false;
if(reader != null) {
reader.searchMapIndex(sr);
}
@ -364,7 +404,7 @@ public class OsmandRegions {
quadTree = new QuadTree<String>(new QuadRect(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE),
8, 0.55f);
final ResultMatcher<BinaryMapDataObject> resultMatcher = new ResultMatcher<BinaryMapDataObject>() {
int c = 0;
// int c = 0;
@Override
public boolean publish(BinaryMapDataObject object) {
if (object.getPointsLength() < 1) {
@ -372,9 +412,9 @@ public class OsmandRegions {
}
initTypes(object);
String nm = object.getNameByType(downloadNameType);
if(nm != null) {
System.out.println((c++) +" " + nm);
}
// if(nm != null) {
// System.out.println((c++) +" " + nm);
// }
if (!countriesByDownloadName.containsKey(nm)) {
LinkedList<BinaryMapDataObject> ls = new LinkedList<BinaryMapDataObject>();
countriesByDownloadName.put(nm, ls);
@ -484,4 +524,6 @@ public class OsmandRegions {
}
}

14
OsmAnd-java/src/net/osmand/util/Algorithms.java
View file

@ -5,6 +5,7 @@ import java.io.Closeable;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -212,6 +213,19 @@ public class Algorithms {
}
public static void fileCopy(File src, File dst) throws IOException {
FileOutputStream fout = new FileOutputStream(dst);
try {
FileInputStream fin = new FileInputStream(src);
try {
Algorithms.streamCopy(fin, fout);
} finally {
fin.close();
}
} finally {
fout.close();
}
}
public static void streamCopy(InputStream in, OutputStream out) throws IOException{
byte[] b = new byte[BUFFER_SIZE];
int read;

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>

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

@ -902,4 +902,25 @@
<string name="poi_operator">Апэратар</string>
<string name="poi_brand">Брэнд</string>
<string name="poi_power_cable_distribution_cabinet">Разьмеркавальная скрыня</string>
<string name="poi_basin">Штучны вадаём</string>
<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-be/strings.xml
View file

@ -1825,7 +1825,7 @@
<string name="shared_string_ellipsis">…</string>
<string name="shared_string_ok">OK</string>
<string name="shared_string_cancel">Скасаваць</string>
<string name="shared_string_dismiss">Скасаваць</string>
<string name="shared_string_dismiss">Адхіліць</string>
<string name="shared_string_yes">Так</string>
<string name="shared_string_no">Не</string>
<string name="shared_string_on">Уключыць</string>

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

@ -927,4 +927,7 @@
<string name="poi_trophy">Trofeus i distincions</string>
<string name="poi_basin">Bassa</string>
<string name="poi_bump_gate">Porta batent de tancament controlat</string>
<string name="poi_country">País</string>
<string name="poi_fee">Pagament</string>
</resources>

84
OsmAnd/res/values-cs/phrases.xml
View file

@ -839,4 +839,88 @@
<string name="poi_garden_furniture">Obchod zahradním nábytkem</string>
<string name="poi_leather">Obchod kůží</string>
<string name="poi_watches">Hodinářství</string>
<string name="poi_pasta">Obchod s těstovinami</string>
<string name="poi_pastry">Cukrárna</string>
<string name="poi_candles">Obchod se svíčkami</string>
<string name="poi_furnace">Obchod s topnými jednotkami</string>
<string name="poi_music">Hudebniny</string>
<string name="poi_scuba_diving_shop">Potápěčské potřeby</string>
<string name="poi_tyres">Obchod s pneumatikami</string>
<string name="poi_energy">Obchod s energiemi</string>
<string name="poi_swimming_pool_shop">Bazénové potřeby</string>
<string name="poi_games">Hry</string>
<string name="poi_model">Modely</string>
<string name="poi_trophy">Trofeje</string>
<string name="poi_video_games">Videohry</string>
<string name="poi_pyrotechnics">Pyrotechnika</string>
<string name="poi_weapons">Obchod se zbraněmi</string>
<string name="poi_breakwater">Vlnolam</string>
<string name="poi_groyne">Pobřežní hráz</string>
<string name="poi_power_cable_distribution_cabinet">Kabelová rozvodní skříň</string>
<string name="poi_basin">Nádrž</string>
<string name="poi_conservation">Chráněné území</string>
<string name="poi_crane">Jeřáb</string>
<string name="poi_tourism_attraction">Turistická atrakce</string>
<string name="poi_religious">Náboženská oblast</string>
<string name="poi_cutline">Výsek lesa</string>
<string name="poi_tree">Strom</string>
<string name="poi_bollard">Patník</string>
<string name="poi_cycle_barrier">Cyklo překážka</string>
<string name="poi_motorcycle_barrier">Překážka pro motocykly</string>
<string name="poi_block">Balvan</string>
<string name="poi_bus_trap">Autobusová uzávěra</string>
<string name="poi_cattle_grid">Mříž proti dobytku</string>
<string name="poi_full_height_turnstile">Vysoký turniket</string>
<string name="poi_bump_gate">Nárazová brána</string>
<string name="poi_general_barrier">Všeobecná překážka</string>
<string name="poi_stile">Schůdky přes ohradu</string>
<string name="poi_height_restrictor">Omezovač výšky</string>
<string name="poi_horse_stile">Přechod pro koně přes překážku</string>
<string name="poi_kissing_gate">Brána proti dobytku</string>
<string name="poi_sally_port">Vstup do pevnosti</string>
<string name="poi_swing_gate">Otočná závora</string>
<string name="poi_turnstile">Turniket</string>
<string name="poi_barrier_entrance">Vstup</string>
<string name="poi_entrance_main">Hlavní vchod</string>
<string name="poi_entrance">Vchod</string>
<string name="poi_entrance_exit">Východ</string>
<string name="poi_highway_crossing">Přechod pro chodce</string>
<string name="poi_icn_ref">Mezinárodní cyklistická síť</string>
<string name="poi_ncn_ref">Národní cyklistická síť</string>
<string name="poi_rcn_ref">Regionální cyklistická síť</string>
<string name="poi_lcn_ref">Lokální cyklistická síť</string>
<string name="poi_iwn_ref">Mezinárodní pěší síť</string>
<string name="poi_nwn_ref">Národní pěší síť</string>
<string name="poi_rwn_ref">Regionální pěší síť</string>
<string name="poi_lwn_ref">Lokální pěší síť</string>
<string name="poi_opening_hours">Otevírací hodiny</string>
<string name="poi_description">Popis</string>
<string name="poi_phone">Telefon</string>
<string name="poi_website">Webstránka</string>
<string name="poi_service_times">Časy služby</string>
<string name="poi_maxheight">Maximální výška</string>
<string name="poi_maxweight">Maximální hmotnost</string>
<string name="poi_abandoned">Opuštěné</string>
<string name="poi_disused">Nevyužívané</string>
<string name="poi_operator">Provozovatel</string>
<string name="poi_brand">Značka</string>
<string name="poi_enforcement_traffic_signals">Vynucení:semafory</string>
<string name="poi_enforcement_maxspeed">Vynucení:maximální rychlost</string>
<string name="poi_enforcement_maxheight">Vynucení:maximální výška</string>
<string name="poi_enforcement_mindistance">Vynucení:minimální vzdálenost</string>
<string name="poi_enforcement_check">Vynucení:kontrola</string>
<string name="poi_enforcement_access">Vynucení:přístup</string>
<string name="poi_enforcement_toll">Vynucení:mýto</string>
<string name="poi_fee">Poplatek</string>
</resources>

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

@ -904,12 +904,12 @@
<string name="poi_building_poi">Bygning</string>
<string name="poi_crane">Kran</string>
<string name="poi_cutline">Cutline</string>
<string name="poi_cutline">Brandbælte</string>
<string name="poi_tree">Træ</string>
<string name="poi_icn_ref">International cykel knudepunkt netværk</string>
<string name="poi_ncn_ref">National cykel knudepunkt netværk</string>
<string name="poi_rcn_ref">Regional cykel knudepunkt netværk</string>
<string name="poi_lcn_ref">Lokal cykel knudepunkt netværk</string>
<string name="poi_icn_ref">International cykelrute</string>
<string name="poi_ncn_ref">National cykelrute</string>
<string name="poi_rcn_ref">Regional cykelrute</string>
<string name="poi_lcn_ref">Lokal cykelrute</string>
<string name="poi_abandoned">Forladt</string>
<string name="poi_disused">Nedlagt</string>
@ -922,10 +922,10 @@
<string name="poi_phone">Telefon</string>
<string name="poi_description">Beskrivelse</string>
<string name="poi_opening_hours">Åbningstider</string>
<string name="poi_iwn_ref">International vandre knudepunkt netværk</string>
<string name="poi_nwn_ref">National vandre knudepunkt netværk</string>
<string name="poi_rwn_ref">Regional vandre knudepunkt netværk</string>
<string name="poi_lwn_ref">Lokal vandre knudepunkt netværk</string>
<string name="poi_iwn_ref">International vandrerute</string>
<string name="poi_nwn_ref">National vandrerute</string>
<string name="poi_rwn_ref">Regional vandrerute</string>
<string name="poi_lwn_ref">Lokal vandrerute</string>
<string name="poi_collection_times">Tømnings antal</string>
<string name="poi_service_times">Service-tider</string>
@ -939,4 +939,7 @@
<string name="poi_enforcement_access">Håndhævelse: adgang</string>
<string name="poi_enforcement_toll">Håndhævelse: vejafgift</string>
<string name="poi_country">Land</string>
<string name="poi_fee">Gebyr</string>
</resources>

5
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -222,7 +222,7 @@
<string name="poi_aerodrome">Aeropuerto</string>
<string name="poi_helipad">Helipuerto</string>
<string name="poi_runway">Pista de rodaje</string>
<string name="poi_aeroway_terminal">Terminal de aeropuerto</string>
<string name="poi_aeroway_terminal">Aeroterminal</string>
<string name="poi_aeroway_gate">Puerta de embarque</string>
<string name="poi_slipway">Rampa</string>
@ -921,4 +921,7 @@
<string name="poi_enforcement_access">Control de acceso</string>
<string name="poi_enforcement_toll">Control de peaje</string>
<string name="poi_country">País</string>
<string name="poi_fee">Costo</string>
</resources>

7
OsmAnd/res/values-es/phrases.xml
View file

@ -150,7 +150,7 @@
<string name="poi_taxi">Parada de taxi</string>
<string name="poi_runway">Pista de rodaje</string>
<string name="poi_aeroway_terminal">Terminal de aeropuerto</string>
<string name="poi_aeroway_terminal">Aeroterminal</string>
<string name="poi_ferry_terminal">Terminal de ferry</string>
<string name="poi_lighthouse">Faro</string>
@ -877,7 +877,7 @@
<string name="poi_highway_crossing">Cruce peatonal</string>
<string name="poi_wiki_lang_nn">Wiki Noruega (Nynorsk)</string>
<string name="poi_wiki_lang_nn">Wiki de Noruega (Nynorsk)</string>
<string name="poi_horse_stile">Portón equino</string>
<string name="poi_breakwater">Rompeolas</string>
<string name="poi_groyne">Rompeolas</string>
@ -924,4 +924,7 @@
<string name="poi_lwn_ref">Red local de senderismo</string>
<string name="poi_enforcement_access">Control de acceso</string>
<string name="poi_country">País</string>
<string name="poi_fee">Costo</string>
</resources>

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

@ -890,7 +890,7 @@
<string name="poi_description">Description</string>
<string name="poi_phone">Téléphone</string>
<string name="poi_website">Site web</string>
<string name="poi_service_times">Temps de service</string>
<string name="poi_service_times">Horaires de service</string>
<string name="poi_maxheight">Hauteur maximale</string>
<string name="poi_maxweight">Poids maximal</string>
<string name="poi_disused">Désaffecté</string>
@ -914,4 +914,7 @@
<string name="poi_collection_times">Heures de levée</string>
<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>

107
OsmAnd/res/values-it/phrases.xml
View file

@ -411,7 +411,7 @@
<string name="poi_caravan_site">Area caravan e camper</string>
<string name="poi_picnic_site">Area attrezzata per picnic</string>
<string name="poi_spring">Sorgente</string>
<string name="poi_cemetery">Zona cimiteriale</string>
<string name="poi_cemetery">Cimitero</string>
<string name="poi_grave_yard">Cimitero</string>
<string name="poi_shelter">Pensilina o ricovero</string>
<string name="poi_funicular">Funicolare</string>
@ -565,4 +565,109 @@
<string name="poi_emergency">Emergenza</string>
<string name="poi_transportation">Trasporti</string>
<string name="poi_road_obstacle">Ostacolo sulla strada</string>
<string name="poi_personal_transport">Trasporto privato</string>
<string name="poi_education">Educazione</string>
<string name="poi_administrative">Amministrativo</string>
<string name="poi_healthcare">Salute</string>
<string name="poi_sport">Sport</string>
<string name="poi_tourism">Turismo</string>
<string name="poi_accomodation"/>
<string name="poi_internet_access">Accesso a Internet</string>
<string name="poi_finance">Finanza</string>
<string name="poi_osmwiki">Wikipedia</string>
<string name="poi_chocolate">Cioccolateria</string>
<string name="poi_abandoned">Abbandonato</string>
<string name="poi_website">Sito web</string>
<string name="poi_service_times">Orario di servizio</string>
<string name="poi_maxheight">Altezza massima</string>
<string name="poi_maxweight">Peso massimo</string>
<string name="poi_phone">Telefono</string>
<string name="poi_opening_hours">Orari di apertura</string>
<string name="poi_description">Descrizione</string>
<string name="poi_entrance_exit">Uscita</string>
<string name="poi_entrance">Ingresso</string>
<string name="poi_turnstile">Tornello</string>
<string name="poi_general_barrier">Barriera generica</string>
<string name="poi_wiki_place">Wikipedia</string>
<string name="poi_wiki_lang_en">Wiki inglese</string>
<string name="poi_wiki_lang_ar">Wiki araba</string>
<string name="poi_wiki_lang_be">Wiki bielorussa</string>
<string name="poi_wiki_lang_bg">Wiki bulgara</string>
<string name="poi_wiki_lang_ca">Wiki catalana</string>
<string name="poi_wiki_lang_cs">Wiki ceca</string>
<string name="poi_wiki_lang_da">Wiki danese</string>
<string name="poi_wiki_lang_ceb">Wiki cebuana</string>
<string name="poi_wiki_lang_de">Wiki tedesca</string>
<string name="poi_wiki_lang_el">Wiki greca</string>
<string name="poi_wiki_lang_et">Wiki estone</string>
<string name="poi_wiki_lang_es">Wiki spagnola</string>
<string name="poi_wiki_lang_fi">Wiki finlandese</string>
<string name="poi_wiki_lang_fr">Wiki francese</string>
<string name="poi_wiki_lang_gl">Wiki galiziana</string>
<string name="poi_wiki_lang_he">Wiki ebraica</string>
<string name="poi_wiki_lang_hi">Wiki hindi</string>
<string name="poi_wiki_lang_hr">Wiki croata</string>
<string name="poi_wiki_lang_ht">Wiki haitiana</string>
<string name="poi_wiki_lang_hu">Wiki ungherese</string>
<string name="poi_wiki_lang_id">Wiki indonesiana</string>
<string name="poi_wiki_lang_it">Wiki italiana</string>
<string name="poi_wiki_lang_ja">Wiki giapponese</string>
<string name="poi_wiki_lang_ko">Wiki coreana</string>
<string name="poi_wiki_lang_lt">Wiki lituana</string>
<string name="poi_wiki_lang_lv">Wiki lettone</string>
<string name="poi_wiki_lang_ms">Wiki malese</string>
<string name="poi_wiki_lang_new">Wiki newari</string>
<string name="poi_wiki_lang_nl">Wiki olandese</string>
<string name="poi_wiki_lang_nn">Wiki norvegese Nynorsk</string>
<string name="poi_wiki_lang_no">Wiki norvegese</string>
<string name="poi_wiki_lang_pl">Wiki polacca</string>
<string name="poi_wiki_lang_pt">Wiki portoghese</string>
<string name="poi_wiki_lang_ro">Wiki rumena</string>
<string name="poi_wiki_lang_ru">Wiki russa</string>
<string name="poi_wiki_lang_sk">Wiki slovacca</string>
<string name="poi_wiki_lang_sl">Wiki slovena</string>
<string name="poi_wiki_lang_sr">Wiki serba</string>
<string name="poi_wiki_lang_sv">Wiki svedese</string>
<string name="poi_wiki_lang_sw">Wiki swahili</string>
<string name="poi_wiki_lang_te">Wiki telugu</string>
<string name="poi_wiki_lang_th">Wiki thai</string>
<string name="poi_wiki_lang_tr">Wiki turca</string>
<string name="poi_wiki_lang_uk">Wiki ucraina</string>
<string name="poi_wiki_lang_vi">Wiki vietnamita</string>
<string name="poi_wiki_lang_vo">Wiki Volapük</string>
<string name="poi_wiki_lang_zh">Wiki cinese</string>
<string name="poi_military_landuse">Zona militare</string>
<string name="poi_harbour_basin">Bacino portuale</string>
<string name="poi_dry_dock">Bacino di carenaggio</string>
<string name="poi_floating_dock">Bacino galleggiante</string>
<string name="poi_diving">Tuffi</string>
<string name="poi_canadian_football">Football canadese</string>
<string name="poi_field_hockey">Hockey su prato</string>
<string name="poi_sport_motor">Sport motoristici</string>
<string name="poi_sailing">Vela</string>
<string name="poi_team_handball">Pallamano</string>
<string name="poi_tourism_attraction">Attrazione turistica</string>
<string name="poi_religious">Area religiosa</string>
<string name="poi_internet_access_service">Accesso a Internet: servizio</string>
<string name="poi_internet_access_wlan">Accesso a Internet: WLAN</string>
<string name="poi_internet_access_terminal">Accesso a Internet: terminale</string>
<string name="poi_internet_access_wired">Accesso a Internet: via cavo</string>
<string name="poi_internet_access_public">Accesso a Internet: pubblico</string>
<string name="poi_picnic_table">Tavolo da picnic</string>
<string name="poi_hot_spring">Sorgente calda</string>
<string name="poi_tomb">Tomba</string>
<string name="poi_dock">Bacino</string>
<string name="poi_smoking_area">Area fumatori</string>
<string name="poi_valley">Valle</string>
<string name="poi_water">Acqua</string>
<string name="poi_wood">Bosco</string>
<string name="poi_tree">Albero</string>
<string name="poi_tower">Torre</string>
<string name="poi_radar">Radar</string>
<string name="poi_crane">Gru</string>
<string name="poi_industrial">Area industriale</string>
<string name="poi_bell_tower">Torre campanaria</string>
</resources>

40
OsmAnd/res/values-ko/phrases.xml
View file

@ -791,4 +791,44 @@
<string name="poi_ski_resort">스키 리조트</string>
<string name="poi_trail_riding_station">트레일 라이딩 역</string>
<string name="poi_cheese">치즈 가게</string>
<string name="poi_chocolate">초콜릿 가게</string>
<string name="poi_coffee">커피숍</string>
<string name="poi_pasta">파스타 가게</string>
<string name="poi_pastry">제과점</string>
<string name="poi_camera">카메라와 렌즈</string>
<string name="poi_candles">양초 가게</string>
<string name="poi_fashion">패션 상점</string>
<string name="poi_free_flying">무료 비행 용품 가게</string>
<string name="poi_furnace">난방 장치 상점</string>
<string name="poi_garden_furniture">정원 가구점</string>
<string name="poi_leather">가죽 상점</string>
<string name="poi_music">음악 상점</string>
<string name="poi_scuba_diving_shop">스쿠버 다이빙 용품 가게</string>
<string name="poi_tyres">타이어 가게</string>
<string name="poi_energy">에너지 저장소</string>
<string name="poi_watches">시계 가게</string>
<string name="poi_swimming_pool_shop">수영장 용품 가게</string>
<string name="poi_games">게임</string>
<string name="poi_model">스케일 모델</string>
<string name="poi_trophy">트로피, 상</string>
<string name="poi_video_games">비디오 게임</string>
<string name="poi_pyrotechnics">불꽃</string>
<string name="poi_weapons">무기 상점</string>
<string name="poi_breakwater">방파제</string>
<string name="poi_groyne">방사제</string>
<string name="poi_power_cable_distribution_cabinet">케이블 분배 캐비닛</string>
<string name="poi_basin">분지</string>
<string name="poi_conservation">보존 땅</string>
<string name="poi_crane">크레인</string>
<string name="poi_country">국가</string>
<string name="poi_tourism_attraction">관광 명소</string>
<string name="poi_religious">종교적인 영역</string>
<string name="poi_cutline">가공선</string>
<string name="poi_tree">나무</string>
<string name="poi_wiki_place">위키백과</string>
<string name="poi_wiki_lang_en">영어 위키</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>

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

@ -11,4 +11,29 @@
<string name="poi_office">कार्यालय</string>
<string name="poi_osmwiki">विकिपीडिया</string>
<string name="poi_books">पुस्तकालय</string>
<string name="poi_transportation">परिवहन</string>
<string name="poi_road_obstacle">रस्त्यतील अडथळा</string>
<string name="poi_personal_transport">व्यक्तिगत परिवहन</string>
<string name="poi_air_transport">वायु परिवहन</string>
<string name="poi_water_transport">जल परिवहन</string>
<string name="poi_power">उर्जा</string>
<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>

16
OsmAnd/res/values-mr/strings.xml
View file

@ -12,7 +12,7 @@
<string name="plugins_screen">प्लगिन्स</string>
<string name="prefs_plugins">प्लगिन्स</string>
<string name="play_commands_of_currently_selected_voice">सध्या निवडलेल्या आवाजाची वाक्ये ऐकवा</string>
<string name="play_commands_of_currently_selected_voice">निवडलेल्या आवाजाची वाक्ये ऐकवा</string>
<string name="test_voice_prompts">आवाज तपासा</string>
<string name="send_files_to_osm">जिपीएक्स फाइल्स ओएसएम ला पाठवायच्या का?</string>
<string name="gpx_description_txt">वर्णन</string>
@ -29,7 +29,7 @@
<string name="backToMenu">पुन्हा मेनूकडे</string>
<string name="zoomOut">झूम कमी करा</string>
<string name="zoomIn">झूम वाढवा</string>
<string name="zoomIs">झूम आहे</string>
<string name="zoomIs">झूम लेवल आहे</string>
<string name="north">उत्तर</string>
<string name="north_north_east">इशान्य-उत्तर</string>
<string name="north_east">इशान्य</string>
@ -48,11 +48,11 @@
<string name="north_north_west">वायव्य-उत्तर</string>
<string name="front">पुढचा</string>
<string name="front_right">पुढील उजवा</string>
<string name="right">उजवा</string>
<string name="right">उजवीकडे</string>
<string name="back_right">मागील उजवा</string>
<string name="back">मागचा</string>
<string name="back">मागे</string>
<string name="back_left">मागील डावा</string>
<string name="left">डावा</string>
<string name="left">डावीकडे</string>
<string name="front_left">पुढील डावा</string>
<string name="oclock">वाजता</string>
<string name="towards">कडे</string>
@ -65,7 +65,7 @@
<string name="i_am_here">मी इथे आहे</string>
<string name="rendering_out_of_memory">निवडलेले क्षेत्र दाखवण्यासाठी पुरेशी प्रोसेस मेमरी नाही</string>
<string name="local_openstreetmap_uploading">अपलोड करत आहे …</string>
<string name="local_openstreetmap_were_uploaded">{0} पीओआय/बग्स अपलोड झाले</string>
<string name="local_openstreetmap_were_uploaded">{0} पीओआय/नोट्स अपलोड झाले</string>
<string name="local_openstreetmap_upload">बदल ओएसएम मधे अपलोड करा</string>
<string name="local_openstreetmap_delete">बदल काढून टाका</string>
@ -221,7 +221,7 @@
<string name="transport_stops">थांबे</string>
<string name="transport_finish_search">शोध संपवा</string>
<string name="transport_stop_to_go_out">उतरण्याचा थांबा निवडा</string>
<string name="transport_route_distance">मार्गाचे अंतर</string>
<string name="transport_route_distance">प्रवासाचे अंतर</string>
<string name="transport">परिवहन</string>
<string name="shared_string_ok">ठीक</string>
<string name="show_transport_over_map_description">सार्वजनिक परिवहन थांबे नकाशावर दाखवा</string>
@ -443,7 +443,7 @@
<string name="vector_data">ऑफलाएन वेक्टर नकाशे</string>
<string name="no_vector_map_loaded">वेक्टर नकाशे लोड झाले नाही</string>
<string name="context_menu_item_search_transport">परिवहन शोधा</string>
<string name="context_menu_item_search_transport">सार्वजनिक परिवहन शोधा</string>
<string name="filter_existing_indexes">डाउनलोड केलेले</string>
<string name="amenity_type_man_made">मानव निर्मित</string>

3
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -922,4 +922,7 @@
<string name="poi_collection_times">Horário de coleta</string>
<string name="poi_enforcement_check">Fiscalização:verificação</string>
<string name="poi_cutline">Linha de corte</string>
<string name="poi_country">País</string>
<string name="poi_fee">Taxa</string>
</resources>

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

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

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

3
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -921,4 +921,7 @@
<string name="poi_enforcement_access">執法：進入</string>
<string name="poi_enforcement_toll">執法：收費</string>
<string name="poi_country">國家</string>
<string name="poi_fee">費用</string>
</resources>

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

@ -369,6 +369,7 @@
<string name="poi_tax_inspection">Tax inspection</string>
<string name="poi_office_administrative">Administrative office</string>
<string name="poi_customs">Customs</string>
<string name="poi_country">Country</string>
<string name="poi_city">City</string>
<string name="poi_town">Town</string>
<string name="poi_village">Village</string>
@ -913,6 +914,7 @@
<string name="poi_operator">Operator</string>
<string name="poi_brand">Brand</string>
<string name="poi_fee">Fee</string>
<string name="poi_enforcement_traffic_signals">Enforcement:traffic signals</string>
<string name="poi_enforcement_maxspeed">Enforcement:maxspeed</string>

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);
}
}

11
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -798,13 +798,20 @@ public class ResourceManager {
}
}
}
// int left = MapUtils.get31TileNumberX(leftLongitude);
// int top = MapUtils.get31TileNumberY(topLatitude);
// int right = MapUtils.get31TileNumberX(rightLongitude);
// int bottom = MapUtils.get31TileNumberY(bottomLatitude);
int left = 0;
int top = 0;
int right = Integer.MAX_VALUE;
int bottom = Integer.MAX_VALUE;
for (AmenityIndexRepositoryBinary index : list) {
if (matcher != null && matcher.isCancelled()) {
break;
}
List<Amenity> result = index.searchAmenitiesByName(MapUtils.get31TileNumberX(lon), MapUtils.get31TileNumberY(lat),
MapUtils.get31TileNumberX(leftLongitude), MapUtils.get31TileNumberY(topLatitude),
MapUtils.get31TileNumberX(rightLongitude), MapUtils.get31TileNumberY(bottomLatitude),
left, top, right, bottom,
searchQuery, matcher);
amenities.addAll(result);
}

8
OsmAnd/src/net/osmand/plus/views/OsmAndMapLayersView.java
View file

@ -50,6 +50,14 @@ public class OsmAndMapLayersView extends View {
return r;
}
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
if(mapView == null) {
return super.onGenericMotionEvent(event);
}
return mapView.onGenericMotionEvent(event);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if(mapView == null) {

8
OsmAnd/src/net/osmand/plus/views/OsmAndMapSurfaceView.java
View file

@ -87,6 +87,14 @@ public class OsmAndMapSurfaceView extends SurfaceView implements Callback {
return r;
}
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
if(mapView == null) {
return super.onGenericMotionEvent(event);
}
return mapView.onGenericMotionEvent(event);
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if(mapView == null) {

15
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -49,6 +49,7 @@ import android.util.DisplayMetrics;
import android.view.GestureDetector;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
import android.view.InputDevice;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.SurfaceHolder;
@ -729,6 +730,20 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
public boolean onGenericMotionEvent(MotionEvent event) {
if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0 &&
event.getAction() == MotionEvent.ACTION_SCROLL &&
event.getAxisValue(MotionEvent.AXIS_VSCROLL) != 0) {
final RotatedTileBox tb = getCurrentRotatedTileBox();
final double lat = tb.getLatFromPixel(event.getX(), event.getY());
final double lon = tb.getLonFromPixel(event.getX(), event.getY());
int zoomDir = event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0 ? -1 : 1;
getAnimatedDraggingThread().startMoving(lat, lon, getZoom() + zoomDir, true);
return true;
}
return false;
}
public boolean onTouchEvent(MotionEvent event) {
if (mapRenderer != null) {
if (event.getAction() == MotionEvent.ACTION_DOWN) {