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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-01-15 09:34:30 +01:00
commit 285e051e00
8 changed files with 50 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-cs/strings.xml
View file

@ -1131,7 +1131,7 @@
\n\t* Modul měření vzdálenosti\n\t* Modul zvykové poznámky\n\t* Modul vrstevnice\n\t* Opravení chyb\n\t* Nový styl mapy \'Touring view\' s více mapovými detaily, novými styly vykreslování silnic, větším kontrastem a možností horské turistiky (značení SAC)\n\t* Korekce výpočtu výšky EGM96 "</string>
<string name="recording_unavailable">nedostupné</string>
<string name="layer_recordings">Audio/video nahrávky</string>
<string name="recording_description">Nahrávka %1$s %2$s na %3$s</string>
<string name="recording_description">Nahrávka %1$s %3$s %2$s</string>
<string name="recording_default_name">nahrávám</string>
<string name="osmand_srtm_short_description_80_chars">OsmAnd modul pro offline zobrazování vrstevnic</string>
@ -1148,7 +1148,7 @@
<string name="stop_routing_confirm">Opravdu chcete zastavit navigaci?</string>
<string name="clear_dest_confirm">Opravdu chcete smazat cíl?</string>
<string name="recording_context_menu_show">Zobrazit</string>
<string name="recording_photo_description">Foto %1$s v %2$s</string>
<string name="recording_photo_description">Foto %1$s %2$s</string>
<string name="av_def_action_picture">Vyfotit</string>
<string name="recording_context_menu_precord">Vyfotit</string>
<string name="local_indexes_cat_av">Zvuková a video data</string>

38
OsmAnd/res/values-nl/phrases.xml
View file

@ -173,7 +173,7 @@
<string name="poi_kindergarten">Kleuterschool</string>
<string name="poi_university">Universiteit</string>
<string name="poi_college">College</string>
<string name="poi_college">Hogeschool</string>
<string name="poi_prison">Gevangenis</string>
<string name="poi_embassy">Ambassade</string>
<string name="poi_government">Regering</string>
@ -438,4 +438,40 @@
<string name="poi_power_substation">Onderstation</string>
<string name="poi_power_transformer">Transformator</string>
<string name="poi_aerialway_station">Kabelbaanstation</string>
<string name="poi_recycling">Recyclage</string>
<string name="poi_landfill">Stortplaats</string>
<string name="poi_surveillance">Bewaking</string>
<string name="poi_works">Fabriek</string>
<string name="poi_construction">Werken</string>
<string name="poi_mineshaft">Mijnschacht</string>
<string name="poi_petroleum_well">Oliebron</string>
<string name="poi_windmill">Windmolen</string>
<string name="poi_salt_pond">Zoutwinning</string>
<string name="poi_driving_school">Rijschool</string>
<string name="poi_courthouse">Gerechtsgebouw</string>
<string name="poi_healthcare_alternative">Alternatieve geneeskunde</string>
<string name="poi_healthcare_centre">Gezondheidscentrum</string>
<string name="poi_midwife">Vroedvrouw</string>
<string name="poi_occupational_therapist">Ergotherapeut</string>
<string name="poi_healthcare_rehabilitation">Revalidatie</string>
<string name="poi_sports_centre">Sportcentrum</string>
<string name="poi_golf_course">Golfbaan</string>
<string name="poi_ice_rink">Schaatsbaan</string>
<string name="poi_running_track">Looppiste</string>
<string name="poi_bicycle_track">Fietspiste</string>
<string name="poi_archery">Boogschieten</string>
<string name="poi_athletics">Athletiek</string>
<string name="poi_basketball">Basketbal</string>
<string name="poi_chess">Schaak</string>
<string name="poi_climbing">Klimmen</string>
<string name="poi_cricket">Cricket</string>
<string name="poi_cycling">Fietsen</string>
<string name="poi_diving">Duiken</string>
<string name="poi_dog_racing">Hondenrennen</string>
<string name="poi_golf">Golf</string>
<string name="poi_gymnastics">Turnen</string>
<string name="poi_handball">Handbal</string>
<string name="poi_horse_racing">Paardenrennen</string>
<string name="poi_ice_skating">Ijsschaatsen</string>
</resources>

4
OsmAnd/res/values-pl/strings.xml
View file

@ -1136,7 +1136,7 @@
<string name="recording_can_not_be_played">Nagranie nie może zostać odtworzone</string>
<string name="recording_context_menu_delete">Usuń nagranie</string>
<string name="recording_context_menu_play">Odtwórz</string>
<string name="recording_description">Nagranie %1$s %2$s w %3$s</string>
<string name="recording_description">Nagranie %1$s %3$s %2$s</string>
<string name="recording_default_name">nagranie</string>
<string name="av_control_stop">Stop</string>
<string name="av_control_start">Start</string>
@ -1155,7 +1155,7 @@
<string name="recording_context_menu_vrecord">Nagraj notatkę wideo</string>
<string name="osmand_srtm_long_description_1000_chars">Ta wtyczka dostarcza poziomice, które mogą być wyświetlane na mapach offline w OsmAnd. Światowe dane (między 70 stopniem szerokości północnej a 70 stopniem szerokości południowej) opierają się na pomiarach SRTM (Shuttle Radar Topography Mission) i ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), przyrządu na pokładzie Terra, flagowego satelity Systemu Obserwacji Ziemi NASA. ASTER jest wspólnym przedsięwzięciem NASA, japońskiego Ministerstwa Gospodarki, Handlu i Przemysłu (METI) i Japońskich Systemów Kosmicznych (J-spacesystems).</string>
<string name="recording_context_menu_show">Pokaż</string>
<string name="recording_photo_description">Zdjęcie %1$s w %2$s</string>
<string name="recording_photo_description">Zdjęcie %1$s %2$s</string>
<string name="av_def_action_picture">Zrób zdjęcie</string>
<string name="recording_context_menu_precord">Zrób zdjęcie</string>
<string name="stop_routing_confirm">Czy na pewno chcesz zatrzymać nawigację?</string>

4
OsmAnd/res/values-sc/strings.xml
View file

@ -341,7 +341,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="precise_routing_mode_descr">Abìlita pro calculare àndalas pretzisas sena attoppos. Est lentu e limitadu in sa distantzia.</string>
<string name="precise_routing_mode">Calculu pretzisu de s\'àndala (alfa)</string>
<string name="recording_context_menu_show">Ammustra</string>
<string name="recording_photo_description">Foto %1$s a %2$s</string>
<string name="recording_photo_description">Foto %1$s %2$s</string>
<string name="av_def_action_picture">Iscata una foto</string>
<string name="recording_context_menu_precord">Iscata una foto</string>
<string name="av_use_external_camera_descr">Imprea s\'aplicu de sistema pro sas fotos</string>
@ -383,7 +383,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="recording_can_not_be_played">Sa registratzione non podet èssere reprodota</string>
<string name="recording_context_menu_delete">Burra sa registratzione</string>
<string name="recording_context_menu_play">Reprodui</string>
<string name="recording_description">Registratzione %1$s %2$s de %3$s</string>
<string name="recording_description">Registratzione %1$s %3$s %2$s</string>
<string name="recording_default_name">registratzione</string>
<string name="av_control_stop">Stop</string>
<string name="av_control_start">Avia/Inghitza</string>

4
OsmAnd/res/values-sk/strings.xml
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s zachytená dňa %2$s</string>
<string name="recording_photo_description">Fotografia %1$s %2$s</string>
<string name="av_def_action_picture">Zachytiť fotografiu</string>
<string name="recording_context_menu_precord">Zachytiť fotografiu</string>
<string name="enable_plugin_monitoring_services">Na použitie služieb pre záznam pozície zapnite monitorovacie zásuvné moduly (stopovanie, stopovanie naživo)</string>
@ -1157,7 +1157,7 @@
<string name="recording_can_not_be_played">Nahrávanie nemôže byť prehrané</string>
<string name="recording_context_menu_delete">Odstrániť záznam</string>
<string name="recording_context_menu_play">Prehrať</string>
<string name="recording_description">Záznam %1$s %2$s v %3$s</string>
<string name="recording_description">Záznam %1$s %2$s %3$s</string>
<string name="recording_default_name">nahrávka</string>
<string name="av_control_stop">Zastaviť</string>
<string name="av_control_start">Nahrať</string>

6
OsmAnd/src/net/osmand/plus/activities/search/SearchCityByNameActivity.java
View file

@ -45,7 +45,7 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
public void onClick(View v) {
searchVillagesMode = 1;
research();
searchVillages.setVisibility(View.GONE);
//searchVillages.setVisibility(View.GONE);
}
});
getListView().addFooterView(ll);
@ -58,7 +58,7 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
final StringMatcherMode startsWith = CollatorStringMatcher.StringMatcherMode.CHECK_ONLY_STARTS_WITH;
return new CityComparator(startsWith, en);
}
@Override
public AsyncTask<Object, ?, ?> getInitializeTask() {
return new AsyncTask<Object, City, List<City>>(){
@ -173,7 +173,7 @@ public class SearchCityByNameActivity extends SearchByNameAbstractActivity<City>
@Override
public void itemSelected(City obj) {
settings.setLastSearchedCity(obj.getId(), obj.getName(region.useEnglishNames()), obj.getLocation());
// Hardy: Looks like disabling this fixes the issue of the Search City dialogue becoming non-functional after the first tapping on a found village (not city) ... (while selected village is still remembered on the dialog for future reference!)
// Hardy: Looks like disabling the next 3 lines fixes the issue of the Search City dialogue becoming non-functional after the first tapping on a found village (not city) ... (while selected village is still remembered on the dialog for future reference!)
//if (region.getCityById(obj.getId(), obj.getName(region.useEnglishNames())) == null) {
// region.addCityToPreloadedList((City) obj);
//}

2
OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
View file

@ -214,7 +214,7 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
@Override
public void itemSelected(Street obj) {
if(!Algorithms.objectEquals(settings.getLastSearchedCity(), obj.getCity().getId())) {
settings.setLastSearchedCity(obj.getCity().getId(), obj.getCity().getName(), obj.getLocation());
settings.setLastSearchedCity(obj.getCity().getId(), obj.getCity().getName(region.useEnglishNames()), obj.getLocation());
}
settings.setLastSearchedStreet(obj.getName(region.useEnglishNames()), obj.getLocation());
// if(obj.getBuildings().size() == 0){

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

@ -129,6 +129,7 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public synchronized void preloadStreets(City o, ResultMatcher<Street> resultMatcher) {
//TODO: Check NPE, looks like o can be null here, question is why
Collection<Street> streets = o.getStreets();
if(!streets.isEmpty()){
return;
@ -138,7 +139,6 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
} catch (IOException e) {
log.error("Disk operation failed" , e); //$NON-NLS-1$
}
}
// // not use ccontains It is really slow, takes about 10 times more than other steps