diff options
27 files changed, 36 insertions, 106 deletions
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index 64fb827..b220580 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Přeložit do angličtiny</string> <string name="translate_length_warning">Při velkém množství textu může překládání selhat.</string> <string name="err_none">OK</string> - <string name="err_start">Komunikace nezačala</string> <string name="err_parse">Čtení přihlašovací obrazovky selhalo</string> <string name="err_server">Nelze se připojit na Geocaching.com. Stránka může být nedostupná nebo je chyba v tvém připojení k Internetu</string> <string name="err_login">Nejsou uloženy žádné přihlašovací údaje</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">c:geo nemůže načíst data požadovaná k zalogování návštěvy.</string> <string name="err_log_load_data_again">c:geo nemůže načíst data požadovaná k zalogování návštěvy. Zkouší to znovu.</string> <string name="err_log_load_data_still">c:geo stále načítá data požadovaná k odeslání Logu. Prosím, počkej ještě chvíli.</string> - <string name="err_log_failed_server">c:geo nemůže odeslat Log, protože server neodpovídá.</string> <string name="err_log_post_failed">Zdá se, že tvůj Log nebyl odeslán. Prosím, zkontroluj to na Geocaching.com.</string> <string name="err_logimage_post_failed">Zdá se, že tvůj obrázek nebyl nahrán. Zkontroluj to, prosím, na Geocaching.com.</string> <string name="err_search_address_forgot">c:geo zapomnělo hledanou adresu.</string> diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index d784056..6b23d3d 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -53,7 +53,6 @@ <string name="log_clear">Fjern</string> <string name="log_webcam">Webcamfoto taget</string> <string name="err_none">Ok</string> - <string name="err_start">Forbindelse ikke oprettet</string> <string name="err_parse">Login-side kan ikke indlæses</string> <string name="err_server">Kan ikke forbinde til Geocaching.com (server eller forbindelsesfejl?)</string> <string name="err_login">Ingen login gemt</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 062f475..86fc324 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Übersetze in Englisch</string> <string name="translate_length_warning">Die Übersetzung kann bei sehr langen Texten evtl. fehlschlagen.</string> <string name="err_none">OK</string> - <string name="err_start">Kommunikation nicht gestartet</string> <string name="err_parse">Parsing der Anmeldung gescheitert</string> <string name="err_server">Verbindung zu Geocaching.com konnte nicht hergestellt werden (Server oder Verbindung inaktiv?)</string> <string name="err_server_ec">Verbindung zu Extremcaching.com konnte nicht hergestellt werden (Server oder Verbindung inaktiv?)</string> @@ -178,7 +177,6 @@ <string name="err_log_load_data">c:geo konnte die benötigten Daten nicht laden, um den Besuch zu loggen.</string> <string name="err_log_load_data_again">c:geo konnte die benötigten Daten nicht laden, um den Besuch zu loggen. Bitte erneut versuchen.</string> <string name="err_log_load_data_still">c:geo lädt gerade die benötigten Daten. Bitte kurz warten.</string> - <string name="err_log_failed_server">c:geo konnte Log nicht senden, weil der Server nicht antwortete.</string> <string name="err_log_post_failed">c:geo konnte Log nicht absenden.</string> <string name="err_log_post_failed_ec">Es scheint dass Ihr Log nicht hochgeladen werden konnte. Bitte prüfen Sie es auf Extremcaching.com nach.</string> <string name="err_logimage_post_failed">Es scheint dass Ihr Logfoto nicht hochgeladen werden konnte. Bitte prüfen Sie es auf Geocaching.com nach.</string> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index b502385..9287073 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -114,7 +114,6 @@ <string name="log_image_description">Descripción</string> <string name="log_image_scale">Redimensionamiento</string> <string name="err_none">Aceptar</string> - <string name="err_start">Comunicación no iniciada</string> <string name="err_parse">Error procesando la página de acceso</string> <string name="err_server">Error conectando a Geocaching.com (¿servidor o conexión caidos?)</string> <string name="err_login">No hay información de acceso guardada</string> @@ -160,7 +159,6 @@ <string name="err_log_load_data">Lo siento, c:geo no puede cargar los datos necesarios para registrar la visita.</string> <string name="err_log_load_data_again">Lo siento, c:geo no puede cargar los datos necesarios para registrar la visita. Intentándolo de nuevo.</string> <string name="err_log_load_data_still">c:geo sigue cargando datos para registrar el escondite. Debes esperar un poquito mas.</string> - <string name="err_log_failed_server">Lo siento, c:geo no ha podido enviar el registro porque el servidor no responde.</string> <string name="err_log_post_failed">Lo siento, c:geo no ha podido enviar el registro.</string> <string name="err_search_address_forgot">Lo siento, c:geo ha olvidado la dirección que buscabas.</string> <string name="err_parse_lat">Lo siento, c:geo no puede procesar la latitud.</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index d99252a..8fdfd2a 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Traduire en anglais</string> <string name="translate_length_warning">La traduction d\'un texte trop long peut échouer.</string> <string name="err_none">ok</string> - <string name="err_start">Communication non démarrée</string> <string name="err_parse">Échec login lecture page</string> <string name="err_server">Échec de la connexion à Geocaching.com (probléme de serveur ou de connexion?)</string> <string name="err_server_ec">Impossible de contacter Extremcaching.com. Le site web peut ne pas fonctionner ou votre connexion Internet peut être défectueuse.</string> @@ -178,7 +177,6 @@ <string name="err_log_load_data">c:geo ne peut pas charger les données pour enregistrer votre visite.</string> <string name="err_log_load_data_again">c:geo ne peut pas charger les données pour enregistrer votre visite. Essayer plus tard.</string> <string name="err_log_load_data_still">c:geo est en train de charger les données pour enregistrer votre visite. Veuillez patienter encore un peu.</string> - <string name="err_log_failed_server">c:geo n\'a pas réussi à charger les données pour enregistrer votre visite car le serveur ne répond pas.</string> <string name="err_log_post_failed">Il semble que votre visite n\'a pas été enregistrée. Veuillez vérifier sur le site Geocaching.com.</string> <string name="err_log_post_failed_ec">Il semble que votre visite n\'a pas été enregistrée. Veuillez vérifier sur le site Extremcaching.com.</string> <string name="err_logimage_post_failed">Il semble que l\'envoi de l\'image ait échoué. Veuillez vérifier sur le site Geocaching.com.</string> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 0666d17..cfc4312 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -105,7 +105,6 @@ <string name="translate_to_english">Fordítás angolra</string> <string name="translate_length_warning">A fordítás sikertelen lehet hosszú szövegeknél.</string> <string name="err_none">Ok</string> - <string name="err_start">A kommunikáció nem indult el</string> <string name="err_parse">Hiba a belépőoldalon</string> <string name="err_server">Hiba a kapcsolatban a geocaching.com-mal (a szerver vagy a kapcsolat nem működik?)</string> <string name="err_login">Nincs mentett belépési adat</string> @@ -157,7 +156,6 @@ <string name="err_log_load_data">Sajnáljuk, a c:geo nem tudja betölteni az adatokat amik a megtalálás bejelentéséhez szükségesek.</string> <string name="err_log_load_data_again">Sajnáljuk, a c:geo nem tudja betölteni az adatokat amik a megtalálás bejelentéséhez szükségesek. Újrapróbálkozás.</string> <string name="err_log_load_data_still">A c:geo még tölti az adatokat amik a megtalálás bejelentéséhez szükségesek. Kérlek várj egy kicsit tovább.</string> - <string name="err_log_failed_server">Sajnáljuk, a c:geo-nak nem sikerült hozzáadni a logot mert a szerver nem válaszol.</string> <string name="err_log_post_failed">Úgy tűnik a logot nem került hozzáadásra. Kérlek ellenőrizd a geocaching.com-on.</string> <string name="err_search_address_forgot">Sajnáljuk, a c:geo elfelejtette a címet amit kerestél.</string> <string name="err_parse_lat">Sajnáljuk, a c:geo nem tudja értelmezni a szélességet.</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 90c9549..8f26c2c 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Traduci in inglese</string> <string name="translate_length_warning">La traduzione può fallire quando c\'è molto testo.</string> <string name="err_none">OK</string> - <string name="err_start">Comunicazione non avviata</string> <string name="err_parse">Errore analizzando la pagina di login</string> <string name="err_server">Connessione fallita con Geocaching.com (server o connessione non disponibile?)</string> <string name="err_login">Informazioni di login non memorizzate</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">c:geo non riesce a caricare i dati necessari per salvare il log della tua visita.</string> <string name="err_log_load_data_again">c:geo non riesce a caricare i dati necessari per salvare il log della tua visita. Nuovo tentativo in corso.</string> <string name="err_log_load_data_still">c:geo sta ancora caricando i dati necessari per salvare il log. Per cortesia attendere ancora un pochino.</string> - <string name="err_log_failed_server">c:geo non è riuscito ad inviare il log perché il server non risponde.</string> <string name="err_log_post_failed">Sembra che il log non sia stato inviato. Prego verificare su Geocaching.com.</string> <string name="err_logimage_post_failed">Sembra che l\'immagine del tuo log non sia stata caricata. Si prega di controllare su Geocaching.com.</string> <string name="err_search_address_forgot">c:geo ha dimenticato l\'indirizzo che vuoi trovare.</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index 2d79690..987391f 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">英語に翻訳</string> <string name="translate_length_warning">文章が長すぎるので翻訳できないかもしれません。</string> <string name="err_none">OK</string> - <string name="err_start">通信を始めることができませんでした</string> <string name="err_parse">ログインページの解析に失敗しました</string> <string name="err_server">Geocaching.comに接続できません。サーバが停止中かインターネットに未接続かもしれません。</string> <string name="err_login">ログイン情報が保存されていません</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">ログを書くのに必要なデータをロードすることができません。</string> <string name="err_log_load_data_again">ログを書くのに必要なデータをロードすることができません。もう一度やってみてください。</string> <string name="err_log_load_data_still">ログを投稿するのに必要なデータをまだロード中です。もう少しお待ちください。</string> - <string name="err_log_failed_server">サーバの反応がないのでログを投稿することができませんでした。</string> <string name="err_log_post_failed">ログを投稿することができなかったようです。Geocaching.comで確認してください。</string> <string name="err_logimage_post_failed">ログの添付画像がアップロードされなかったようです。Geocaching.comで確認してください。</string> <string name="err_search_address_forgot">c:geo forgot the address you tried to find.</string> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 6eb61a2..d5af0cf 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -69,7 +69,6 @@ <string name="log_new_log">Logg</string> <string name="log_new_log_text">Logg tekst</string> <string name="err_none">Ok</string> - <string name="err_start">Klarte ikke å koble til</string> <string name="err_parse">Klarte ikke å lese innloggings-siden</string> <string name="err_server">Klarte ikke å koble til Geocaching.com (server eller tilkobling nede?)</string> <string name="err_login">Ingen innloggings-opplysninger lagret</string> @@ -103,7 +102,6 @@ <string name="err_log_load_data">Beklager, c:geo klarte ikke å laste den nødvendige informasjonen for å logge funnet.</string> <string name="err_log_load_data_again">Beklager, c:geo klarte ikke å laste den nødvendige informasjonen for å logge funnet. c:geo prøver på nytt.</string> <string name="err_log_load_data_still">c:geo laster fortsatt informasjonen som er nødvendig for å logge funnet. Vennligst vent.</string> - <string name="err_log_failed_server">Beklager, c:geo klarte ikke å logge funnet fordi serveren er nede.</string> <string name="err_log_post_failed">Beklager, c:geo klarte ikke å logge funnet.</string> <string name="err_search_address_forgot">Beklager, c:geo glemte adressen du prøvde å finne.</string> <string name="err_parse_lat">Beklager, c:geo klarte ikke å lese breddegraden.</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 63e5f65..e1a4852 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Vertaal naar engels</string> <string name="translate_length_warning">Vertaling kan mislukken bij grote stukken tekst.</string> <string name="err_none">Ok</string> - <string name="err_start">Communicatie niet gestart</string> <string name="err_parse">Login pagina verwerken mislukt</string> <string name="err_server">Verbinding met Geocaching.com mislukt (geen verbinding of server niet bereikbaar)</string> <string name="err_login">Geen login informatie opgeslagen</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">Sorry, c:geo kan data om bezoek te loggen niet laden.</string> <string name="err_log_load_data_again">Sorry, c:geo kan data om bezoek te loggen niet laden. Bezig nogmaals te proberen.</string> <string name="err_log_load_data_still">c:geo is nog steeds bezig om data te laden om bezoek te loggen. Graag nog even geduld.</string> - <string name="err_log_failed_server">Sorry, c:geo kon bezoek niet loggen omdat de server niet reageert.</string> <string name="err_log_post_failed">Sorry, het is c:geo niet gelukt het log te posten.</string> <string name="err_logimage_post_failed">Het lijkt erop dat uw log-foto is niet geüpload. Controleer het op Geocaching.com.</string> <string name="err_search_address_forgot">Sorry, c:geo is het adres dat je zoekt vergeten.</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 71340cc..90c17f7 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Przetłumacz na angielski</string> <string name="translate_length_warning">Tłumaczenie może nie udać się przy dużej ilości tekstu.</string> <string name="err_none">OK</string> - <string name="err_start">Komunikacja nie rozpoczeła się</string> <string name="err_parse">Nieudany odczyt strony logowania.</string> <string name="err_server">Nieudane połączenie z Geocaching.com. Strona albo Twoje połączenie internetowe nie działa.</string> <string name="err_login">Brak danych do logowania.</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">c:geo nie może załadować danych wymaganych do wpisania wizyty.</string> <string name="err_log_load_data_again">c:geo nie może załadować danych wymaganych do wpisania wizyty. Próbuję ponownie.</string> <string name="err_log_load_data_still">Nadal trwa ładowanie danych wymaganych do wpisu w dzienniku. Proszę czekać…</string> - <string name="err_log_failed_server">c:geo nie może dokonać wpisu ponieważ serwer nie odpowiada.</string> <string name="err_log_post_failed">Wygląda na to, że Twój wpis nie został zapisany. Proszę sprawdź na Geocaching.com.</string> <string name="err_logimage_post_failed">Wygląda na to, że Twój obraz nie został dodany. Proszę sprawdź to na Geocaching.com.</string> <string name="err_search_address_forgot">c:geo zapomniał adresu, którego szukałeś.</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 67dbab2..0ecec98 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Traduzir para inglês</string> <string name="translate_length_warning">A tradução pode falhar se o texto fôr muito grande.</string> <string name="err_none">Ok</string> - <string name="err_start">Comunicação não iniciada</string> <string name="err_parse">Falha na análise da página de login</string> <string name="err_server">Falha na ligação a Geocaching.com (servidor ou ligação em baixo?)</string> <string name="err_login">Informação de login não gravada</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">O c:geo não consegue carregar os dados necessários para registar a sua visita.</string> <string name="err_log_load_data_again">O c:geo não consegue carregar os dados necessários para registar a sua visita. A tentar de novo.</string> <string name="err_log_load_data_still">O c:geo ainda está a carregar dados necessários para publicar o registo. Por favor espere mais um pouco.</string> - <string name="err_log_failed_server">O c:geo falhou a publicação do registo porque o servidor não responde.</string> <string name="err_log_post_failed">O c:geo falhou a publicação do registo.</string> <string name="err_logimage_post_failed">Parece que a sua imagem de registo não foi enviada. Por favor verifique em Geocaching.com.</string> <string name="err_search_address_forgot">O c:geo esqueceu o endereço que procura.</string> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index c8dbecc..278f5aa 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -105,7 +105,6 @@ <string name="translate_to_english">Preložiť do angličtiny</string> <string name="translate_length_warning">Pre veľké texty môže preklad zlyhať.</string> <string name="err_none">Ok</string> - <string name="err_start">Komunikácia nezačala.</string> <string name="err_parse">Zlyhalo čítanie prihlasovacej stránky.</string> <string name="err_server">Zlyhalo pripojenie k serveru Geocaching.com (pripojenie, alebo server nefunkčný?)</string> <string name="err_login">Nie sú uložené žiadne prihlasovacie údaje.</string> @@ -157,7 +156,6 @@ <string name="err_log_load_data">c:geo nemôže načítať dáta potrebné pre zalogovanie návštevy.</string> <string name="err_log_load_data_again">c:geo nemôže načítať dáta potrebné pre zalogovanie návštevy. Skúša to znovu.</string> <string name="err_log_load_data_still">c:geo stále načítava dáta potrebné pre zalogovanie návštevy. Prosím, počkajte chvíľu.</string> - <string name="err_log_failed_server">c:geo nemohlo odoslať log, pretože server neodpovedá.</string> <string name="err_log_post_failed">c:geo nemohlo odoslať log.</string> <string name="err_search_address_forgot">c:geo zabudlo adresu, ktorú sa pokúšate nájsť.</string> <string name="err_parse_lat">c:geo nemôže dopočítať šírku.</string> diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml index ed67c5d..dce642c 100644 --- a/main/res/values-sl/strings.xml +++ b/main/res/values-sl/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Prevedi v: angleščino</string> <string name="translate_length_warning">Prevod lahko spodleti zaradi velike količine besedila.</string> <string name="err_none">OK</string> - <string name="err_start">Komunikacija se ni začela</string> <string name="err_parse">Razčlenjevanje prijavne strani ni uspelo</string> <string name="err_server">Ni bilo mogoče vzpostaviti povezave z Geocaching.com. Spletna stran ali vaša povezava z internetom je lahko nedosegljiva.</string> <string name="err_login">Prijavni podatki niso shranjeni</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">c:geo ni mogel naložiti podatkov za zapis obiska.</string> <string name="err_log_load_data_again">c:geo ne more naložiti podatkov za zapis obiska. Ponovni poskus…</string> <string name="err_log_load_data_still">c:geo še vedno nalaga podatke za zapis obiska. Prosimo počakajte še trenutek.</string> - <string name="err_log_failed_server">c:geo ni mogel objaviti zapisa, ker se strežnik ne odziva.</string> <string name="err_log_post_failed">Izgleda, kot da zapis ni bil objavljen. Preverite na Geocaching.com.</string> <string name="err_logimage_post_failed">Izgleda, kot da slika ni bila naložena. Preverite na Geocaching.com.</string> <string name="err_search_address_forgot">c:geo je pozabil naslov, ki ste ga hoteli najti.</string> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 155da29..6a8a200 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -121,7 +121,6 @@ <string name="translate_to_english">Översätt till engelska</string> <string name="translate_length_warning">Översättningen kan misslyckas med långa texter.</string> <string name="err_none">Ok</string> - <string name="err_start">Kommunikationen har inte påbörjats</string> <string name="err_parse">Misslyckades att analysera inloggningssidan</string> <string name="err_server">Misslyckades att ansluta till Geocaching.com. Hemsidan kan vara ur funktion eller så är det problem med din anslutning till Internet.</string> <string name="err_login">Inloggningsinformationen ej sparad</string> @@ -177,7 +176,6 @@ <string name="err_log_load_data">Tyvärr kan c:geo inte ladda information som krävs för att logga ditt besök.</string> <string name="err_log_load_data_again">Tyvärr kan c:geo inte ladda information som krävs för att logga ditt besök. Försöker igen.</string> <string name="err_log_load_data_still">c:geo laddar fortfarande data för att kunna posta loggen. Vänligen vänta en stund till.</string> - <string name="err_log_failed_server">Tyvärr misslyckades c:geo att posta loggen eftersom servern inte svarade.</string> <string name="err_log_post_failed">Tyvärr misslyckades c:geo att posta loggen.</string> <string name="err_logimage_post_failed">Det verkar som om din bild till loggen inte kunde laddas upp. Vänligen kontrollera den på Geocaching.com.</string> <string name="err_search_address_forgot">Tyvärr glömde c:geo adressen du sökte efter.</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index c4bda48..10f834d 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -145,7 +145,6 @@ <!-- errors, warnings, info toasts --> <string name="err_none">OK</string> - <string name="err_start">Communication not started</string> <string name="err_parse">Failed Login page parsing</string> <string name="err_server">Unable to contact Geocaching.com. The website may be down or your internet connection not working.</string> <string name="err_server_ec">Unable to contact Extremcaching.com. The website may be down or your internet connection not working.</string> @@ -202,7 +201,6 @@ <string name="err_log_load_data">c:geo can\'t load data required to log visit.</string> <string name="err_log_load_data_again">c:geo can\'t load data required to log visit. Trying again.</string> <string name="err_log_load_data_still">c:geo is still loading data required to post log. Please wait a little while longer.</string> - <string name="err_log_failed_server">c:geo failed to post log because server is not responding.</string> <string name="err_log_post_failed">It seems that your log was not posted. Please check it on Geocaching.com.</string> <string name="err_log_post_failed_ec">It seems that your log was not posted. Please check it on Extremcaching.com.</string> <string name="err_logimage_post_failed">It seems that your log image was not uploaded. Please check it on Geocaching.com.</string> diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index 9c7f692..3d62e7e 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -48,10 +48,12 @@ import cgeo.geocaching.utils.GeoDirHandler; import cgeo.geocaching.utils.Log; import ch.boye.httpclientandroidlib.HttpResponse; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; + import rx.util.functions.Action1; import android.app.Activity; @@ -394,7 +396,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA if (isInvokedFromAttachment()) { type = CacheListType.OFFLINE; if (coords == null) { - coords = new Geopoint(0.0, 0.0); + coords = Geopoint.ZERO; } } diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java index 66d37bd..30ab55f 100644 --- a/main/src/cgeo/geocaching/Geocache.java +++ b/main/src/cgeo/geocaching/Geocache.java @@ -33,6 +33,7 @@ import cgeo.geocaching.utils.MatcherWrapper; import cgeo.geocaching.utils.UncertainProperty; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.BooleanUtils; @@ -1366,17 +1367,6 @@ public class Geocache implements ICache, IWaypoint { } /** - * Retrieve a given waypoint. - * - * @param index - * the index of the waypoint - * @return waypoint or <code>null</code> if index is out of range - */ - public Waypoint getWaypoint(final int index) { - return index >= 0 && index < waypoints.size() ? waypoints.get(index) : null; - } - - /** * Lookup a waypoint by its id. * * @param id diff --git a/main/src/cgeo/geocaching/enumerations/StatusCode.java b/main/src/cgeo/geocaching/enumerations/StatusCode.java index e1a1aaa..8bda371 100644 --- a/main/src/cgeo/geocaching/enumerations/StatusCode.java +++ b/main/src/cgeo/geocaching/enumerations/StatusCode.java @@ -6,7 +6,6 @@ import android.content.res.Resources; public enum StatusCode { - COMMUNICATION_NOT_STARTED(R.string.err_start), NO_ERROR(R.string.err_none), LOG_SAVED(R.string.info_log_saved), LOGIN_PARSE_ERROR(R.string.err_parse), @@ -24,7 +23,6 @@ public enum StatusCode { LOG_POST_ERROR(R.string.err_log_post_failed), LOG_POST_ERROR_EC(R.string.err_log_post_failed_ec), NO_LOG_TEXT(R.string.warn_log_text_fill), - NO_DATA_FROM_SERVER(R.string.err_log_failed_server), NOT_LOGGED_IN(R.string.init_login_popup_failed), LOGIMAGE_POST_ERROR(R.string.err_logimage_post_failed); diff --git a/main/src/cgeo/geocaching/geopoint/Geopoint.java b/main/src/cgeo/geocaching/geopoint/Geopoint.java index f21df01..e91a93d 100644 --- a/main/src/cgeo/geocaching/geopoint/Geopoint.java +++ b/main/src/cgeo/geocaching/geopoint/Geopoint.java @@ -4,6 +4,7 @@ import cgeo.geocaching.ICoordinates; import cgeo.geocaching.R; import org.apache.commons.lang3.StringUtils; +import org.eclipse.jdt.annotation.NonNull; import android.location.Location; import android.os.Build; @@ -11,10 +12,13 @@ import android.os.Parcel; import android.os.Parcelable; /** - * Abstraction of geographic point. + * Abstraction of geographic point. This class is immutable. */ public final class Geopoint implements ICoordinates, Parcelable { - public static final Geopoint ZERO = new Geopoint(0.0, 0.0); + /** + * Reusable default object + */ + public static final @NonNull Geopoint ZERO = new Geopoint(0.0, 0.0); private static final double DEG_TO_RAD = Math.PI / 180; private static final double RAD_TO_DEG = 180 / Math.PI; @@ -64,7 +68,6 @@ public final class Geopoint implements ICoordinates, Parcelable { * longitude string to parse * @throws Geopoint.ParseException * if any argument string cannot be parsed - * @see GeopointParser#parse(String, String) */ public Geopoint(final String latText, final String lonText) { this(GeopointParser.parseLatitude(latText), GeopointParser.parseLongitude(lonText)); @@ -273,19 +276,6 @@ public final class Geopoint implements ICoordinates, Parcelable { } /** - * Checks if given Geopoint is similar to this Geopoint with tolerance. - * - * @param gp - * Geopoint to check - * @param tolerance - * tolerance in km - * @return true if similar, false otherwise - */ - public boolean isEqualTo(Geopoint gp, double tolerance) { - return null != gp && distanceTo(gp) <= tolerance; - } - - /** * Returns formatted coordinates. * * @param format @@ -300,7 +290,7 @@ public final class Geopoint implements ICoordinates, Parcelable { /** * Returns formatted coordinates with default format. * Default format is decimalminutes, e.g. N 52° 36.123 E 010° 03.456 - * + * * @return formatted coordinates */ @Override @@ -365,7 +355,7 @@ public final class Geopoint implements ICoordinates, Parcelable { /** * Get longitude character (E or W). - * + * * @return */ public char getLonDir() { diff --git a/main/src/cgeo/geocaching/geopoint/GeopointParser.java b/main/src/cgeo/geocaching/geopoint/GeopointParser.java index c043d6f..120e02e 100644 --- a/main/src/cgeo/geocaching/geopoint/GeopointParser.java +++ b/main/src/cgeo/geocaching/geopoint/GeopointParser.java @@ -70,37 +70,11 @@ class GeopointParser { } /** - * Parses a pair of coordinates (latitude and longitude) out of a String. - * Accepts following formats and combinations of it: - * X DD - * X DD° - * X DD° MM - * X DD° MM.MMM - * X DD° MM SS - * - * as well as: - * DD.DDDDDDD - * - * Both . and , are accepted, also variable count of spaces (also 0) - * - * @param latitude - * the latitude string to parse - * @param longitude - * the longitude string to parse - * @return an Geopoint with parsed latitude and longitude - * @throws Geopoint.ParseException - * if lat or lon could not be parsed - */ - public static Geopoint parse(final String latitude, final String longitude) { - final double lat = parseLatitude(latitude); - final double lon = parseLongitude(longitude); - - return new Geopoint(lat, lon); - } - - /* - * (non JavaDoc) - * Helper for coordinates-parsing. + * Helper for coordinates-parsing + * + * @param text + * @param latlon + * @return */ private static ResultWrapper parseHelper(final String text, final LatLon latlon) { diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java index 93f50e1..651ff6e 100644 --- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java @@ -54,7 +54,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { } else if (geo != null && geo.getCoords() != null) { this.gp = geo.getCoords(); } else { - this.gp = new Geopoint(0.0, 0.0); + this.gp = Geopoint.ZERO; } } @@ -396,7 +396,7 @@ public class CoordinatesInputDialog extends NoTitleDialog { if (geo != null && geo.getCoords() != null) { gp = geo.getCoords(); } else { - gp = new Geopoint(0.0, 0.0); + gp = Geopoint.ZERO; } } } diff --git a/tests/src/cgeo/geocaching/CgeoApplicationTest.java b/tests/src/cgeo/geocaching/CgeoApplicationTest.java index edf7862..cd80889 100644 --- a/tests/src/cgeo/geocaching/CgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/CgeoApplicationTest.java @@ -366,7 +366,7 @@ public class CgeoApplicationTest extends CGeoTestCase { final Geocache cacheFromViewport = DataStore.loadCache(cache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB); Log.d("cgeoApplicationTest.testSearchByViewportNotLoggedIn: Coords expected = " + cache.getCoords()); Log.d("cgeoApplicationTest.testSearchByViewportNotLoggedIn: Coords actual = " + cacheFromViewport.getCoords()); - assertFalse(cache.getCoords().isEqualTo(cacheFromViewport.getCoords(), 1e-3)); + assertFalse(cache.getCoords().distanceTo(cacheFromViewport.getCoords()) <= 1e-3); // depending on the chosen strategy the coords can be reliable or not assertEquals(testStrategy == Strategy.DETAILED, cacheFromViewport.isReliableLatLon()); diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java index 53c393b..1509563 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java @@ -178,9 +178,10 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase { cache.setPersonalNote(note); cache.setWaypoints(new ArrayList<Waypoint>(), false); cache.parseWaypointsFromNote(); - assertEquals(expected.length, cache.getWaypoints().size()); + final List<Waypoint> waypoints = cache.getWaypoints(); + assertEquals(expected.length, waypoints.size()); for (int i = 0; i < expected.length; i++) { - assertTrue(expected[i].equals(cache.getWaypoint(i).getCoords())); + assertTrue(expected[i].equals(waypoints.get(i).getCoords())); } } diff --git a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java index 1de2e26..28dbe77 100644 --- a/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java +++ b/tests/src/cgeo/geocaching/geopoint/GeoPointParserTest.java @@ -19,7 +19,13 @@ public class GeoPointParserTest extends AndroidTestCase { public static void testFullCoordinates() { final Geopoint goal = new Geopoint(refLatitude, refLongitude); - assertTrue(goal.isEqualTo(GeopointParser.parse("N 49° 56.031 | E 8° 38.564"), 1e-6)); + assertEquals(goal, GeopointParser.parse("N 49° 56.031 | E 8° 38.564"), 1e-6); + } + + private static void assertEquals(final Geopoint expected, Geopoint actual, double tolerance) { + assertNotNull(expected); + assertNotNull(actual); + assertTrue(expected.distanceTo(actual) <= tolerance); } public static void testCoordinateMissingPart() { @@ -48,18 +54,18 @@ public class GeoPointParserTest extends AndroidTestCase { public static void testVariousFormats() { final Geopoint goal1 = GeopointParser.parse("N 49° 43' 57\" | E 2 12' 35"); final Geopoint goal2 = GeopointParser.parse("N 49 43.95 E2°12.5833333333"); - assertTrue(goal1.isEqualTo(goal2, 1e-6)); + assertEquals(goal1, goal2, 1e-6); } public static void testParseOurOwnSeparator() { final Geopoint separator = GeopointParser.parse("N 49° 43' 57\"" + Formatter.SEPARATOR + "E 2 12' 35"); final Geopoint noSeparator = GeopointParser.parse("N 49 43.95 E2°12.5833333333"); - assertTrue(separator.isEqualTo(noSeparator, 1e-6)); + assertEquals(separator, noSeparator, 1e-6); } public static void testInSentence() { final Geopoint p1 = GeopointParser.parse("Station3: N51 21.523 / E07 02.680"); - final Geopoint p2 = GeopointParser.parse("N51 21.523", "E07 02.680"); + final Geopoint p2 = GeopointParser.parse("N51 21.523 E07 02.680"); assertNotNull(p1); assertNotNull(p2); assertEquals(p1, p2); @@ -106,6 +112,6 @@ public class GeoPointParserTest extends AndroidTestCase { } public static void testEquatorMeridian() { - assertEquals(new Geopoint(0, 0), GeopointParser.parse("00° 00.000 00° 00.000")); + assertEquals(Geopoint.ZERO, GeopointParser.parse("00° 00.000 00° 00.000")); } } diff --git a/tests/src/cgeo/geocaching/geopoint/ViewportTest.java b/tests/src/cgeo/geocaching/geopoint/ViewportTest.java index da7d58f..11f78ad 100644 --- a/tests/src/cgeo/geocaching/geopoint/ViewportTest.java +++ b/tests/src/cgeo/geocaching/geopoint/ViewportTest.java @@ -52,7 +52,7 @@ public class ViewportTest extends AndroidTestCase { public static void testInViewport() { assertFalse(vpRef.contains(new Geopoint(-2.0, -2.0))); assertFalse(vpRef.contains(new Geopoint(4.0, 4.0))); - assertTrue(vpRef.contains(new Geopoint(0.0, 0.0))); + assertTrue(vpRef.contains(Geopoint.ZERO)); assertTrue(vpRef.contains(new Geopoint(-1.0, -2.0))); assertTrue(vpRef.contains(new Geopoint(3.0, 4.0))); } diff --git a/tests/src/cgeo/geocaching/sorting/DistanceComparatorTest.java b/tests/src/cgeo/geocaching/sorting/DistanceComparatorTest.java index 2db3f59..0cfee49 100644 --- a/tests/src/cgeo/geocaching/sorting/DistanceComparatorTest.java +++ b/tests/src/cgeo/geocaching/sorting/DistanceComparatorTest.java @@ -20,7 +20,7 @@ public class DistanceComparatorTest extends AndroidTestCase { } caches.add(cache); } - Collections.sort(caches, new DistanceComparator(new Geopoint(0, 0), caches)); + Collections.sort(caches, new DistanceComparator(Geopoint.ZERO, caches)); } } |