aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-07-14 13:58:20 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-07-14 13:58:20 +0200
commitc9e2182c6db930fb4794e20b7009b12051f9b108 (patch)
tree61af639f648bc3e39ab990c53a1401d97e2bd110
parentb7a84cf3cd81526f3396735e2134771a73cbb7a7 (diff)
parent9ab45c5e28ff9b1dd993c8d28048016db86c6319 (diff)
downloadcgeo-c9e2182c6db930fb4794e20b7009b12051f9b108.zip
cgeo-c9e2182c6db930fb4794e20b7009b12051f9b108.tar.gz
cgeo-c9e2182c6db930fb4794e20b7009b12051f9b108.tar.bz2
Merge branch 'remove-altitude' into upstream
-rw-r--r--main/res/values-cs/strings.xml7
-rw-r--r--main/res/values-de/strings.xml7
-rw-r--r--main/res/values-es/strings.xml4
-rw-r--r--main/res/values-fr/strings.xml7
-rw-r--r--main/res/values-hu/strings.xml7
-rw-r--r--main/res/values-it/strings.xml7
-rw-r--r--main/res/values-ja/strings.xml7
-rw-r--r--main/res/values-nl/strings.xml7
-rw-r--r--main/res/values-pl/strings.xml7
-rw-r--r--main/res/values-pt/strings.xml7
-rw-r--r--main/res/values-sk/strings.xml7
-rw-r--r--main/res/values-sv/strings.xml7
-rw-r--r--main/res/values/preference_keys.xml2
-rw-r--r--main/res/values/strings.xml7
-rw-r--r--main/res/xml/preferences.xml17
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java19
-rw-r--r--main/src/cgeo/geocaching/CompassActivity.java7
-rw-r--r--main/src/cgeo/geocaching/Geocache.java13
-rw-r--r--main/src/cgeo/geocaching/IGeoData.java1
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java7
-rw-r--r--main/src/cgeo/geocaching/cgData.java90
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCParser.java10
-rw-r--r--main/src/cgeo/geocaching/geopoint/Geopoint.java28
-rw-r--r--main/src/cgeo/geocaching/geopoint/Units.java12
-rw-r--r--main/src/cgeo/geocaching/settings/Settings.java10
-rw-r--r--main/src/cgeo/geocaching/settings/SettingsActivity.java1
-rw-r--r--tests/src/cgeo/geocaching/geopoint/GeopointTest.java8
-rw-r--r--tests/src/cgeo/geocaching/geopoint/UnitsTest.java33
28 files changed, 72 insertions, 274 deletions
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 8798512..fa4e835 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -377,8 +377,6 @@
<string name="init_signature_template_owner">Vlastník</string>
<string name="init_ratingwanted">Načítat hodnocení keše z GCvote.com</string>
<string name="init_summary_ratingwanted">Načítat hodnocení keše z GCvote.com</string>
- <string name="init_elevationwanted">Načítat výšková data keše</string>
- <string name="init_summary_elevationwanted">Načítat výšková data keše</string>
<string name="init_friendlogswanted">Načítat doplňkový Logbook s logy od kámošů</string>
<string name="init_summary_friendlogswanted">Načítat doplňkový Logbook s logy od kámošů</string>
<string name="init_openlastdetailspage">Otevřít detaily na naposledy použité stránce</string>
@@ -413,8 +411,8 @@
<string name="init_summary_choose_list">Ptát se na seznam pro uložení keše</string>
<string name="init_livelist">Zobrazovat směr v seznamu keší</string>
<string name="init_summary_livelist">Zobrazovat směr v seznamu keší</string>
- <string name="init_altitude">Výšková korekce</string>
- <string name="init_altitude_description">Pokud Tvoje GPS špatně počítá výšku, můžeš ji korigovat zde. Stačí zadat kladné či záporné číslo v metrech.</string>
+ <string name="init_clear">Smazat přihlašovací údaje</string>
+ <string name="init_cleared">c:geo smazalo přihlašovací údaje.</string>
<string name="init_backup">Záloha</string>
<string name="init_backup_backup">Zálohovat</string>
<string name="init_backup_running">Vytváření zálohy databáze keší…</string>
@@ -547,7 +545,6 @@
<string name="cache_dialog_loading_details_status_logs">Načítání logů</string>
<string name="cache_dialog_loading_details_status_waypoints">Zpracovávání bodů trasy</string>
<string name="cache_dialog_loading_details_status_gcvote">Načítání GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Načítání údajů o nadmořské výšce</string>
<string name="cache_dialog_loading_details_status_cache">Ukládání do mezipaměti</string>
<string name="cache_dialog_loading_details_status_render">Vykreslování pohledu</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 5b59cfd..228d716 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -410,8 +410,6 @@
<string name="init_signature_template_owner">Besitzer</string>
<string name="init_ratingwanted">GCvote-Bewertung</string>
<string name="init_summary_ratingwanted">Lade Cache-Bewertung von GCvote.com</string>
- <string name="init_elevationwanted">Höhe des Caches</string>
- <string name="init_summary_elevationwanted">Lade Höhe des Caches</string>
<string name="init_friendlogswanted">Logs von Freunden</string>
<string name="init_summary_friendlogswanted">Lade zusätzliche Logbuch-Seite für Logs von Freunden</string>
<string name="init_openlastdetailspage">Zuletzt genutzte Seite</string>
@@ -446,8 +444,8 @@
<string name="init_summary_choose_list">Beim Speichern von Caches nach Liste fragen</string>
<string name="init_livelist">Richtung zum Cache</string>
<string name="init_summary_livelist">Richtung zum Cache in der Cache-Liste anzeigen</string>
- <string name="init_altitude">Höhenkorrektur (m)</string>
- <string name="init_altitude_description">Falls das GPS eine falsche Höhe ermittelt, kann dies durch Angabe eines positiven oder negativen Wertes in Metern korrigiert werden.</string>
+ <string name="init_clear">Login zurücksetzen</string>
+ <string name="init_cleared">c:geo hat die Anmeldedaten gelöscht.</string>
<string name="init_backup">Sicherung</string>
<string name="init_backup_backup">Sicherung</string>
<string name="init_backup_running">Erzeuge Sicherung der Cache-Datenbank…</string>
@@ -608,7 +606,6 @@
<string name="cache_dialog_loading_details_status_logs">Lade Logs</string>
<string name="cache_dialog_loading_details_status_waypoints">Verarbeite Wegpunkte</string>
<string name="cache_dialog_loading_details_status_gcvote">Lade GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Lade Höhe</string>
<string name="cache_dialog_loading_details_status_cache">Zwischenspeichern</string>
<string name="cache_dialog_loading_details_status_render">Erzeuge Darstellung</string>
<string name="cache_dialog_offline_save_title">Offline-Verwendung</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 8e80a8a..e70d408 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -354,8 +354,8 @@
<string name="init_summary_autoload">Autocargar descripción larga</string>
<string name="init_livelist">Mostrar dirección a los escondites en su listado</string>
<string name="init_summary_livelist">Mostrar dirección a los escondites en su listado</string>
- <string name="init_altitude">Corrección de altitud</string>
- <string name="init_altitude_description">Si el GPS te indica una altitud errónea, puedes corregirla con un valor positivo o negativo. La corrección es siempre en metros.</string>
+ <string name="init_clear">Borrar acceso</string>
+ <string name="init_cleared">c:geo ha borrado la información de acceso.</string>
<string name="init_backup">Backup</string>
<string name="init_backup_backup">Copia de seguridad</string>
<string name="init_backup_note">Esta opción copia/restaura la base de datos de escondites y puntos de referencia, no la configuración. Los datos de acceso y contraseña no se guardarán.</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 1edc489..6ecdc19 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -341,8 +341,6 @@
<string name="init_signature_template_owner">Propriétaire</string>
<string name="init_ratingwanted">Charger la note depuis GCvote.com</string>
<string name="init_summary_ratingwanted">Charger la note depuis GCvote.com</string>
- <string name="init_elevationwanted">Charger l\'altitude de la cache</string>
- <string name="init_summary_elevationwanted">Charger l\'altitude de la cache</string>
<string name="init_friendlogswanted">Charger le carnet (amis)</string>
<string name="init_summary_friendlogswanted">Charger le carnet (amis)</string>
<string name="init_openlastdetailspage">Réouvrir les détails à la dernière page ouverte</string>
@@ -377,8 +375,8 @@
<string name="init_summary_choose_list">Demander dans quelle liste sauver les caches.</string>
<string name="init_livelist">Afficher la direction des caches dans les listes</string>
<string name="init_summary_livelist">Afficher la direction des caches dans les listes</string>
- <string name="init_altitude">Correction de l\'altitude</string>
- <string name="init_altitude_description">Si le GPS indique une mauvaise altitude, vous pouvez la corriger avec une valeur en mètres, positive ou négative.</string>
+ <string name="init_clear">Effacer l\'identifiant</string>
+ <string name="init_cleared">c:geo a effacé votre identifiant.</string>
<string name="init_backup">Sauvegarde</string>
<string name="init_backup_backup">Sauvegarde</string>
<string name="init_backup_running">Création de la copie de sauvegarde…</string>
@@ -509,7 +507,6 @@
<string name="cache_dialog_loading_details_status_logs">Entrées du carnet</string>
<string name="cache_dialog_loading_details_status_waypoints">Points intermédiaires</string>
<string name="cache_dialog_loading_details_status_gcvote">Votes</string>
- <string name="cache_dialog_loading_details_status_elevation">Altitude</string>
<string name="cache_dialog_loading_details_status_cache">Sauvegarde des données</string>
<string name="cache_dialog_loading_details_status_render">Préparation de la page</string>
<string name="cache_dialog_offline_save_title">Hors ligne</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 9142245..c25665e 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -342,8 +342,6 @@
<string name="init_signature_template_owner">Tulajdonos</string>
<string name="init_ratingwanted">Értékelés betöltése a GCvote.com-ról</string>
<string name="init_summary_ratingwanted">Értékelés betöltése a GCvote.com-ról</string>
- <string name="init_elevationwanted">A geoláda magassági adatainak betöltése</string>
- <string name="init_summary_elevationwanted">A geoláda magassági adatainak betöltése</string>
<string name="init_friendlogswanted">További logbook oldal betöltése a barátok logjainak.</string>
<string name="init_summary_friendlogswanted">További logbook oldal betöltése a barátok logjainak.</string>
<string name="init_openlastdetailspage">Az utoljára használt oldal részleteinek betöltése</string>
@@ -376,8 +374,8 @@
<string name="init_summary_log_offline">Offline logolás használata mindig (ne mutassa az online log ablakot logoláskor, ne küldje el a logot online)</string>
<string name="init_livelist">Mutassa a ládák irányát a listában</string>
<string name="init_summary_livelist">Mutassa a ládák irányát a listában</string>
- <string name="init_altitude">Magasság korrekció</string>
- <string name="init_altitude_description">Ha a GPS rossz magasságot mutat, módosíthatod pozitív vagy negatív irányban. A korrekció mindig méterben van.</string>
+ <string name="init_clear">Belépési adatok törlése</string>
+ <string name="init_cleared">a c:geo törölte a belépési adatokat.</string>
<string name="init_backup">Biztonsági mentés</string>
<string name="init_backup_backup">Biztonsági mentés</string>
<string name="init_backup_running">A geoláda adatbázis biztonsági mentése…</string>
@@ -505,7 +503,6 @@
<string name="cache_dialog_loading_details_status_logs">Logok betöltése</string>
<string name="cache_dialog_loading_details_status_waypoints">Útpontok feldolgozása</string>
<string name="cache_dialog_loading_details_status_gcvote">A GCVote betöltése</string>
- <string name="cache_dialog_loading_details_status_elevation">Magassági adatok betöltése</string>
<string name="cache_dialog_loading_details_status_cache">Láda adatai</string>
<string name="cache_dialog_loading_details_status_render">Render nézet</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 8c3c01f..810f3d4 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -385,8 +385,6 @@
<string name="init_signature_template_owner">Proprietario</string>
<string name="init_ratingwanted">Carica il rating del cache da GCvote.com</string>
<string name="init_summary_ratingwanted">Carica il rating del cache da GCvote.com</string>
- <string name="init_elevationwanted">Carica dati altitudine cache</string>
- <string name="init_summary_elevationwanted">Carica dati altitudine cache</string>
<string name="init_friendlogswanted">Carica logbook addizionale con i log dei miei amici</string>
<string name="init_summary_friendlogswanted">Carica logbook addizionale con i log dei miei amici</string>
<string name="init_openlastdetailspage">Ricorda l\'ultima pagina usata nei dettagli</string>
@@ -421,8 +419,8 @@
<string name="init_summary_choose_list">Chiedi la lista quando salvi un cache</string>
<string name="init_livelist">Visualizza in che direzione sono i cache, nelle liste</string>
<string name="init_summary_livelist">Visualizza in che direzione sono i cache, nelle liste</string>
- <string name="init_altitude">Correzione di altitudine</string>
- <string name="init_altitude_description">Se il GPS restituisce un\'errata altitudine, puoi correggerla inserendo un valore positivo o negativo, in metri.</string>
+ <string name="init_clear">Azzera login</string>
+ <string name="init_cleared">c:geo ha azzerato le informazioni di login.</string>
<string name="init_backup">Backup</string>
<string name="init_backup_backup">Backup</string>
<string name="init_backup_running">Creazione del backup del database dei cache in corso…</string>
@@ -570,7 +568,6 @@
<string name="cache_dialog_loading_details_status_logs">Caricamento log</string>
<string name="cache_dialog_loading_details_status_waypoints">Elaborazione waypoints</string>
<string name="cache_dialog_loading_details_status_gcvote">Caricamento GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Caricamento dati di altitudine</string>
<string name="cache_dialog_loading_details_status_cache">Salvataggio dati</string>
<string name="cache_dialog_loading_details_status_render">Creazione pagina</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 62b4c1c..7affb8b 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -352,8 +352,6 @@
<string name="init_signature_template_owner">所有者</string>
<string name="init_ratingwanted">キャッシュの評価をGCvote.comから取得</string>
<string name="init_summary_ratingwanted">キャッシュの評価をGCvote.comから取得</string>
- <string name="init_elevationwanted">キャッシュの標高値を取得</string> <!-- 正確に訳すと高度値 -->
- <string name="init_summary_elevationwanted">キャッシュの標高値を取得</string> <!-- 正確に訳すと高度値 -->
<string name="init_friendlogswanted">友達の書いたログを別ページに表示</string>
<string name="init_summary_friendlogswanted">友達の書いたログを別ページに表示</string>
<string name="init_openlastdetailspage">キャッシュ情報の表示では最後に表示したページを開く</string>
@@ -386,8 +384,8 @@
<string name="init_summary_log_offline">ログ書きをオフライン専用にする\n(ログを書く際にオンラインでの投稿をしない。このチェックを外してもオフライン用に保存することはできます。)</string>
<string name="init_livelist">キャッシュの一覧で方向をアイコン表示</string>
<string name="init_summary_livelist">キャッシュの一覧で方向をアイコン表示</string>
- <string name="init_altitude">標高の修正</string>
- <string name="init_altitude_description">もし現在地の標高が正しくないなら修正できます。正または負のメートル単位で入力してください。</string>
+ <string name="init_clear">ログイン情報を消去</string>
+ <string name="init_cleared">ログイン情報を消去しました。</string>
<string name="init_backup">バックアップ</string>
<string name="init_backup_backup">バックアップ</string>
<string name="init_backup_running">キャッシュのデータベースをバックアップ中…</string>
@@ -515,7 +513,6 @@
<string name="cache_dialog_loading_details_status_logs">ログをロード中</string>
<string name="cache_dialog_loading_details_status_waypoints">ウェイポイントを処理中</string>
<string name="cache_dialog_loading_details_status_gcvote">GCVoteをロード中</string>
- <string name="cache_dialog_loading_details_status_elevation">標高値をロード中</string> <!-- 正確に訳すと高度値 -->
<string name="cache_dialog_loading_details_status_cache">データのキャッシュ中</string>
<string name="cache_dialog_loading_details_status_render">表示の処理中</string>
<string name="cache_dialog_offline_save_title">オフライン</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index 6f7a53a..b79ce8b 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -358,8 +358,6 @@
<string name="init_signature_template_owner">Eigenaar</string>
<string name="init_ratingwanted">Laad cachewaardering van GCvote.com</string>
<string name="init_summary_ratingwanted">Laad cachewaardering van GCvote.com</string>
- <string name="init_elevationwanted">Laad cache hoogte gegevens</string>
- <string name="init_summary_elevationwanted">Laad cache hoogte gegevens</string>
<string name="init_friendlogswanted">Laad extra logbook pagina voor logs van vrienden</string>
<string name="init_summary_friendlogswanted">Laad extra logbook pagina voor logs van vrienden</string>
<string name="init_openlastdetailspage">Laad details met laatst gebruikte pagina</string>
@@ -394,8 +392,8 @@
<string name="init_summary_choose_list">Vraag naar lijst voor opslaan caches.</string>
<string name="init_livelist">Toon afstand tot cache in lijst</string>
<string name="init_summary_livelist">Toon afstand tot cache in lijst</string>
- <string name="init_altitude">Hoogte correctie</string>
- <string name="init_altitude_description">Als de GPS een verkeerde hoogte aangeeft, kan dit gecorrigeerd worden met een positief of negatief nummer. De correctie is in meters.</string>
+ <string name="init_clear">Login wissen</string>
+ <string name="init_cleared">c:geo Heeft inloginformatie gewist.</string>
<string name="init_backup">Backup</string>
<string name="init_backup_backup">Backup</string>
<string name="init_backup_running">Backup aan het maken van de cache-database…</string>
@@ -528,7 +526,6 @@
<string name="cache_dialog_loading_details_status_logs">Laden logs</string>
<string name="cache_dialog_loading_details_status_waypoints">Verwerken waypoints</string>
<string name="cache_dialog_loading_details_status_gcvote">Laden GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Laden van hoogte gegevens</string>
<string name="cache_dialog_loading_details_status_cache">Caching Gegevens</string>
<string name="cache_dialog_loading_details_status_render">Weergave genereren</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index a552466..cdb9f74 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -375,8 +375,6 @@
<string name="init_signature_template_owner">Właściciel</string>
<string name="init_ratingwanted">Załaduj ocenę skrzynki z GCvote.com</string>
<string name="init_summary_ratingwanted">Załaduj ocenę skrzynki z GCvote.com</string>
- <string name="init_elevationwanted">Załaduj dane o ukształtowaniu terenu</string>
- <string name="init_summary_elevationwanted">Załaduj dane o ukształtowaniu terenu</string>
<string name="init_friendlogswanted">Załaduj dodatkowy dziennik dla wpisów od przyjaciół</string>
<string name="init_summary_friendlogswanted">Załaduj dodatkowy dziennik dla wpisów od przyjaciół</string>
<string name="init_openlastdetailspage">Otwórz szczegóły ostatnio używanej strony</string>
@@ -411,8 +409,8 @@
<string name="init_summary_choose_list">Zapytaj o wykaz podczas zapisywania skrzynek</string>
<string name="init_livelist">Pokazuj kierunek do skrzynek na liście</string>
<string name="init_summary_livelist">Pokazuj kierunek do skrzynek na liście</string>
- <string name="init_altitude">Korekta wysokości</string>
- <string name="init_altitude_description">Jeśli GPS podaje Tobie złą wysokość, możesz skorygować ją liczbą dodatnią lub ujemną. Poprawka musi być zawsze wyrażona w metrach.</string>
+ <string name="init_clear">Usuń nazwę użytkownika</string>
+ <string name="init_cleared">c:geo usunął dane logowania.</string>
<string name="init_backup">Kopia zapasowa</string>
<string name="init_backup_backup">Wykonaj kopię zapasową</string>
<string name="init_backup_running">Tworzę kopię zapasową bazy skrzynek…</string>
@@ -547,7 +545,6 @@
<string name="cache_dialog_loading_details_status_logs">Ładuję wpisy</string>
<string name="cache_dialog_loading_details_status_waypoints">Przetwarzam punkty nawigacji</string>
<string name="cache_dialog_loading_details_status_gcvote">Ładuję GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Ładuję dane o ukształtowaniu terenu</string>
<string name="cache_dialog_loading_details_status_cache">Zapisuję dane</string>
<string name="cache_dialog_loading_details_status_render">Renderuję widok</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index f0f1f7e..768a2bc 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -349,8 +349,6 @@
<string name="init_signature_template_owner">Dono</string>
<string name="init_ratingwanted">Carregar a pontuação da cache de GCvote.com</string>
<string name="init_summary_ratingwanted">Carregar a pontuação da cache de GCvote.com</string>
- <string name="init_elevationwanted">Carregar dados de elevação de cache</string>
- <string name="init_summary_elevationwanted">Carregar dados de elevação de cache</string>
<string name="init_friendlogswanted">Carregar página adicional de registos de amigos</string>
<string name="init_summary_friendlogswanted">Carregar página adicional de registos de amigos</string>
<string name="init_openlastdetailspage">Abrir detalhes da última página vizualizada</string>
@@ -383,8 +381,8 @@
<string name="init_summary_log_offline">Activar registo offline\n(Não mostrar o registo online quando fôr registar, não enviar o registo online)</string>
<string name="init_livelist">Mostrar a direcção para a cache na lista</string>
<string name="init_summary_livelist">Mostrar a direcção para a cache na lista</string>
- <string name="init_altitude">Correcção de altitude</string>
- <string name="init_altitude_description">Se o GPS estiver a dar uma altitude errada, pode corrigi-la com um número positivo ou negativo. A correcção é sempre em metros.</string>
+ <string name="init_clear">Limpar login</string>
+ <string name="init_cleared">O c:geo limpou a informação de login.</string>
<string name="init_backup">Backup</string>
<string name="init_backup_backup">Backup</string>
<string name="init_backup_running">A criar um backup da base de dados de caches…</string>
@@ -514,7 +512,6 @@
<string name="cache_dialog_loading_details_status_logs">A carregar os registo</string>
<string name="cache_dialog_loading_details_status_waypoints">A processar os waypoints</string>
<string name="cache_dialog_loading_details_status_gcvote">A carregar GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">A carregar os dados de elevação</string>
<string name="cache_dialog_loading_details_status_cache">A carregar dados</string>
<string name="cache_dialog_loading_details_status_render">A renderizar a vista</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index ffff2e3..aca3000 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -349,8 +349,6 @@
<string name="init_signature_template_owner">Vlastník</string>
<string name="init_ratingwanted">Načítať hodnotenie skrýše z GCvote.com</string>
<string name="init_summary_ratingwanted">Načítať hodnotenie skrýše z GCvote.com</string>
- <string name="init_elevationwanted">Načítať údaje o stúpaní skrýše</string>
- <string name="init_summary_elevationwanted">Načítať údaje o stúpaní skrýše</string>
<string name="init_friendlogswanted">Načítať dodatočnú stránku s logmi od priateľov</string>
<string name="init_summary_friendlogswanted">Načítať dodatočnú stránku s logmi od priateľov</string>
<string name="init_openlastdetailspage">Otvoriť detaily na naposledy použitej stránke</string>
@@ -383,8 +381,8 @@
<string name="init_summary_log_offline">Pri zaznamenávaní vždy použiť offline režim (nezobrazovať online obrazovku počas zaznamenávania, neposielať záznam online)</string>
<string name="init_livelist">Zobrazovať smer v zozname skrýš</string>
<string name="init_summary_livelist">Zobrazovať smer v zozname skrýš</string>
- <string name="init_altitude">Oprava výšky</string>
- <string name="init_altitude_description">Keď vám GPS zobrazuje nesprávnu nadmorskú výšku, môžete ju opraviť zadaním kladného alebo záporného čísla. Oprava ja vždy v metroch.</string>
+ <string name="init_clear">Zmazať prihlasovacie údaje</string>
+ <string name="init_cleared">Prihlasovacie údaje zmazané.</string>
<string name="init_backup">Záloha</string>
<string name="init_backup_backup">Zálohovať</string>
<string name="init_backup_running">Vytváranie zálohy databázy skrýš…</string>
@@ -515,7 +513,6 @@
<string name="cache_dialog_loading_details_status_logs">Načítanie logov</string>
<string name="cache_dialog_loading_details_status_waypoints">Spracovanie bodov trasy</string>
<string name="cache_dialog_loading_details_status_gcvote">Načítanie GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Načítanie údajov o stúpaní</string>
<string name="cache_dialog_loading_details_status_cache">Kešovanie údajov</string>
<string name="cache_dialog_loading_details_status_render">Vykreslovanie pohľadu</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 32b9f42..d8695d7 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -383,8 +383,6 @@
<string name="init_signature_template_owner">Ägare</string>
<string name="init_ratingwanted">Ladda cache betyg från GCvote.com</string>
<string name="init_summary_ratingwanted">Ladda cache betyg från GCvote.com</string>
- <string name="init_elevationwanted">Ladda höjddata för cacher</string>
- <string name="init_summary_elevationwanted">Ladda höjddata för cacher</string>
<string name="init_friendlogswanted">Ladda extra sida med loggbok för dina vänner</string>
<string name="init_summary_friendlogswanted">Ladda extra sida med loggbok för dina vänner</string>
<string name="init_openlastdetailspage">Visa senaste använda delsidan när detaljer öppnas</string>
@@ -419,8 +417,8 @@
<string name="init_summary_choose_list">Fråga efter lista när cacher sparas</string>
<string name="init_livelist">Visa riktning till cacher i listan</string>
<string name="init_summary_livelist">Visa riktning till cacher i listan</string>
- <string name="init_altitude">Höjd justering</string>
- <string name="init_altitude_description">Det är möjligt att justera höjden över havet om din GPS visar fel. Detta görs med ett positivt eller negativt tal, angivet i meter.</string>
+ <string name="init_clear">Rensa inloggningsinfo</string>
+ <string name="init_cleared">c:geo har rensat inloggningsinformationen</string>
<string name="init_backup">Säkerhetskopiering</string>
<string name="init_backup_backup">Kopiera</string>
<string name="init_backup_running">Skapar säkerhetskopia av databasen med cacher…</string>
@@ -555,7 +553,6 @@
<string name="cache_dialog_loading_details_status_logs">Hämtar tidigare loggar</string>
<string name="cache_dialog_loading_details_status_waypoints">Analyserar punkter</string>
<string name="cache_dialog_loading_details_status_gcvote">Hämtar betyg från GCVote.com</string>
- <string name="cache_dialog_loading_details_status_elevation">Hämtar höjddata</string>
<string name="cache_dialog_loading_details_status_cache">Sparar information</string>
<string name="cache_dialog_loading_details_status_render">Förbereder för visning</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index 8856853..b1a7b01 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -17,7 +17,6 @@
<string name="pref_units">units</string>
<string name="pref_autoloaddesc">autoloaddesc</string>
<string name="pref_ratingwanted">ratingwanted</string>
- <string name="pref_elevationwanted">elevationwanted</string>
<string name="pref_friendlogswanted">friendlogswanted</string>
<string name="pref_opendetailslastpage">opendetailslastpage</string>
<string name="pref_excludemine">excludemine</string>
@@ -42,7 +41,6 @@
<string name="pref_gpxImportDir">gpxImportDir</string>
<string name="pref_showcaptcha">showcaptcha</string>
<string name="pref_loaddirectionimg">loaddirectionimg</string>
- <string name="pref_altcorrection">altcorrection</string>
<string name="pref_fakekey_preference_backup_info">fakekey_preference_backup_info</string>
<string name="pref_fakekey_preference_backup">fakekey_preference_backup</string>
<string name="pref_fakekey_preference_restore">fakekey_preference_restore</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index bbd1f17..638e1de 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -412,8 +412,6 @@
<string name="init_signature_template_owner">Owner</string>
<string name="init_ratingwanted">GCvote Rating</string>
<string name="init_summary_ratingwanted">Load cache rating from GCvote.com</string>
- <string name="init_elevationwanted">Elevation Data</string>
- <string name="init_summary_elevationwanted">Load cache elevation data</string>
<string name="init_friendlogswanted">Friend\'s Logs</string>
<string name="init_summary_friendlogswanted">Load additional logbook page for logs from friends</string>
<string name="init_openlastdetailspage">Last Details Page</string>
@@ -448,8 +446,8 @@
<string name="init_summary_choose_list">Ask for list when storing caches</string>
<string name="init_livelist">Show Direction</string>
<string name="init_summary_livelist">Show Direction to caches in the list</string>
- <string name="init_altitude">Altitude Correction (m)</string>
- <string name="init_altitude_description">If your GPS is calculating a wrong altitude, you can correct it with a positive or negative number. The correction always has to be given in meters.</string>
+ <string name="init_clear">Clear Login</string>
+ <string name="init_cleared">c:geo cleared login information.</string>
<string name="init_backup">Backup</string>
<string name="init_backup_backup">Backup</string>
<string name="init_backup_running">Creating backup of cache database…</string>
@@ -610,7 +608,6 @@
<string name="cache_dialog_loading_details_status_logs">Loading logs</string>
<string name="cache_dialog_loading_details_status_waypoints">Processing waypoints</string>
<string name="cache_dialog_loading_details_status_gcvote">Loading GCVote</string>
- <string name="cache_dialog_loading_details_status_elevation">Loading elevation data</string>
<string name="cache_dialog_loading_details_status_cache">Caching Data</string>
<string name="cache_dialog_loading_details_status_render">Render view</string>
<string name="cache_dialog_offline_save_title">Offline</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index fa1ffc2..42e50e7 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -162,11 +162,6 @@
android:summary="@string/init_summary_ratingwanted"
android:defaultValue="true" />
<CheckBoxPreference
- android:key="@string/pref_elevationwanted"
- android:title="@string/init_elevationwanted"
- android:summary="@string/init_summary_elevationwanted"
- android:defaultValue="false" />
- <CheckBoxPreference
android:key="@string/pref_friendlogswanted"
android:title="@string/init_friendlogswanted"
android:summary="@string/init_summary_friendlogswanted"
@@ -375,18 +370,6 @@
</PreferenceCategory>
<PreferenceCategory
- android:title="@string/init_altitude" >
-
- <cgeo.geocaching.settings.NumberPickerPreference
- android:key="@string/pref_altcorrection"
- android:dialogLayout="@layout/number_picker_preference"
- android:dialogMessage="@string/init_altitude_description"
- android:title="@string/init_altitude"
- android:defaultValue="0" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
android:title="@string/init_backup" >
<cgeo.geocaching.settings.TextPreference
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 1b31463..9dffeb2 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -160,24 +160,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
return;
}
- try {
- final StringBuilder dist = new StringBuilder();
-
- if (geo.getCoords() != null && cache != null && cache.getCoords() != null) {
- dist.append(Units.getDistanceFromKilometers(geo.getCoords().distanceTo(cache.getCoords())));
- }
-
- if (cache != null && cache.getElevation() != null) {
- if (geo.getAltitude() != 0.0) {
- final float diff = (float) (cache.getElevation() - geo.getAltitude());
- dist.append(' ').append(Units.getElevation(diff));
- }
- }
-
- cacheDistanceView.setText(dist.toString());
+ if (geo.getCoords() != null && cache != null && cache.getCoords() != null) {
+ cacheDistanceView.setText(Units.getDistanceFromKilometers(geo.getCoords().distanceTo(cache.getCoords())));
cacheDistanceView.bringToFront();
- } catch (final Exception e) {
- Log.w("Failed to update location.");
}
}
};
diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index 8626173..a7e0f03 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -262,12 +262,7 @@ public class CompassActivity extends AbstractActivity {
navAccuracy.setText(null);
}
- if (geo.getAltitude() != 0.0f) {
- final String humanAlt = Units.getDistanceFromMeters((float) geo.getAltitude());
- navLocation.setText(geo.getCoords() + " | " + humanAlt);
- } else {
- navLocation.setText(geo.getCoords().toString());
- }
+ navLocation.setText(geo.getCoords().toString());
updateDistanceInfo(geo);
} else {
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index dd292f9..e6db8d5 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -86,7 +86,6 @@ public class Geocache implements ICache, IWaypoint {
private String location = null;
private Geopoint coords = null;
private boolean reliableLatLon = false;
- private Double elevation = null;
private String personalNote = null;
/**
* lazy initialized
@@ -279,9 +278,6 @@ public class Geocache implements ICache, IWaypoint {
if (coords == null) {
coords = other.coords;
}
- if (elevation == null) {
- elevation = other.elevation;
- }
// don't use StringUtils.isBlank here. Otherwise we cannot recognize a note which was deleted on GC
if (personalNote == null) {
personalNote = other.personalNote;
@@ -402,7 +398,6 @@ public class Geocache implements ICache, IWaypoint {
StringUtils.equalsIgnoreCase(cacheId, other.cacheId) &&
(direction != null ? direction.equals(other.direction) : null == other.direction) &&
(distance != null ? distance.equals(other.distance) : null == other.distance) &&
- (elevation != null ? elevation.equals(other.elevation) : null == other.elevation) &&
rating == other.rating &&
votes == other.votes &&
myVote == other.myVote &&
@@ -944,14 +939,6 @@ public class Geocache implements ICache, IWaypoint {
this.reliableLatLon = reliableLatLon;
}
- public Double getElevation() {
- return elevation;
- }
-
- public void setElevation(Double elevation) {
- this.elevation = elevation;
- }
-
public void setShortDescription(String shortdesc) {
this.shortdesc = shortdesc;
}
diff --git a/main/src/cgeo/geocaching/IGeoData.java b/main/src/cgeo/geocaching/IGeoData.java
index 252fd4f..c5ef698 100644
--- a/main/src/cgeo/geocaching/IGeoData.java
+++ b/main/src/cgeo/geocaching/IGeoData.java
@@ -13,7 +13,6 @@ public interface IGeoData {
public boolean isPseudoLocation();
public Geopoint getCoords();
- public double getAltitude();
public float getBearing();
public float getSpeed();
public float getAccuracy();
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 961217f..85ebe05 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -541,12 +541,7 @@ public class MainActivity extends AbstractActivity {
(new ObtainAddressThread()).start();
}
} else {
- if (geo.getAltitude() != 0.0) {
- final String humanAlt = Units.getDistanceFromKilometers((float) geo.getAltitude() / 1000);
- navLocation.setText(geo.getCoords() + " | " + humanAlt);
- } else {
- navLocation.setText(geo.getCoords().toString());
- }
+ navLocation.setText(geo.getCoords().toString());
}
} else {
if (nearestView.isClickable()) {
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 2af2f82..ead698d 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -86,29 +86,28 @@ public class cgData {
"cg_caches.terrain," + // 18
"cg_caches.latlon," + // 19
"cg_caches.location," + // 20
- "cg_caches.elevation," + // 21
- "cg_caches.personal_note," + // 22
- "cg_caches.shortdesc," + // 23
- "cg_caches.favourite_cnt," + // 24
- "cg_caches.rating," + // 25
- "cg_caches.votes," + // 26
- "cg_caches.myvote," + // 27
- "cg_caches.disabled," + // 28
- "cg_caches.archived," + // 29
- "cg_caches.members," + // 30
- "cg_caches.found," + // 31
- "cg_caches.favourite," + // 32
- "cg_caches.inventoryunknown," + // 33
- "cg_caches.onWatchlist," + // 34
- "cg_caches.reliable_latlon," + // 35
- "cg_caches.coordsChanged," + // 36
- "cg_caches.latitude," + // 37
- "cg_caches.longitude," + // 38
- "cg_caches.finalDefined," + // 39
- "cg_caches._id," + // 40
- "cg_caches.inventorycoins," + // 41
- "cg_caches.inventorytags," + // 42
- "cg_caches.logPasswordRequired"; // 43
+ "cg_caches.personal_note," + // 21
+ "cg_caches.shortdesc," + // 22
+ "cg_caches.favourite_cnt," + // 23
+ "cg_caches.rating," + // 24
+ "cg_caches.votes," + // 25
+ "cg_caches.myvote," + // 26
+ "cg_caches.disabled," + // 27
+ "cg_caches.archived," + // 28
+ "cg_caches.members," + // 29
+ "cg_caches.found," + // 30
+ "cg_caches.favourite," + // 31
+ "cg_caches.inventoryunknown," + // 32
+ "cg_caches.onWatchlist," + // 33
+ "cg_caches.reliable_latlon," + // 34
+ "cg_caches.coordsChanged," + // 35
+ "cg_caches.latitude," + // 36
+ "cg_caches.longitude," + // 37
+ "cg_caches.finalDefined," + // 38
+ "cg_caches._id," + // 39
+ "cg_caches.inventorycoins," + // 40
+ "cg_caches.inventorytags," + // 41
+ "cg_caches.logPasswordRequired"; // 42
//TODO: remove "latlon" field from cache table
@@ -164,7 +163,6 @@ public class cgData {
+ "latitude double, "
+ "longitude double, "
+ "reliable_latlon integer, "
- + "elevation double, "
+ "personal_note text, "
+ "shortdesc text, "
+ "description text, "
@@ -580,7 +578,6 @@ public class cgData {
+ "latitude double, "
+ "longitude double, "
+ "reliable_latlon integer, "
- + "elevation double, "
+ "personal_note text, "
+ "shortdesc text, "
+ "description text, "
@@ -601,7 +598,7 @@ public class cgData {
db.execSQL(dbCreateCachesTemp);
db.execSQL("insert into " + dbTableCachesTemp + " select _id,updated,detailed,detailedupdate,visiteddate,geocode,reason,cacheid,guid,type,name,own,owner,owner_real," +
- "hidden,hint,size,difficulty,terrain,latlon,location,direction,distance,latitude,longitude, 0,elevation," +
+ "hidden,hint,size,difficulty,terrain,latlon,location,direction,distance,latitude,longitude, 0," +
"personal_note,shortdesc,description,favourite_cnt,rating,votes,myvote,disabled,archived,members,found,favourite,inventorycoins," +
"inventorytags,inventoryunknown,onWatchlist from " + dbTableCaches);
db.execSQL("drop table " + dbTableCaches);
@@ -1082,7 +1079,6 @@ public class cgData {
values.put("direction", cache.getDirection());
putCoords(values, cache.getCoords());
values.put("reliable_latlon", cache.isReliableLatLon() ? 1 : 0);
- values.put("elevation", cache.getElevation());
values.put("shortdesc", cache.getShortDescription());
values.put("personal_note", cache.getPersonalNote());
values.put("description", cache.getDescription());
@@ -1656,31 +1652,25 @@ public class cgData {
}
cache.setTerrain(cursor.getFloat(18));
// do not set cache.location
- cache.setCoords(getCoords(cursor, 37, 38));
- index = 21;
- if (cursor.isNull(index)) {
- cache.setElevation(null);
- } else {
- cache.setElevation(cursor.getDouble(index));
- }
- cache.setPersonalNote(cursor.getString(22));
+ cache.setCoords(getCoords(cursor, 36, 37));
+ cache.setPersonalNote(cursor.getString(21));
// do not set cache.shortdesc
// do not set cache.description
- cache.setFavoritePoints(cursor.getInt(24));
- cache.setRating(cursor.getFloat(25));
- cache.setVotes(cursor.getInt(26));
- cache.setMyVote(cursor.getFloat(27));
- cache.setDisabled(cursor.getInt(28) == 1);
- cache.setArchived(cursor.getInt(29) == 1);
- cache.setPremiumMembersOnly(cursor.getInt(30) == 1);
- cache.setFound(cursor.getInt(31) == 1);
- cache.setFavorite(cursor.getInt(32) == 1);
- cache.setInventoryItems(cursor.getInt(33));
- cache.setOnWatchlist(cursor.getInt(34) == 1);
- cache.setReliableLatLon(cursor.getInt(35) > 0);
- cache.setUserModifiedCoords(cursor.getInt(36) > 0);
- cache.setFinalDefined(cursor.getInt(39) > 0);
- cache.setLogPasswordRequired(cursor.getInt(43) > 0);
+ cache.setFavoritePoints(cursor.getInt(23));
+ cache.setRating(cursor.getFloat(24));
+ cache.setVotes(cursor.getInt(25));
+ cache.setMyVote(cursor.getFloat(26));
+ cache.setDisabled(cursor.getInt(27) == 1);
+ cache.setArchived(cursor.getInt(28) == 1);
+ cache.setPremiumMembersOnly(cursor.getInt(29) == 1);
+ cache.setFound(cursor.getInt(30) == 1);
+ cache.setFavorite(cursor.getInt(31) == 1);
+ cache.setInventoryItems(cursor.getInt(32));
+ cache.setOnWatchlist(cursor.getInt(33) == 1);
+ cache.setReliableLatLon(cursor.getInt(34) > 0);
+ cache.setUserModifiedCoords(cursor.getInt(35) > 0);
+ cache.setFinalDefined(cursor.getInt(38) > 0);
+ cache.setLogPasswordRequired(cursor.getInt(42) > 0);
Log.d("Loading " + cache.toString() + " (" + cache.getListId() + ") from DB");
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index ea15633..9ecb51b 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1756,16 +1756,6 @@ public abstract class GCParser {
}
}
- if (Settings.isElevationWanted()) {
- if (CancellableHandler.isCancelled(handler)) {
- return;
- }
- CancellableHandler.sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_elevation);
- if (cache.getCoords() != null) {
- cache.setElevation(cache.getCoords().getElevation());
- }
- }
-
if (Settings.isRatingWanted()) {
if (CancellableHandler.isCancelled(handler)) {
return;
diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java
index 1973b03..11f03cb 100644
--- a/main/src/cgeo/geocaching/geopoint/Geopoint.java
+++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java
@@ -323,34 +323,6 @@ public final class Geopoint implements ICoordinates, Parcelable {
}
}
- public Double getElevation() {
- try {
- final String uri = "http://maps.googleapis.com/maps/api/elevation/json";
- final Parameters params = new Parameters(
- "sensor", "false",
- "locations", format(Format.LAT_LON_DECDEGREE_COMMA));
- final JSONObject response = Network.requestJSON(uri, params);
-
- if (response == null) {
- return null;
- }
-
- if (!StringUtils.equalsIgnoreCase(response.getString("status"), "OK")) {
- return null;
- }
-
- if (response.has("results")) {
- JSONArray results = response.getJSONArray("results");
- JSONObject result = results.getJSONObject(0);
- return result.getDouble("elevation");
- }
- } catch (Exception e) {
- Log.w("Geopoint.getElevation", e);
- }
-
- return null;
- }
-
@Override
public Geopoint getCoords() {
return this;
diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
index 75d71d0..b99e00e 100644
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ b/main/src/cgeo/geocaching/geopoint/Units.java
@@ -47,18 +47,6 @@ public class Units {
return String.format(formatString + " %s", scaled.left, scaled.right);
}
- /**
- * Get human readable elevation, depending on settings for metric units.
- * Result is rounded to full meters/feet, as the sensors don't have that precision anyway.
- *
- * @param meters
- * @return
- */
- public static String getElevation(float meters) {
- final ImmutablePair<Double, String> scaled = scaleDistance(meters / 1000f);
- return (meters >= 0 ? "↥ " : "↧ ") + String.format("%d %s", Math.abs(Math.round(scaled.left)), scaled.right);
- }
-
public static String getDistanceFromMeters(float meters) {
return getDistanceFromKilometers(meters / 1000f);
}
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 20bbf22..775b699 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -117,13 +117,11 @@ public final class Settings {
e.putInt(getKey(R.string.pref_version), old.getInt(getKey(R.string.pref_version), 0));
e.putBoolean(getKey(R.string.pref_autoloaddesc), 0 != old.getInt(getKey(R.string.pref_autoloaddesc), 1));
e.putBoolean(getKey(R.string.pref_ratingwanted), old.getBoolean(getKey(R.string.pref_ratingwanted), true));
- e.putBoolean(getKey(R.string.pref_elevationwanted), old.getBoolean(getKey(R.string.pref_elevationwanted), false));
e.putBoolean(getKey(R.string.pref_friendlogswanted), old.getBoolean(getKey(R.string.pref_friendlogswanted), true));
e.putBoolean(getKey(R.string.pref_useenglish), old.getBoolean(getKey(R.string.pref_useenglish), false));
e.putBoolean(getKey(R.string.pref_usecompass), 0 != old.getInt(getKey(R.string.pref_usecompass), 1));
e.putBoolean(getKey(R.string.pref_trackautovisit), old.getBoolean(getKey(R.string.pref_trackautovisit), false));
e.putBoolean(getKey(R.string.pref_sigautoinsert), old.getBoolean(getKey(R.string.pref_sigautoinsert), false));
- e.putInt(getKey(R.string.pref_altcorrection), old.getInt(getKey(R.string.pref_altcorrection), 0));
e.putBoolean(getKey(R.string.pref_logimages), old.getBoolean(getKey(R.string.pref_logimages), false));
e.putBoolean(getKey(R.string.pref_excludedisabled), 0 != old.getInt(getKey(R.string.pref_excludedisabled), 0));
e.putBoolean(getKey(R.string.pref_excludemine), 0 != old.getInt(getKey(R.string.pref_excludemine), 0));
@@ -527,10 +525,6 @@ public final class Settings {
return getBoolean(R.string.pref_ratingwanted, true);
}
- public static boolean isElevationWanted() {
- return getBoolean(R.string.pref_elevationwanted, false);
- }
-
public static boolean isFriendLogsWanted() {
if (!isLogin()) {
// don't show a friends log if the user is anonymous
@@ -693,10 +687,6 @@ public final class Settings {
return keyConsumerSecret;
}
- public static int getAltitudeCorrection() {
- return getInt(R.string.pref_altcorrection, 0);
- }
-
public static String getWebDeviceCode() {
return getString(R.string.pref_webDeviceCode, null);
}
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index d6bd550..ad8d9d3 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -130,7 +130,6 @@ public class SettingsActivity extends PreferenceActivity {
R.string.pref_fakekey_preference_backup_info, }) {
bindSummaryToStringValue(this, getKey(k));
}
- bindSummaryToIntValue(this, getKey(R.string.pref_altcorrection));
}
private static String getKey(final int prefKeyId) {
diff --git a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
index 8aaeef8..e64028f 100644
--- a/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/GeopointTest.java
@@ -1,10 +1,10 @@
package cgeo.geocaching.geopoint;
+import junit.framework.Assert;
+
import android.os.Bundle;
import android.test.AndroidTestCase;
-import junit.framework.Assert;
-
public class GeopointTest extends AndroidTestCase {
public static void testCreation() {
@@ -230,10 +230,6 @@ public class GeopointTest extends AndroidTestCase {
Assert.assertEquals(lonSecFrac, gp.getLonSecFrac());
}
- public static void testElevation() {
- assertEquals(125.663703918457, (new Geopoint(48.0, 2.0)).getElevation(), 0.1);
- }
-
private static void assertParseException(Runnable runnable) {
try {
runnable.run();
diff --git a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
index 3b7331c..52c5adf 100644
--- a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
+++ b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java
@@ -42,39 +42,6 @@ public class UnitsTest extends CGeoTestCase {
// Make method non-static so that Settings is initialized
@SuppressWarnings("static-method")
- public void testElevation() {
- final boolean savedImperial = Settings.isUseImperialUnits();
- try {
- TestSettings.setUseImperialUnits(false);
- assertElevation("↥ 123 m", 122.782f);
- assertElevation("↥ 123 m", 123.456f);
- assertElevation("↥ 12 m", 12.3456f);
- assertElevation("↥ 1 m", 1.23456f);
- assertElevation("↥ 2 m", 1.6f);
- assertElevation("↥ 0 m", 0.123456f);
- assertElevation("↧ 123 m", -122.782f);
- assertElevation("↧ 123 m", -123.456f);
- assertElevation("↧ 12 m", -12.3456f);
- assertElevation("↧ 1 m", -1.23456f);
- assertElevation("↧ 2 m", -1.6f);
- assertElevation("↧ 0 m", -0.123456f);
- TestSettings.setUseImperialUnits(true);
- assertElevation("↥ 405 ft", 123.456f);
- assertElevation("↥ 41 ft", 12.3456f);
- } finally {
- TestSettings.setUseImperialUnits(savedImperial);
- }
- }
-
- private static void assertElevation(final String expected, final float meters) {
- final String actual = Units.getElevation(meters);
- if (!StringUtils.equals(expected, actual.replace(',', '.'))) {
- fail("elevation " + actual + " does not match expected " + expected);
- }
- }
-
- // Make method non-static so that Settings is initialized
- @SuppressWarnings("static-method")
public void testSpeed() {
assertEquals("?", Units.getDistanceFromKilometers(null));
final boolean savedImperial = Settings.isUseImperialUnits();