Merge branch 'master' of https://github.com/osmandapp/Osmand into gpxpoint_dialog
This commit is contained in:
Denis
commit
903263e42d
30 changed files with 762 additions and 377 deletions
30
AUTHORS
30
AUTHORS
|
|
@ -1,17 +1,17 @@
|
|||
(C) OsmAnd 2010-2014
|
||||
### Credits to all major contributors/developers :
|
||||
* Victor Shcherb - all parts of the project, originator
|
||||
* Pavol Zibrita - first contributor and developer of some utilities
|
||||
* Dusan Kazik - one of the first contributors
|
||||
* Andre Van Atten - project supporter, active forum participant, one of the first users.
|
||||
* Dr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
|
||||
* Yvecai - main contributor to Contour Lines and Hillshade maps
|
||||
* Alexey Pelykh - C++ developer, created native library and made application much snappier.
|
||||
* Max (Zahnstocher) - Java contributor, active forum participant.
|
||||
* Harry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
|
||||
* Robin `ypid` Schneider - opening hours contributor
|
||||
Copyright © OsmAnd 2010–2014
|
||||
### Credits to all major contributors/developers:
|
||||
* Victor Shcherb – all parts of the project, originator
|
||||
* Pavol Zibrita – first contributor and developer of some utilities
|
||||
* Dusan Kazik – one of the first contributors
|
||||
* Andre Van Atten – project supporter, active forum participant, one of the first users.
|
||||
* Dr. Hardy Mueller – map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
|
||||
* Yvecai – main contributor to Contour Lines and Hillshade maps
|
||||
* Alexey Pelykh – C++ developer, created native library and made application much snappier.
|
||||
* Max (Zahnstocher) – Java contributor, active forum participant.
|
||||
* Harry van der Wolf – contributor to country boundaries, configuration files, address files, and much else; active forum participant.
|
||||
* Robin ‘ypid’ Schneider – opening hours contributor
|
||||
|
||||
### Other Pull requests
|
||||
(C) All authors of translations and pull requests could be found in commits history :
|
||||
- Translations are under special "contributor" name 'weblate'
|
||||
- Pull requests have 2 committers, first is original contributor and second is project maintainer
|
||||
Copyright © All authors of translations and pull requests could be found in commits history:
|
||||
- Translations are under special “contributor” name ‘weblate’
|
||||
- Pull requests have two committers, first is original contributor and second is project maintainer
|
||||
|
|
|
|||
77
LICENSE
77
LICENSE
|
|
@ -1,16 +1,16 @@
|
|||
|
||||
OsmAnd - OSM Automated Navigation Directions - navigation software based on OSM maps.
|
||||
Copyright (C) 2010-2014 OsmAnd ( Amstelveen, Netherlands - KvK 55730183).
|
||||
|
||||
The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources.
|
||||
ATTENTION : please be aware that some art work has proprietary license.
|
||||
|
||||
Main AUTHORS (more detailed list in AUTHORS):
|
||||
Victor Shcherb - all parts of the project, originator
|
||||
Alexey Pelykh - rendering and core parts
|
||||
Hardy Mueller - main parts of the project, mostly rendering, UI interaction design
|
||||
Pavol Zibrita - first contributor and developer of some utilities
|
||||
|
||||
OsmAnd – OSM Automated Navigation Directions – navigation software based on OpenStreetMap.
|
||||
Copyright © 2010–2014 OsmAnd (Amstelveen, Netherlands - KvK 55730183).
|
||||
|
||||
The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources.
|
||||
ATTENTION: please be aware that some artwork has proprietary license.
|
||||
|
||||
Main AUTHORS (more detailed list in AUTHORS):
|
||||
Victor Shcherb – all parts of the project, originator
|
||||
Alexey Pelykh – rendering and core parts
|
||||
Hardy Mueller – main parts of the project, mostly rendering, UI interaction design
|
||||
Pavol Zibrita – first contributor and developer of some utilities
|
||||
|
||||
-------------------------- GPLv3 ----------------------------------
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
-------------------------------------------------------------------
|
||||
|
||||
|
||||
* Source code in main repositories is covered by GPLv3 (license exceptions below) :
|
||||
* Source code in main repositories is covered by GPLv3 (license exceptions below):
|
||||
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd
|
||||
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java
|
||||
- https://github.com/osmandapp/Osmand-core/tree/legacy_core
|
||||
|
|
@ -38,22 +38,22 @@
|
|||
* UI Design and UX work, such as layout, icons is covered by CC-BY-ND
|
||||
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others
|
||||
|
||||
* Map icons and their derived primities are covered by proprietary license :
|
||||
- (C) icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
|
||||
* Map icons and their derived primities are covered by proprietary license:
|
||||
- © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
|
||||
|
||||
* Generated voice files from TTS files are covered by proprietary license :
|
||||
* Generated voice files from TTS files are covered by proprietary license:
|
||||
- Voice files (https://github.com/osmandapp/OsmAnd-resources/tree/master/voice)
|
||||
|
||||
|
||||
* Fonts (https://github.com/osmandapp/OsmAnd-resources/tree/master/rendering_styles/fonts)
|
||||
- Google Fonts (Apache License 2)
|
||||
|
||||
* Map icons (Mapnik) :
|
||||
- Open-SVG-Map-Icons - Public Domain
|
||||
|
||||
* Non patched source libraries :
|
||||
* Map icons (Mapnik):
|
||||
- Open-SVG-Map-Icons - Public Domain
|
||||
|
||||
* Non patched source libraries:
|
||||
- SherlockBar - Apache Lisense - https://github.com/osmandapp/Osmand/tree/master/SherlockBar (https://github.com/JakeWharton/ActionBarSherlock/blob/master/LICENSE.txt)
|
||||
|
||||
* Patched libraries :
|
||||
* Patched libraries:
|
||||
- Protobuf - New BSD License (patches - https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/protobuf-src, https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/protobuf)
|
||||
- Expat - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/expat)
|
||||
- Freetype - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/freetype)
|
||||
|
|
@ -63,31 +63,30 @@
|
|||
- Skia - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/skia)
|
||||
- ZLib - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/zlib)
|
||||
|
||||
* 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs):
|
||||
- bzip2-20090327.jar Bzip2 - Apache License
|
||||
* 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs):
|
||||
- bzip2-20090327.jar Bzip2 - Apache License
|
||||
- bsh-core-2.0b4.jar Bean Shell - SPL and LGPL (http://www.beanshell.org/license.html)
|
||||
- commons-logging-1.1.1.jar - Apache License
|
||||
- gnu-trove-osmand.jar GNU trove - LGPL
|
||||
- icu4j-49_1.jar - ICU license ( http://source.icu-project.org/repos/icu/icu/trunk/license.html)
|
||||
- commons-logging-1.1.1.jar - Apache License
|
||||
- gnu-trove-osmand.jar GNU trove - LGPL
|
||||
- icu4j-49_1.jar - ICU license (http://source.icu-project.org/repos/icu/icu/trunk/license.html)
|
||||
- json-20090211.jar - BSD alike (http://www.json.org/license.html)
|
||||
- junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/)
|
||||
- kxml2-2.3.0.jar - BSD license ( http://www.kxml.org/)
|
||||
- junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/)
|
||||
- kxml2-2.3.0.jar - BSD license (http://www.kxml.org/)
|
||||
- tuprolog.jar - LGPL (http://apice.unibo.it/xwiki/bin/view/Tuprolog/)
|
||||
|
||||
|
||||
* Pull-requests and translations :
|
||||
- All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list )
|
||||
|
||||
* Pull-requests and translations:
|
||||
- All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list)
|
||||
|
||||
* Libraries not used in final product (https://github.com/osmandapp/OsmAnd-tools/tree/master/OsmAndMapCreator/libi)
|
||||
- Ant libraries - (tools) https://github.com/osmandapp/Osmand/tree/master/OsmAnd/ant-lib
|
||||
- jleveldb-v01.jar
|
||||
- jleveldb-v01.jar
|
||||
- jsch-20120101.jar
|
||||
- junit-4.10.jar
|
||||
- mysql-connector-java-5.1.18-bin.jar
|
||||
- sqlite-jdbc-3.7.6.3-20110609.081603-3.jar
|
||||
- h2-latest.jar
|
||||
|
||||
* Special tools for new rendering (GPLv3) - (C) Alexey Pelykh
|
||||
* Special tools for new rendering (GPLv3) - © Alexey Pelykh
|
||||
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-inspector
|
||||
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-verifier
|
||||
- https://github.com/osmandapp/OsmAnd-tools/tree/master/route-tester
|
||||
|
|
@ -96,7 +95,7 @@
|
|||
- Extracts - https://github.com/osmandapp/OsmAnd-misc/blob/master/osm-planet/osm-data/
|
||||
|
||||
* Data files
|
||||
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons (C) by Geofabrik - data free to use
|
||||
- Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons (C) by http://be.gis-lab.info - data free to use
|
||||
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use
|
||||
- Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,9 @@ public class FavouritePoint implements Serializable {
|
|||
private double latitude;
|
||||
private double longitude;
|
||||
private int color;
|
||||
private int extraParam = -1;
|
||||
private boolean visible = true;
|
||||
private boolean removeable = true;
|
||||
|
||||
public FavouritePoint(){
|
||||
}
|
||||
|
|
@ -21,6 +23,22 @@ public class FavouritePoint implements Serializable {
|
|||
this.name = name;
|
||||
}
|
||||
|
||||
public int getExtraParam() {
|
||||
return extraParam;
|
||||
}
|
||||
|
||||
public void setExtraParam(int extraParam) {
|
||||
this.extraParam = extraParam;
|
||||
}
|
||||
|
||||
public boolean isRemoveable() {
|
||||
return removeable;
|
||||
}
|
||||
|
||||
public void setRemoveable(boolean removeable) {
|
||||
this.removeable = removeable;
|
||||
}
|
||||
|
||||
public int getColor() {
|
||||
return color;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:state_selected="true"
|
||||
|
|
|
|||
|
|
@ -392,7 +392,7 @@
|
|||
<string name="show_details">Vis detaljer</string>
|
||||
<string name="accessibility_extensions_descr">Tilgængelighedsudvidelser for gamle Android versioner</string>
|
||||
<string name="accessibility_extensions">Tilgængelighedsudvidelser</string>
|
||||
<string name="accessibility_mode">Tilgængelighedsmodus</string>
|
||||
<string name="accessibility_mode">Tilgængelighedstilstand</string>
|
||||
<string name="osmand_parking_pm">PM</string>
|
||||
<string name="default_buttons_support">Støt</string>
|
||||
<string name="info_button">Information</string>
|
||||
|
|
@ -1939,5 +1939,5 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
|
|||
<string name="lang_zh_CN">Kinesisk, forenklet</string>
|
||||
<string name="lang_zh_TW">Kinesisk, traditionelt</string>
|
||||
<string name="lang_sc">Sardisk</string>
|
||||
<string name="rendering_attr_subwayMode_name">Undergrundsbanetilstand</string>
|
||||
<string name="rendering_attr_subwayMode_name">Metrotilstand</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1924,4 +1924,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="gpx_monitoring_stop">Stoppe GPX-Aufzeichnung</string>
|
||||
<string name="gpx_start_new_segment">Starte neues Segment</string>
|
||||
<string name="lang_sc">Sardinisch</string>
|
||||
<string name="rendering_attr_subwayMode_name">U-Bahn-Modus</string>
|
||||
<string name="gps_wake_up_timer">GPS Aufwach Intervall</string>
|
||||
<string name="sleep_mode_stop_dialog">GPS aktiv lassen?</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1221,7 +1221,7 @@ ASTERはNASAと日本の経済産業省（METI）、そして宇宙システム
|
|||
<string name="live_monitoring_url">オンライン追跡ウェブアドレス</string>
|
||||
<string name="gpx_monitoring_disabled_warn">\'追跡ログをGPXに記録\'を有効にして下さい</string>
|
||||
<string name="show_current_gpx_title">現在のトラックを表示</string>
|
||||
<string name="free_version_message">このOsmAnd 無料バージョンは%1$sのダウンロード数が制限されており、オフラインでWikipediaの記事をサポートしていません。</string>
|
||||
<string name="free_version_message">このOsmAnd 無料バージョンはダウンロード数が%1$s個に制限されており、オフラインでのWikipediaの記事利用をサポートしていません。</string>
|
||||
<string name="free_version_title">無料バージョン</string>
|
||||
<string name="poi_context_menu_showdescription">POIの説明文を表示</string>
|
||||
<string name="index_name_north_america">北米</string>
|
||||
|
|
@ -1918,4 +1918,53 @@ OsmAndはオープンソースであり、活発に開発が進められいま
|
|||
<string name="osmo_share_current_session">ブラウザで現在のセッションを共有する</string>
|
||||
<string name="osmo_session_not_available">セッションはが利用できません「送信場所」がオンになっていることを確認してください。</string>
|
||||
<string name="osmo_share_session">セッションの共有</string>
|
||||
<string name="rendering_attr_subwayMode_name">地下鉄モード</string>
|
||||
<string name="osmo_session_id_share">デバイスを追跡するためのセッションURL (%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">目的のデバイス %2$sに接続するには、リンク %3$sをクリックするかトラッカーIDを指定してください(%1$s)</string>
|
||||
<string name="osmo_track_interval">記録間隔</string>
|
||||
<string name="osmo_track_interval_descr">位置を送信する時間間隔を選択してください</string>
|
||||
<string name="int_days">日</string>
|
||||
<string name="osmo_connect_menu">接続</string>
|
||||
<string name="osmo_expire_group">失効</string>
|
||||
<string name="osmo_group_description">解説</string>
|
||||
<string name="osmo_group_policy">ポリシー</string>
|
||||
<string name="osmo_connect_to_device_tracker_id">トラッカーID</string>
|
||||
<string name="osmo_connect_to_device_name">ユーザーネーム</string>
|
||||
<string name="osmo_connect_to_group_id">グループID</string>
|
||||
<string name="osmo_group_name">グループ名</string>
|
||||
<string name="osmo_connect_to_device">デバイスとリンク</string>
|
||||
<string name="osmo_connect_to_group">グループとリンク</string>
|
||||
<string name="osmo_connect">接続する</string>
|
||||
<string name="osmo_create_group">グループの作成</string>
|
||||
<string name="osmo_server_operation_failed">OsMoのサーバー操作に失敗しました</string>
|
||||
<string name="osmo_activity">OpenStreetMapの監視</string>
|
||||
<string name="osmo_enable_tracker">自分の場所を送信</string>
|
||||
<string name="osmo_control">OsMoクイックアクセス</string>
|
||||
<string name="hours_ago">時間前</string>
|
||||
<string name="minutes_ago">分前</string>
|
||||
<string name="seconds_ago">秒前</string>
|
||||
<string name="osmo_connected_devices">デバイスと接続されました</string>
|
||||
<string name="osmo_groups">OsMoグループ/デバイス</string>
|
||||
<string name="osmo_auto_send_locations_descr">アプリケーション起動後に自動的にトラッカーセッションを開始し場所を送信する</string>
|
||||
<string name="osmo_auto_send_locations">自動的トラッカーセッションを開始する</string>
|
||||
<string name="osmo_tracker_id">パーソナルトラッカーID</string>
|
||||
<string name="osmo_tracker_id_descr">クリックでトラッカーIDを表示したり共有したりします。トラッカーIDにて接続されたデバイスを使用すると、このデバイスのすべての動きを監視することができます！解除するには[再作成]オプションを選択してください。</string>
|
||||
<string name="osmo_session_token">セッショントークン: %1$s</string>
|
||||
<string name="osmo_auth_pending">認証を待っています...</string>
|
||||
<string name="osmo_locations_sent">"位置の送信 %1$d (バッファ内 %2$d) "</string>
|
||||
<string name="osmo_conn_successfull">"接続が確立されました: %1$s "</string>
|
||||
<string name="osmo_io_error">"OsMoの接続に問題があります "</string>
|
||||
<string name="osmo_settings_uuid">固有のデバイスID</string>
|
||||
<string name="tip_recent_changes_1_8_alpha">"1.8での変更点：* GPXトラックのルートポイント間のルートを計算 * 国別ダウンロードのレイアウト変更(ローカル名検索をサポート) * GPX / KMLのインポートをサポート(KMLからGPXに変換) * GPXトラックは「マイデータ」に移動 * GPXトラックを分割し、距離/標高差/速度を確認することができます * ナビゲーションを遅延させて自動開始 "</string>
|
||||
<string name="use_points_as_intermediates">地点間のルートを計算</string>
|
||||
<string name="osmo_mode_restart">OsMoセッションを再起動</string>
|
||||
<string name="osmo_mode_on">OsMoセッションの停止</string>
|
||||
<string name="osmo_mode_off">OsMoセッションの開始</string>
|
||||
<string name="osmo_settings_debug">デバッグ情報</string>
|
||||
<string name="osmo_settings_descr">監視についての設定と各個の監視チャネルのセットアップ</string>
|
||||
<string name="osmo_settings">OsMo OpenStreetMap監視 (beta)</string>
|
||||
<string name="keep_informing">ナビゲーション指示の繰り返し</string>
|
||||
<string name="keep_informing_descr">定期的にナビゲーション指示を繰り返す</string>
|
||||
<string name="arrival_distance">目的地周辺のお知らせ</string>
|
||||
<string name="arrival_distance_descr">どの程度の距離で目的地周辺のアナウンスを希望するか？</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="file_can_not_be_renamed">파일 이름을 바꿀 수 없습니다.</string>
|
||||
<string name="file_with_name_already_exists">같은 이름을 가진 파일이 이미 존재합니다.</string>
|
||||
<string name="gpx_navigation">GPX 루트</string>
|
||||
<string name="poi_query_by_name_matches_categories">이름으로 검색한 POI에 해당하는 몇몇 카테고라를 찾았습니다 :</string>
|
||||
<string name="poi_query_by_name_matches_categories">이름으로 검색한 POI에 해당하는 몇몇 카테고리를 찾았습니다 :</string>
|
||||
<string name="data_to_search_poi_not_available">검색한 POI에 대한 로컬 데이터가 존재하지 않습니다.</string>
|
||||
<string name="poi_filter_by_name">이름으로 검색</string>
|
||||
<string name="old_poi_file_should_be_deleted">POI 데이터 파일 \'%1$s\' 가 중복되어 있으니 삭제할 수 있습니다.</string>
|
||||
|
|
@ -298,7 +298,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="local_index_items_restored">%2$d 개의 아이템 중 %1$d 가 성공적으로 활성화되었습니다.</string>
|
||||
<string name="local_index_no_items_to_do">%1$s할 아이템이 없습니다</string>
|
||||
<string name="local_index_action_do">%2$s 아이템을 %1$s하려고 합니다. 계속하시겠습니까?</string>
|
||||
<string name="local_index_descr_title">지도 파일 관리</string>
|
||||
<string name="local_index_descr_title">지도 관리</string>
|
||||
|
||||
<string name="local_index_mi_restore">활성화</string>
|
||||
<string name="local_index_mi_backup">비활성화</string>
|
||||
|
|
@ -338,7 +338,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="internet_connection_required_for_online_route">온라인 길안내 서비스가 선택되었지만 인터넷 연결이 되지 않습니다.</string>
|
||||
<string name="tts_language_not_supported_title">지원되지 않은 언어</string>
|
||||
<string name="tts_language_not_supported">선택한 언어는 설치된 안드로이드 TTS (text-to-speech) 엔진이 지원되지 않습니다. 다른 TTS 엔진을 찾기 위해 구글마켓으로 가시겠습니까? 아니면 미리설정된 TTS 언어가 사용될 것입니다.</string>
|
||||
<string name="tts_missing_language_data_title">실종된 데이터</string>
|
||||
<string name="tts_missing_language_data_title">누락된 데이터</string>
|
||||
<string name="tts_missing_language_data">선택한 언어에 대한 데이터가 설치되지 않았습니다. 설치하기 위해 구글마켓으로 가시겠습니까?</string>
|
||||
|
||||
<string name="gpx_option_reverse_route">GPX 길안내 반대로 가기</string>
|
||||
|
|
@ -369,7 +369,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="internet_not_available">동작에 필요한 인터넷 연결이 되지 않습니다</string>
|
||||
<string name="install_more">추가 설치…</string>
|
||||
|
||||
<string name="tip_update_index">오프라인 지도 업데이중</string>
|
||||
<string name="tip_update_index">오프라인 지도 업데이트중</string>
|
||||
<string name="tip_update_index_t">Up-to-date map data is essential for offline map viewing, for POI/address search, and for offline navigation. OsmAnd provides a data manager to download these offline maps (and some other data files), and to check for available updates.
|
||||
\n\nTo download maps go to \'Settings\' → \'Data Management\' → \'Download offline data\'.
|
||||
\n\nAfter the global region list is retrieved from the internet, click on any entry to download or update a file. Please note the file type selector near the top of the screen to select the type of download you want (regular maps, hillshade overlays, etc.).
|
||||
|
|
@ -430,8 +430,9 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
|
||||
<string name="tip_search">검색 중</string>
|
||||
<string name="tip_map_context_menu">[위치 사용] 메뉴</string>
|
||||
<string name="tip_map_context_menu_t">
|
||||
</string>
|
||||
<string name="tip_map_context_menu_t">"The \'Use location\' context menu contains all actions referring to a point (location).
|
||||
\n\nIt is available by long-pressing any point on the map (then tapping its marker), or by pressing the trackball button, or by selecting \'Menu\' → \'Use location\' (the last two ways take the map center as reference).
|
||||
\n\nA marker box can be hidden again by long-clicking on it. "</string>
|
||||
|
||||
<string name="tip_initial">팁과 트릭</string>
|
||||
<string name="tip_initial_t">OsmAnd는 많은 기능을 가진 네비게이션 앱입니다.
|
||||
|
|
@ -504,7 +505,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="application_dir">저장 폴더</string>
|
||||
|
||||
|
||||
<string name="osmand_net_previously_installed">이전 OsmAnd 버전이 설치되어 있습니다. 모든 오프라인 데이터는 새로운 앱에서 지원합니다. 하지만 즐겨찾기 포인트는 이전 앱에서 익스포트되어야 하며 나중에 새로은 것으로 임포트되어야 합니다..</string>
|
||||
<string name="osmand_net_previously_installed">이전 OsmAnd 버전이 설치되어 있습니다. 모든 오프라인 데이터는 새로운 앱에서 지원합니다. 하지만 즐겨찾기 포인트는 이전 앱에서 익스포트되어야 하며 나중에 새로운 것으로 임포트(가져오기)하여야 합니다..</string>
|
||||
<string name="build_installed">빌드 {0} 가 성공적으로 설치되었습니다 ({1}).</string>
|
||||
<string name="downloading_build">빌드 다운로딩…</string>
|
||||
<string name="install_selected_build">OsmAnd - {0} from {1} {2} MB - 설치를 계속하시겠습니까 ?</string>
|
||||
|
|
@ -525,7 +526,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="daynight">주간/야간 모드</string>
|
||||
|
||||
<string name="download_files_question">{0} 개의 파일 ({1} MB) 를 다운로드?</string>
|
||||
<string name="items_were_selected">{0} 항목이 선택되었습니다</string>
|
||||
<string name="items_were_selected">{0} 아이템목이 선택되었습니다</string>
|
||||
<string name="filter_existing_indexes">다운로드된 것들로 필터링</string>
|
||||
<string name="deselect_all">모든 선택 해제</string>
|
||||
<string name="select_all">모두 선택</string>
|
||||
|
|
@ -555,7 +556,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="download_type_to_filter">필터 종류</string>
|
||||
<string name="use_high_res_maps">고해상도 지도 표시</string>
|
||||
<string name="use_high_res_maps_descr">고해상도 장치를 위해 고해상도 지도를 사용합니다</string>
|
||||
<string name="unknown_location">위치를 알 수 없음</string>
|
||||
<string name="unknown_location">위치는 아직 알 수 없음</string>
|
||||
<string name="download_files">다운로드</string>
|
||||
<string name="context_menu_item_search_transport">대중교통 검색</string>
|
||||
<string name="transport_searching_transport">대중교통 검색결과 (목적지 없음):</string>
|
||||
|
|
@ -720,7 +721,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="downloading">다운로드 중…</string>
|
||||
<string name="downloading_list_indexes">사용 가능한 지역 목록을 다운로드하는 중…</string>
|
||||
<string name="list_index_files_was_not_loaded">지역 목록을 osmand.googlecode.com 로부터 가져올 수 없습니다.</string>
|
||||
<string name="select_index_file_to_download">원하는 지역을 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요.</string>
|
||||
<string name="select_index_file_to_download">원하는 지역의 지도를 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요.</string>
|
||||
<string name="show_poi_on_map">지도에서 보기</string>
|
||||
<string name="fav_points_edited">즐겨찾기 포인트가 수정되었습니다</string>
|
||||
<string name="fav_points_not_exist">즐겨찾기 포인트가 하나도 존재하지 않습니다</string>
|
||||
|
|
@ -922,7 +923,7 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
|
||||
<string name="index_item_nation_addresses">전국 주소</string>
|
||||
<string name="index_item_world_altitude_correction">세계 고도 보정</string>
|
||||
<string name="index_item_world_seamarks">세계 등대</string>
|
||||
<string name="index_item_world_seamarks">세계 seamarks</string>
|
||||
<string name="index_item_world_basemap">세계 개요 지도</string>
|
||||
<string name="index_item_world_ski">세계 스키 지도</string>
|
||||
<string name="lang_hr">크로아티아어</string>
|
||||
|
|
@ -983,9 +984,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="routing_attr_avoid_motorway_description">전용도로 회피하기</string>
|
||||
<string name="routing_attr_weight_name">최대중량</string>
|
||||
<string name="routing_attr_weight_description">차량중량제한 지정하기</string>
|
||||
<string name="android_19_location_disabled">KitKat version 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s). 모든 파일을 그곳에 복사하는 것을 허락하겠는가?
|
||||
\n Note : 이전 파일은 그대로 유지됩니다.
|
||||
\n Note : OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. </string>
|
||||
<string name="android_19_location_disabled">"KitKat version 이후로 이전에 저장한 위치에 지도를 다운로드하고 업데이트 할 수 없습니다 (%s).
|
||||
\n모든 파일을 그곳에 복사하는 것을 허락하겠는가?
|
||||
\n Note : 이전 파일은 그대로 유지됩니다.
|
||||
\n Note : OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. "</string>
|
||||
<string name="application_dir_change_warning2">OsmAnd는 새 목적지로 데이터를 이동하려고 합니다. 그렇게 하겠습니까?</string>
|
||||
<string name="copying_osmand_one_file_descr">새 목적지로 파일(%s)을 복사중...</string>
|
||||
<string name="copying_osmand_files_descr">새로운 목적지에 OsmAnd 파일을 복사중 (%s)</string>
|
||||
|
|
@ -996,8 +998,8 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="speech_rate_descr">TTS에 대한 음성속도를 지정합니다</string>
|
||||
<string name="speech_rate">음성 속도</string>
|
||||
<string name="complex_route_calculation_failed">빠른 루트 계산 실패(%s), 느린 계산으로 돌아감.</string>
|
||||
<string name="disable_complex_routing">복잡한 라우팅 비활성화</string>
|
||||
<string name="amenity_type_seamark">등대</string>
|
||||
<string name="disable_complex_routing">복잡한 라우팅 사용불능</string>
|
||||
<string name="amenity_type_seamark">Seamark</string>
|
||||
<string name="app_modes_choose">앱 프로필</string>
|
||||
<string name="map_widget_map_rendering">지도 렌더링:</string>
|
||||
<string name="app_mode_hiking">하이킹</string>
|
||||
|
|
@ -1008,10 +1010,10 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="tip_faq">자주 묻는 질문 (FAQ)</string>
|
||||
<string name="local_osm_changes_delete_all">모두 삭제하기</string>
|
||||
<string name="animate_routing_route_not_calculated">먼저 루트를 계산하세요</string>
|
||||
<string name="animate_routing_route">계산된 루트를 사용하여 모의주행하기 </string>
|
||||
<string name="animate_routing_route">"계산된 루트를 이용하여 모의주행하기 "</string>
|
||||
<string name="animate_routing_gpx">GPX트랙을 이용하여 모의주행하기</string>
|
||||
<string name="remember_choice">나의 선택을 기억하기</string>
|
||||
<string name="gps_status_eclipsim">GPS 상태</string>
|
||||
<string name="remember_choice">내 선택을 기억하기</string>
|
||||
<string name="gps_status_eclipsim">GPS status</string>
|
||||
<string name="default_and">그리고</string>
|
||||
<string name="default_or">또는</string>
|
||||
<string name="auto_zoom_none">자동 줌 안됨</string>
|
||||
|
|
@ -1065,13 +1067,11 @@ OsmAnd 는 Openstreetmap.org (OSM) 데이터 기반의 맵을 사용하며 -맵
|
|||
<string name="lang_cy">웨일스어</string>
|
||||
<string name="route_preferences">루트 선호도</string>
|
||||
<string name="guidance_preferences_descr">길안내 선호도</string>
|
||||
<string name="disable_complex_routing_descr">자동차 길안내에 대한 2길 길찾기(라우팅) 비활성화</string>
|
||||
<string name="disable_complex_routing_descr">자동차 길안내에 대한 2길 라우팅 사용불능</string>
|
||||
<string name="app_modes_choose_descr">앱에서 볼 수있는 사용자 프로필를 선택합니다</string>
|
||||
<string name="map_widget_appearance">나머지 요소 :</string>
|
||||
<string name="local_osm_changes_delete_all_confirm">%1$d OSM 변경 사항을 삭제하려고 합니다. 확실합니까?</string>
|
||||
<string name="route_is_too_long">OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있다.
|
||||
(가끔 작동 되지 않을 수 있음)
|
||||
당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있다.</string>
|
||||
<string name="route_is_too_long">OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있음) 당신은 더 나은 성능을 위해 중간 중간 포인트를 추가할 수 있습니다.</string>
|
||||
<string name="auto_zoom_close">좀더 가까이에</string>
|
||||
<string name="auto_zoom_far">미드 레인지(중간 거리)에</string>
|
||||
<string name="auto_zoom_farthest">롱 레인지(긴 거리)에</string>
|
||||
|
|
@ -1169,7 +1169,7 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
|
|||
<string name="favourites_list_activity">즐겨찾기 선택</string>
|
||||
<string name="local_openstreetmap_act_title">OSM 대량수정</string>
|
||||
<string name="default_buttons_other_actions">다른 작업</string>
|
||||
<string name="available_downloads_left">다운로드 할 파일 가능 %1$d</string>
|
||||
<string name="available_downloads_left">"다운로드 할 파일 %1$d 가능"</string>
|
||||
|
||||
<string name="layer_hillshade">음영 레이어</string>
|
||||
<string name="map_widget_gps_info">GPS 정보</string>
|
||||
|
|
@ -1214,13 +1214,13 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
|
|||
<string name="av_settings">오디오/비디오 설정 </string>
|
||||
<string name="recording_error">"기록하는 동안 오류가 발생했습니다 "</string>
|
||||
<string name="recording_camera_not_available">카메라는 사용할 수 없습니다</string>
|
||||
<string name="recording_is_recorded">오디오/비디오는 기록 되고있다. 정지하려면 AV 위젯을 누르면 됩니다.</string>
|
||||
<string name="recording_is_recorded">오디오/비디오는 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다.</string>
|
||||
<string name="recording_playing">지정된 레코딩에서 오디오가 재생되고 있습니다.\n%1$s</string>
|
||||
<string name="recording_open_external_player">외부 플레이어 열기</string>
|
||||
<string name="recording_delete_confirm">이 기록을 삭제하시겠습니까 ?</string>
|
||||
<string name="recording_unavailable">사용 불가능</string>
|
||||
<string name="recording_context_menu_arecord">오디오 녹음하기</string>
|
||||
<string name="recording_context_menu_vrecord">비디오 녹화하기</string>
|
||||
<string name="recording_context_menu_arecord">오디오 노트 기록하기</string>
|
||||
<string name="recording_context_menu_vrecord">비디오 노트 기록하기</string>
|
||||
<string name="layer_recordings">레코딩 레이어</string>
|
||||
<string name="recording_can_not_be_played">레코딩을 재생할 수 없습니다</string>
|
||||
<string name="recording_context_menu_delete">레코딩 삭제</string>
|
||||
|
|
@ -1229,13 +1229,13 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
|
|||
<string name="recording_default_name">레코딩</string>
|
||||
<string name="av_control_stop">정지</string>
|
||||
<string name="av_control_start">찍기</string>
|
||||
<string name="map_widget_av_notes">오디오/비디오 메모</string>
|
||||
<string name="map_widget_av_notes">오디오/비디오 노트</string>
|
||||
<string name="osmand_srtm_short_description_80_chars">오프라인 등고선에 대한 OsmAnd 플러그인</string>
|
||||
<string name="map_widget_distancemeasurement">거리 측정</string>
|
||||
<string name="monitoring_control_stop">정지</string>
|
||||
<string name="map_widget_audionotes">오디오 메모</string>
|
||||
<string name="audionotes_plugin_description">트래킹하는 동안 오디오/비디오 찍기</string>
|
||||
<string name="audionotes_plugin_name">오디오/비디오 메모</string>
|
||||
<string name="map_widget_audionotes">오디오 노트</string>
|
||||
<string name="audionotes_plugin_description">여행하는 동안 오디오/비디오 노트 기록하기</string>
|
||||
<string name="audionotes_plugin_name">오디오/비디오 노트</string>
|
||||
<string name="index_srtm_parts">부분</string>
|
||||
<string name="index_srtm_ele">등고선</string>
|
||||
<string name="srtm_plugin_description">오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→데이터 관리→다운로드→ 원하는 지도 유형 선택)</string>
|
||||
|
|
@ -1279,8 +1279,8 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
|
|||
<string name="map_widget_monitoring_services">로깅 서비스</string>
|
||||
<string name="no_route">어떠한 루트도 없음</string>
|
||||
<string name="delete_target_point">포인트 제거</string>
|
||||
<string name="target_point">목적지 %1$s</string>
|
||||
<string name="intermediate_point">중간 포인트 %1$s</string>
|
||||
<string name="target_point">포인트 %1$s</string>
|
||||
<string name="intermediate_point">포인트 %1$s</string>
|
||||
<string name="context_menu_item_last_intermediate_point">마지막 포인트로 추가</string>
|
||||
<string name="context_menu_item_first_intermediate_point">첫번째 포인트로 추가</string>
|
||||
<string name="add_as_last_destination_point">마지막 목적지 포인트로 추가</string>
|
||||
|
|
@ -1289,10 +1289,10 @@ GPX로 저장하여, GPX 루트를 계획할 수 있습니다.</string>
|
|||
<string name="replace_destination_point">목적지 포인트 대체</string>
|
||||
<string name="new_destination_point_dialog">이미 목적지 포인트 세트가 있다.</string>
|
||||
<string name="target_points">목적지</string>
|
||||
<string name="intermediate_point_too_far">도로에서 너무 멀리 떨어진 중간 포인트 %1$s .</string>
|
||||
<string name="arrived_at_intermediate_point">중간 포인트에 도착했습니다</string>
|
||||
<string name="context_menu_item_intermediate_point">중간 포인트로 추가</string>
|
||||
<string name="map_widget_intermediate_distance">중간 포인트</string>
|
||||
<string name="intermediate_point_too_far">도로에서 너무 멀리 떨어진 포인트 %1$s .</string>
|
||||
<string name="arrived_at_intermediate_point">포인트에 도착했습니다</string>
|
||||
<string name="context_menu_item_intermediate_point">포인트로 추가</string>
|
||||
<string name="map_widget_intermediate_distance">포인트</string>
|
||||
<string name="ending_point_too_far">도로에서 너무 멀리 떨어진 마지막 포인트.</string>
|
||||
<string name="btn_add_tag">태그 추가</string>
|
||||
<string name="btn_advanced_mode">고급 모드…</string>
|
||||
|
|
@ -1414,7 +1414,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="day_night_info_description">일출: %1$s \n일몰: %2$s</string>
|
||||
<string name="day_night_info">주간/야간 정보</string>
|
||||
<string name="map_widget_day_night">주간/야간 지도</string>
|
||||
<string name="map_widget_vector_attributes">특성 렌더링 :</string>
|
||||
<string name="map_widget_vector_attributes">렌더링 속성:</string>
|
||||
<string name="map_widget_renderer">지도 스타일</string>
|
||||
|
||||
|
||||
|
|
@ -1441,7 +1441,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="map_widget_lock_screen">화면 잠금</string>
|
||||
<string name="map_widget_compass">나침반</string>
|
||||
<string name="map_widget_top_stack">상태 표시줄 :</string>
|
||||
<string name="map_widget_reset">기본값으로 초기화</string>
|
||||
<string name="map_widget_reset">기본값으로 재설정</string>
|
||||
<string name="map_widget_right_stack">오른쪽 패널 :</string>
|
||||
<string name="map_widget_left_stack">왼쪽 패널 :</string>
|
||||
<string name="map_widget_parking">주차</string>
|
||||
|
|
@ -1462,7 +1462,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="show_traffic_warnings">트래픽 경고 표시</string>
|
||||
<string name="avoid_toll_roads">유료 도로 회피</string>
|
||||
<string name="continue_follow_previous_route_auto">이전 길안내는 아직 끝나지 안났습니다. 계속 길안내를 받으시겠습니까? (%1$s 초)</string>
|
||||
<string name="route_updated_loc_found">위치가 발견되면 루트를 찾을 것입니다</string>
|
||||
<string name="route_updated_loc_found">위치가 확정되면 루트를 찾을 것입니다</string>
|
||||
<string name="osmand_parking_hours">시간</string>
|
||||
<string name="osmand_parking_minutes">분</string>
|
||||
<string name="osmand_parking_position_description_add_time">자동차를 ~에 주차했습니다 :</string>
|
||||
|
|
@ -1506,7 +1506,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="context_menu_item_delete_parking_point">주차 마커를 삭제</string>
|
||||
<string name="gpxup_public">공용</string>
|
||||
<string name="gpxup_identifiable">식별가능</string>
|
||||
<string name="gpxup_trackable">트래킹 가능</string>
|
||||
<string name="gpxup_trackable">추적 가능</string>
|
||||
<string name="gpxup_private">개인</string>
|
||||
<string name="asap">가능한 빨리</string>
|
||||
<string name="save_route_as_gpx">GPX 파일로 루트를 저장</string>
|
||||
|
|
@ -1532,9 +1532,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="offline_navigation_not_available">OsmAnd 오프라인 길안내는 일시적으로 사용할 수 없습니다.</string>
|
||||
<string name="left_side_navigation">왼쪽좌석 운전</string>
|
||||
<string name="left_side_navigation_descr">왼쪽좌석 운전 국가를 선택합니다</string>
|
||||
<string name="download_link_and_local_description">오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오.
|
||||
세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 위해 길게 누르세요.
|
||||
기기에 남아있는 현재 데이터는 (%1$s free):</string>
|
||||
<string name="download_link_and_local_description">오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오. 세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 길게 누르세요. 기기에 남아있는 현재 데이터는 (%1$s free):</string>
|
||||
<string name="unknown_from_location">시작 포인트은 아직 결정되지 않았습니다</string>
|
||||
<string name="confirm_interrupt_download">파일 다운로드를 중단 하시겠습니까 ?</string>
|
||||
<string name="basemap_was_selected_to_download">베이스맵은 적절한 앱의 작동에 필요하며, 다운로드하기 위해 베이스맵을 선택 했습니다.</string>
|
||||
|
|
@ -1665,7 +1663,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
\n\t* 버그 수정
|
||||
\n\t* 지도 세부정보아 함께 지도 스타일 옵션, 새 도로 스타일,
|
||||
\n\t* EGM96 geoid 오프셋 보정, GPS 고도 읽기 "</string>
|
||||
<string name="audionotes_location_not_defined">메모와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 메모를 할당하려면 \" 위치 사용…\"</string>
|
||||
<string name="audionotes_location_not_defined">노트와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 노트를 할당하려면 \" 위치 사용…\"</string>
|
||||
<string name="tip_recent_changes_0_8_3_t">"Changes in 0.8.3:
|
||||
\n\t* 포인트
|
||||
\n\t* 향상된 루트 안내
|
||||
|
|
@ -1810,7 +1808,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
\n\t* \'To compass\': Map will continuously be aligned with the device\'s compass reading
|
||||
이동방향(나침반) : 지도는 계속 나침반의 진행방향을 가르킨다
|
||||
</string>
|
||||
<string name="mile_per_hour">마일퍼아워</string>
|
||||
<string name="mile_per_hour">mph</string>
|
||||
<string name="tip_recent_changes_1_6_t">Changes in 1.6:
|
||||
\n\t* 풀 HD 기기 지원.
|
||||
\n\t* 투명지도 백그라운드 지원.
|
||||
|
|
@ -1827,7 +1825,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="voice_pref_title">음성</string>
|
||||
<string name="misc_pref_title">기타</string>
|
||||
<string name="localization_pref_title">현지화</string>
|
||||
<string name="osmand_srtm_long_description_1000_chars">이 플러그인은 OsmAnd 의 오프라인 지도에 표시할 수 있는 등고선을 제공합니다. (북쪽으로 70도 남쪽으로 70도 사이 ) 글로벌 데이터는 SRTM (셔틀 레이더 지형 미션 ) 과 ASTER (고급화 된 Spaceborne 열 방출 및 반사 복사계 테라 온보드영상 기기) NASA 의 주력 위성에 의한 측정을 기반으로 합니다. 지구 관측 시스템의 애스터 는 NASA 사이의 협력 노력 , 일본의 경제 산업성(METI ), 일본 우주 시스템 (J- spacesystems )의 장관.</string>
|
||||
<string name="osmand_srtm_long_description_1000_chars">이 플러그인은 OsmAnd 의 오프라인 지도에 표시할 수 있는 등고선을 제공합니다. (북쪽으로 70도 남쪽으로 70도 사이 ) 글로벌 데이터는 SRTM (셔틀 레이더 지형 미션 ) 과 ASTER (고급화 된 Spaceborne 열 방출 및 반사 복사계 테라 온보드영상 기기) NASA 의 주력 위성에 의한 측정을 기반으로 합니다. 지구 관측 시스템의 ASTER 는 NASA 사이의 협력 노력 , 일본의 경제 산업성(METI ), 일본 우주 시스템 (J- spacesystems )의 장관.</string>
|
||||
<string name="tip_altitude_offset_t">대부분의 GPS 장치는 로컬로 사용되는 시스템에 대한 변환이 위치에 의존하는 보정을 필요로 하는 타원체 기반 WGS84 참조 시스템에서 고도 측정을 보고합니다.
|
||||
이 지역 시스템에 더 나은 근사치의 EGM96 (지오이드) 기준 입니다.
|
||||
[설정]를 통해 세계 Altitide 보정 파일를 다운로드 한 후 EGM96 시스템의 고도는 위치를 표시합니다.
|
||||
|
|
@ -1847,14 +1845,13 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
\ n 개의 \ 티셔츠 * 사용성 및 UI 경험 *
|
||||
\ n \ t - 많은 분야에서 개선
|
||||
</string>
|
||||
<string name="tip_day_night_mode_t_v2">지도의 모양은 오프라인 벡터 맵에서 주간(밝게 )과 야간(어둡게) 사이에서 변경 될 수 있습니다. 야간의 색상은 안전하고 야간 운전에 더 편안합니다.
|
||||
\'메뉴\'→\'화면구성\'→\'주간/야간 지도\' 의 주간/야간 전환을 설정할 수 있습니다.
|
||||
선택 사항은 다음과 같습니다 :
|
||||
\'일출/일몰\' 자동 모드 (태양의 위치에 따라 제어)
|
||||
\'주간\' 항상 주간 모드를 사용
|
||||
\'야간\' 항상 야간 모드를 사용
|
||||
\'광 센서\' : 지도 모양이 장치의 광센서에 의해 제어된다 (광센서가 장착된 경우에만)
|
||||
</string>
|
||||
<string name="tip_day_night_mode_t_v2">"The map appearance can for offline vector maps be changed between day (brighter) and night (darker). Night colors are safer and more comfortable for night driving.
|
||||
\n\nYou can set a policy for day/night switching in \'Menu\' → \'Configure screen\' → \'Day/night map\'.
|
||||
\n\nThe choices are:
|
||||
\n\t* \'Sunrise/Sunset\': automatic mode, controlled by the position of the 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 the device\'s light sensor (only if equipped) "</string>
|
||||
<string name="tip_map_switch_t_v2">표시된 지도소스와 지도레이어는 [메뉴]->[지도 레이어]에서 변경할 수 있다.
|
||||
[지도 소스] 아래에 미리 로드된 오프라인 벡터 지도를 사용하여 선택할 수 있다.
|
||||
OsmAnd 는 또한 사용자 지도를 지원한다.
|
||||
|
|
@ -1872,7 +1869,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
\n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다.
|
||||
</string>
|
||||
<string name="osmo_settings_uuid">고유 장치 id</string>
|
||||
<string name="osmo_settings_descr">모니터링 설정 및 설정 개인 모니터링 채널을 구성</string>
|
||||
<string name="osmo_settings_descr">모니터링 설정을 구성하고 개인 모니터링 채널을 설정</string>
|
||||
<string name="osmo_plugin_description">"OpenStreetMap 고급 실시간 모니터링. 이에 대해서는 http://osmo.mobi를 참조 하십시오. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며 일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. "</string>
|
||||
<string name="osmo_plugin_name">OsMo (실시간 친구위치 공유)</string>
|
||||
<string name="osmo_settings">OsMo (실시간 친구찾기)</string>
|
||||
|
|
@ -1900,12 +1897,10 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
|
||||
<string name="osmo_connected_devices">연결된 장치</string>
|
||||
<string name="osmo_groups">OsMo 그룹/장치</string>
|
||||
<string name="osmo_auto_send_locations_descr">자동으로 트래커 세션을 시작하고 응용 프로그램 시작 후 위치를 전송</string>
|
||||
<string name="osmo_auto_send_locations">자동으로 트래킹 세션을 시작</string>
|
||||
<string name="osmo_auto_send_locations_descr">자동으로 트래커 세션을 시작하고 앱 시작 후 위치를 전송</string>
|
||||
<string name="osmo_auto_send_locations">자동으로 트래커 세션을 시작</string>
|
||||
<string name="osmo_tracker_id">개인 트래커 ID</string>
|
||||
<string name="osmo_tracker_id_descr">트래킹 ID를 보거나 공유하려면 클릭하십시오.
|
||||
트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다!
|
||||
선택 재생성 옵션을 분리합니다.</string>
|
||||
<string name="osmo_tracker_id_descr">트래커 ID를 보거나 공유하려면 클릭하십시오. 트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! 선택 재생성 옵션을 분리합니다.</string>
|
||||
<string name="osmo_session_token">세션 토큰 : %1$s</string>
|
||||
<string name="osmo_auth_pending">허가를 기다리는 중...</string>
|
||||
<string name="osmo_locations_sent">위치 전송 %1$d (in buffer %2$d) </string>
|
||||
|
|
@ -1919,13 +1914,13 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="osmo_group_share">%2$s 그룹에 연결하려면, 그룹 아이디(%1$s) 를 지정하세요 또는 %3$s 를 클릭하세요.</string>
|
||||
<string name="osmo_share_connect_device">영구적으로 이 장치를 따릅니다.</string>
|
||||
<string name="osmo_share_current_session">브라우저에서 현재의 세션을 공유하기</string>
|
||||
<string name="osmo_session_not_available">세션을 사용할 수 없습니다 , \'Send locations\' 가 켜져 있는지 확인하시기 바랍니다</string>
|
||||
<string name="osmo_session_not_available">세션을 사용할 수 없습니다 , \'위치 전송하기\' 가 켜져 있는지 확인하시기 바랍니다</string>
|
||||
<string name="osmo_share_session">세션 공유</string>
|
||||
<string name="osmo_session_id_share">장치를 추적하기 위한 세션 URL(%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">%2$s 목적지 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요</string>
|
||||
<string name="osmo_track_interval">로깅 간격</string>
|
||||
<string name="osmo_track_interval_descr">위치를 전송하도록 시간 간격을 선택</string>
|
||||
<string name="int_days">일</string>
|
||||
<string name="int_days">하루</string>
|
||||
<string name="osmo_connect_menu">연결</string>
|
||||
<string name="osmo_expire_group">만료</string>
|
||||
<string name="osmo_group_description">설명</string>
|
||||
|
|
@ -1937,7 +1932,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="osmo_create_group">그룹 만들기</string>
|
||||
<string name="osmo_server_operation_failed">OsMo 서버 작업 실패</string>
|
||||
<string name="osmo_activity">OpenStreetMap의 모니터링</string>
|
||||
<string name="osmo_enable_tracker">내 위치 보내기</string>
|
||||
<string name="osmo_enable_tracker">내 위치 전송하기</string>
|
||||
<string name="osmo_control">OsMo 빠른 접근</string>
|
||||
<string name="local_index_mi_export">내보내기</string>
|
||||
<string name="import_file_favourites">GPX 파일로 저장? 또는 즐겨찾기로 가져오기?</string>
|
||||
|
|
@ -1954,7 +1949,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="osmo_edit_device">사용자 등록정보 변경</string>
|
||||
<string name="osmo_edit_color">디스플레이 색상</string>
|
||||
<string name="osmo_follow">따라가기</string>
|
||||
<string name="osmo_sign_in">로그인</string>
|
||||
<string name="osmo_sign_in">가입하기</string>
|
||||
<string name="osmo_create_groups_confirm">그룹을 만들려면 OsMo의 사용자 등록이 필요합니다.</string>
|
||||
<string name="osmo_credentials_not_valid">OsMo 자격증명이 유효하지 않습니다.</string>
|
||||
<string name="osmo_regenerate_login_ids_confirm">개인 ID를 재발급 받으시겠습니까? 연결된 모든 장치는 더 이상 GPX트랙을 기록할 수 없습니다.</string>
|
||||
|
|
@ -1967,16 +1962,16 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="osmo_user_name">사용자</string>
|
||||
<string name="color_green">녹색</string>
|
||||
|
||||
<string name="osmo_user_joined">사용자 %1$s 이(가) 그룹 %2$s 에 합류</string>
|
||||
<string name="osmo_user_left">사용자 %1$s 그룹 %2$s 남기다</string>
|
||||
<string name="osmo_user_joined">사용자 %1$s이(가) 그룹 %2$s에 합류합니다</string>
|
||||
<string name="osmo_user_left">"사용자 %1$s가 그룹 %2$s에 남습니다"</string>
|
||||
<string name="osmo_show_group_notifications">그룹 알림 보기</string>
|
||||
<string name="osmo_show_group_notifications_descr">사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시</string>
|
||||
<string name="gpx_file_is_empty">GPX트랙이 비어있습니다</string>
|
||||
<string name="selected_track">선택한 GPX트랙</string>
|
||||
<string name="my_tracks">모든 GPX트랙</string>
|
||||
<string name="my_favorites">내 즐겨찾기</string>
|
||||
<string name="my_data_Button">즐겨찾기</string>
|
||||
<string name="my_data_activity">즐겨찾기</string>
|
||||
<string name="my_data_Button">내 장소</string>
|
||||
<string name="my_data_activity">내 장소</string>
|
||||
<string name="gpx_info_subtracks">하위트랙 : %1$s </string>
|
||||
<string name="gpx_info_distance">거리: %1$s (%2$s points) </string>
|
||||
<string name="gpx_info_start_time">시작 시간: %1$tF, %1$tR </string>
|
||||
|
|
@ -1986,7 +1981,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="gpx_info_avg_altitude">평균 고도: %1$s</string>
|
||||
<string name="gpx_info_diff_altitude">고도 범위: %1$s</string>
|
||||
<string name="gpx_timespan">시간 범위: %1$s</string>
|
||||
<string name="gpx_timemoving">이동한 시간: %1$s</string>
|
||||
<string name="gpx_timemoving">이동 시간: %1$s</string>
|
||||
<string name="gpx_selection_segment_title">구간</string>
|
||||
<string name="gpx_selection_number_of_points"> %1$s 포인트</string>
|
||||
<string name="gpx_selection_point">포인트 %1$s</string>
|
||||
|
|
@ -1997,7 +1992,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="gpx_available_current_track">현재 기록중인 GPX트랙</string>
|
||||
<string name="loading_smth">%1$s 불러오는 중…</string>
|
||||
<string name="map_widget_plain_time">현재 시간</string>
|
||||
<string name="gpx_wpt">중간지점</string>
|
||||
<string name="gpx_wpt">포인트</string>
|
||||
<string name="selected_gpx_info_show">\n\n지도를 보려면 누르고 계십시요</string>
|
||||
<string name="delay_navigation_start">순차적인 길안내를 시작합니다</string>
|
||||
<string name="selected">선택됨</string>
|
||||
|
|
@ -2009,7 +2004,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="layer_amenity_label">포인트 레이블</string>
|
||||
<string name="show_zoom_buttons_navigation_descr">길안내중에 줌 버튼 보기</string>
|
||||
<string name="show_zoom_buttons_navigation">줌 버튼 보이기</string>
|
||||
<string name="none_selected_gpx">"선택한 GPX 파일 없음. 사용 가능한 GPX트랙을 선택 하려면 누르고 있어요."</string>
|
||||
<string name="none_selected_gpx">"선택한 GPX 파일 없음. 이용 가능한 경로를 선택 하려면 누르고 있어요."</string>
|
||||
<string name="local_index_unselect_gpx_file">선택을 취소합니다.</string>
|
||||
<string name="local_index_select_gpx_file">보이기위해 선택</string>
|
||||
<string name="sort_by_distance">거리로 정렬</string>
|
||||
|
|
@ -2025,7 +2020,7 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="osmo_group_information">그룹을 만들기 전에 읽어 보시기 바랍니다!</string>
|
||||
<string name="osmo_not_signed_in">OsMo 로그인 실패</string>
|
||||
<string name="osmo_gpx_points_downloaded">OsMo 포인트 %1$s 다운로드됨.</string>
|
||||
<string name="osmo_auto_connect_descr">응용 프로그램 시작 후 서비스에 자동으로 연결</string>
|
||||
<string name="osmo_auto_connect_descr">앱 시작 후 서비스에 자동으로 연결</string>
|
||||
<string name="osmo_auto_connect">자동 연결</string>
|
||||
<string name="osmo_start_service">OsMo 서비스</string>
|
||||
<string name="osmo_gpx_track_downloaded">OsMo GPX트랙 %1$s 다운로드됨.</string>
|
||||
|
|
@ -2037,10 +2032,10 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="rendering_attr_moreDetailed_name">더 상세히</string>
|
||||
<string name="rendering_attr_lessDetailed_name">덜 상세히</string>
|
||||
<string name="rendering_attr_hideAccess_name">액세스 유형 숨기기</string>
|
||||
<string name="rendering_attr_showAccess_name">액세스 유형을 표시합니다</string>
|
||||
<string name="rendering_attr_showAccess_name">액세스 유형 보이기</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">도로의 품질 표시</string>
|
||||
<string name="rendering_attr_showSurfaces_name">도로 표면 표시</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">자전거 노선 표시하기</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">자전거 루트 표시</string>
|
||||
<string name="keep_navigation_service">계속</string>
|
||||
<string name="stop_navigation_service">중지</string>
|
||||
<string name="enable_sleep_mode">절전 모드 활성화</string>
|
||||
|
|
|
|||
|
|
@ -683,7 +683,8 @@
|
|||
<string name="offline_navigation_not_available">Nawigacja offline w OsmAnd jest tymczasowo niedostępna.</string>
|
||||
<string name="left_side_navigation">Ruch lewostronny</string>
|
||||
<string name="left_side_navigation_descr">Wybierz dla krajów z ruchem lewostronnym</string>
|
||||
<string name="download_link_and_local_description">Kliknij tutaj, aby pobrać lub zaktualizować pliki map w trybu offline. \nKliknij istniejący element, aby zobaczyć więcej szczegółów. Naciśnij i przytrzymaj, aby go wyłączyć lub usunąć. Obecne dane na urządzeniu (%1$s dostępne):</string>
|
||||
<string name="download_link_and_local_description">Kliknij tutaj, aby pobrać lub zaktualizować pliki map trybu offline.
|
||||
\nKliknij istniejący element, aby zobaczyć więcej szczegółów. Naciśnij i przytrzymaj, aby go wyłączyć lub usunąć. Obecne dane na urządzeniu (%1$s dostępne):</string>
|
||||
<string name="unknown_from_location">Punkt początkowy nie jest jeszcze wyznaczony</string>
|
||||
<string name="confirm_interrupt_download">Czy chcesz przerwać pobieranie pliku?</string>
|
||||
<string name="basemap_was_selected_to_download">Mapa bazowa jest wymagana do prawidłowego funkcjonowania aplikacji i została wybrana do pobrania.</string>
|
||||
|
|
@ -1839,8 +1840,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="select_destination_and_intermediate_points">Wybierz punkty</string>
|
||||
<string name="layer_amenity_label">Etykiety punktów</string>
|
||||
<string name="visible_element">Pokaż na mapie</string>
|
||||
<string name="show_zoom_buttons_navigation_descr">Pokazuj przyciski zbliżania podczas nawigacji</string>
|
||||
<string name="show_zoom_buttons_navigation">Pokazuj przyciski zbliżania</string>
|
||||
<string name="show_zoom_buttons_navigation_descr">Pokazuj przyciski skalowania podczas nawigacji</string>
|
||||
<string name="show_zoom_buttons_navigation">Pokazuj przyciski skalowania</string>
|
||||
<string name="sort_by_distance">Sortuj według odległości</string>
|
||||
<string name="sort_by_name">Sortuj według nazwy</string>
|
||||
<string name="none_selected_gpx">Nie wybrano żadnych plików GPX. W celu wyboru naciśnij i przytrzymaj dostępną ścieżkę.</string>
|
||||
|
|
@ -1868,7 +1869,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="local_map_names">Nazwy lokalne</string>
|
||||
<string name="lang_sw">Suahili</string>
|
||||
<string name="lang_he">Hebrajski</string>
|
||||
<string name="forward">Do przodu</string>
|
||||
<string name="forward">Dalej</string>
|
||||
<string name="home">Dom</string>
|
||||
<string name="live_monitoring_m_descr">Wysyłaj aktualną pozycję do określonej usługi internetowej, jeśli nagrywanie GPX jest włączone.</string>
|
||||
<string name="live_monitoring_m">Śledzenie online (wymagane GPX)</string>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="recording_context_menu_show">Zobraziť</string>
|
||||
<string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
|
||||
<string name="av_def_action_picture">Zachytiť fotografiu</string>
|
||||
|
|
@ -1745,11 +1745,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="lang_cy">Welšsky (Cymraeg)</string>
|
||||
<string name="osmo_settings_uuid">Jedinečné ID zariadenia</string>
|
||||
<string name="osmo_settings_descr">Zmeniť nastavenia monitorovania a nastaviť osobný monitorovací kanál</string>
|
||||
<string name="osmo_plugin_description">OpenStreetMap-Monitorovanie - Pokročilé sledovanie naživo. Ponúka možnosti sledovania iných zariadení a byť sledovaný.
|
||||
Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania.
|
||||
Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny.
|
||||
Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom.
|
||||
Prečítajte si viac na http://osmo.mobi.</string>
|
||||
<string name="osmo_plugin_description">"OpenStreetMap pokročilé sledovanie naživo, pozrite http://osmo.mobi. Ponúka možnosti sledovania iných zariadení a byť sledovaný. Vytvorte anonymné skupiny, zdieľajte vzájomne polohu a komunikujte. Rôzne možnosti nastavenia krátkodobého a dlhodobého sledovania. Anonymné skupiny sú obmedzené na počet dní a pre niektoré funkcie nie je diaľkové ovládanie ani administrátor skupiny. Plne funkčné skupiny sa vytvárajú na webstránke a sú prístupné len registrovaným používateľom. "</string>
|
||||
<string name="osmo_plugin_name">OsMo (Pokročilé sledovanie naživo)</string>
|
||||
<string name="osmo_settings">OsMo sledovanie OpenStreetMap (beta)</string>
|
||||
<string name="keep_informing_never">Nikdy</string>
|
||||
|
|
@ -1939,4 +1935,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="rendering_attr_showCycleRoutes_name">Zobraziť cyklocesty</string>
|
||||
<string name="lang_fa">Perzsky</string>
|
||||
<string name="keep_navigation_service">Ponechať</string>
|
||||
<string name="rendering_attr_subwayMode_name">Režim metra</string>
|
||||
<string name="lang_al">Albánsky</string>
|
||||
<string name="lang_ar">Arabsky</string>
|
||||
<string name="lang_sc">Sardínsky</string>
|
||||
<string name="lang_sr">Srbsky</string>
|
||||
<string name="lang_zh_CN">Zjednodušená čínština</string>
|
||||
<string name="lang_zh_TW">Tradičná čínština</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1858,7 +1858,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
|
|||
<string name="gpx_monitoring_stop">Končaj GPX snemanje</string>
|
||||
<string name="gpx_start_new_segment">Začni nov segment</string>
|
||||
<string name="rendering_attr_hideBuildings_name">Skrij stavbe</string>
|
||||
<string name="rendering_attr_hideNonVehicleHighways_name">Skrij ne-vozne ceste</string>
|
||||
<string name="rendering_attr_hideNonVehicleHighways_name">Skrij neprevozne ceste</string>
|
||||
<string name="rendering_attr_hideText_name">Skrij besedilo</string>
|
||||
<string name="rendering_attr_hideWoodScrubs_name">Skrij gozdove in grmičevje</string>
|
||||
<string name="rendering_attr_buildings15zoom_name">Zgradbe v povečavi 15</string>
|
||||
|
|
|
|||
|
|
@ -1645,4 +1645,5 @@
|
|||
<string name="lang_sr">Serbiska</string>
|
||||
<string name="lang_zh_CN">Förenklad kinesiska</string>
|
||||
<string name="lang_zh_TW">Traditionell kinesiska</string>
|
||||
</resources>
|
||||
<string name="rendering_attr_subwayMode_name">Tunnelbaneläge</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@
|
|||
<string name="offline_navigation_not_available">OsmAnd 離線導航，暫時不能使用。</string>
|
||||
<string name="left_side_navigation">左駕</string>
|
||||
<string name="left_side_navigation_descr">選擇左駕的國家</string>
|
||||
<string name="download_link_and_local_description">點選此處下載或更新離線地圖檔案。\n按任何一項查看細節，按住即可解除或刪除。目前裝置上的資料空間剩(%1$s 可用)：</string>
|
||||
<string name="download_link_and_local_description">點選此處可下載或更新離線地圖檔案。\n點選現存的任何項目可查看細節，按住即可停用或刪除。目前裝置上資料的可用空間尚有 (%1$s)：</string>
|
||||
<string name="unknown_from_location">起始標點尚未決定</string>
|
||||
<string name="unknown_location">未知地理位置</string>
|
||||
<string name="modify_transparency">調整透明度(0 - 透明, 255 - 不透明)</string>
|
||||
|
|
@ -298,21 +298,21 @@
|
|||
<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_left">左後方</string>
|
||||
<string name="left">左邊</string>
|
||||
<string name="left">左方</string>
|
||||
<string name="front_left">左前方</string>
|
||||
<string name="oclock">點</string>
|
||||
<string name="towards">接近</string>
|
||||
<string name="oclock">點鐘</string>
|
||||
<string name="towards">將近</string>
|
||||
<string name="accuracy">精確性</string>
|
||||
<string name="altitude">高度</string>
|
||||
<string name="no_info">無資訊</string>
|
||||
<string name="direction_style_sidewise">方向方位 (8個方位)</string>
|
||||
<string name="direction_style_clockwise">時鐘方位(12個方位)</string>
|
||||
<string name="no_info">沒有數據</string>
|
||||
<string name="direction_style_sidewise">橫向 (8 個扇區)</string>
|
||||
<string name="direction_style_clockwise">順時鐘 (12 個扇區)</string>
|
||||
<string name="settings_direction_style">方向樣式</string>
|
||||
<string name="settings_direction_style_descr">選擇在行進中相對方向的表示樣式</string>
|
||||
<string name="settings_direction_style_descr">在行進當中，以選擇的樣式來表示相對的方向</string>
|
||||
<string name="auto_announce_on">啟動自動告知</string>
|
||||
<string name="auto_announce_off">關閉自動告知</string>
|
||||
<string name="scroll_map_by_gestures_descr">在觸控螢幕上用手勢移動地圖</string>
|
||||
|
|
@ -324,7 +324,7 @@
|
|||
<string name="use_short_object_names">使用物件名稱</string>
|
||||
<string name="accessibility_preferences_descr">協助工具的相關偏好設定</string>
|
||||
<string name="accessibility_preferences">協助工具</string>
|
||||
<string name="rendering_out_of_memory">沒有足夠的處理記憶體去顯示已選取的區域</string>
|
||||
<string name="rendering_out_of_memory">處理記憶體不足，無法顯示已選取的區域</string>
|
||||
<string name="use_fluorescent_overlays">螢光覆疊層</string>
|
||||
<string name="use_fluorescent_overlays_descr">使用螢光色彩來顯示軌跡與導航路線</string>
|
||||
<string name="offline_edition">離線編輯</string>
|
||||
|
|
@ -1721,7 +1721,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
|
|||
<string name="always_center_position_on_map">位置顯示始終處於中心</string>
|
||||
<string name="voice_pref_title">聲音</string>
|
||||
<string name="localization_pref_title">定位</string>
|
||||
<string name="interrupt_music_descr">當制作通告時中斷音樂</string>
|
||||
<string name="interrupt_music_descr">當制作預告時中斷音樂</string>
|
||||
<string name="interrupt_music">中斷音樂</string>
|
||||
<string name="misc_pref_title">雜項</string>
|
||||
<string name="share_route_as_gpx">以 GPX 檔案分享路線</string>
|
||||
|
|
@ -1735,8 +1735,8 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
|
|||
<string name="keep_informing_never">永不</string>
|
||||
<string name="keep_informing_descr">按照定期間隔重新通報導航指示</string>
|
||||
<string name="keep_informing">重複導航指示</string>
|
||||
<string name="arrival_distance">抵達通告</string>
|
||||
<string name="arrival_distance_descr">您希望抵達通告要有多快？</string>
|
||||
<string name="arrival_distance">到達預告</string>
|
||||
<string name="arrival_distance_descr">您希望到達預告要有多快告知？</string>
|
||||
<string name="osmo_io_error">OsMo 連線問題： </string>
|
||||
<string name="osmo_mode_on">停止 OsMo 連線階段</string>
|
||||
<string name="osmo_mode_off">啟動 OsMo 連線階段</string>
|
||||
|
|
@ -1748,8 +1748,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
|
|||
<string name="osmo_auto_send_locations_descr">自動開始追蹤連線階段和發送位置之後啟動應用程式</string>
|
||||
<string name="osmo_auto_send_locations">自動開始追蹤連線階段</string>
|
||||
<string name="osmo_tracker_id">個人追蹤 ID</string>
|
||||
<string name="osmo_tracker_id_descr">點擊查看或分享追蹤 ID。
|
||||
使用追蹤 ID 連線的裝置將能夠監視該裝置的所有動作！ 要斷開選擇恢復選項。</string>
|
||||
<string name="osmo_tracker_id_descr">點擊查看或分享追蹤 ID。 使用追蹤 ID 連線的裝置將能夠監控該裝置的所有動作！ 要斷開選擇恢復選項。</string>
|
||||
<string name="osmo_session_token">連線階段標記：%1$s</string>
|
||||
<string name="osmo_auth_pending">等候授權...</string>
|
||||
<string name="osmo_locations_sent">發送位置 %1$d（在緩衝區 %2$d） </string>
|
||||
|
|
@ -1788,7 +1787,7 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
|
|||
<string name="osmo_connect">連接到</string>
|
||||
<string name="osmo_create_group">建立群組</string>
|
||||
<string name="osmo_server_operation_failed">OsMo 伺服器操作失敗</string>
|
||||
<string name="osmo_activity">OpenStreetMap-監視</string>
|
||||
<string name="osmo_activity">OpenStreetMap-監控中</string>
|
||||
<string name="osmo_enable_tracker">傳送我的位置</string>
|
||||
<string name="osmo_control">OsMo 快速進入</string>
|
||||
<string name="local_index_mi_export">匯出</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<resources>
|
||||
<string name="start_new_stage">Do you want to interrupt current stage and start new ?</string>
|
||||
<string name="enter_access_code">Enter access code to see if you are entitled for a specific tour (optional)</string>
|
||||
<string name="sherpafy_stage_tab_fav">Fav</string>
|
||||
<string name="sherpafy_stage_tab_target">Target</string>
|
||||
<string name="sherpafy_stage_tab_route">Route</string>
|
||||
|
|
@ -18,7 +20,6 @@
|
|||
<string name="sherpafy_download_tours">Download Tours</string>
|
||||
<string name="sherpafy_tours">Sherpafy Tours</string>
|
||||
<string name="access_code_is_not_valid">Access code is not valid</string>
|
||||
<string name="enter_access_code">Enter access code</string>
|
||||
<string name="overview">Overview</string>
|
||||
<string name="selecting_tour_progress">Selecting tour...</string>
|
||||
<string name="no_stages_provided">No stages provided</string>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
|
||||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
<string name="continue_navigation">Continue Navigation</string>
|
||||
<string name="pause_navigation">Pause Navigation</string>
|
||||
<string name="keep_navigation_service">Keep</string>
|
||||
<string name="rendering_attr_subwayMode_name">Subway mode</string>
|
||||
<string name="keep_navigation_service">Keep</string>
|
||||
<string name="stop_navigation_service">Stop</string>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package net.osmand.access;
|
|||
import android.app.Activity;
|
||||
import android.view.MotionEvent;
|
||||
|
||||
import com.actionbarsherlock.app.SherlockActivity;
|
||||
|
||||
// Provide some additional accessibility means for activity view elements.
|
||||
//
|
||||
// To make use of these capabilities simply derive your activity from this class
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package net.osmand.plus;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import net.osmand.Location;
|
||||
import net.osmand.binary.RouteDataObject;
|
||||
|
|
@ -36,7 +38,8 @@ public class CurrentPositionHelper {
|
|||
} else {
|
||||
return;
|
||||
}
|
||||
RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p.name().toLowerCase(), 10);
|
||||
RoutingConfiguration cfg = app.getDefaultRoutingConfig().build(p.name().toLowerCase(), 10,
|
||||
new HashMap<String, String>());
|
||||
ctx = new RoutePlannerFrontEnd(false).buildRoutingContext(cfg, null, app.getResourceManager().getRoutingMapFiles());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -554,6 +554,19 @@ public class GPXUtilities {
|
|||
}
|
||||
return tpoints;
|
||||
}
|
||||
|
||||
public WptPt getLastPoint() {
|
||||
if (tracks.size() > 0) {
|
||||
Track tk = tracks.get(tracks.size() - 1);
|
||||
if (tk.segments.size() > 0) {
|
||||
TrkSegment ts = tk.segments.get(tk.segments.size() - 1);
|
||||
if (ts.points.size() > 0) {
|
||||
return ts.points.get(ts.points.size() - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public WptPt findPointToShow() {
|
||||
for (Track t : tracks) {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.data.FavouritePoint;
|
||||
import net.osmand.plus.activities.DownloadIndexActivity;
|
||||
import net.osmand.plus.activities.FavouritesActivity;
|
||||
import net.osmand.plus.activities.LocalIndexesActivity;
|
||||
|
|
@ -102,4 +103,8 @@ public class OsmAndAppCustomization {
|
|||
public void prepareLocationMenu(MapActivity mapActivity, ContextMenuAdapter adapter) {
|
||||
}
|
||||
|
||||
public List<FavouritePoint> getFavorites() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,10 +106,10 @@ public class HelpActivity extends SherlockActivity {
|
|||
createMenuItem(menu, HOME, R.string.home,
|
||||
R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM );
|
||||
createMenuItem(menu, BACK, R.string.back,
|
||||
createMenuItem(menu, BACK, R.string.previous_button,
|
||||
0, 0, //R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM );
|
||||
createMenuItem(menu, FORWARD, R.string.forward,
|
||||
createMenuItem(menu, FORWARD, R.string.next_button,
|
||||
0, 0, //R.drawable.ic_action_home_light, R.drawable.ic_action_home_dark,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM );
|
||||
createMenuItem(menu, CLOSE, R.string.close,
|
||||
|
|
|
|||
|
|
@ -805,6 +805,25 @@ public class MapActivityActions implements DialogProvider {
|
|||
enterRoutePlanningMode(null, null);
|
||||
}
|
||||
}).reg();
|
||||
} else if(routingHelper.isRouteCalculated()) {
|
||||
optionsMenuHelper.item(
|
||||
routingHelper.isRoutePlanningMode() ? R.string.continue_navigation :
|
||||
R.string.pause_navigation)
|
||||
.icons(R.drawable.ic_action_gdirections_dark, R.drawable.ic_action_gdirections_light)
|
||||
.listen(new OnContextMenuClick() {
|
||||
@Override
|
||||
public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) {
|
||||
if(routingHelper.isRoutePlanningMode()) {
|
||||
routingHelper.setRoutePlanningMode(false);
|
||||
routingHelper.setFollowingMode(true);
|
||||
} else {
|
||||
routingHelper.setRoutePlanningMode(true);
|
||||
routingHelper.setFollowingMode(false);
|
||||
}
|
||||
mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
|
||||
mapActivity.refreshMap();
|
||||
}
|
||||
}).reg();
|
||||
}
|
||||
if (getTargets().getPointToNavigate() != null) {
|
||||
optionsMenuHelper.item(R.string.target_points).icons(R.drawable.ic_action_flage_dark, R.drawable.ic_action_flage_light)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import java.util.Map;
|
|||
import java.util.TreeSet;
|
||||
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.data.FavouritePoint;
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.OsmAndAppCustomization;
|
||||
|
|
@ -19,10 +20,15 @@ import net.osmand.plus.OsmandSettings.CommonPreference;
|
|||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.DownloadIndexActivity;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.activities.MapActivityLayers;
|
||||
import net.osmand.plus.api.FileSettingsAPIImpl;
|
||||
import net.osmand.plus.download.DownloadActivityType;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageFavorite;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageInformation;
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.AlertDialog.Builder;
|
||||
import android.os.Bundle;
|
||||
import android.view.Window;
|
||||
import android.widget.TextView;
|
||||
|
||||
|
|
@ -39,6 +45,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
private TourInformation selectedTour = null;
|
||||
private File toursFolder;
|
||||
private CommonPreference<String> accessCodePref;
|
||||
private List<FavouritePoint> cachedFavorites = new ArrayList<FavouritePoint>();
|
||||
|
||||
@Override
|
||||
public void setup(OsmandApplication app) {
|
||||
|
|
@ -149,7 +156,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
e.printStackTrace();
|
||||
}
|
||||
if (selected) {
|
||||
reloadSelectedTour(progress, tr, tourInformation, warns);
|
||||
reloadSelectedTour(progress, tourInformation);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -170,11 +177,11 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
return selectedTour;
|
||||
}
|
||||
|
||||
private void reloadSelectedTour(IProgress progress, File tr, final TourInformation tourInformation, List<String> warns) {
|
||||
private void reloadSelectedTour(IProgress progress, final TourInformation tourInformation) {
|
||||
if(progress != null) {
|
||||
progress.startTask(app.getString(R.string.indexing_tour, tr.getName()), -1);
|
||||
progress.startTask(app.getString(R.string.indexing_tour, tourInformation.getName()), -1);
|
||||
}
|
||||
File settingsFile = new File(tr, "settings.props");
|
||||
File settingsFile = new File(tourInformation.getFolder(), "settings.props");
|
||||
FileSettingsAPIImpl fapi;
|
||||
try {
|
||||
fapi = new FileSettingsAPIImpl(app, settingsFile);
|
||||
|
|
@ -183,25 +190,10 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
app.getSettings().setSettingsAPI(fapi);
|
||||
} catch (IOException e) {
|
||||
warns.add(app.getString(R.string.settings_file_create_error));
|
||||
app.showToastMessage(R.string.settings_file_create_error);
|
||||
}
|
||||
selectedStagePref = app.getSettings().registerStringPreference(SELECTED_STAGE, null).makeGlobal();
|
||||
try {
|
||||
tourInformation.loadFullInformation();
|
||||
} catch (Exception e) {
|
||||
warns.add("Selected tour : " + e.getMessage());
|
||||
}
|
||||
selectedTour = tourInformation;
|
||||
if(selectedStagePref.get() != null) {
|
||||
for(StageInformation s : selectedTour.getStageInformation()) {
|
||||
if(s.getName().equals(selectedStagePref.get())) {
|
||||
selectedStage = s;
|
||||
loadSelectedStage();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public StageInformation getSelectedStage() {
|
||||
|
|
@ -221,6 +213,20 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
|
||||
private void loadSelectedStage() {
|
||||
final StageInformation st = selectedStage;
|
||||
cachedFavorites = new ArrayList<FavouritePoint>();
|
||||
for(Object o : st.favorites ) {
|
||||
if(o instanceof StageFavorite) {
|
||||
StageFavorite sf = (StageFavorite) o;
|
||||
FavouritePoint fp = new FavouritePoint(sf.getLatLon().getLatitude(), sf.getLatLon().getLongitude(),
|
||||
sf.getName(), sf.getGroup() == null ? "" : sf.getGroup().name);
|
||||
if(sf.getGroup() != null && sf.getGroup().getColor() != 0 ){
|
||||
fp.setColor(sf.getGroup().getColor());
|
||||
}
|
||||
fp.setRemoveable(false);
|
||||
fp.setExtraParam(sf.getOrder());
|
||||
cachedFavorites.add(fp);
|
||||
}
|
||||
}
|
||||
if(st != null && st.gpxFile != null) {
|
||||
if(st.gpx == null) {
|
||||
st.gpx = GPXUtilities.loadGPXFile(app, st.gpxFile);
|
||||
|
|
@ -235,13 +241,8 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
} else {
|
||||
selectedTourPref.set(tour.getName());
|
||||
}
|
||||
selectedTour = null;
|
||||
selectedStage = null;
|
||||
// to avoid null reference ecxeption if there's no selected tour yet.
|
||||
if (selectedStagePref != null) {
|
||||
selectedStagePref.set(null);
|
||||
}
|
||||
app.getResourceManager().reloadIndexes(progress);
|
||||
selectedTour = tour;
|
||||
reloadSelectedTour(progress, tour);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -254,8 +255,31 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
filter(adapter, R.string.context_menu_item_directions_to,
|
||||
R.string.context_menu_item_destination_point, R.string.context_menu_item_search,
|
||||
R.string.context_menu_item_share_location, R.string.context_menu_item_add_favorite);
|
||||
MapActivityLayers layers = mapActivity.getMapLayers();
|
||||
if(layers.getContextMenuLayer().getFirstSelectedObject() instanceof FavouritePoint) {
|
||||
FavouritePoint fp = ((FavouritePoint)layers.getContextMenuLayer().getFirstSelectedObject());
|
||||
if(fp.getExtraParam() >= 0 && selectedStage != null) {
|
||||
StageFavorite sf = (StageFavorite) selectedStage.getFavorites().get(fp.getExtraParam());
|
||||
showFavoriteDialog(mapActivity, selectedStage, sf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void showFavoriteDialog(MapActivity mapActivity, StageInformation stage, StageFavorite sf) {
|
||||
SherpafyFavoriteFragment fragment = new SherpafyFavoriteFragment();
|
||||
Bundle bl = new Bundle();
|
||||
bl.putInt(SherpafyFavoriteFragment.STAGE_PARAM, stage.getOrder());
|
||||
bl.putString(SherpafyFavoriteFragment.TOUR_PARAM, stage.getTour().getId());
|
||||
bl.putInt(SherpafyFavoriteFragment.FAV_PARAM, sf.getOrder());
|
||||
fragment.setArguments(bl);
|
||||
Builder bld = new AlertDialog.Builder(mapActivity);
|
||||
bld.setTitle(sf.getName() + " TODO ");
|
||||
bld.setPositiveButton(R.string.default_buttons_ok, null);
|
||||
// TODO
|
||||
// Builder bld = new AlertDialog.Builder(mapActivity);
|
||||
// FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void prepareOptionsMenu(MapActivity mapActivity, ContextMenuAdapter adapter) {
|
||||
|
||||
|
|
@ -280,4 +304,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<FavouritePoint> getFavorites() {
|
||||
return cachedFavorites;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package net.osmand.plus.sherpafy;
|
|||
import com.actionbarsherlock.view.Menu;
|
||||
import com.actionbarsherlock.view.MenuInflater;
|
||||
import com.actionbarsherlock.view.MenuItem;
|
||||
import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
|
||||
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageFavorite;
|
||||
|
|
@ -47,13 +48,19 @@ public class SherpafyFavoriteFragment extends SherpafyStageInfoFragment {
|
|||
((TourViewActivity) getSherlockActivity()).createMenuItem(menu, SHOW_ON_MAP,
|
||||
R.string.show_poi_on_map ,
|
||||
R.drawable.ic_action_map_marker_light, R.drawable.ic_action_map_marker_dark,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, new OnMenuItemClickListener() {
|
||||
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
return onOptionsItemSelected(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
|
||||
if (item.getItemId() == SHOW_ON_MAP) {
|
||||
// TODO actions
|
||||
((TourViewActivity) getSherlockActivity()).goToMap(fav.location);
|
||||
return true;
|
||||
} else if (item.getItemId() == android.R.id.home) {
|
||||
((TourViewActivity) getSherlockActivity()).showSelectedItem();
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ import android.view.LayoutInflater;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.inputmethod.EditorInfo;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ImageView;
|
||||
|
|
@ -65,20 +63,14 @@ public class SherpafySelectToursFragment extends SherlockListFragment {
|
|||
|
||||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
|
||||
com.actionbarsherlock.view.MenuItem menuItem = menu.add(0, ACTION_DOWNLOAD, 0, R.string.sherpafy_download_tours).setShowAsActionFlags(
|
||||
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
// OsmandApplication app = (OsmandApplication) getActivity().getApplication();
|
||||
// boolean light = true; //app.getSettings().isLightActionBar();
|
||||
//menuItem = menuItem.setIcon(light ? R.drawable.ic_action_gdirections_light : R.drawable.ic_action_gdirections_dark);
|
||||
menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
|
||||
if (custom.getAccessCode().length() == 0) {
|
||||
openAccessCode(true);
|
||||
} else {
|
||||
startDownloadActivity();
|
||||
}
|
||||
openAccessCode();
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
|
@ -95,7 +87,7 @@ public class SherpafySelectToursFragment extends SherlockListFragment {
|
|||
// });
|
||||
}
|
||||
|
||||
protected void openAccessCode(final boolean startDownload) {
|
||||
protected void openAccessCode() {
|
||||
Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder.setTitle(R.string.enter_access_code);
|
||||
final EditText editText = new EditText(getActivity());
|
||||
|
|
@ -113,55 +105,12 @@ public class SherpafySelectToursFragment extends SherlockListFragment {
|
|||
Toast.makeText(getActivity(), R.string.access_code_is_not_valid, Toast.LENGTH_LONG).show();
|
||||
return;
|
||||
}
|
||||
if (startDownload) {
|
||||
startDownloadActivity();
|
||||
}
|
||||
((TourViewActivity) getActivity()).startDownloadActivity();
|
||||
}
|
||||
});
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
private void startDownloadActivity() {
|
||||
final Intent download = new Intent(getActivity(), DownloadIndexActivity.class);
|
||||
download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
startActivity(download);
|
||||
}
|
||||
|
||||
private void selectTourAsync(final TourInformation tour) {
|
||||
new AsyncTask<TourInformation, Void, Void>() {
|
||||
private ProgressDialog dlg;
|
||||
|
||||
protected void onPreExecute() {
|
||||
dlg = new ProgressDialog(getActivity());
|
||||
dlg.setTitle(R.string.selecting_tour_progress);
|
||||
dlg.setMessage(getString(R.string.indexing_tour, tour == null ? "" : tour.getName()));
|
||||
dlg.show();
|
||||
};
|
||||
|
||||
@Override
|
||||
protected Void doInBackground(TourInformation... params) {
|
||||
// if tour is already selected - do nothing
|
||||
if (custom.getSelectedTour() != null) {
|
||||
if (custom.getSelectedTour().equals(params[0])) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
custom.selectTour(params[0], IProgress.EMPTY_PROGRESS);
|
||||
return null;
|
||||
}
|
||||
|
||||
protected void onPostExecute(Void result) {
|
||||
// to avoid illegal argument exception when rotating phone during loading
|
||||
try {
|
||||
dlg.dismiss();
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
//startTourView();
|
||||
};
|
||||
}.execute(tour);
|
||||
}
|
||||
|
||||
class TourAdapter extends ArrayAdapter<TourInformation> {
|
||||
|
||||
public TourAdapter(List<TourInformation> list) {
|
||||
|
|
|
|||
|
|
@ -2,43 +2,30 @@ package net.osmand.plus.sherpafy;
|
|||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.osmand.access.AccessibleAlertBuilder;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageFavoriteGroup;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageInformation;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import android.support.v4.view.ViewPager;
|
||||
import android.text.Html;
|
||||
import android.text.Html.ImageGetter;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ScrollView;
|
||||
import android.widget.TabHost;
|
||||
import android.widget.TabHost.TabSpec;
|
||||
import android.widget.TabWidget;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.actionbarsherlock.app.SherlockFragment;
|
||||
import com.actionbarsherlock.view.Menu;
|
||||
import com.actionbarsherlock.view.MenuInflater;
|
||||
import com.actionbarsherlock.view.MenuItem;
|
||||
import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
|
||||
|
||||
public class SherpafyStageFragment extends SherlockFragment {
|
||||
public static final String STAGE_PARAM = "STAGE";
|
||||
|
|
@ -87,10 +74,14 @@ public class SherpafyStageFragment extends SherlockFragment {
|
|||
// MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
if (tour != null) {
|
||||
boolean current = customization.getSelectedStage() == stage;
|
||||
((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START,
|
||||
current ? R.string.continue_stage : R.string.start_stage ,
|
||||
0, 0,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START, current ? R.string.continue_stage
|
||||
: R.string.start_stage, 0, 0, MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT,
|
||||
new OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
return onOptionsItemSelected(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -100,6 +91,7 @@ public class SherpafyStageFragment extends SherlockFragment {
|
|||
((TourViewActivity) getSherlockActivity()).selectMenu(tour);
|
||||
return true;
|
||||
} else if(item.getItemId() == START) {
|
||||
((TourViewActivity) getSherlockActivity()).startStage(stage);
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
|
|
@ -155,88 +147,7 @@ public class SherpafyStageFragment extends SherlockFragment {
|
|||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/////////
|
||||
private ImageGetter getImageGetter(final View v) {
|
||||
return new Html.ImageGetter() {
|
||||
@Override
|
||||
public Drawable getDrawable(String s) {
|
||||
Bitmap file = customization.getSelectedTour().getImageBitmapFromPath(s);
|
||||
v.setTag(file);
|
||||
Drawable bmp = new BitmapDrawable(getResources(), file);
|
||||
// if image is thicker than screen - it may cause some problems, so we need to scale it
|
||||
int imagewidth = bmp.getIntrinsicWidth();
|
||||
// TODO
|
||||
// if (displaySize.x - 1 > imagewidth) {
|
||||
// bmp.setBounds(0, 0, bmp.getIntrinsicWidth(), bmp.getIntrinsicHeight());
|
||||
// } else {
|
||||
// double scale = (double) (displaySize.x - 1) / imagewidth;
|
||||
// bmp.setBounds(0, 0, (int) (scale * bmp.getIntrinsicWidth()),
|
||||
// (int) (scale * bmp.getIntrinsicHeight()));
|
||||
// }
|
||||
return bmp;
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void addOnClickListener(final TextView tv) {
|
||||
tv.setOnClickListener(new View.OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (v.getTag() instanceof Bitmap) {
|
||||
final AccessibleAlertBuilder dlg = new AccessibleAlertBuilder(getActivity());
|
||||
dlg.setPositiveButton(R.string.default_buttons_ok, null);
|
||||
ScrollView sv = new ScrollView(getActivity());
|
||||
ImageView img = new ImageView(getActivity());
|
||||
img.setImageBitmap((Bitmap) tv.getTag());
|
||||
sv.addView(img);
|
||||
dlg.setView(sv);
|
||||
dlg.show();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void prepareBitmap(Bitmap imageBitmap) {
|
||||
ImageView img = null;
|
||||
if (imageBitmap != null) {
|
||||
img.setImageBitmap(imageBitmap);
|
||||
img.setAdjustViewBounds(true);
|
||||
img.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
|
||||
img.setCropToPadding(true);
|
||||
img.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
img.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
private void goToMap() {
|
||||
if (customization.getSelectedStage() != null) {
|
||||
GPXFile gpx = customization.getSelectedStage().getGpx();
|
||||
List<SelectedGpxFile> sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles();
|
||||
if (gpx == null && sgpx.size() > 0) {
|
||||
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
|
||||
} else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) {
|
||||
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
|
||||
if (gpx != null && gpx.findPointToShow() != null) {
|
||||
WptPt p = gpx.findPointToShow();
|
||||
getMyApplication().getSettings().setMapLocationToShow(p.lat, p.lon, 16, null);
|
||||
getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
|
||||
}
|
||||
}
|
||||
}
|
||||
Intent newIntent = new Intent(getActivity(), customization.getMapActivity());
|
||||
newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
this.startActivityForResult(newIntent, 0);
|
||||
}
|
||||
|
||||
private OsmandApplication getMyApplication() {
|
||||
return (OsmandApplication) getActivity().getApplication();
|
||||
}
|
||||
|
||||
/**
|
||||
* This is a helper class that implements the management of tabs and all
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import com.actionbarsherlock.app.SherlockListFragment;
|
|||
import com.actionbarsherlock.view.Menu;
|
||||
import com.actionbarsherlock.view.MenuInflater;
|
||||
import com.actionbarsherlock.view.MenuItem;
|
||||
import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
|
||||
|
||||
public class SherpafyTourFragment extends SherlockListFragment {
|
||||
private static final int SHARE_ID = 6;
|
||||
|
|
@ -105,13 +106,19 @@ public class SherpafyTourFragment extends SherlockListFragment {
|
|||
// MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
if (tour != null) {
|
||||
boolean current = customization.getSelectedTour() == tour;
|
||||
OnMenuItemClickListener oic = new OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
return onOptionsItemSelected(item);
|
||||
}
|
||||
};
|
||||
((TourViewActivity) getSherlockActivity()).createMenuItem(menu, START,
|
||||
current ? R.string.continue_tour : R.string.start_tour ,
|
||||
0, 0,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT, oic);
|
||||
((TourViewActivity) getSherlockActivity()).createMenuItem(menu, SHARE_ID, R.string.share_fav,
|
||||
R.drawable.ic_action_gshare_light, R.drawable.ic_action_gshare_dark,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM, oic);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -126,6 +133,9 @@ public class SherpafyTourFragment extends SherlockListFragment {
|
|||
}
|
||||
sd.showDialog();
|
||||
return true;
|
||||
} else if(item.getItemId() == START) {
|
||||
((TourViewActivity) getSherlockActivity()).startTour(tour);
|
||||
return true;
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
package net.osmand.plus.sherpafy;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.TargetPointsHelper;
|
||||
import net.osmand.plus.activities.DownloadIndexActivity;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageFavorite;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageInformation;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.AlertDialog.Builder;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.DialogInterface.OnClickListener;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.content.res.Configuration;
|
||||
|
|
@ -188,19 +200,15 @@ public class TourViewActivity extends SherlockFragmentActivity {
|
|||
super.onResume();
|
||||
}
|
||||
|
||||
public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType) {
|
||||
public MenuItem createMenuItem(Menu m, int id, int titleRes, int iconLight, int iconDark, int menuItemType,
|
||||
final OnMenuItemClickListener listener) {
|
||||
// int r = getMyApplication().getSettings().isLightActionBar() ? iconLight : iconDark;
|
||||
int r = iconLight;
|
||||
MenuItem menuItem = m.add(0, id, 0, titleRes);
|
||||
if (r != 0) {
|
||||
menuItem.setIcon(r);
|
||||
}
|
||||
menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(new OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(com.actionbarsherlock.view.MenuItem item) {
|
||||
return onOptionsItemSelected(item);
|
||||
}
|
||||
});
|
||||
menuItem.setShowAsActionFlags(menuItemType).setOnMenuItemClickListener(listener);
|
||||
return menuItem;
|
||||
}
|
||||
|
||||
|
|
@ -330,4 +338,98 @@ public class TourViewActivity extends SherlockFragmentActivity {
|
|||
}
|
||||
|
||||
|
||||
public void startDownloadActivity() {
|
||||
final Intent download = new Intent(this, DownloadIndexActivity.class);
|
||||
download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
startActivity(download);
|
||||
}
|
||||
|
||||
public void goToMap(LatLon location) {
|
||||
if(location != null) {
|
||||
getMyApplication().getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), 16, null);
|
||||
}
|
||||
Intent newIntent = new Intent(this, customization.getMapActivity());
|
||||
newIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
this.startActivityForResult(newIntent, 0);
|
||||
}
|
||||
|
||||
public void startStage(final StageInformation stage) {
|
||||
if(stage != customization.getSelectedStage() && customization.getSelectedStage() != null) {
|
||||
Builder bld = new AlertDialog.Builder(this);
|
||||
bld.setMessage(R.string.start_new_stage);
|
||||
bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
runStage(stage.getTour(), stage, customization.getSelectedStage() != stage);
|
||||
}
|
||||
});
|
||||
bld.setNegativeButton(R.string.default_buttons_no, null);
|
||||
bld.show();
|
||||
} else {
|
||||
runStage(stage.getTour(), stage, customization.getSelectedStage() != stage);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void startTour(final TourInformation tour) {
|
||||
if(tour != customization.getSelectedTour() && customization.getSelectedTour() != null) {
|
||||
Builder bld = new AlertDialog.Builder(this);
|
||||
bld.setMessage(R.string.start_new_stage);
|
||||
bld.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
startTourImpl(tour);
|
||||
}
|
||||
});
|
||||
bld.setNegativeButton(R.string.default_buttons_no, null);
|
||||
bld.show();
|
||||
} else {
|
||||
startTourImpl(tour);
|
||||
}
|
||||
}
|
||||
|
||||
private void startTourImpl(TourInformation tour) {
|
||||
StageInformation stage;
|
||||
if (tour.getStageInformation().isEmpty()) {
|
||||
if (tour != customization.getSelectedTour() || customization.getSelectedStage() == null) {
|
||||
stage = tour.getStageInformation().get(0);
|
||||
} else {
|
||||
stage = customization.getSelectedStage();
|
||||
}
|
||||
runStage(tour, stage, customization.getSelectedTour() != tour);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void runStage(TourInformation tour, StageInformation stage, boolean startOver) {
|
||||
WptPt point = null;
|
||||
GPXFile gpx = null;
|
||||
customization.selectTour(tour, IProgress.EMPTY_PROGRESS);
|
||||
customization.selectStage(stage, IProgress.EMPTY_PROGRESS);
|
||||
if (customization.getSelectedStage() != null) {
|
||||
gpx = customization.getSelectedStage().getGpx();
|
||||
List<SelectedGpxFile> sgpx = getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles();
|
||||
if (gpx == null && sgpx.size() > 0) {
|
||||
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
|
||||
} else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) {
|
||||
getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
|
||||
if (gpx != null && gpx.findPointToShow() != null) {
|
||||
point = gpx.findPointToShow();
|
||||
getMyApplication().getSelectedGpxHelper().setGpxFileToDisplay(gpx);
|
||||
}
|
||||
}
|
||||
}
|
||||
WptPt lp = gpx.getLastPoint();
|
||||
if(lp != null) {
|
||||
TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
|
||||
targetPointsHelper.navigateToPoint(new LatLon(lp.lat, lp.lon), true, -1, lp.name);
|
||||
getMyApplication().getSettings().navigateDialog();
|
||||
}
|
||||
if(startOver && point != null){
|
||||
goToMap(new LatLon(point.lat, point.lon));
|
||||
} else {
|
||||
goToMap(null);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import net.osmand.data.RotatedTileBox;
|
|||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
|
||||
import net.osmand.plus.FavouritesDbHelper;
|
||||
import net.osmand.plus.OsmAndAppCustomization;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.base.FavoriteImageDrawable;
|
||||
import net.osmand.plus.views.MapTextLayer.MapTextProvider;
|
||||
|
|
@ -33,6 +34,8 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
private List<FavouritePoint> cache = new ArrayList<FavouritePoint>();
|
||||
private MapTextLayer textLayer;
|
||||
// private Bitmap d;
|
||||
|
||||
private OsmAndAppCustomization customization;
|
||||
|
||||
|
||||
|
||||
|
|
@ -46,7 +49,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
|
||||
favorites = view.getApplication().getFavorites();
|
||||
textLayer = view.getLayerByClass(MapTextLayer.class);
|
||||
|
||||
customization = view.getApplication().getAppCustomization();
|
||||
// favoriteIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_favourite);
|
||||
|
||||
}
|
||||
|
|
@ -80,15 +83,12 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
// request to load
|
||||
final QuadRect latLonBounds = tileBox.getLatLonBounds();
|
||||
for (FavouritePoint o : favorites.getFavouritePoints()) {
|
||||
if (o.isVisible() && o.getLatitude() >= latLonBounds.bottom && o.getLatitude() <= latLonBounds.top && o.getLongitude() >= latLonBounds.left
|
||||
&& o.getLongitude() <= latLonBounds.right ) {
|
||||
cache.add(o);
|
||||
int x = (int) tileBox.getPixXFromLatLon(o.getLatitude(), o.getLongitude());
|
||||
int y = (int) tileBox.getPixYFromLatLon(o.getLatitude(), o.getLongitude());
|
||||
FavoriteImageDrawable fid = FavoriteImageDrawable.getOrCreate(view.getContext(), o.getColor());
|
||||
fid.drawBitmapInCenter(canvas, x, y, tileBox.getDensity());
|
||||
// canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2,
|
||||
// y - favoriteIcon.getHeight(), paint);
|
||||
drawPoint(canvas, tileBox, latLonBounds, o);
|
||||
}
|
||||
List<FavouritePoint> customFavorites = customization.getFavorites();
|
||||
if (customFavorites != null) {
|
||||
for (FavouritePoint o : customFavorites) {
|
||||
drawPoint(canvas, tileBox, latLonBounds, o);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -96,6 +96,19 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
textLayer.putData(this, cache);
|
||||
}
|
||||
}
|
||||
|
||||
private void drawPoint(Canvas canvas, RotatedTileBox tileBox, final QuadRect latLonBounds, FavouritePoint o) {
|
||||
if (o.isVisible() && o.getLatitude() >= latLonBounds.bottom && o.getLatitude() <= latLonBounds.top && o.getLongitude() >= latLonBounds.left
|
||||
&& o.getLongitude() <= latLonBounds.right ) {
|
||||
cache.add(o);
|
||||
int x = (int) tileBox.getPixXFromLatLon(o.getLatitude(), o.getLongitude());
|
||||
int y = (int) tileBox.getPixYFromLatLon(o.getLatitude(), o.getLongitude());
|
||||
FavoriteImageDrawable fid = FavoriteImageDrawable.getOrCreate(view.getContext(), o.getColor());
|
||||
fid.drawBitmapInCenter(canvas, x, y, tileBox.getDensity());
|
||||
// canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2,
|
||||
// y - favoriteIcon.getHeight(), paint);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
|
|
@ -108,12 +121,23 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
int ex = (int) point.x;
|
||||
int ey = (int) point.y;
|
||||
for (FavouritePoint n : favorites.getFavouritePoints()) {
|
||||
if (n.isVisible()) {
|
||||
int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude());
|
||||
int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude());
|
||||
if (calculateBelongs(ex, ey, x, y, r)) {
|
||||
res.add(n);
|
||||
}
|
||||
getFavFromPoint(tb, res, r, ex, ey, n);
|
||||
}
|
||||
List<FavouritePoint> customFavorites = customization.getFavorites();
|
||||
if (customFavorites != null) {
|
||||
for (FavouritePoint n : customFavorites) {
|
||||
getFavFromPoint(tb, res, r, ex, ey, n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void getFavFromPoint(RotatedTileBox tb, List<? super FavouritePoint> res, int r, int ex, int ey,
|
||||
FavouritePoint n) {
|
||||
if (n.isVisible()) {
|
||||
int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude());
|
||||
int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude());
|
||||
if (calculateBelongs(ex, ey, x, y, r)) {
|
||||
res.add(n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -190,9 +214,11 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
adapter.item(R.string.favourites_context_menu_delete).icons(R.drawable.ic_action_delete_dark,
|
||||
R.drawable.ic_action_delete_light).listen(listener).reg();
|
||||
if (a.isRemoveable()) {
|
||||
adapter.item(R.string.favourites_context_menu_delete)
|
||||
.icons(R.drawable.ic_action_delete_dark, R.drawable.ic_action_delete_light).listen(listener)
|
||||
.reg();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -78,5 +78,5 @@ Functionality
|
|||
|
||||
<p>
|
||||
List of countries supported (basically world wide!):
|
||||
Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Cura<EFBFBD>ao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
|
||||
Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
|
||||
</p>
|
||||
|
|
|
|||
Loading…
Reference in a new issue