Merge
This commit is contained in:
Victor Shcherb
commit
9ce44d20fe
17 changed files with 244 additions and 199 deletions
|
|
@ -1,5 +1,7 @@
|
|||
package net.osmand.data;
|
||||
|
||||
import net.osmand.FloatMath;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
public class LatLon implements Serializable {
|
||||
|
|
@ -32,10 +34,17 @@ public class LatLon implements Serializable {
|
|||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
LatLon other = (LatLon) obj;
|
||||
|
||||
if (Float.floatToIntBits((float) latitude) != Float.floatToIntBits((float) other.latitude))
|
||||
return false;
|
||||
if (Float.floatToIntBits((float) longitude) != Float.floatToIntBits((float) other.longitude))
|
||||
return false;
|
||||
/*
|
||||
if (Double.doubleToLongBits(latitude) != Double.doubleToLongBits(other.latitude))
|
||||
return false;
|
||||
if (Double.doubleToLongBits(longitude) != Double.doubleToLongBits(other.longitude))
|
||||
return false;
|
||||
*/
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/search_address_building"
|
||||
android:maxLines="8"
|
||||
android:maxLines="6"
|
||||
android:ellipsize="end"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:textSize="@dimen/default_list_text_size_large"/>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@
|
|||
android:layout_marginLeft="12dp"
|
||||
android:layout_marginRight="12dp"
|
||||
android:text="@string/search_address_building"
|
||||
android:maxLines="3"
|
||||
android:ellipsize="end"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:textSize="@dimen/default_list_text_size_large"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -1793,4 +1793,20 @@
|
|||
<string name="poi_resource_mineral_oil">Oli mineral</string>
|
||||
<string name="poi_resource_slate_iron_ore_copper">Pissarra, mineral de ferro i coure</string>
|
||||
<string name="poi_wetland_wet_meadow">Prat humit</string>
|
||||
<string name="poi_historic_quarry">Pedrera històrica</string>
|
||||
|
||||
<string name="poi_resource_aggregate">Àrid</string>
|
||||
<string name="poi_resource_antimony">Antimoni</string>
|
||||
<string name="poi_resource_asbestos">Asbest</string>
|
||||
<string name="poi_resource_barite">Baritina</string>
|
||||
<string name="poi_resource_basalt">Basalt</string>
|
||||
<string name="poi_resource_bauxite">Bauxita</string>
|
||||
<string name="poi_resource_beryl">Beril</string>
|
||||
<string name="poi_resource_bismuth">Bismut</string>
|
||||
<string name="poi_resource_cereal">Cereals</string>
|
||||
<string name="poi_resource_chromite">Cromita</string>
|
||||
<string name="poi_resource_clay">Argila</string>
|
||||
<string name="poi_resource_coal">Carbó</string>
|
||||
<string name="poi_resource_copper">Coure</string>
|
||||
<string name="poi_resource_diamond">Diamants</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1686,144 +1686,4 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
|
|||
<string name="delete_change">Suprimeix les modificacions</string>
|
||||
<string name="successfully_uploaded_pattern">S\'ha pujat amb èxit {0}/{1}</string>
|
||||
<string name="try_again">Torna a provar-ho</string>
|
||||
<string name="error_message_pattern">Error: {0}</string>
|
||||
<string name="no_updates_available">No hi ha actualitzacions disponibles</string>
|
||||
<string name="we_really_care_about_your_opinion">Valorem molt la vostra opinió i ens és important disposar dels vostres comentaris.</string>
|
||||
<string name="rendering_value_boldOutline_name">Contorn destacat</string>
|
||||
<string name="traffic_warning_hazard">Perill informat</string>
|
||||
<string name="dahboard_options_dialog_title">Configura el tauler</string>
|
||||
<string name="shared_string_card_was_hidden">La tarja era amagada</string>
|
||||
<string name="shared_string_undo">Desfés</string>
|
||||
<string name="shared_string_skip">Omet</string>
|
||||
<string name="app_name_osmand">OsmAnd</string>
|
||||
<string name="offline_maps_and_navigation">Mapes fora de línia\ni navegació</string>
|
||||
<string name="commit_poi">Publica els PDI</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_name">Evita tren llançadora</string>
|
||||
<string name="routing_attr_avoid_shuttle_train_description">Evita tren llançadora</string>
|
||||
<string name="plugin_settings">Connectors</string>
|
||||
<string name="tab_title_basic">Bàsic</string>
|
||||
<string name="tab_title_advanced">Estès</string>
|
||||
<string name="building_number">Nombre de finca</string>
|
||||
<string name="next_proceed">Següent</string>
|
||||
<string name="opening_at">Obert a les</string>
|
||||
<string name="closing_at">Tanquen a les</string>
|
||||
<string name="av_locations">Ubicacions</string>
|
||||
<string name="av_locations_descr">Fitxer GPX amb posicions comentades</string>
|
||||
<string name="contact_info">Informació de contacte</string>
|
||||
<string name="description">Descripció</string>
|
||||
<string name="add_opening_hours">Afegeix l\'horari de servei</string>
|
||||
<string name="poi_dialog_poi_type">Tipus de PDI</string>
|
||||
<string name="please_specify_poi_type">Especifiqueu el tipus de PDI.</string>
|
||||
<string name="number_of_rows_in_dash">Nombre de files al tauler %1$s</string>
|
||||
<string name="poi_action_delete">Suprimeix</string>
|
||||
<string name="working_days">Dies laborables</string>
|
||||
<string name="recent_places">Llocs recents</string>
|
||||
<string name="favourites">Preferits</string>
|
||||
<string name="saved_at_time">S\'ha desat correctament a: %1$s</string>
|
||||
<string name="poi_deleted_localy">El PDI s\'eliminara un cop pugeu els vostres canvis</string>
|
||||
<string name="show_gpx">Mostra GPX</string>
|
||||
<string name="favourites_edit_dialog_title">Detalls del preferit</string>
|
||||
<string name="simulate_your_location_stop_descr">Atura la simulació de la vostra posició</string>
|
||||
<string name="simulate_your_location_descr">Simula utilitzant un GPX enregistrat o una ruta calculada</string>
|
||||
<string name="address_unknown">L\'adreça encara no es coneix</string>
|
||||
<string name="favourites_context_menu_add">Afegeix un preferit</string>
|
||||
<string name="show_on_start">Mostra a l\'inici</string>
|
||||
<string name="count_of_lines">Recompte de línies</string>
|
||||
<string name="are_you_sure">N\'esteu segur?</string>
|
||||
<string name="unsaved_changes_will_be_lost">Es perdran tots els canvis no desats. Voleu continuar?</string>
|
||||
<string name="downloads_left_template">%1$s baixades pendents</string>
|
||||
<string name="roads">Carreteres</string>
|
||||
<string name="shared_string_trip_recording">Enregistrament de trajectes</string>
|
||||
<string name="shared_string_navigation">Navegació</string>
|
||||
<string name="osmand_running_in_background">Execució en procés de fons</string>
|
||||
<string name="favorite_category_add_new">Afegeix nova categoria</string>
|
||||
<string name="favorite_category_select">Selecciona categoria</string>
|
||||
<string name="default_speed_system_descr">Defineix el sistema de mesura de velocitat</string>
|
||||
<string name="default_speed_system">Mesura de velocitat</string>
|
||||
<string name="nm">mm</string>
|
||||
<string name="si_nm">Milles marines</string>
|
||||
<string name="si_kmh">Quilòmetres per hora</string>
|
||||
<string name="si_mph">Milles per hora</string>
|
||||
<string name="si_m_s">Metres per segon</string>
|
||||
<string name="si_min_km">Minuts per quilòmetre</string>
|
||||
<string name="si_min_m">Minuts per milla</string>
|
||||
<string name="si_nm_h">Millesmarines per hora (nusos)</string>
|
||||
<string name="nm_h">mmh</string>
|
||||
<string name="min_mile">min/m</string>
|
||||
<string name="min_km">min/km</string>
|
||||
<string name="m_s">m/s</string>
|
||||
<string name="srtm_plugin_disabled">Corbes de nivell desactivades</string>
|
||||
<string name="show_free_version_banner">Mostra bàner de la versió gratuïta</string>
|
||||
<string name="show_free_version_banner_description">Encara que tinguéssiu una versió de pagament també podríeu veure el bàner de la versió gratuïta</string>
|
||||
<string name="downloading_number_of_files">Baixada - %1$d fitxer</string>
|
||||
<string name="hillshade_layer_disabled">Capa d\'ombrejat desactivada</string>
|
||||
<string name="buy">Compra</string>
|
||||
<string name="regions">Regions</string>
|
||||
<string name="region_maps">Mapes de regions</string>
|
||||
<string name="world_maps">Mapes del món</string>
|
||||
<string name="later">Mes tard</string>
|
||||
<string name="get_full_version">Versió completa</string>
|
||||
<string name="downloads">Baixades</string>
|
||||
<string name="activate_seamarks_plugin">Activeu el connector de cartes marines</string>
|
||||
<string name="activate_srtm_plugin">Activeu el connector de corbes de nivell</string>
|
||||
<string name="favorite_category_dublicate_message">El nom de categoria especificat ja existeix. Definiu un altre nom.</string>
|
||||
<string name="favorite_category_name">Nom de categoria</string>
|
||||
<string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
|
||||
<string name="confirm_download_roadmaps">N\'esteu segur de baixar un mapa de carreteres quan teniu disponible un mapa complet?</string>
|
||||
<string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
|
||||
<string name="file_size_in_mb">%.1f MB</string>
|
||||
<string name="update_all">Actualitzeu tot (%1$s MB)</string>
|
||||
<string name="free_downloads_used">Baixades gratuïtes realitzades</string>
|
||||
<string name="free_downloads_used_description">Podeu veure quantes baixades gratuïtes heu fet</string>
|
||||
<string name="simulate_initial_startup_descr">Configura el senyalitzador de primera engegada de l\'aplicació, mantenint la resta de paràmetres sense canvis</string>
|
||||
<string name="simulate_initial_startup">Simula l\'engegada inicial de l\'aplicació</string>
|
||||
<string name="share_geo">geo:</string>
|
||||
<string name="share_menu_location">Comparteix la posició</string>
|
||||
<string name="shared_string_send">Envia</string>
|
||||
<string name="application_dir_description">Trieu on voleu desar els fitxers de mapes.</string>
|
||||
<string name="shared_string_qr_code">Codi QR</string>
|
||||
<string name="map_downloaded">Mapa baixat</string>
|
||||
<string name="map_downloaded_descr">S\'ha baixat el mapa de %1$s. Torneu al mapa per començar a utilitzar-lo.</string>
|
||||
<string name="go_to_map">Vés al mapa</string>
|
||||
<string name="world_map_download_descr">El mapa base mundial (que abasta el món sencer però amb poca ampliació) no es troba o està malmès. Considereu baixar-lo per una operació completa.</string>
|
||||
<string name="show_on_start_description">Si es desactiva s\'engega amb la pantalla del mapa</string>
|
||||
<string name="enter_country_name">Indiqueu el nom del país</string>
|
||||
<string name="shared_string_upload">Pujada</string>
|
||||
<string name="osm_edit_created_poi">S\'ha creat un PDI a OSM</string>
|
||||
|
||||
<string name="new_version">Versió nova</string>
|
||||
<string name="begin_with_osmand_menu_group">Primeres passes a OsmAnd</string>
|
||||
<string name="features_menu_group">Característiques</string>
|
||||
<string name="help_us_to_improve_menu_group">Ajudeu-nos a millorar OsmAnd</string>
|
||||
<string name="other_menu_group">Altres</string>
|
||||
<string name="plugins_menu_group">Connectors</string>
|
||||
<string name="first_usage_item">Primera utilització</string>
|
||||
<string name="first_usage_item_description">Com baixar mapes, fixar la configuració bàsica</string>
|
||||
<string name="navigation_item_description">confifuració de la navegació</string>
|
||||
<string name="planning_trip_item">Planeja un viatge</string>
|
||||
<string name="faq_item">PMF</string>
|
||||
<string name="faq_item_description">Preguntes més freqüents</string>
|
||||
<string name="map_viewing_item">Visualització del mapa</string>
|
||||
<string name="search_on_the_map_item">Cerca al mapa</string>
|
||||
<string name="instalation_troubleshooting_item">Instal·lació i solució de problemes</string>
|
||||
<string name="techical_articles_item">Articles tècnics</string>
|
||||
<string name="versions_item">Versions</string>
|
||||
<string name="feedback">Comentaris</string>
|
||||
<string name="contact_us">Contacteu-nos</string>
|
||||
<string name="map_legend">Llegenda del mapa</string>
|
||||
<string name="shared_string_update">Actualitza</string>
|
||||
<string name="rendering_attr_hideProposed_name">Amaga proposta d\'objectes</string>
|
||||
|
||||
<string name="read_more">Llegiu-ne més</string>
|
||||
<string name="whats_new">Què hi ha de nou a</string>
|
||||
<string name="share_osm_edits_subject">Edicions OSM compartides via OsmAnd</string>
|
||||
<string name="lang_nds">Baix alemany</string>
|
||||
<string name="lang_mk">Macedònic</string>
|
||||
<string name="lang_fy">Frisó</string>
|
||||
<string name="lang_als">Albanès (Tosc)</string>
|
||||
<string name="save_poi_without_poi_type_message">Confirmeu desar el PDI sense indicar el tipus?</string>
|
||||
<string name="context_menu_item_delete_waypoint">Voleu suprimir la fita GPX?</string>
|
||||
<string name="context_menu_item_edit_waypoint">Edita la fita GPX</string>
|
||||
<string name="shared_string_location">Localització</string>
|
||||
<string name="poi_context_menu_modify_osm_change">Modifica el canvi OSM</string>
|
||||
</resources>
|
||||
<string name="error_message_pattern"
|
||||
|
|
@ -773,7 +773,7 @@
|
|||
<string name="rendering_attr_hikingRoutesOSMC_name">Superponer símbolo de senderismo</string>
|
||||
<string name="rendering_attr_hikingRoutesOSMC_description">Dibujar senderos según trazas OSMC</string>
|
||||
<string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string>
|
||||
<string name="rendering_attr_noAdminboundaries_description">Evitar mostrar fronteras regionales (niveles administrativos 5-9)</string>
|
||||
<string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5-9)</string>
|
||||
<string name="map_widget_max_speed">Límite de velocidad</string>
|
||||
<string name="monitoring_control_start">GPX</string>
|
||||
<string name="no_buildings_found">No se encontró edificios.</string>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<resources>
|
||||
|
||||
<string name="layer_map_appearance">Configurar pantalla</string>
|
||||
<string name="show_lanes">Mostrar carriles</string>
|
||||
|
|
@ -326,7 +327,6 @@
|
|||
<string name="error_reading_gpx">Error leyendo datos GPX</string>
|
||||
<string name="vector_data">Mapas vectoriales sin conexión</string>
|
||||
<string name="transport_context_menu">Buscar transporte en parada</string>
|
||||
|
||||
<string name="poi_context_menu_modify">Modificar PDI</string>
|
||||
<string name="poi_context_menu_delete">Borrar PDI</string>
|
||||
<string name="rotate_map_compass_opt">A la brújula</string>
|
||||
|
|
@ -460,7 +460,7 @@
|
|||
<string name="downloading_list_indexes">Descargando lista de regiones disponibles…</string>
|
||||
<string name="list_index_files_was_not_loaded">La lista de regiones no fue recuperada desde osmand.net.</string>
|
||||
<string name="select_index_file_to_download">No se encontró nada. Si no encuentra su región, puede hacer el archivo usted mismo (vea http://osmand.net).</string>
|
||||
<string name="fav_points_edited">Se editó el punto favorito</string>
|
||||
<string name="fav_points_edited">Se editó el favorito</string>
|
||||
<string name="fav_points_not_exist">No hay puntos favoritos</string>
|
||||
<string name="update_existing">Reemplazar</string>
|
||||
<string name="only_show">Mostrar ruta</string>
|
||||
|
|
@ -569,7 +569,6 @@
|
|||
<string name="search_address_street_option">Intersección de calle</string>
|
||||
<string name="search_tabs_location">Ubicación</string>
|
||||
<string name="context_menu_item_update_map">Actualizar mapa</string>
|
||||
|
||||
<string name="context_menu_item_create_poi">Crear PDI</string>
|
||||
<string name="shared_string_yes">Sí</string>
|
||||
<string name="shared_string_cancel">Cancelar</string>
|
||||
|
|
@ -578,26 +577,15 @@
|
|||
<string name="shared_string_no">No</string>
|
||||
<string name="add_favorite_dialog_top_text">Introduzca nombre de favorito</string>
|
||||
<string name="add_favorite_dialog_default_favourite_name">Favorito</string>
|
||||
<string name="add_favorite_dialog_favourite_added_template">El punto favorito \'\'{0}\'\' se añadió correctamente.</string>
|
||||
<string name="add_favorite_dialog_favourite_added_template">El favorito \'\'{0}\'\' se añadió correctamente.</string>
|
||||
<string name="favourites_context_menu_edit">Editar favorito</string>
|
||||
<string name="favourites_context_menu_delete">Borrar favorito</string>
|
||||
<string name="favourites_remove_dialog_msg">¿Borrar el punto favorito \'%s\'?</string>
|
||||
<string name="favourites_remove_dialog_success">El punto favorito {0} se borró correctamente.</string>
|
||||
|
||||
|
||||
|
||||
|
||||
<string name="favourites_remove_dialog_msg">¿Quitar el favorito \'%s\'?</string>
|
||||
<string name="favourites_remove_dialog_success">El favorito {0} se borró correctamente.</string>
|
||||
<string name="osb_comment_dialog_message">Mensaje</string>
|
||||
<string name="osb_comment_dialog_author">Nombre del autor</string>
|
||||
|
||||
|
||||
<string name="osb_comment_dialog_success">El comentario fue añadido correctamente</string>
|
||||
<string name="osb_comment_dialog_error">Error: No se añadió el comentario</string>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<string name="poi_edit_title">Editar PDI</string>
|
||||
<string name="poi_create_title">Crear PDI</string>
|
||||
<string name="poi_error_poi_not_found">No se encontró el nodo o la instalación se compone de varios nodos</string>
|
||||
|
|
@ -626,7 +614,7 @@
|
|||
<string name="offline_navigation_not_available">La navegación desconectada de OsmAnd, no está disponible temporalmente.</string>
|
||||
<string name="left_side_navigation">Conducción por la izquierda</string>
|
||||
<string name="left_side_navigation_descr">Seleccione en países con tráfico por la izquierda</string>
|
||||
<string name="unknown_from_location">El punto de partida todavía no ha sido determinado</string>
|
||||
<string name="unknown_from_location">Todavía no se determinó el punto de partida</string>
|
||||
<string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de archivos?</string>
|
||||
<string name="basemap_was_selected_to_download">El Mapa Base (World Basemap) se necesita para el correcto funcionamiento de la aplicación y se seleccionó para su descarga.</string>
|
||||
<string name="map_online_plugin_is_not_installed">Habilita el complemento mapas en línea para seleccionar diferentes fuentes de mapas</string>
|
||||
|
|
@ -886,7 +874,7 @@
|
|||
<string name="map_widget_max_speed">Límite de velocidad</string>
|
||||
<string name="monitoring_control_start">GPX</string>
|
||||
<string name="rendering_attr_noAdminboundaries_name">Ocultar fronteras</string>
|
||||
<string name="rendering_attr_noAdminboundaries_description">Evita mostrar las fronteras regionales (niveles administrativos 5-9)</string>
|
||||
<string name="rendering_attr_noAdminboundaries_description">Ocultar fronteras regionales (niveles administrativos 5-9)</string>
|
||||
<string name="index_srtm_parts">piezas</string>
|
||||
<string name="index_srtm_ele">Curvas de nivel</string>
|
||||
<string name="srtm_plugin_description">"Este complemento proporciona tanto una capa superpuesta de curvas de nivel y una capa (de relieve) sombreada que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.
|
||||
|
|
@ -1118,7 +1106,7 @@
|
|||
<string name="driving_region">Región de conducción</string>
|
||||
<string name="edit_tilesource_minzoom">Acercamiento mínimo</string>
|
||||
<string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
|
||||
<string name="edit_tilesource_successfully">Fuente de teselas %1$s ha sido guardada correctamente</string>
|
||||
<string name="edit_tilesource_successfully">La fuente de teselas %1$s, se guardó correctamente</string>
|
||||
<string name="local_index_tile_data_name">Datos de teselas: %1$s</string>
|
||||
<string name="local_index_tile_data_expire">Expirar (minutos): %1$s</string>
|
||||
<string name="shared_string_about">Acerca de</string>
|
||||
|
|
@ -1538,10 +1526,10 @@
|
|||
<string name="traffic_warning">Aviso de tráfico</string>
|
||||
<string name="text_size_descr">Establece el tamaño del texto en el mapa.</string>
|
||||
<string name="text_size">Tamaño de texto</string>
|
||||
<string name="fav_point_dublicate">Nombre de punto favorito duplicado</string>
|
||||
<string name="fav_point_dublicate">Nombre del favorito duplicado</string>
|
||||
<string name="fav_point_dublicate_message">El nombre del favorito especificado está en uso, fue cambiado a %1$s para evitar duplicados.</string>
|
||||
<string name="print_route">Imprimir ruta</string>
|
||||
<string name="fav_point_emoticons_message">El nombre de punto favorito ha sido cambiado a %1$s para facilitar el guardado de la cadena con emoticonos a un archivo.</string>
|
||||
<string name="fav_point_emoticons_message">Se cambió el nombre del favorito a %1$s, para facilitar el guardado de la cadena con emoticonos a un archivo.</string>
|
||||
<string name="speed_limit_exceed">Tolerancia de límite de velocidad</string>
|
||||
<string name="speed_limit_exceed_message">Seleccione el margen de tolerancia sobre el límite de velocidad con el cual recibirá un aviso de voz.</string>
|
||||
<string name="osmo_device_not_found">Dispositivo no encontrado</string>
|
||||
|
|
@ -1741,7 +1729,6 @@
|
|||
<string name="shared_string_copy">Copiar</string>
|
||||
<string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string>
|
||||
<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
|
||||
|
||||
<string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string>
|
||||
<string name="routing_attr_height_name">Límite de altura</string>
|
||||
<string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string>
|
||||
|
|
@ -1949,13 +1936,11 @@
|
|||
<string name="feedback">Encuesta</string>
|
||||
<string name="contact_us">Contáctenos</string>
|
||||
<string name="osm_edit_created_poi">PDI de OSM creado</string>
|
||||
|
||||
<string name="map_legend">Leyenda del mapa</string>
|
||||
<string name="shared_string_update">Actualizar</string>
|
||||
<string name="shared_string_upload">Subir</string>
|
||||
<string name="rendering_attr_hideProposed_name">Ocultar objetos propuestos</string>
|
||||
|
||||
<string name="read_more">Leer más</string>
|
||||
<string name="read_more">Leer más</string>
|
||||
<string name="whats_new">Novedades en</string>
|
||||
<string name="lang_nds">Bajo Alemán</string>
|
||||
<string name="lang_mk">Macedonio</string>
|
||||
|
|
@ -1965,4 +1950,7 @@
|
|||
<string name="save_poi_without_poi_type_message">¿Quiere guardar el punto de interés sin especificar el tipo?</string>
|
||||
<string name="shared_string_location">Ubicación</string>
|
||||
<string name="poi_context_menu_modify_osm_change">Modificar cambio OSM</string>
|
||||
</resources>
|
||||
<string name="context_menu_item_delete_waypoint">¿Borrar punto de ruta GPX?</string>
|
||||
<string name="context_menu_item_edit_waypoint">Editar punto de ruta GPX</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1450,4 +1450,71 @@
|
|||
<string name="poi_payment_routex_no">Neprijíma Routex palivové karty</string>
|
||||
<string name="poi_payment_bancomat_yes">Prijíma Bancomat</string>
|
||||
<string name="poi_payment_bancomat_no">Prijíma Bancomat</string>
|
||||
<string name="poi_payment_icsf_yes">Prijíma karty IC s predplateným jazdným</string>
|
||||
<string name="poi_payment_icsf_no">Neprijíma karty IC s predplateným jazdným</string>
|
||||
<string name="poi_payment_prepaid_ticket_yes">Prijíma predplatené lístky</string>
|
||||
<string name="poi_payment_jcb_yes">Prijíma JCB karty</string>
|
||||
<string name="poi_payment_jcb_no">Neprijíma JCB karty</string>
|
||||
<string name="poi_payment_laser_yes">Prijíma Laser karty</string>
|
||||
<string name="poi_payment_laser_no">Neprijíma Laser karty</string>
|
||||
<string name="poi_payment_ep_quick_yes">Prijíma Quick karty</string>
|
||||
<string name="poi_payment_ep_quick_no">Neprijíma Quick karty</string>
|
||||
<string name="poi_payment_eurowag_yes">Prijíma Eurowag karty</string>
|
||||
<string name="poi_payment_eurowag_no">Neprijíma Eurowag karty</string>
|
||||
<string name="poi_payment_e_zpass_yes">Prijíma E-ZPass</string>
|
||||
<string name="poi_payment_e_zpass_no">Neprijíma E-ZPass</string>
|
||||
<string name="poi_payment_euroshell_yes">Prijíma Euroshell palivové karty</string>
|
||||
<string name="poi_payment_euroshell_no">Neprijíma Euroshell palivové karty</string>
|
||||
<string name="poi_payment_kitcard_yes">Prijíma KITCard</string>
|
||||
<string name="poi_payment_kitcard_no">Neprijíma KITCard</string>
|
||||
<string name="poi_payment_westfalen_card_yes">Prijíma Westfalen karty</string>
|
||||
<string name="poi_payment_westfalen_card_no">Neprijíma Westfalen karty</string>
|
||||
<string name="poi_payment_v_pay_yes">Prijíma V PAY karty</string>
|
||||
<string name="poi_payment_v_pay_no">Neprijíma V PAY karty</string>
|
||||
<string name="poi_payment_dogecoin_yes">Prijíma Dogecoin</string>
|
||||
<string name="poi_payment_dogecoin_no">Neprijíma Dogecoin</string>
|
||||
<string name="poi_payment_cibus_yes">Prijíma Cibus karty</string>
|
||||
<string name="poi_payment_cibus_no">Neprijíma Cibus karty</string>
|
||||
<string name="poi_payment_wire_transfer_yes">Prijíma bankové prevody</string>
|
||||
<string name="poi_payment_wire_transfer_no">Neprijíma bankové prevody</string>
|
||||
<string name="poi_payment_ep_cash_yes">Prijíma Geldkarte hotovostné karty</string>
|
||||
<string name="poi_payment_ep_cash_no">Neprijíma Geldkarte hotovostné karty</string>
|
||||
<string name="poi_payment_ep_proton_yes">Prijíma Proton karty</string>
|
||||
<string name="poi_payment_ep_proton_no">Neprijíma Proton karty</string>
|
||||
<string name="poi_payment_ep_avant_yes">Prijíma AvantCard</string>
|
||||
<string name="poi_payment_ep_avant_no">Neprijíma AvantCard</string>
|
||||
<string name="poi_payment_ep_mep_yes">Prijíma MEP</string>
|
||||
<string name="poi_payment_ep_mep_no">Neprijíma MEP</string>
|
||||
<string name="poi_payment_ep_minipay_yes">Prijíma Minipay</string>
|
||||
<string name="poi_payment_ep_minipay_no">Neprijíma Minipay</string>
|
||||
<string name="poi_payment_ep_minicash_yes">Prijíma MiniCash</string>
|
||||
<string name="poi_payment_ep_minicash_no">Neprijíma MiniCash</string>
|
||||
<string name="poi_payment_ep_moneo_yes">Prijíma Moneo</string>
|
||||
<string name="poi_payment_ep_moneo_no">Neprijíma Moneo</string>
|
||||
<string name="poi_payment_ep_monedero4b_yes">Prijíma Monedero 4B</string>
|
||||
<string name="poi_payment_ep_monedero4b_no">Neprijíma Monedero 4B</string>
|
||||
<string name="poi_payment_ep_monedero_yes">Prijíma Monedero</string>
|
||||
<string name="poi_payment_ep_monedero_no">Neprijíma Monedero</string>
|
||||
<string name="poi_payment_bankaxess_yes">Prijíma BankAxess</string>
|
||||
<string name="poi_payment_bankaxess_no">Neprijíma BankAxess</string>
|
||||
<string name="poi_payment_coinkite_yes">Prijíma Coinkite</string>
|
||||
<string name="poi_payment_coinkite_no">Neprijíma Coinkite</string>
|
||||
<string name="poi_payment_roadrunner_yes">Prijíma Roadrunner karty</string>
|
||||
<string name="poi_payment_roadrunner_no">Neprijíma Roadrunner karty</string>
|
||||
<string name="poi_payment_svg_yes">Prijíma SVG</string>
|
||||
<string name="poi_payment_svg_no">Neprijíma SVG</string>
|
||||
<string name="poi_payment_sms_yes">Prijíma SMS platby</string>
|
||||
<string name="poi_payment_sms_no">Neprijíma SMS platby</string>
|
||||
<string name="poi_payment_ov_chipkaart_yes">Prijíma OV-Chipkaart</string>
|
||||
<string name="poi_payment_ov_chipkaart_no">Neprijíma OV-Chipkaart</string>
|
||||
<string name="poi_payment_oyster_yes">Prijíma Oyster karty</string>
|
||||
<string name="poi_payment_oyster_no">Neprijíma Oyster karty</string>
|
||||
<string name="poi_payment_sube_yes">Prijíma SUBE karty</string>
|
||||
<string name="poi_payment_sube_no">Neprijíma SUBE karty</string>
|
||||
<string name="poi_payment_via_verde_yes">Prijíma Via Verde</string>
|
||||
<string name="poi_payment_via_verde_no">Neprijíma Via Verde</string>
|
||||
<string name="poi_payment_meal_voucher_yes">Prijíma stravné poukážky</string>
|
||||
<string name="poi_payment_meal_voucher_no">Neprijíma stravné poukážky</string>
|
||||
<string name="poi_payment_paypal_yes">Prijíma PayPal</string>
|
||||
<string name="poi_payment_paypal_no">Neprijíma PayPal</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1992,4 +1992,8 @@
|
|||
<string name="lang_fy">Frizijščina</string>
|
||||
<string name="lang_als">Toskovska albanščina</string>
|
||||
<string name="save_poi_without_poi_type_message">Ali res želite shraniti točko POI brez ustreznega določila vrste?</string>
|
||||
</resources>
|
||||
<string name="context_menu_item_delete_waypoint">Ali želite izbrisati vmesno točko GPX?</string>
|
||||
<string name="context_menu_item_edit_waypoint">Uredi vmesno točko GPX</string>
|
||||
<string name="shared_string_location">Mesto</string>
|
||||
<string name="poi_context_menu_modify_osm_change">Popravi spremembo OSM</string>
|
||||
</resources>
|
||||
|
|
@ -40,6 +40,7 @@ public class PointDescription {
|
|||
public static final String POINT_TYPE_TARGET = "destination";
|
||||
public static final String POINT_TYPE_OSM_BUG = "bug";
|
||||
public static final String POINT_TYPE_WORLD_REGION = "world_region";
|
||||
public static final String POINT_TYPE_GPX_ITEM = "gpx_item";
|
||||
|
||||
|
||||
public static final PointDescription LOCATION_POINT = new PointDescription(POINT_TYPE_LOCATION, "");
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import android.graphics.Color;
|
|||
|
||||
import net.osmand.Location;
|
||||
import net.osmand.PlatformUtil;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.LocationPoint;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.util.Algorithms;
|
||||
|
|
@ -137,6 +136,31 @@ public class GPXUtilities {
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((name == null) ? 0 : name.hashCode());
|
||||
result = prime * result + ((category == null) ? 0 : category.hashCode());
|
||||
result = prime * result + ((desc == null) ? 0 : desc.hashCode());
|
||||
result = prime * result + ((lat == 0) ? 0 : Double.valueOf(lat).hashCode());
|
||||
result = prime * result + ((lon == 0) ? 0 : Double.valueOf(lon).hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null || getClass() != obj.getClass())
|
||||
return false;
|
||||
WptPt other = (WptPt) obj;
|
||||
return Algorithms.objectEquals(other.name, name)
|
||||
&& Algorithms.objectEquals(other.category, category)
|
||||
&& Algorithms.objectEquals(other.lat, lat)
|
||||
&& Algorithms.objectEquals(other.lon, lon)
|
||||
&& Algorithms.objectEquals(other.desc, desc);
|
||||
}
|
||||
}
|
||||
|
||||
public static class TrkSegment extends GPXExtensions {
|
||||
|
|
@ -608,6 +632,8 @@ public class GPXUtilities {
|
|||
}
|
||||
|
||||
public void updateWptPt(WptPt pt, double lat, double lon, long time, String description, String name, String category, int color) {
|
||||
int index = points.indexOf(pt);
|
||||
|
||||
pt.lat = lat;
|
||||
pt.lon = lon;
|
||||
pt.time = time;
|
||||
|
|
@ -617,6 +643,10 @@ public class GPXUtilities {
|
|||
if (color != 0) {
|
||||
pt.setColor(color);
|
||||
}
|
||||
|
||||
if (index != -1) {
|
||||
points.set(index, pt);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean deleteWptPt(WptPt pt) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package net.osmand.plus;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
|
|
@ -11,7 +9,6 @@ import net.osmand.plus.GPXUtilities.Route;
|
|||
import net.osmand.plus.GPXUtilities.Track;
|
||||
import net.osmand.plus.GPXUtilities.TrkSegment;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
|
||||
import net.osmand.plus.OsmandSettings.MetricsConstants;
|
||||
import net.osmand.plus.activities.SavingTrackHelper;
|
||||
import net.osmand.plus.helpers.GpxUiHelper;
|
||||
|
|
@ -21,7 +18,9 @@ import org.json.JSONArray;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class GpxSelectionHelper {
|
||||
|
||||
|
|
@ -55,11 +54,8 @@ public class GpxSelectionHelper {
|
|||
|
||||
public SelectedGpxFile getSelectedGPXFile(WptPt point) {
|
||||
for (SelectedGpxFile g : selectedGPXFiles) {
|
||||
List<WptPt> pts = g.getGpxFile().points;
|
||||
for (WptPt n : pts) {
|
||||
if (n == point) {
|
||||
return g;
|
||||
}
|
||||
if (g.getGpxFile().points.contains(point)) {
|
||||
return g;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
|
@ -199,6 +195,7 @@ public class GpxSelectionHelper {
|
|||
|
||||
item.description = GpxUiHelper.getDescription(app, analysis, true);
|
||||
item.analysis = analysis;
|
||||
/*
|
||||
String name = "";
|
||||
// if(group.track.segments.size() > 1) {
|
||||
// name += t++ + ". ";
|
||||
|
|
@ -241,7 +238,8 @@ public class GpxSelectionHelper {
|
|||
OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app));
|
||||
}
|
||||
}
|
||||
item.name = name;
|
||||
*/
|
||||
item.name = group.getName();//.replace("\n", "");
|
||||
item.locationStart = analysis.locationStart;
|
||||
item.locationEnd = analysis.locationEnd;
|
||||
list.add(item);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import net.osmand.data.FavouritePoint;
|
|||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GpxSelectionHelper;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.TargetPointsHelper.TargetPoint;
|
||||
|
|
@ -19,6 +21,7 @@ import net.osmand.plus.mapcontextmenu.controllers.AmenityMenuController;
|
|||
import net.osmand.plus.mapcontextmenu.controllers.AudioVideoNoteMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.EditPOIMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.FavouritePointMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.GpxItemMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.HistoryMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.MyLocationMenuController;
|
||||
|
|
@ -93,6 +96,8 @@ public abstract class MenuController extends BaseMenuController {
|
|||
menuController = new MapDataMenuController(app, mapActivity, pointDescription, (BinaryMapDataObject) object);
|
||||
} else if (object instanceof OpenStreetNote) {
|
||||
menuController = new OsmBugMenuController(app, mapActivity, pointDescription, (OpenStreetNote) object);
|
||||
} else if (object instanceof GpxDisplayItem) {
|
||||
menuController = new GpxItemMenuController(app, mapActivity, pointDescription, (GpxDisplayItem) object);
|
||||
} else if (object instanceof LatLon) {
|
||||
if (pointDescription.isParking()) {
|
||||
menuController = new ParkingPositionMenuController(app, mapActivity, pointDescription);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
package net.osmand.plus.mapcontextmenu.controllers;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.plus.ApplicationMode;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.MenuBuilder;
|
||||
import net.osmand.plus.mapcontextmenu.MenuController;
|
||||
|
||||
public class GpxItemMenuController extends MenuController {
|
||||
private GpxDisplayItem item;
|
||||
|
||||
public GpxItemMenuController(OsmandApplication app, MapActivity mapActivity, PointDescription pointDescription, GpxDisplayItem item) {
|
||||
super(new MenuBuilder(app), pointDescription, mapActivity);
|
||||
this.item = item;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setObject(Object object) {
|
||||
if (object instanceof GpxDisplayItem) {
|
||||
this.item = (GpxDisplayItem) object;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSupportedMenuStatesPortrait() {
|
||||
return MenuState.HEADER_ONLY | MenuState.HALF_SCREEN | MenuState.FULL_SCREEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTypeStr() {
|
||||
return getPointDescription().getTypeName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommonTypeStr() {
|
||||
return getMapActivity().getString(R.string.gpx_selection_segment_title);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean needStreetName() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Drawable getLeftIcon() {
|
||||
return getIcon(R.drawable.ic_action_polygom_dark, R.color.osmand_orange);
|
||||
}
|
||||
}
|
||||
|
|
@ -104,6 +104,12 @@ public class WptPtEditorFragment extends PointEditorFragment {
|
|||
menu.update(latLon, wpt.getPointDescription(getMapActivity()), wpt);
|
||||
}
|
||||
|
||||
if (editor.isNew() && selectedGpxFile == null) {
|
||||
selectedGpxHelper.setGpxFileToDisplay(savingTrackHelper.getCurrentGpx());
|
||||
} else if (selectedGpxFile != null) {
|
||||
selectedGpxHelper.setGpxFileToDisplay(selectedGpxFile.getGpxFile());
|
||||
}
|
||||
|
||||
saved = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -480,14 +480,26 @@ public class SelectedGPXFragment extends OsmAndListFragment {
|
|||
|
||||
GpxDisplayItem child = adapter.getItem(position);
|
||||
|
||||
if (child.group.getGpx() != null) {
|
||||
app.getSelectedGpxHelper().setGpxFileToDisplay(child.group.getGpx());
|
||||
}
|
||||
|
||||
final OsmandSettings settings = app.getSettings();
|
||||
LatLon location = new LatLon(child.locationStart.lat, child.locationStart.lon);
|
||||
|
||||
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
|
||||
settings.getLastKnownMapZoom(),
|
||||
new PointDescription(PointDescription.POINT_TYPE_FAVORITE, Html.fromHtml(child.name).toString()),
|
||||
false,
|
||||
child.locationStart); //$NON-NLS-1$
|
||||
if (child.group.getType() == GpxDisplayItemType.TRACK_POINTS) {
|
||||
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
|
||||
settings.getLastKnownMapZoom(),
|
||||
new PointDescription(PointDescription.POINT_TYPE_WPT, child.locationStart.name),
|
||||
false,
|
||||
child.locationStart);
|
||||
} else {
|
||||
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
|
||||
settings.getLastKnownMapZoom(),
|
||||
new PointDescription(PointDescription.POINT_TYPE_GPX_ITEM, child.name),
|
||||
false,
|
||||
child);
|
||||
}
|
||||
MapActivity.launchMapActivityMoveToTop(getActivity());
|
||||
/*
|
||||
// if(child.group.getType() == GpxDisplayItemType.TRACK_POINTS ||
|
||||
|
|
|
|||
|
|
@ -78,28 +78,22 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
int minh = contextMarker.getDrawable().getMinimumHeight();
|
||||
contextMarker.layout(0, 0, minw, minh);
|
||||
}
|
||||
|
||||
|
||||
public boolean isVisible() {
|
||||
return menu.isActive();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
|
||||
if (menu.isActive()) {
|
||||
public void onDraw(Canvas canvas, RotatedTileBox box, DrawSettings nightMode) {
|
||||
if(menu.isActive()) {
|
||||
LatLon latLon = menu.getLatLon();
|
||||
int x = (int) tileBox.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
|
||||
int y = (int) tileBox.getPixYFromLatLon(latLon.getLatitude(), latLon.getLongitude());
|
||||
int x = (int) box.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
|
||||
int y = (int) box.getPixYFromLatLon(latLon.getLatitude(), latLon.getLongitude());
|
||||
canvas.translate(x - contextMarker.getWidth() / 2, y - contextMarker.getHeight());
|
||||
contextMarker.draw(canvas);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDraw(Canvas canvas, RotatedTileBox box, DrawSettings nightMode) {
|
||||
}
|
||||
|
||||
|
||||
public void setSelectOnMap(CallbackWithObject<LatLon> selectOnMap) {
|
||||
this.selectOnMap = selectOnMap;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue