Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
GaidamakUA 2015-10-14 11:30:18 +03:00
commit 1bcb2241b2
15 changed files with 540 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LICENSE
View file

@ -148,4 +148,5 @@
- Amsterdam: "Amsterdam metro" by Peeperman - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Amsterdam_metro.svg#/media/File:Amsterdam_metro.svg
- Brussels: "Brussels Metro logo" by Source. Licensed under Fair use via Wikipedia - https://en.wikipedia.org/wiki/File:Brussels_Metro_logo.svg#/media/File:Brussels_Metro_logo.svg
- Lyon: "Métro-M-Lyon" by Otourly - Own work. Licensed under CC BY-SA 3.0 via Wikimedia Commons - https://commons.wikimedia.org/wiki/File:M%C3%A9tro-M-Lyon.svg#/media/File:M%C3%A9tro-M-Lyon.svg
- Washington: "WMATA Metro Logo" by Noclip - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:WMATA_Metro_Logo.svg#/media/File:WMATA_Metro_Logo.svg
- Washington: "WMATA Metro Logo" by Noclip - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:WMATA_Metro_Logo.svg#/media/File:WMATA_Metro_Logo.svg
- Los Angeles: "Lametro" by Los Angeles County Metropolitan Transportation Authority. Original uploader was Cheeselouise at en.wikipedia - Metro materials at http://www.metro.net/riding_metro/pocket_guide_cambodian_printers.pdf. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Lametro.svg#/media/File:Lametro.svg

2
OsmAnd-java/src/net/osmand/map/ITileSource.java
View file

@ -27,5 +27,7 @@ public interface ITileSource {
public int getExpirationTimeMillis();
public int getExpirationTimeMinutes();
public String getReferer();
}

3
OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
View file

@ -91,6 +91,7 @@ public class MapTileDownloader {
public final int xTile;
public final int yTile;
public final String url;
public String referer = null;
public boolean error;
public DownloadRequest(String url, File fileToSave, int xTile, int yTile, int zoom) {
@ -262,6 +263,8 @@ public class MapTileDownloader {
try {
URLConnection connection = NetworkUtils.getHttpURLConnection(request.url);
connection.setRequestProperty("User-Agent", USER_AGENT); //$NON-NLS-1$
if(request.referer != null)
connection.setRequestProperty("Referer", request.referer); //$NON-NLS-1$
connection.setConnectTimeout(CONNECTION_TIMEOUT);
connection.setReadTimeout(CONNECTION_TIMEOUT);
BufferedInputStream inputStream = new BufferedInputStream(connection.getInputStream(), 8 * 1024);

3
OsmAnd-java/src/net/osmand/map/TileSourceManager.java
View file

@ -140,6 +140,9 @@ public class TileSourceManager {
return expirationTimeMillis;
}
public String getReferer() {
return null;
}
@Override
public int getTileSize() {

48
OsmAnd/res/values-da/phrases.xml
View file

@ -756,7 +756,7 @@
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_biogas">Biogas</string>
<string name="poi_fuel_lh2">Flydende brint</string>
<string name="poi_fuel_electricity">Elektricitet</string>
<string name="poi_industrial">Industriområde</string>
@ -863,7 +863,7 @@
<string name="poi_sally_port">Fæstningssport</string>
<string name="poi_swing_gate">Svingport</string>
<string name="poi_turnstile">Adgangsmølle</string>
<string name="poi_barrier_entrance">Indgang</string>
<string name="poi_barrier_entrance">Passage i en mur eller et hegn</string>
<string name="poi_entrance_main">Hovedindgang</string>
<string name="poi_entrance">Indgang</string>
<string name="poi_entrance_exit">Udgang</string>
@ -2044,4 +2044,46 @@
<string name="poi_parish">Sognekontor</string>
<string name="poi_publisher">Forlagskontor</string>
</resources>
<string name="poi_debris">Debris</string>
<string name="poi_jersey_barrier">Jersey barriere</string>
<string name="poi_fuel_91ul">91UL brændstof</string>
<string name="poi_fuel_100ll">100LL brændstof</string>
<string name="poi_autogas">Autogas</string>
<string name="poi_jeta1">Jet A-1 brændstof</string>
<string name="poi_fuel_adblue">AdBlue brændstof</string>
<string name="poi_fuel_wood">Brændstof: træ</string>
<string name="poi_fuel_charcoal">Brwændstof: trækul</string>
<string name="poi_fuel_coal">Brændstof: kul</string>
<string name="poi_street_lamp">Gadelampe</string>
<string name="poi_crop_rice">Afgrøde: ris</string>
<string name="poi_crop_grass">Afgrøde: græs</string>
<string name="poi_crop_corn">Afgrøde: majs</string>
<string name="poi_crop_cereal">Afgrøde: korn</string>
<string name="poi_crop_sugarcane">Afgrøde: sukkerrør</string>
<string name="poi_crop_wheat">Afgrøde: hvede</string>
<string name="poi_crop_soy">Afgrøde: soja</string>
<string name="poi_crop_barley">Afgrøde: Byg</string>
<string name="poi_crop_vegetables">Afgrøde: grøntsager</string>
<string name="poi_crop_hop">Afgrøde: humle</string>
<string name="poi_crop_rape">Afgrøde: raps</string>
<string name="poi_crop_beet">Afgrøde: sukkerroer</string>
<string name="poi_crop_lavender">Afgrøde: lavendel</string>
<string name="poi_crop_tea">Afgrøde: te</string>
<string name="poi_crop_coffee">Afgrøde: kaffe</string>
<string name="poi_crop_poultry">Afgrøde: fjerkræ</string>
<string name="poi_crop_sunflower">Afgrøde: solsikke</string>
<string name="poi_crop_raspberry">Afgrøde: hindbær</string>
<string name="poi_crop_tobacco">Afgrøde: tobak</string>
<string name="poi_crop_strawberry">Afgrøde: jordbær</string>
<string name="poi_crop_vegetables_flowers">Afgrøde: grøntsager, blomster</string>
<string name="poi_crop_cassava">Afgrøde: cassava</string>
<string name="poi_crop_cranberry">Afgrøde: tranebær</string>
<string name="poi_crop_asparagus">Afgrøde: asparges</string>
<string name="poi_crop_flowers">Afgrøde: blomster</string>
<string name="poi_escape_lane">Nødstopsspor</string>
</resources>

18
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -846,7 +846,7 @@
<string name="poi_sally_port">Poterna</string>
<string name="poi_swing_gate">Barrera giratoria</string>
<string name="poi_turnstile">Molinete</string>
<string name="poi_barrier_entrance">Entrada</string>
<string name="poi_barrier_entrance">Pasaje hueco en una pared o valla</string>
<string name="poi_entrance_main">Entrada principal</string>
<string name="poi_entrance">Entrada</string>
<string name="poi_entrance_exit">Salida</string>
@ -2020,4 +2020,18 @@
<string name="poi_parish">Oficina parroquial</string>
<string name="poi_publisher">Oficina de editorial</string>
</resources>
<string name="poi_debris">Escombros</string>
<string name="poi_jersey_barrier">Barrera New Jersey</string>
<string name="poi_wetland_palsa_bog">Palsa (humedal)</string>
<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
<string name="poi_autogas">Autogas (Etanol libre de plomo)</string>
<string name="poi_jeta1">Jet A-1 (diésel)</string>
<string name="poi_fuel_adblue">AdBlue</string>
<string name="poi_fuel_wood">Combustible: madera</string>
<string name="poi_fuel_charcoal">Combustible: carbón vegetal</string>
<string name="poi_fuel_coal">Combustible: carbón</string>
<string name="poi_wetland_string_bog">Cadena de humedales</string>
</resources>

187
OsmAnd/res/values-es/phrases.xml
View file

@ -870,7 +870,7 @@
<string name="poi_height_restrictor">Limitador de altura</string>
<string name="poi_swing_gate">Barrera giratoria</string>
<string name="poi_turnstile">Molinete</string>
<string name="poi_barrier_entrance">Entrada</string>
<string name="poi_barrier_entrance">Pasaje en una pared o valla</string>
<string name="poi_entrance_main">Entrada principal</string>
<string name="poi_entrance">Entrada</string>
<string name="poi_entrance_exit">Salida</string>
@ -955,8 +955,8 @@
<string name="poi_facebook">Facebook</string>
<string name="poi_mobile">Celular</string>
<string name="poi_animal_shelter_dog">Refugio canino</string>
<string name="poi_animal_shelter_cat">Refugio para gatos</string>
<string name="poi_animal_shelter_dog_cat">Refugio para perros y gatos</string>
<string name="poi_animal_shelter_cat">Refugio gatuno</string>
<string name="poi_animal_shelter_dog_cat">Refugio canino y gatuno</string>
<string name="poi_animal_shelter_bird">Refugio para aves</string>
<string name="poi_recycling_centre">Tipo: Centro de reciclaje</string>
@ -1641,7 +1641,7 @@
<string name="poi_automated_yes">Automatizado</string>
<string name="poi_automated_no">No automatizado</string>
<string name="poi_full_service_yes">Servicio completo</string>
<string name="poi_aeroway_fuel">Estación de combustible para aviones</string>
<string name="poi_aeroway_fuel">Gasolinera para aviones</string>
<string name="poi_public_bath">Baño público</string>
<string name="poi_male_yes">Masculino</string>
@ -1737,7 +1737,7 @@
<string name="poi_resource_coal">Carbón</string>
<string name="poi_resource_copper">Cobre</string>
<string name="poi_resource_diamond">Diamante</string>
<string name="poi_resource_dimension_stone">Piedra de dimensión</string>
<string name="poi_resource_dimension_stone">Piedras grandes</string>
<string name="poi_resource_dolomite">Dolomita</string>
<string name="poi_resource_gas">Gas</string>
<string name="poi_resource_gold">Oro</string>
@ -1788,7 +1788,7 @@
<string name="poi_wetland_mud">Lodazal</string>
<string name="poi_beach_sand">Playa arenosa</string>
<string name="poi_beach_shingle">Playa con guijarro</string>
<string name="poi_beach_shingle">Playa rocosa</string>
<string name="poi_beach_rocky">Playa rocosa</string>
<string name="poi_chimney">Chimenea</string>
@ -1850,7 +1850,7 @@
<string name="poi_architecture_new_objectivity">Arquitectura: nueva objetividad</string>
<string name="poi_architecture_contemporary">Arquitectura contemporánea</string>
<string name="poi_architecture_constructivism">Arquitectura constructivista</string>
<string name="poi_architecture_umgebinde">Arquitectura: umgebinde</string>
<string name="poi_architecture_umgebinde">Arquitectura alemana</string>
<string name="poi_architecture_timber_frame">Arquitectura de madera</string>
<string name="poi_architecture_art_nouveau">Arquitectura: arte nuevo</string>
<string name="poi_architecture_neoclassicism">Arquitectura neoclasista</string>
@ -1865,4 +1865,177 @@
<string name="poi_architecture_renaissance">Arquitectura renacentista</string>
<string name="poi_architecture_romanesque">Arquitectura románica</string>
<string name="poi_debris">Escombros</string>
<string name="poi_jersey_barrier">Barrera New Jersey</string>
<string name="poi_animal_shelter">Refugio para animales</string>
<string name="poi_memorial_stolperstein">Stolperstein</string>
<string name="poi_memorial_column">Columna</string>
<string name="poi_memorial_stupa">Estupa</string>
<string name="poi_memorial_prasat">Templo piramidal</string>
<string name="poi_wetland_saltern">Salina</string>
<string name="poi_wetland_string_bog">Cadena de humedales</string>
<string name="poi_wetland_palsa_bog">Palsa (humedal)</string>
<string name="poi_tunnel_waterway">Túnel fluvial</string>
<string name="poi_tunnel_car">Túnel vial</string>
<string name="poi_tunnel_pedestrian">Túnel peatonal</string>
<string name="poi_tunnel_railway">Túnel ferroviario</string>
<string name="poi_bridge_car">Puente vial</string>
<string name="poi_bridge_pedestrian">Puente peatonal</string>
<string name="poi_bridge_bicycle">Puente para bicicletas</string>
<string name="poi_bridge_railway">Puente ferroviario</string>
<string name="poi_bridge_waterway">Puente fluvial</string>
<string name="poi_bridge_structure_beam">Estructura del puente: viga</string>
<string name="poi_bridge_structure_simple_suspension">Estructura del puente: suspensión simple</string>
<string name="poi_bridge_structure_suspension">Estructura del puente: suspensión</string>
<string name="poi_bridge_structure_arch">Estructura del puente: arco</string>
<string name="poi_bridge_structure_truss">Estructura del puente: reticulada</string>
<string name="poi_bridge_structure_floating">Estructura del puente: flotante</string>
<string name="poi_bridge_structure_humpback">Estructura del puente: jorobado</string>
<string name="poi_bridge_structure_cable_stayed">Estructura del puente: atirantado</string>
<string name="poi_bridge_structure_boardwalk">Estructura del puente: pasarela</string>
<string name="poi_bridge_structure_simple_wooden">Estructura del puente: de madera simple</string>
<string name="poi_bridge_structure_viaduct">Estructura del puente: viaducto</string>
<string name="poi_bridge_structure_aqueduct">Estructura del puente: acueducto</string>
<string name="poi_bridge_structure_log">Estructura del puente: tronco</string>
<string name="poi_bridge_type_movable">Estructura del puente: móvil</string>
<string name="poi_bridge_movable_bascule">Tipo de puente móvil: báscula</string>
<string name="poi_bridge_movable_swing">Tipo de puente móvil: oscilación</string>
<string name="poi_bridge_movable_lift">Tipo de puente móvil: ascensor</string>
<string name="poi_bridge_movable_drawbridge">Tipo de puente móvil: levadizo</string>
<string name="poi_bridge_movable_submersible">Tipo de puente móvil: sumergible</string>
<string name="poi_bridge_movable_transporter">Tipo de puente móvil: transportador</string>
<string name="poi_bridge_movable_retractable">Tipo de puente móvil: retráctil</string>
<string name="poi_lit_yes">Iluminado</string>
<string name="poi_lit_no">No iluminado</string>
<string name="poi_surface_unpaved">Superficie: sin pavimento</string>
<string name="poi_surface_paved">Superficie: pavimentado</string>
<string name="poi_surface_asphalt">Superficie: asfaltado</string>
<string name="poi_surface_concrete">Superficie: hormigón</string>
<string name="poi_surface_sett">Superficie: intertrabado</string>
<string name="poi_surface_cobblestone">Superficie: empedrado</string>
<string name="poi_surface_paving_stones">Superficie: adoquín prefabricado</string>
<string name="poi_surface_pebblestone">Superficie: empedrado</string>
<string name="poi_surface_stone">Superficie: piedras</string>
<string name="poi_surface_metal">Superficie: metalizado</string>
<string name="poi_surface_wood">Superficie: madera</string>
<string name="poi_surface_gravel">Superficie: ripio</string>
<string name="poi_surface_fine_gravel">Superficie: ripio fino</string>
<string name="poi_surface_compacted">Superficie: compactado</string>
<string name="poi_surface_sand">Superficie: arenoso</string>
<string name="poi_surface_grass">Superficie: césped</string>
<string name="poi_surface_grass_paver">Superficie: césped pavimentado</string>
<string name="poi_surface_ground">Superficie: tierra</string>
<string name="poi_surface_dirt">Superficie: lodoso</string>
<string name="poi_surface_mud">Superficie: sobre hojas</string>
<string name="poi_surface_ice">Superficie: hielo</string>
<string name="poi_surface_salt">Superficie: sal</string>
<string name="poi_surface_snow">Superficie: nieve</string>
<string name="poi_route_bus_ref">Colectivo</string>
<string name="poi_route_share_taxi_ref">Taxi compartido</string>
<string name="poi_route_trolleybus_ref">Trolebús</string>
<string name="poi_route_tram_ref">Tranvía</string>
<string name="poi_route_train_ref">Tren</string>
<string name="poi_route_light_rail_ref">Tren ligero</string>
<string name="poi_route_monorail_ref">Monorriel</string>
<string name="poi_route_funicular_ref">Funicular</string>
<string name="poi_route_ferry_ref">Transbordador</string>
<string name="poi_route_railway_ref">Ruta ferroviaria</string>
<string name="poi_historic_yes">Objeto histórico</string>
<string name="poi_surveillance_yes">Vigilado</string>
<string name="poi_shop_yes">Con negocio</string>
<string name="poi_service_bicycle_retail_yes">Vende bicicletas</string>
<string name="poi_service_bicycle_retail_no">No vende bicicletas</string>
<string name="poi_service_bicycle_repair_yes">Repara bicicletas</string>
<string name="poi_service_bicycle_repair_no">No repara bicicletas</string>
<string name="poi_service_bicycle_rental_yes">Alquila bicicletas</string>
<string name="poi_service_bicycle_rental_no">No alquila bicicletas</string>
<string name="poi_service_bicycle_pump_yes">Infla de bicicletas</string>
<string name="poi_service_bicycle_pump_no">No infla bicicletas</string>
<string name="poi_service_bicycle_diy_yes">Autoservicio de herramientas para bicicletas</string>
<string name="poi_service_bicycle_diy_no">Sin autoservicio de herramientas para bicicletas</string>
<string name="poi_service_bicycle_cleaning_yes">Limpia bicicletas</string>
<string name="poi_service_bicycle_cleaning_no">No limpia bicicletas</string>
<string name="poi_service_bicycle_chaintool_yes">Con herramientas para cadenas de bicicletas</string>
<string name="poi_service_bicycle_chaintool_no">Sin herramientas para cadenas de bicicletas</string>
<string name="poi_service_bicycle_second_hand_yes">Vende bicicletas de segunda mano</string>
<string name="poi_service_bicycle_second_hand_no">No vende bicicletas de segunda mano</string>
<string name="poi_wildlife_hide">Observatorio de vida salvaje</string>
<string name="poi_training_language">Capacitación: idioma</string>
<string name="poi_training_music">Capacitación: música</string>
<string name="poi_training_dance">Capacitación: danza</string>
<string name="poi_training_sport">Capacitación: deportes</string>
<string name="poi_training_art">Capacitación: arte</string>
<string name="poi_training_cooking">Capacitación: cocina</string>
<string name="poi_training_computer">Capacitación: computación</string>
<string name="poi_training_yoga">Capacitación: yoga</string>
<string name="poi_training_martial_art">Capacitación: artes marciales</string>
<string name="poi_training_aviation">Capacitación: aviación</string>
<string name="poi_training_hairdressing">Capacitación: peluquería</string>
<string name="poi_monument_yes">Monumento</string>
<string name="poi_industrial_oil">Tipo: industria petrolera</string>
<string name="poi_industrial_wellsite">Tipo: wellsite</string>
<string name="poi_industrial_factory">Tipo: fábrica</string>
<string name="poi_industrial_gas">Tipo: industria gasífera</string>
<string name="poi_industrial_timber">Tipo: maderera</string>
<string name="poi_industrial_refinery">Tipo: refinería</string>
<string name="poi_industrial_warehouse">Tipo: almacén</string>
<string name="poi_industrial_auto_wrecker">Tipo: vehículo de auxilio</string>
<string name="poi_industrial_agriculture">Tipo: agrícola</string>
<string name="poi_industrial_brewery">Tipo: cervecería</string>
<string name="poi_industrial_brickyard">Tipo: fábrica de ladrillos</string>
<string name="poi_industrial_intermodal_freight_terminal">Tipo: terminal intermodal de mercancías</string>
<string name="poi_industrial_sawmill">Tipo: aserradero</string>
<string name="poi_industrial_water_purification">Tipo: purificación del agua</string>
<string name="poi_industrial_port">Tipo: puerto</string>
<string name="poi_industrial_depot">Tipo: depósito</string>
<string name="poi_note">Nota</string>
<string name="poi_watering_place">Lugar de riego</string>
<string name="poi_animal_boarding">Alojamiento de animales</string>
<string name="poi_animal_boarding_dog">Alojamiento canino</string>
<string name="poi_animal_boarding_cat">Alojamiento gatuno</string>
<string name="poi_animal_boarding_dog_cat">Alojamiento canino y gatuno</string>
<string name="poi_animal_boarding_horse">Alojamiento ecuestre</string>
<string name="poi_historic_aircraft">Avión histórico</string>
<string name="poi_honey">Miel</string>
<string name="poi_elevator_yes">Con ascensor</string>
<string name="poi_elevator_no">Sin ascensor</string>
<string name="poi_technical_monument">Monumento técnico</string>
<string name="poi_office_camping">Oficina del campamento</string>
<string name="poi_model_aerodrome">Aeródromo a escala</string>
<string name="poi_guide">Oficina del guía</string>
<string name="poi_quango">ONG dependiente</string>
<string name="poi_consulting">Oficina de consultoría</string>
<string name="poi_cooperative">Oficina de cooperativa</string>
<string name="poi_office_forestry">Oficina forestal</string>
<string name="poi_logistics">Oficina logística</string>
<string name="poi_parish">Oficina parroquial</string>
<string name="poi_publisher">Oficina de editorial</string>
<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
<string name="poi_autogas">Autogas (etanol libre de plomo)</string>
<string name="poi_jeta1">Jet A-1 (diésel)</string>
<string name="poi_fuel_adblue">AdBlue</string>
<string name="poi_fuel_wood">Combustible: madera</string>
<string name="poi_fuel_charcoal">Combustible: carbón vegetal</string>
<string name="poi_fuel_coal">Combustible: carbón</string>
</resources>

5
OsmAnd/res/values-es/strings.xml
View file

@ -2236,4 +2236,7 @@
<string name="later">Luego</string>
<string name="get_full_version">Obtener versión completa</string>
<string name="downloads">Descargas</string>
</resources>
<string name="favorite_category_dublicate_message">Ya existe ese nombre de categoría. Defina otro nombre.</string>
<string name="favorite_category_name">Nombre de categoría</string>
<string name="favorite_category_add_new_title">Añadir nueva categoría</string>
</resources>

191
OsmAnd/res/values-ru/phrases.xml
View file

@ -780,7 +780,6 @@
<string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
<string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
<string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
<string name="poi_internet_access_service">Доступ в Интернет: сервис</string>
<string name="poi_internet_access_yes">Доступ в Интернет</string>
<string name="poi_internet_access_no">Нет доступа в Интернет</string>
@ -833,6 +832,13 @@
<string name="poi_fuel_diesel">Дизель</string>
<string name="poi_fuel_ethanol">Этанол</string>
<string name="poi_fuel_methanol">Метанол</string>
<string name="poi_fuel_gtl_diesel">Дизель GTL</string>
<string name="poi_fuel_hgv_diesel">Дизель HGV</string>
<string name="poi_fuel_biodiesel">Биодизель</string>
<string name="poi_fuel_lpg">Пропан-бутан (LPG)</string>
<string name="poi_fuel_cng">Метан (CNG)</string>
<string name="poi_fuel_1_25">Смесь 1:25</string>
<string name="poi_fuel_1_50">Смесь 1:50</string>
<string name="poi_photo">Фото магазин</string>
<string name="poi_power">Энергетика</string>
<string name="poi_landuse">Землепользование</string>
@ -1473,7 +1479,6 @@
<string name="poi_brushless_no">Контактная</string>
<string name="poi_car_wash_no">Без автомойки</string>
<string name="poi_aeroway_fuel">Заправочная станция для воздушного транспорта</string>
<string name="poi_public_bath">Общественная баня</string>
<string name="poi_male_yes">Для мужчин</string>
@ -1849,4 +1854,186 @@
<string name="poi_parish">Приход</string>
<string name="poi_publisher">Издательство</string>
<string name="poi_maxheight">Максимальная высота</string>
<string name="poi_maxweight">Максимальный вес</string>
<string name="poi_node_networks">Пешеходные/велосипедные точки маршрутов</string>
<string name="poi_aeroway_fuel">Авиационная заправка</string>
<string name="poi_fuel_91ul">Топливо 91UL</string>
<string name="poi_fuel_100ll">Топливо 100LL</string>
<string name="poi_jeta1">Топливо Jet A-1</string>
<string name="poi_fuel_adblue">Топливо AdBlue</string>
<string name="poi_fuel_wood">Топливо: дрова</string>
<string name="poi_fuel_charcoal">Топливо: древесный уголь</string>
<string name="poi_fuel_coal">Топливо: каменный уголь</string>
<string name="poi_fuel_biogas">Биогаз</string>
<string name="poi_recycling_tetrapak">Упаковки Tetra Pak</string>
<string name="poi_cabin">Хижина</string>
<string name="poi_religion_voodoo">Вуду</string>
<string name="poi_religion_unitarian_universalist">Унитарный универсализм</string>
<string name="poi_religion_multifaith">Многоконфессиональность</string>
<string name="poi_religion_jain">Джайнизм</string>
<string name="poi_religion_scientologist">Саентология</string>
<string name="poi_denomination_united_reformed">Объединенная реформированная церковь</string>
<string name="poi_denomination_nazarene">Назаряне</string>
<string name="poi_denomination_united_methodist">Объединенная методистская церковь</string>
<string name="poi_denomination_congregational">Конгрегационная церковь</string>
<string name="poi_denomination_dutch_reformed">Нидерландская реформатская церковь</string>
<string name="poi_denomination_apostolic">Апостольская церковь</string>
<string name="poi_denomination_latter_day_saints">Движение святых последних дней</string>
<string name="poi_denomination_church_of_christ">Церковь Христа</string>
<string name="poi_denomination_united_church_of_christ">Объединённая Церковь Христа</string>
<string name="poi_denomination_georgian_orthodox">Грузинское православие</string>
<string name="poi_denomination_scientist">Сайентизм</string>
<string name="poi_denomination_romanian_orthodox">Румынское православие</string>
<string name="poi_denomination_ethiopian_orthodox_tewahedo">Эфиопская (Абиссинская) православная церковь</string>
<string name="poi_denomination_unitarian">Унитарианство</string>
<string name="poi_denomination_coptic_orthodox">Коптская православная церковь</string>
<string name="poi_denomination_wesleyan">Веслианская церковь</string>
<string name="poi_denomination_shaktism">Шактизм</string>
<string name="poi_denomination_shingon_shu">Сингон</string>
<string name="poi_denomination_maronite">Маронитская католическая церковь</string>
<string name="poi_denomination_mahayana">Махаяна</string>
<string name="poi_hanami">Ханами</string>
<string name="poi_wiki_place">Википедия</string>
<string name="poi_wiki_lang_en">Английская википедия</string>
<string name="poi_wiki_lang_ar">Арабская википедия</string>
<string name="poi_wiki_lang_be">Белорусская википедия</string>
<string name="poi_wiki_lang_bg">Болгарская википедия</string>
<string name="poi_wiki_lang_ca">Каталонская википедия</string>
<string name="poi_wiki_lang_ceb">Википедия Кебуано</string>
<string name="poi_wiki_lang_cs">Чешская википедия</string>
<string name="poi_wiki_lang_da">Датская википедия</string>
<string name="poi_wiki_lang_de">Немецкая википедия</string>
<string name="poi_wiki_lang_el">Греческая википедия</string>
<string name="poi_wiki_lang_et">Эстонская википедия</string>
<string name="poi_wiki_lang_es">Испанская википедия</string>
<string name="poi_wiki_lang_fi">Финская википедия</string>
<string name="poi_wiki_lang_fr">Французская википедия</string>
<string name="poi_wiki_lang_gl">Галицийская википедия</string>
<string name="poi_wiki_lang_he">Википедия на иврите</string>
<string name="poi_wiki_lang_hi">Википедия на хинди</string>
<string name="poi_wiki_lang_hr">Хорватская википедия</string>
<string name="poi_wiki_lang_ht">Гаитянская википедия</string>
<string name="poi_wiki_lang_hu">Венгерская википедия</string>
<string name="poi_wiki_lang_id">Индонезийская википедия</string>
<string name="poi_wiki_lang_it">Итальянская википедия</string>
<string name="poi_wiki_lang_ja">Японская википедия</string>
<string name="poi_wiki_lang_ko">Корейская википедия</string>
<string name="poi_wiki_lang_lt">Литовская википедия</string>
<string name="poi_wiki_lang_lv">Латвийская википедия</string>
<string name="poi_wiki_lang_ms">Малайская википедия</string>
<string name="poi_wiki_lang_new">Неварская википедия</string>
<string name="poi_wiki_lang_nl">Голландская википедия</string>
<string name="poi_wiki_lang_nn">Википедия на норвежском нюнорске</string>
<string name="poi_wiki_lang_no">Норвежская википедия</string>
<string name="poi_wiki_lang_pl">Польская википедия</string>
<string name="poi_wiki_lang_pt">Португальская википедия</string>
<string name="poi_wiki_lang_ro">Румынская википедия</string>
<string name="poi_wiki_lang_ru">Русская википедия</string>
<string name="poi_wiki_lang_sk">Словацкая википедия</string>
<string name="poi_wiki_lang_sl">Словенская википедия</string>
<string name="poi_wiki_lang_sr">Сербская википедия</string>
<string name="poi_wiki_lang_sv">Шведская википедия</string>
<string name="poi_wiki_lang_sw">Википедия на суахили</string>
<string name="poi_wiki_lang_te">Википедия на телугу</string>
<string name="poi_wiki_lang_th">Тайская википедия</string>
<string name="poi_wiki_lang_tr">Турецкая википедия</string>
<string name="poi_wiki_lang_uk">Украинская википедия</string>
<string name="poi_wiki_lang_vi">Вьетнамская википедия</string>
<string name="poi_wiki_lang_vo">Википедия на волапюк</string>
<string name="poi_wiki_lang_zh">Китайская википедия</string>
<string name="poi_bollard">Столбик</string>
<string name="poi_cycle_barrier">Барьер для велосипедов</string>
<string name="poi_motorcycle_barrier">Мотоциклетный барьер</string>
<string name="poi_block">Блок</string>
<string name="poi_bus_trap">Проезд только для автобусов</string>
<string name="poi_cattle_grid">Металлическая решётка</string>
<string name="poi_full_height_turnstile">Турникет-крестовина в полный рост</string>
<string name="poi_bump_gate">Ворота, открывающиеся бампером</string>
<string name="poi_general_barrier">Барьер</string>
<string name="poi_stile">Ступени через ограду</string>
<string name="poi_height_restrictor">Ограничитель высоты</string>
<string name="poi_horse_stile">Проход только для лошадей с наездником и пешеходов</string>
<string name="poi_sally_port">Проём в толстой стене</string>
<string name="poi_swing_gate">Шлагбаум с горизонтально вращаемой стрелой</string>
<string name="poi_turnstile">Турникет</string>
<string name="poi_kent_carriage_gap">Кентский проезд для карет</string>
<string name="poi_barrier_entrance">Проход в стене или заборе</string>
<string name="poi_debris">Мусор</string>
<string name="poi_jersey_barrier">Барьерное ограждение</string>
<string name="poi_entrance_main">Главный вход</string>
<string name="poi_entrance">Вход</string>
<string name="poi_entrance_exit">Выход</string>
<string name="poi_highway_crossing">Пешеходный переход</string>
<string name="poi_vk">ВКонтакте</string>
<string name="poi_content_silage">Содержимое: силос</string>
<string name="poi_content_water">Содержимое: вода</string>
<string name="poi_content_slurry">Содержимое: взвесь</string>
<string name="poi_content_oil">Содержимое: нефть (масло)</string>
<string name="poi_content_fuel">Содержимое: топливо</string>
<string name="poi_content_manure">Содержимое: навоз</string>
<string name="poi_content_wine">Содержимое: вино</string>
<string name="poi_content_sewage">Содержимое: сточные воды</string>
<string name="poi_content_gas">Содержимое: газ</string>
<string name="poi_content_biomass">Содержимое: биомасса</string>
<string name="poi_content_crop">Содержимое: урожай</string>
<string name="poi_content_fodder">Содержимое: корм</string>
<string name="poi_content_beer">Содержимое: пиво</string>
<string name="poi_content_salt">Содержимое: соль</string>
<string name="poi_content_grain">Содержимое: зерно</string>
<string name="poi_nudism_yes">Нудизм разрешен</string>
<string name="poi_nudism_no">Нудизм запрещён</string>
<string name="poi_nudism_obligatory">Нудизм: обязательно</string>
<string name="poi_nudism_customary">Нудизм: приветствуется</string>
<string name="poi_nudism_permissive">Нудизм: с разрешения</string>
<string name="poi_trade_building_supplies">Строительные материалы</string>
<string name="poi_trade_plumbing">Материалы для водопровода</string>
<string name="poi_trade_wood">Лесоматериалы</string>
<string name="poi_trade_agricultural_supplies">Сельхозпродукция</string>
<string name="poi_trade_tile">Плитка</string>
<string name="poi_garden_type_residential">Тип сада: дворовый</string>
<string name="poi_internet_access_service">Доступ в интернет: служебный</string>
<string name="poi_internet_access_type_service">Тип доступа в интернет: служебный</string>
<string name="poi_street_lamp">Уличный фонарь</string>
<string name="poi_escape_lane">Полоса аварийного торможения</string>
<string name="poi_crop_rice">Выращиваемая культура: рис</string>
<string name="poi_crop_grass">Выращиваемая культура: трава</string>
<string name="poi_crop_corn">Выращиваемая культура: кукуруза</string>
<string name="poi_crop_cereal">Выращиваемая культура: зерновая</string>
<string name="poi_crop_sugarcane">Выращиваемая культура: сахарный тростник</string>
<string name="poi_crop_wheat">Выращиваемая культура: пшеница</string>
<string name="poi_crop_soy">Выращиваемая культура: соя</string>
<string name="poi_crop_barley">Выращиваемая культура: ячмень</string>
<string name="poi_crop_vegetables">Выращиваемая культура: овощи</string>
<string name="poi_crop_hop">Выращиваемая культура: хмель</string>
<string name="poi_crop_rape">Выращиваемая культура: рапс</string>
<string name="poi_crop_beet">Выращиваемая культура: свёкла</string>
<string name="poi_crop_lavender">Выращиваемая культура: лаванда</string>
<string name="poi_crop_tea">Выращиваемая культура: чай</string>
<string name="poi_crop_coffee">Выращиваемая культура: кофе</string>
<string name="poi_crop_poultry">Выращиваемая культура: кормовое растение</string>
<string name="poi_crop_sunflower">Выращиваемая культура: подсолнечник</string>
<string name="poi_crop_raspberry">Выращиваемая культура: малина</string>
<string name="poi_crop_tobacco">Выращиваемая культура: табак</string>
<string name="poi_crop_strawberry">Выращиваемая культура: клубника</string>
<string name="poi_crop_vegetables_flowers">Выращиваемая культура: овощи, цветы</string>
<string name="poi_crop_cassava">Выращиваемая культура: маниока</string>
<string name="poi_crop_cranberry">Выращиваемая культура: клюква</string>
<string name="poi_crop_asparagus">Выращиваемая культура: спаржа</string>
<string name="poi_crop_flowers">Выращиваемая культура: цветы</string>
</resources>

5
OsmAnd/res/values-sv/strings.xml
View file

@ -1595,7 +1595,7 @@
<string name="speak_poi">Närbelägna intresssepunkter</string>
<string name="index_tours">Rundturer</string>
<string name="shared_string_all">Alla</string>
<string name="record_plugin_description">"Denna modul aktiverar funktionen att antingen spela in och spara dina spår genom att du trycker på widgeten GPX-loggning på kartskärmen eller alla dina rutter sparas automatiskt i en GPX-fil.
<string name="record_plugin_description">"Denna modul aktiverar funktionen att antingen spela in och spara dina spår genom att du trycker på widgeten GPX-loggning på kartskärmen eller att alla dina rutter sparas automatiskt i en GPX-fil.
\n\nInspelade spår kan delas ut till vänner eller användas som bidrag till OSM. Idrottsmän kan använda inspelade spår för att följa sin träning. Viss grundläggande spåranalys kan göras direkt i OsmAnd, såsom varvtider, genomsnittshastighet etc och spår kan givetvis också analyseras i efterhand i speciella analysverktyg från tredje part. "</string>
<string name="record_plugin_name">Inspelning av resor</string>
<string name="int_hour">h</string>
@ -2039,4 +2039,7 @@
<string name="activate_srtm_plugin">Aktivera modulen SRTM</string>
<string name="later">Senare</string>
<string name="get_full_version">Köp fullversionen</string>
<string name="favorite_category_dublicate_message">Det angivna kategorinamnet finns redan. Ange ett annat namn.</string>
<string name="favorite_category_name">Kategorinamn</string>
<string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
</resources>

15
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -192,7 +192,7 @@
<string name="poi_fuel_e10">混合配方油 E10</string>
<string name="poi_fuel_e20">混合配方油 E20</string>
<string name="poi_fuel_e85">混合配方油 E85</string>
<string name="poi_fuel_biogas">混合配方油 E85</string>
<string name="poi_fuel_biogas">生物氣體</string>
<string name="poi_fuel_lh2">液態氫</string>
<string name="poi_fuel_electricity">電力</string>
<string name="poi_charging_station">充電站</string>
@ -847,7 +847,7 @@
<string name="poi_swing_gate">搖擺彈門</string>
<string name="poi_turnstile">旋轉門</string>
<string name="poi_kent_carriage_gap">馬車間格柱</string>
<string name="poi_barrier_entrance">入口</string>
<string name="poi_barrier_entrance">在一堵牆或柵欄的出入口</string>
<string name="poi_entrance_main">主入口</string>
<string name="poi_entrance">入口</string>
<string name="poi_entrance_exit">出口</string>
@ -1647,7 +1647,7 @@
<string name="poi_brushless_no">無刷：無</string>
<string name="poi_car_wash_no">洗車：無</string>
<string name="poi_aeroway_fuel">飛機燃料站</string>
<string name="poi_aeroway_fuel">飛機燃油站</string>
<string name="poi_public_bath">公共浴室</string>
<string name="poi_male_yes">男性</string>
@ -1819,4 +1819,13 @@
<string name="poi_shelter_type_tent">遮蔽類型：帳篷</string>
<string name="poi_shelter_type_abandoned">遮蔽類型：已遺棄</string>
<string name="poi_debris">碎瓦礫</string>
<string name="poi_jersey_barrier">紐澤西護欄</string>
<string name="poi_internet_access_type_wlan">網際網路存取類型：wlan</string>
<string name="poi_internet_access_type_terminal">網際網路存取類型：終端機</string>
<string name="poi_internet_access_type_wired">網際網路存取類型：有線網路</string>
<string name="poi_internet_access_type_public">網際網路存取類型：公共網路</string>
<string name="poi_internet_access_type_service">網際網路存取類型：網路服務</string>
<string name="poi_internet_access_type_no">網際網路存取類型：無</string>
</resources>

46
OsmAnd/res/values/phrases.xml
View file

@ -223,7 +223,7 @@
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_biogas">Biogas</string>
<string name="poi_fuel_lh2">Liquid hydrogen</string>
<string name="poi_fuel_electricity">Electricity</string>
<string name="poi_charging_station">Charging station</string>
@ -1044,6 +1044,8 @@
<string name="poi_bump_gate">Bump gate</string>
<string name="poi_general_barrier">General barrier</string>
<string name="poi_stile">Stile</string>
<string name="poi_debris">Debris</string>
<string name="poi_jersey_barrier">Jersey barrier</string>
<string name="poi_height_restrictor">Height restrictor</string>
<string name="poi_horse_stile">Horse stile</string>
<string name="poi_kissing_gate">Kissing gate</string>
@ -1051,7 +1053,7 @@
<string name="poi_swing_gate">Swing gate</string>
<string name="poi_turnstile">Turnstile</string>
<string name="poi_kent_carriage_gap">Kent carriage gap</string>
<string name="poi_barrier_entrance">Entrance</string>
<string name="poi_barrier_entrance">Passage in a wall or a fence</string>
<string name="poi_entrance_main">Main entrance</string>
<string name="poi_entrance">Entrance</string>
<string name="poi_entrance_exit">Exit</string>
@ -1999,4 +2001,44 @@
<string name="poi_parish">Parish office</string>
<string name="poi_publisher">Publishing office</string>
<string name="poi_fuel_91ul">91UL fuel</string>
<string name="poi_fuel_100ll">100LL fuel</string>
<string name="poi_autogas">Autogas</string>
<string name="poi_jeta1">Jet A-1 fuel</string>
<string name="poi_fuel_adblue">AdBlue fuel</string>
<string name="poi_fuel_wood">Fuel: wood</string>
<string name="poi_fuel_charcoal">Fuel: charcoal</string>
<string name="poi_fuel_coal">Fuel: coal</string>
<string name="poi_street_lamp">Street lamp</string>
<string name="poi_escape_lane">Escape lane</string>
<string name="poi_crop_rice">Crop: rice</string>
<string name="poi_crop_grass">Crop: grass</string>
<string name="poi_crop_corn">Crop: corn</string>
<string name="poi_crop_cereal">Crop: cereal</string>
<string name="poi_crop_sugarcane">Crop: sugarcane</string>
<string name="poi_crop_wheat">Crop: wheat</string>
<string name="poi_crop_soy">Crop: soy</string>
<string name="poi_crop_barley">Crop: barley</string>
<string name="poi_crop_vegetables">Crop: vegetables</string>
<string name="poi_crop_hop">Crop: hop</string>
<string name="poi_crop_rape">Crop: rape</string>
<string name="poi_crop_beet">Crop: beet</string>
<string name="poi_crop_lavender">Crop: lavender</string>
<string name="poi_crop_tea">Crop: tea</string>
<string name="poi_crop_coffee">Crop: coffee</string>
<string name="poi_crop_poultry">Crop: poultry</string>
<string name="poi_crop_sunflower">Crop: sunflower</string>
<string name="poi_crop_raspberry">Crop: raspberry</string>
<string name="poi_crop_tobacco">Crop: tobacco</string>
<string name="poi_crop_strawberry">Crop: strawberry</string>
<string name="poi_crop_vegetables_flowers">Crop: vegetables, flowers</string>
<string name="poi_crop_cassava">Crop: cassava</string>
<string name="poi_crop_cranberry">Crop: cranberry</string>
<string name="poi_crop_asparagus">Crop: asparagus</string>
<string name="poi_crop_flowers">Crop: flowers</string>
</resources>

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

@ -10,6 +10,7 @@ import java.util.List;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast;
import net.osmand.data.QuadRect;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager;
@ -24,6 +25,7 @@ import bsh.Interpreter;
import android.database.sqlite.SQLiteDiskIOException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.widget.Toast;
public class SQLiteTileSource implements ITileSource {
@ -44,6 +46,7 @@ public class SQLiteTileSource implements ITileSource {
private int expirationTimeMillis = -1; // never
private boolean isEllipsoid = false;
private String rule = null;
private String referer = null;
static final int tileSize = 256;
private OsmandApplication ctx;
@ -122,6 +125,8 @@ public class SQLiteTileSource implements ITileSource {
}
return (String) bshInterpreter.eval("getTileUrl("+zoom+","+x+","+y+");");
} catch (bsh.EvalError e) {
WDebug.log("getUrlToLoad Error"+e.getMessage());
AccessibleToast.makeText(ctx, e.getMessage(), Toast.LENGTH_LONG).show();
log.error(e.getMessage(), e);
return null;
}
@ -164,6 +169,7 @@ public class SQLiteTileSource implements ITileSource {
protected SQLiteConnection getDatabase(){
if((db == null || db.isClosed()) && file.exists() ){
WDebug.log("Open "+file.getAbsolutePath());
try {
onlyReadonlyAvailable = false;
db = ctx.getSQLiteAPI().openByAbsolutePath(file.getAbsolutePath(), false);
@ -188,6 +194,10 @@ public class SQLiteTileSource implements ITileSource {
if(ruleId != -1) {
rule = cursor.getString(ruleId);
}
int refererId = list.indexOf("referer");
if(refererId != -1) {
referer = cursor.getString(refererId);
}
int tnumbering = list.indexOf("tilenumbering");
if(tnumbering != -1) {
inversiveZoom = "BigPlanet".equalsIgnoreCase(cursor.getString(tnumbering));
@ -442,13 +452,26 @@ public class SQLiteTileSource implements ITileSource {
}
public void closeDB(){
WDebug.log("closeDB");
bshInterpreter = null;
if(timeSupported)
clearOld();
if(db != null){
db.close();
db = null;
}
}
public void clearOld() {
SQLiteConnection db = getDatabase();
if(db == null || db.isReadOnly()){
return;
}
WDebug.log("DELETE FROM tiles WHERE time<"+(System.currentTimeMillis()-getExpirationTimeMillis()));
db.execSQL("DELETE FROM tiles WHERE time<"+(System.currentTimeMillis()-getExpirationTimeMillis())); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
db.execSQL("VACUUM"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
}
@Override
public boolean couldBeDownloadedFromInternet() {
if(getDatabase() == null || getDatabase().isReadOnly() || onlyReadonlyAvailable){
@ -474,6 +497,9 @@ public class SQLiteTileSource implements ITileSource {
return expirationTimeMillis;
}
public String getReferer() {
return referer;
}
}

9
OsmAnd/src/net/osmand/plus/resources/AsyncLoadingThread.java
View file

@ -170,6 +170,15 @@ public class AsyncLoadingThread extends Thread {
this.tileId = tileId;
}
public TileLoadDownloadRequest(File dirWithTiles, String url, File fileToSave, String tileId, ITileSource source, int tileX,
int tileY, int zoom, String referer) {
super(url, fileToSave, tileX, tileY, zoom);
this.dirWithTiles = dirWithTiles;
this.tileSource = source;
this.tileId = tileId;
this.referer = referer;
}
public void saveTile(InputStream inputStream) throws IOException {
if(tileSource instanceof SQLiteTileSource){
ByteArrayOutputStream stream = null;

2
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -323,7 +323,7 @@ public class ResourceManager {
}
}
TileLoadDownloadRequest req = new TileLoadDownloadRequest(dirWithTiles, url, toSave,
tileId, map, x, y, zoom);
tileId, map, x, y, zoom, map.getReferer());
if(sync){
return getRequestedImageTile(req);
} else {