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-02-09 00:08:26 +01:00
commit 96fa01d724
9 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-da/strings.xml
View file

@ -1877,7 +1877,7 @@
<string name="show_pedestrian_warnings">Fodgængerovergange</string>
<string name="speak_pedestrian">Fodgængerovergange</string>
<string name="rendering_value__name">Standard</string>
<string name="save_track_to_gpx_globally_headline">On demand sporingslogning</string>
<string name="save_track_to_gpx_globally_headline">Sporingslogning på efterspørgsel</string>
<string name="navigation_over_track">Start navigation langs spor?</string>
<string name="avoid_roads_msg">Generere en alternativ rute ved at vælge veje der skal undgås</string>
<string name="recents">SENESTE</string>
@ -1905,7 +1905,7 @@
<string name="plugin_description_title">Beskrivelse</string>
<string name="plugin_settings_button_caption">Indstillinger</string>
<string name="edit_group">Rediger gruppe</string>
<string name="plugin_install_needs_network">Der behøves en internetforbindelse for at installere udvidelsen.</string>
<string name="plugin_install_needs_network">Internetforbindelse behøves for at installere udvidelsen.</string>
<string name="enable_plugin2">Aktiver</string>
<string name="disable_plugin2">Deaktiver</string>
<string name="get_plugin">Hent</string>

7
OsmAnd/res/values-el/strings.xml
View file

@ -850,7 +850,7 @@
<string name="searching">Αναζήτηση…</string>
<string name="searching_address">Αναζήτηση διεύθυνσης…</string>
<string name="search_osm_nominatim">Αναζήτηση διεύθυνσης χρησιμοποιώντας το OSM Nominatim</string>
<string name="hint_search_online">Αριθμός σπιτιού, οδός, πόλη</string>
<string name="hint_search_online">Online αναζήτηση: Αριθμός σπιτιού, οδός, πόλη</string>
<string name="search_offline_address">Χωρίς σύνδεση</string>
<string name="search_online_address">Διαδίκτυο</string>
<string name="max_level_download_tile">Μεγ. online κλίμακα</string>
@ -1703,4 +1703,9 @@
<string name="my_location">Η τοποθεσία μου</string>
<string name="recents">ΠΡΟΣΦΑΤΑ</string>
<string name="navigation_over_track">Έναρξη πλοήγησης βάσει ίχνους;</string>
<string name="edit_group">Επεξεργασία ομάδας</string>
<string name="remove_the_tag">ΑΦΑΙΡΕΣΗ ΕΤΙΚΕΤΑΣ</string>
<string name="proxy_pref_title">Διαμεσολαβητής</string>
<string name="osm_editing_manage">Διαχείριση</string>
<string name="rendering_value__name">Προκαθορισμένο</string>
</resources>

10
OsmAnd/res/values-hu/strings.xml
View file

@ -1832,10 +1832,16 @@
<string name="proxy_host_descr">Állítsd be a proxy szervered hosztnevét (pl. 127.0.0.1)</string>
<string name="proxy_port_title">Proxy port</string>
<string name="proxy_port_descr">Állítsd be a proxy szervered portszámát (pl. 8118)</string>
<string name="enable_plugin">Engedélyezés</string>
<string name="disable_plugin">Letiltás</string>
<string name="enable_plugin">Letiltva</string>
<string name="disable_plugin">Engedélyezve</string>
<string name="plugin_description_title">Leírás</string>
<string name="plugin_settings_button_caption">Beállítások</string>
<string name="edit_group">Csoport szerkesztése</string>
<string name="remove_the_tag">CÍMKE ELTÁVOLÍTÁSA</string>
<string name="version_settings_descr">Napi összeállítások letöltése</string>
<string name="enable_plugin2">Engedélyezés</string>
<string name="disable_plugin2">Letiltás</string>
<string name="plugin_install_needs_network">Internetkapcsolat szükséges a bővítmény telepítéséhez.</string>
<string name="get_plugin">Beszerzés</string>
<string name="version_settings">Összeállítások</string>
</resources>

7
OsmAnd/res/values-it/strings.xml
View file

@ -2067,10 +2067,13 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="gps_status">Stato GPS</string>
<string name="parking_place">Parcheggio</string>
<string name="remove_the_tag">RIMUOVI IL TAG</string>
<string name="enable_plugin">Attiva</string>
<string name="disable_plugin">Disattiva</string>
<string name="enable_plugin">Disattivato</string>
<string name="disable_plugin">Attivato</string>
<string name="plugin_description_title">Descrizione</string>
<string name="plugin_settings_button_caption">Impostazioni</string>
<string name="edit_group">Modifica il gruppo</string>
<string name="plugin_install_needs_network">È necessario la connessione a internet per installare questo componente aggiuntivo.</string>
<string name="enable_plugin2">Attiva</string>
<string name="disable_plugin2">Disattiva</string>
<string name="get_plugin">Ottieni</string>
</resources>

7
OsmAnd/res/values-ko/strings.xml
View file

@ -2130,10 +2130,13 @@
<string name="gps_status">GPS status</string>
<string name="parking_place">주차장</string>
<string name="remove_the_tag">태그를 제거</string>
<string name="enable_plugin">사용가능</string>
<string name="disable_plugin">사용안함</string>
<string name="enable_plugin">비활성화됨</string>
<string name="disable_plugin">활성화됨</string>
<string name="plugin_description_title">설명</string>
<string name="plugin_settings_button_caption">설정</string>
<string name="edit_group">그룹 편집</string>
<string name="plugin_install_needs_network">이 플러그인을 설치 하려면 인터넷에 연결을 해야 합니다.</string>
<string name="enable_plugin2">활성화</string>
<string name="disable_plugin2">비활성화</string>
<string name="get_plugin">가져오기</string>
</resources>

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

@ -56,7 +56,7 @@
<string name="index_name_gb">Europa - Britannia Manna</string>
<string name="calculate_osmand_route_without_internet">Càlcula un\'àndala cun OsmAnd sena impreare internet</string>
<string name="gpx_option_calculate_first_last_segment">Càlcula un\'àndala cun OsmAnd pro su primu e s\'ùrtimu segmentu de sa caminera</string>
<string name="use_displayed_track_for_navigation">Boles impreare s\'àndala visualizada pro su nàvigu?</string>
<string name="use_displayed_track_for_navigation">Boles impreare s\'àndala ammustrada pro su nàvigu?</string>
<string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
<string name="select_gpx">Issèbera GPX…</string>
<string name="route_descr_select_destination">Issèbera sa destinatzione</string>
@ -564,7 +564,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="select_index_file_to_download">No est istadu agatau nudda. Si no agatades sa zona vostra la podies ingendrare bois (bie http://osmand.net).</string>
<string name="none_selected_gpx">Perunu documentu GPX ischertau. Pro ischertare tene carcau in supra de una de sas rastas disponìbiles.</string>
<string name="local_index_unselect_gpx_file">Boga s\'ischerta</string>
<string name="local_index_select_gpx_file">Ischerta pro lu visualizare</string>
<string name="local_index_select_gpx_file">Ischerta pro l\'ammustrare</string>
<string name="gpx_split_interval">Intervallu partidura</string>
<string name="sort_by_distance">Òrdina pro distàntzia</string>
<string name="sort_by_name">Òrdina pro nùmene</string>
@ -1077,7 +1077,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="user_password_descr">Netzessària pro imbiare contributos a openstreetmap.org</string>
<string name="osmand_service">Servìtziu \"a reposu\"</string>
<string name="osmand_service_descr">Impreadu pro esecutare OsmAnd cun s\'ischermu mortu</string>
<string name="tip_rotation_switching_t_v2">"Podes mudare comente boles sa rotatzione de sa visualizatzione de sa mapa carcande in s\'icona de sa bùssola in s\'ischermu de sa mapa.
<string name="tip_rotation_switching_t_v2">"Podes mudare comente boles sa rotatzione de s\'immàgine de sa mapa carcande in s\'icona de sa bùssola in s\'ischermu de sa mapa.
\n\nSas optziones sunt:
\n\t* \'Non rotare (nord in supra)\': Sa mapa no at a èssere rotada. Su nord at a èssere semper in artu
\n\t* \'In sa diretzione de su movimentu\': Sa mapa at a èssere aliniada cun sa diretzione tua
@ -1842,9 +1842,13 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="gps_status">Istadu GPS</string>
<string name="parking_place">Parchègiu</string>
<string name="remove_the_tag">BOGA SU TAG</string>
<string name="enable_plugin">Abìlita</string>
<string name="disable_plugin">Disabìlita</string>
<string name="enable_plugin">Disabilitadu</string>
<string name="disable_plugin">Abilitadu</string>
<string name="plugin_description_title">Descritzione</string>
<string name="plugin_settings_button_caption">Impostaduras</string>
<string name="edit_group">Modìfica su grupu</string>
</resources>
<string name="enable_plugin2">Abìlita</string>
<string name="disable_plugin2">Disabìlita</string>
<string name="plugin_install_needs_network">Est netzessària sa cunnessione a ìnternet pro installare custu cumponente annuntilu (plugin).</string>
<string name="get_plugin">Iscàrriga</string>
</resources>

7
OsmAnd/res/values-sk/strings.xml
View file

@ -2051,10 +2051,13 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="parking_place">Parkovacie miesto</string>
<string name="remove_the_tag">ODSTRÁNIŤ ZNAČKU</string>
<string name="gps_status">Stav GPS</string>
<string name="enable_plugin">Zapnúť</string>
<string name="disable_plugin">Vypnúť</string>
<string name="enable_plugin">Vypnutý</string>
<string name="disable_plugin">Zapnutý</string>
<string name="edit_group">Upraviť skupinu</string>
<string name="plugin_description_title">Popis</string>
<string name="plugin_settings_button_caption">Nastavenia</string>
<string name="plugin_install_needs_network">Pre nainštalovanie tohto doplnku potrebujete pripojenie na Internet.</string>
<string name="enable_plugin2">Zapnúť</string>
<string name="disable_plugin2">Vypnúť</string>
<string name="get_plugin">Získať</string>
</resources>

10
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1892,9 +1892,13 @@
<string name="gps_status">GPS 狀態</string>
<string name="parking_place">停車地點</string>
<string name="remove_the_tag">移除標記</string>
<string name="enable_plugin">啟用</string>
<string name="disable_plugin">停用</string>
<string name="enable_plugin">已停用</string>
<string name="disable_plugin">已啟用</string>
<string name="plugin_description_title">描述</string>
<string name="plugin_settings_button_caption">設定</string>
<string name="edit_group">編輯群組</string>
</resources>
<string name="enable_plugin2">啟用</string>
<string name="disable_plugin2">停用</string>
<string name="plugin_install_needs_network">您需要連接網際網路來安裝這個外掛程式。</string>
<string name="get_plugin">接收</string>
</resources>

11
OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
View file

@ -40,6 +40,7 @@ public class SQLiteTileSource implements ITileSource {
private boolean inversiveZoom = true; // BigPlanet
private boolean timeSupported = false;
private int expirationTimeMillis = -1; // never
private boolean isEllipsoid = false;
static final int tileSize = 256;
private OsmandApplication ctx;
@ -187,6 +188,13 @@ public class SQLiteTileSource implements ITileSource {
} else {
addInfoColumn("expireminutes", "0");
}
int ellipsoid = list.indexOf("ellipsoid");
if(ellipsoid != -1) {
int set = (int) cursor.getInt(ellipsoid);
if(set == 1){
this.isEllipsoid = true;
}
}
//boolean inversiveInfoZoom = tnumbering != -1 && "BigPlanet".equals(cursor.getString(tnumbering));
boolean inversiveInfoZoom = inversiveZoom;
int mnz = list.indexOf("minzoom");
@ -422,7 +430,8 @@ public class SQLiteTileSource implements ITileSource {
@Override
public boolean isEllipticYTile() {
return false;
return this.isEllipsoid;
//return false;
}
public int getExpirationTimeMinutes() {