Skip to content

Commit

Permalink
Merge branch 'osmandapp:master' into hardy_Afa
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonora
sonora authored Dec 9, 2024
2 parents 11c0db7 + 05c2033 commit f091e16
Show file tree
Hide file tree
Showing 46 changed files with 1,098 additions and 962 deletions.
6 changes: 6 additions & 0 deletions OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import gnu.trove.list.array.TIntArrayList;
import gnu.trove.map.hash.TLongObjectHashMap;

import net.osmand.PlatformUtil;
import net.osmand.data.LatLon;
import net.osmand.data.QuadRect;
import net.osmand.data.TransportRoute;
Expand All @@ -22,13 +23,16 @@
import net.osmand.osm.edit.Way;
import net.osmand.util.MapUtils;

import org.apache.commons.logging.Log;

public class TransportRoutePlanner {

private static final boolean MEASURE_TIME = false;

private static final int MIN_DIST_STOP_TO_GEOMETRY = 150;
public static final long GEOMETRY_WAY_ID = -1;
public static final long STOPS_WAY_ID = -2;
private final static Log LOG = PlatformUtil.getLog(TransportRoutePlanner.class);

public List<TransportRouteResult> buildRoute(TransportRoutingContext ctx, LatLon start, LatLon end) throws IOException, InterruptedException {
ctx.startCalcTime = System.currentTimeMillis();
Expand All @@ -41,6 +45,7 @@ public List<TransportRouteResult> buildRoute(TransportRoutingContext ctx, LatLon
endSegments.put(s.getId(), s);
}
if(startStops.size() == 0) {
LOG.info("Public transport. Start stop is empty");
return Collections.emptyList();
}
PriorityQueue<TransportRouteSegment> queue = new PriorityQueue<TransportRouteSegment>(startStops.size(), new SegmentsComparator(ctx));
Expand Down Expand Up @@ -581,6 +586,7 @@ public static List<TransportRouteResult> convertToTransportRoutingResult(NativeT
TLongObjectHashMap<TransportStop> convertedStopsCache = new TLongObjectHashMap<>();

if (res.length == 0) {
LOG.info("Public transport. No route found");
return new ArrayList<TransportRouteResult>();
}
List<TransportRouteResult> convertedRes = new ArrayList<TransportRouteResult>();
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5576,7 +5576,7 @@
<string name="quick_action_showhide_osm_edits_descr">Schaltfläche zum Ein- und Ausblenden von lokalen OSM-Bearbeitungen auf der Karte.</string>
<string name="rendering_attr_showDirtbikeTrails_name">Dirtbike-Strecken</string>
<string name="liter_per_hour">l/h</string>
<string name="release_4_9">• Vollbild-Galerie-Viewer für Wikimedia-Bilder hinzugefügt\n\n • Neue Erweiterung „Fahrzeugdaten“ zur Überwachung der Fahrzeugleistung unter Verwendung des OBD-II-Protokolls eingeführt\n\n • Möglichkeit hinzugefügt, Aktivitäten zu Tracks zuzuordnen und sie entsprechend zu filtern\n\n • Neue Schnellaktionen für die Aufzeichnung von Fahrten und die Touchscreen-Sperre implementiert\n\n • Anpassbare Kartenschaltfläche und präzises Raster eingeführt\n\n • Kontextmenü und Aktion „Durchschnittsgeschwindigkeit zurücksetzen“ zu Widgets hinzugefügt\n\n • Neue Routenebene „Dirtbike-Strecken“ hinzugefügt\n\n • „Automatische Aufzeichnung des Tracks während der Navigation“ korrigiert\n\n • Problem mit umgedrehten Koordinaten in RTL behoben\n\n • Fehlende Sensordaten für die aktuell aufgezeichnete Strecke behoben\n\n • Informationen über die Umgebung des ausgewählten Punktes hinzugefügt\n\n • Schnellaktion zur Kontrolle der Sichtbarkeit von OSM-Bearbeitungen hinzugefügt\n\n • Sichtbarkeitsparameter für die Terrain-Einfärbungsoptionen separiert\n\n • Antippbares Symbol hinzugefügt, um Zufahrtswege oder andere Straßen- oder Pfadattribute anzuzeigen</string>
<string name="release_4_9">• Vollbild-Galerie-Viewer für Wikimedia-Bilder hinzugefügt\n\n • Neue Erweiterung „Fahrzeugdaten“ zur Überwachung der Fahrzeugleistung unter Verwendung des OBD-II-Protokolls eingeführt\n\n • Möglichkeit hinzugefügt, Aktivitäten Tracks zuordnen und sie entsprechend filtern\n\n • Neue Schnellaktionen für die Aufzeichnung von Fahrten und die Touchscreen-Sperre implementiert\n\n • Anpassbare Kartenschaltfläche und präzises Raster eingeführt\n\n • Kontextmenü und Aktion „Durchschnittsgeschwindigkeit zurücksetzen“ zu Widgets hinzugefügt\n\n • Neue Routenebene „Dirtbike-Strecken“ hinzugefügt\n\n • „Automatische Aufzeichnung des Tracks während der Navigation“ korrigiert\n\n • Problem mit umgedrehten Koordinaten in RTL behoben\n\n • Fehlende Sensordaten für die aktuell aufgezeichnete Strecke behoben\n\n • Informationen über die Umgebung des ausgewählten Punktes hinzugefügt\n\n • Schnellaktion zur Kontrolle der Sichtbarkeit von OSM-Bearbeitungen hinzugefügt\n\n • Sichtbarkeitsparameter für die Terrain-Einfärbungsoptionen separiert\n\n • Antippbares Symbol hinzugefügt, um Zufahrtswege oder andere Straßen- oder Pfadattribute anzuzeigen</string>
<string name="screen_is_locked_by_external_button">Der Touchscreen ist gesperrt. Um die Sperre aufzuheben, drücken Sie die Taste %1$s oder tippen Sie auf die Schaltfläche auf dem Bildschirm.</string>
<string name="screen_is_unlocked">Der Touchscreen ist entsperrt.</string>
<string name="screen_is_locked_by_action_button">Der Touchscreen ist gesperrt. Tippen Sie zum Entsperren auf die Schaltfläche.</string>
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd/res/values-eo/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5588,7 +5588,7 @@
<string name="imperial_gallons">Britaj galjonoj</string>
<string name="us_gallons">Usonaj galjonoj</string>
<string name="unit_of_volume_description">Elektata mezurunuo estos aplikita al ĉiuj volumen-rilataj datumoj en la elektita profilo.</string>
<string name="unit_of_volume">Mezurunuo de volumeno</string>
<string name="unit_of_volume">Unuo de volumeno</string>
<string name="dynamic_icon_type_summary">Bildsimbolo ŝanĝiĝas laŭ stato de ago.</string>
<string name="shared_string_dynamic">Dinamika</string>
<string name="obd_connected_to_device">Konektita kun %s</string>
Expand Down
159 changes: 149 additions & 10 deletions OsmAnd/res/values-hr/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@
<string name="poi_climbing">Penjanje</string>
<string name="poi_cycling">Biciklizam</string>
<string name="poi_diving">Ronjenje</string>
<string name="poi_dog_racing">Trka pasa</string>
<string name="poi_dog_racing">Utrka pasa</string>
<string name="poi_equestrian">Konjički sport</string>
<string name="poi_field_hockey">Hokej</string>
<string name="poi_field_hockey">Hokej na travi</string>
<string name="poi_ice_skating">Klizanje na ledu</string>
<string name="poi_sport_motor">Motorni sport</string>
<string name="poi_sport_motor">Motoristički sport</string>
<string name="poi_orienteering">Orijentiranje</string>
<string name="poi_sailing">Jedrenje</string>
<string name="poi_skating">Klizanje</string>
Expand Down Expand Up @@ -612,7 +612,7 @@
<string name="poi_nudism_yes">Dozvoljeno</string>
<string name="poi_population">Stanovništvo</string>
<string name="poi_parking_underground">Podzemno</string>
<string name="poi_bicycle_parking_anchors">Sidro</string>
<string name="poi_bicycle_parking_anchors">Pričvršćeni stalak</string>
<string name="poi_bicycle_parking_rack">Ormar</string>
<string name="poi_bicycle_parking_informal">Neformalno</string>
<string name="poi_leaf_type_mixed">Miješano</string>
Expand Down Expand Up @@ -910,17 +910,17 @@
<string name="poi_healthcare_speciality_dermatology">Dermatologija</string>
<string name="poi_healthcare_speciality_urology">Urologija</string>
<string name="poi_healthcare_speciality_radiotherapy">Radioterapija</string>
<string name="poi_healthcare_speciality_biology">Kliniška biologija</string>
<string name="poi_healthcare_speciality_biology">Klinička biologija</string>
<string name="poi_healthcare_speciality_anaesthetics">Anesteziologija</string>
<string name="poi_healthcare_speciality_diagnostic_radiology">Radiološko dijagnosticiranje</string>
<string name="poi_healthcare_speciality_stomatology">Zubar</string>
<string name="poi_healthcare_speciality_nuclear">Nuklearna medicina</string>
<string name="poi_healthcare_speciality_oncology">Onkologija</string>
<string name="poi_healthcare_speciality_optometry">Optometrija</string>
<string name="poi_healthcare_speciality_clinical_pathology">Kliniška patologija</string>
<string name="poi_healthcare_speciality_clinical_pathology">Klinička patologija</string>
<string name="poi_healthcare_speciality_sports">Sportska medicina</string>
<string name="poi_healthcare_speciality_chiropractic">Kiropraktika</string>
<string name="poi_healthcare_speciality_behavior">Ponašanje</string>
<string name="poi_healthcare_speciality_behavior">Bihevioralna terapija</string>
<string name="poi_healthcare_speciality_palliative_medicine">Paliativna medicina</string>
<string name="poi_building_type_pyramid">Vrsta zgrade: piramida</string>
<string name="poi_fitness">Fitnes</string>
Expand Down Expand Up @@ -1199,11 +1199,11 @@
<string name="poi_direction_entrance">Smjer: ulaz</string>
<string name="poi_direction_exit">Smjer: izlaz</string>
<string name="poi_direction_all">Smjer: svi</string>
<string name="poi_reservation_required">Rezervacija: obavezno</string>
<string name="poi_reservation_recommended">Rezervacija: preporučeno</string>
<string name="poi_reservation_required">Obavezno</string>
<string name="poi_reservation_recommended">Preporučeno</string>
<string name="poi_reservation_yes">Da</string>
<string name="poi_reservation_no">Ne</string>
<string name="poi_reservation_members_only">Rezervacija: samo članovi</string>
<string name="poi_reservation_members_only">Samo za članove</string>
<string name="poi_beds">Kreveti</string>
<string name="poi_network">Mreža</string>
<string name="poi_government_archive">Arhiv</string>
Expand Down Expand Up @@ -1747,4 +1747,143 @@
<string name="poi_estate_agent">Agent za nekretnine</string>
<string name="poi_lawyer">Odvjetnik</string>
<string name="poi_healthcare_speciality_orthodontics">Ortodoncija</string>
<string name="poi_rowing">Veslanje</string>
<string name="poi_religion_sikh">Sikhi</string>
<string name="poi_religion_tenrikyo">Tenrikyo</string>
<string name="poi_lean_to">Nadstrešnica;Sklonište</string>
<string name="poi_denomination_anglican">Anglikan</string>
<string name="poi_denomination_evangelical">Evanđelist</string>
<string name="poi_denomination_church_of_scotland">Škotska crkva</string>
<string name="poi_denomination_salvation_army">Vojska spasa</string>
<string name="poi_denomination_episcopal">Episkopalizam</string>
<string name="poi_denomination_united_reformed">Reformirani unitarizam</string>
<string name="poi_denomination_church_of_england">Engleska crkva</string>
<string name="poi_healthcare_speciality_depth">Dubinska psihologija</string>
<string name="poi_historic_ruins">Povijesne ruševine</string>
<string name="poi_attraction_carousel">Vrtuljak</string>
<string name="poi_attraction_big_wheel">Panoramski kotač</string>
<string name="poi_clothes_maternity">Majčinstvo</string>
<string name="poi_aerialway_transport">Prijevoz žičarom</string>
<string name="poi_cricket">Kriket</string>
<string name="poi_horse_racing">Utrka konja</string>
<string name="poi_ice_stock">Bavarski curling</string>
<string name="poi_paragliding">Paragliding</string>
<string name="poi_shooting">Streljaštvo</string>
<string name="poi_skateboard">Skateboard</string>
<string name="poi_historic_tank">Povijesni tenk</string>
<string name="poi_monument">Spomenik</string>
<string name="poi_photo_booth">Foto kabina</string>
<string name="poi_attraction_swing_carousel">Luljački vrtuljak</string>
<string name="poi_alpine_hut">Planinska koliba;Sklonište</string>
<string name="poi_attraction_train">Vlak (atrakcija)</string>
<string name="poi_chalet">Planinska kuća;Sklonište</string>
<string name="poi_religion_hindu">Hinduizam</string>
<string name="poi_religion_voodoo">Vudu</string>
<string name="poi_religion_jain">Džainizam</string>
<string name="poi_religion_unitarian_universalist">Unitaristički univerzalizam</string>
<string name="poi_religion_multifaith">Viševjerstvo</string>
<string name="poi_religion_bahai">Bahaizam</string>
<string name="poi_religion_scientologist">Scijentologija</string>
<string name="poi_religion_pagan">Paganizam</string>
<string name="poi_denomination_baptist">Baptist</string>
<string name="poi_denomination_roman_catholic">Rimokatolicizam</string>
<string name="poi_denomination_catholic">Katolicizam</string>
<string name="poi_denomination_pentecostal">Pentekostalac</string>
<string name="poi_denomination_mormon">Mormon</string>
<string name="poi_denomination_greek_orthodox">Grčki pravoslavac</string>
<string name="poi_denomination_mennonite">Menoniti</string>
<string name="poi_denomination_georgian_orthodox">Gruzijsko pravoslavlje</string>
<string name="poi_bollard">Stupić</string>
<string name="poi_healthcare_speciality_pulmonology">Pulmologija</string>
<string name="poi_healthcare_speciality_dental_oral_maxillo_facial_surgery">Zubna, oralna i maksilofacijalna kirurgija</string>
<string name="poi_healthcare_speciality_occupational">Ergoterapija</string>
<string name="poi_healthcare_speciality_nephrology">Nefrologija (bolesti bubrega)</string>
<string name="poi_parking_garage_boxes">Garažni ormari</string>
<string name="poi_parking_carports">Natkrivene garaže</string>
<string name="poi_fire_hydrant_position_lane">Traka</string>
<string name="poi_in_service_yes">U upotrebi: da</string>
<string name="poi_healthcare_speciality_physiatry">Fizijatrija</string>
<string name="poi_healthcare_speciality_maxillofacial_surgery">Maksilofacijalna kirurgija</string>
<string name="poi_healthcare_speciality_tropical_medicine">Tropska medicina</string>
<string name="poi_health_specialty_tropical_medicine_no">Specijalizacija: tropska medicina: ne</string>
<string name="poi_attraction_water_slide">Vodeni tobogan</string>
<string name="poi_religion_spiritualist">Spiritualizam</string>
<string name="poi_denomination_jehovahs_witness">Jehovini svjedoci</string>
<string name="poi_denomination_bulgarian_orthodox">Bugarsko pravoslavlje</string>
<string name="poi_denomination_romanian_orthodox">Rumunjsko pravoslavlje</string>
<string name="poi_ref_post">Poštanski broj</string>
<string name="poi_us_maps_recreation_area_activity_scuba_diving">Ronjenje s bocom</string>
<string name="poi_bicycle_transport">Prijevoz bicikla</string>
<string name="poi_attraction_animal">Životinja (atrakcija)</string>
<string name="poi_religion_muslim">Islam</string>
<string name="poi_religion_zoroastrian">Zoroastrizam</string>
<string name="poi_denomination_sunni">Sunit</string>
<string name="poi_religion_jewish">Judaizam</string>
<string name="poi_denomination_methodist">Metodist</string>
<string name="poi_denomination_new_apostolic">Novo apostolstvo</string>
<string name="poi_parking_multi_storey">Višekatno</string>
<string name="poi_healthcare_speciality_addiction">Lijekovi za liječenje ovisnosti</string>
<string name="poi_healthcare_speciality_naturopathy">Naturopatija</string>
<string name="poi_fire_hydrant_position_parking_lot">Parkiralište</string>
<string name="poi_fire_hydrant_position_sidewalk">Trotoar</string>
<string name="poi_museum">Muzej</string>
<string name="poi_memorial">Spomenik</string>
<string name="poi_theme_park">Zabavni park</string>
<string name="poi_gaelic_games">Galske igre</string>
<string name="poi_denomination_russian_orthodox">Rusko pravoslavlje</string>
<string name="poi_fountain">Zdenac</string>
<string name="poi_health_specialty_emergency_medicine_no">Specijalizacija: nesreća i hitna medicina: ne</string>
<string name="poi_denomination_united">Unitarizam</string>
<string name="poi_surfing">Surfing</string>
<string name="poi_table_tennis">Stolni tenis</string>
<string name="poi_attraction_summer_toboggan">Ljetni tobogan</string>
<string name="poi_place_of_worship">Mjesto bogoslužja</string>
<string name="poi_religion_christian">Kršćanstvo</string>
<string name="poi_denomination_presbyterian">Prezbiterijanac</string>
<string name="poi_bicycle_parking_stands">Stalak</string>
<string name="poi_bicycle_parking_shed">Šupa</string>
<string name="poi_bicycle_parking_bollard">Stupić</string>
<string name="poi_healthcare_speciality_social_paediatrics">Socijalna pedijatrija</string>
<string name="poi_activities_running">Trčanje</string>
<string name="poi_activities_snowmobile">Motorne sanjke</string>
<string name="poi_camp_site_basic">Osnovno</string>
<string name="poi_camp_site_standard">Standardno</string>
<string name="poi_historic_ship">Povijesni brod</string>
<string name="poi_historic_mine">Povijesni rudnik</string>
<string name="poi_hunting_lodge">Lovački dom;Sklonište</string>
<string name="poi_denomination_lutheran">Luteran</string>
<string name="poi_healthcare_speciality_maternity">Majčinstvo</string>
<string name="poi_healthcare_speciality_emergency">Nesreća i hitna medicina</string>
<string name="poi_toboggan">Tobogan</string>
<string name="poi_denomination_shia">Šijizam</string>
<string name="poi_denomination_greek_catholic">Grkokatoličanstvo</string>
<string name="poi_health_specialty_social_paediatrics_no">Specijalizacija: socijalna pedijatrija: ne</string>
<string name="poi_battlefield">Bojno polje</string>
<string name="poi_us_maps_recreation_area_activity_ice_skating">Klizanje na ledu</string>
<string name="poi_croquet">Kroket</string>
<string name="poi_healthcare_speciality_manual_therapy">Ručna terapija</string>
<string name="poi_stands">Stalak</string>
<string name="poi_fort">Utvrda</string>
<string name="poi_tourism_yes">Turistički objekt</string>
<string name="poi_attraction_amusement_ride">Zabavna vožnja</string>
<string name="poi_cabin">Koliba;Sklonište</string>
<string name="poi_wilderness_hut">Koliba u divljini;Sklonište</string>
<string name="poi_religion_shinto">Šintoizam</string>
<string name="poi_religion_taoist">Taoizam</string>
<string name="poi_denomination_seventh_day_adventist">Adventist sedmoga dana</string>
<string name="poi_denomination_serbian_orthodox">Srpsko pravoslavlje</string>
<string name="poi_motorcycle_barrier">Motociklistička prepreka</string>
<string name="poi_bicycle_parking_building">Posebna zgrada</string>
<string name="poi_fitness_centre">Fitness centar</string>
<string name="poi_dojo">Dojo</string>
<string name="poi_us_maps_recreation_area_activity_swimming">Plivanje</string>
<string name="poi_scuba_diving">Ronjenje s bocom</string>
<string name="poi_attraction_roller_coaster">Vlak smrti</string>
<string name="poi_boundary_stone">Granični kamen</string>
<string name="poi_denomination_protestant">Protestant</string>
<string name="poi_korfbal">Korfball</string>
<string name="poi_free_flying_paragliding_yes">Paragliding</string>
<string name="poi_denomination_orthodox">Pravoslavlje</string>
<string name="poi_denomination_reformed">Reformist</string>
<string name="poi_denomination_iglesia_ni_cristo">Crkva krista</string>
</resources>
Loading

0 comments on commit f091e16

Please sign in to comment.