Skip to content

Commit

Permalink
Merge branch 'osmandapp:master' into hardy_test
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonora
sonora authored Sep 2, 2024
2 parents 314bb80 + 7b64d0a commit 9cb0df8
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 24 deletions.
5 changes: 2 additions & 3 deletions OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,8 @@ FinalRouteSegment searchRouteInternal(final RoutingContext ctx, RouteSegmentPoin
println(" " + segment.segEnd + ">> Already visited by minimum");
}
skipSegment = true;
} else if (cst.cost + 2.0 < minCost[forwardSearch ? 1 : 0] && ASSERT_CHECKS && ctx.calculationMode != RouteCalculationMode.COMPLEX) {
// squareRootDist is inaccurate by 0.0015%-0.0036% according to tests
// think about multiplier * 1.00004f instead of the const (2.0)
} else if (cst.cost + 5.0 < minCost[forwardSearch ? 1 : 0] && ASSERT_CHECKS && ctx.calculationMode != RouteCalculationMode.COMPLEX) {
// squareRootDist doesn't follow Triangle-inequality and it breaks A* algorithm. Maximum error on the optimal route could be constant (5.0)
if (ctx.config.heuristicCoefficient <= 1) {
throw new IllegalStateException(cst.cost + " < ??? " + minCost[forwardSearch ? 1 : 0]);
}
Expand Down
8 changes: 5 additions & 3 deletions OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/io/KFile.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ class KFile {
}

fun getFileNameWithoutExtension(): String? {
return getFileNameWithoutExtension(this.name())
return Companion.getFileNameWithoutExtension(this.name())
}

fun getFileNameWithoutExtension(name: String?): String? {
return name?.substringBeforeLast(".");
companion object {
fun getFileNameWithoutExtension(name: String?): String? {
return name?.substringBeforeLast(".");
}
}
}
85 changes: 84 additions & 1 deletion OsmAnd/res/values-el/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@
<string name="change_color">Αλλαγή χρώματος</string>
<string name="edit_name">Επεξεργασία ονόματος</string>
<string name="animate_my_location">Κίνησε γραφικά την θέση μου</string>
<string name="animate_my_location_desc">Ενεργοποίηση κίνησης γραφικών στην εύρεσης της \'Θέσης μου\' κατά την πλοήγηση.</string>
<string name="animate_my_location_desc">Ομαλή κίνηση χάρτη όταν βρίσκεται σε κίνηση. Επιφέρει μικρή καθυστέρηση.</string>
<string name="shared_string_overview">Επισκόπηση</string>
<string name="select_street">Επιλέξτε οδό</string>
<string name="shared_string_in_name">σε %1$s</string>
Expand Down Expand Up @@ -4481,4 +4481,87 @@
<string name="shared_string_simulate">Προσομοίωσε</string>
<string name="shared_string_replace">Αντικατάσταση</string>
<string name="ltr_or_rtl_combine_with_brackets">%1$s (%2$s)</string>
<string name="top">Κορυφή</string>
<string name="quick_action_photo_note">Σημείωση φωτογραφίας</string>
<string name="user_palette">Παλέτα χρήστη</string>
<string name="top_and_bottom">Κορυφή και πάτος</string>
<string name="title_3d_track">3D Ίχνος</string>
<string name="app_profile">Προφίλ εφαρμογής</string>
<string name="shared_string_included">Περιλαμβάνεται</string>
<string name="wall_height">Ύψος τοίχου</string>
<string name="bottom">Πάτος</string>
<string name="required_maps">Απαιτούμενοι Χάρτες</string>
<string name="quick_action_move_map_left">Χάρτης στα αριστερά</string>
<string name="shared_string_not_checked">Μη ελεγμένο</string>
<string name="new_key_assignment">Νέα ανάθεση κλειδιού</string>
<string name="key_name_pattern">Κλειδί \"%1$s\"</string>
<string name="key_assignment_add_key">Προσθήκη κλειδιού</string>
<string name="action_icon">Εικονίδιο ενέργειας</string>
<string name="quick_action_first_intermediate">Πρώτη ενδιάμεση</string>
<string name="rendering_value_sacScale_description">Swiss Alpine Club (Ελβετική Αλπική Λέσχη)</string>
<string name="quick_action_location_by_gpx">Τοποθεσία από GPX</string>
<string name="quick_action_directions_from">Αφετηρία</string>
<string name="quick_action_move_map_up">Χάρτης πάνω</string>
<string name="quick_action_new_route">Νέα διαδρομή</string>
<string name="shared_string_set">Ορισμός</string>
<string name="weather_screen">Οθόνη καιρού</string>
<string name="map_text">Κείμενα χάρτη</string>
<string name="key_assignment_add_action">Προσθήκη ενέργειας</string>
<string name="quick_action_to_my_location">Προς την τοποθεσία μου</string>
<string name="tomorrow">Αύριο</string>
<string name="rendering_attr_alpineHiking_name">Βαθμός δυσκολίας μονοπατιών πεζοπορίας</string>
<string name="shared_string_checked">Ελεγμένο</string>
<string name="quick_action_destination">Προορισμός</string>
<string name="quick_action_audio_note">Σημείωση ήχου</string>
<string name="weather_source_GFS_title">GFS</string>
<string name="weather_source_ecmwf_title">ECMWF</string>
<string name="quick_action_move_map_right">Χάρτης στα δεξιά</string>
<string name="quick_action_move_map_down">Χάρτης κάτω</string>
<string name="rendering_value_caiScale_description">Club Alpino Italiano (Ιταλική Αλπική Λέσχη)</string>
<string name="ltr_or_rtl_combine_via_or">%1$s ή %2$s</string>
<string name="auto_25_chars_route_kr">Μείνετε δεξιά</string>
<string name="empty_category_name">Κενό όνομα κατηγορίας</string>
<string name="bearing_secondary_desc">Μπορείτε να αλλάξετε την μορφή δεδομένων που χρησιμοποιείται σε: %1$s – %2$s – %3$s.</string>
<string name="audio_video_notes_desc">Προσφέρει γρήγορη πρόσβαση για ξεκίνημα/σταμάτημα λήψης σημείωσης ήχου, βίντεο ή εικόνας.</string>
<string name="use_login_and_password">Χρήση ονόματος χρήστη και κωδικού</string>
<string name="mtb_scale">Κλίμακα MTB</string>
<string name="auto_25_chars_route_tshl">Στρίψτε απότομα αριστερά</string>
<string name="you_can_get_feature_as_part_of_pattern">Πάρτε το “%1$s” ως μέρος του %2$s πλάνου. Σύγκριση:</string>
<string name="ask_every_time">Ρώτα κάθε φορά</string>
<string name="driving_region_india">Ινδία</string>
<string name="auto_25_chars_route_tshr">Στρίψτε απότομα δεξιά</string>
<string name="auto_25_chars_route_tslr">Στρίψτε ελαφρώς δεξιά</string>
<string name="auto_25_chars_route_tl">Στρίψτε αριστερά</string>
<string name="shared_string_keywords">Λέξεις κλειδιά</string>
<string name="route_roundabout_exit">Πάρτε την %1$d έξοδο</string>
<string name="available_as_part_of_subscription_plan">Διαθέσιμο ως μέρος της %1$s συνδρομής.</string>
<string name="auto_25_chars_route_tl_kl">Στρίψτε αριστερά και μείνετε αριστερά</string>
<string name="auto_25_chars_route_tl_kr">Στρίψτε αριστερά και μείνετε δεξιά</string>
<string name="auto_25_chars_route_tr_kl">Στρίψτε δεξιά και μείνετε αριστερά</string>
<string name="auto_25_chars_route_roundabout_kr">Πάρτε την %1$d έξοδο και μείνετε δεξιά</string>
<string name="analyze_by_intervals">Ανάλυση κατά διαστήματα</string>
<string name="shared_string_additional">Επιπρόσθετο</string>
<string name="shared_string_extensions">Επεκτάσεις</string>
<string name="auto_25_chars_route_tr_kr">Στρίψτε δεξιά και μείνετε δεξιά</string>
<string name="auto_25_chars_route_roundabout_kl">Πάρτε την %1$d έξοδο και μείνετε αριστερά</string>
<string name="included_in_your_current_plan">Περιλαμβάνεται στο τρέχων \"%1$s\" πλάνο σας</string>
<string name="coordinates_widget_secondary_desc">Μπορείτε να αλλάξετε την μορφή συντεταγμένων σε %1$s – %2$s – %3$s.</string>
<string name="backup_welcome_back">Καλώς ήρθατε πίσω!</string>
<string name="auto_zoom_discrete">Διακριτό</string>
<string name="widget_secondary_desc_part_of">Μέρος του πρόσθετου %1$s.</string>
<string name="backup_deleting_all_data">Διαγραφή όλων των δεδομένων…</string>
<string name="app_mode_suv">SUV</string>
<string name="graph_axis">Άξονας γραφήματος</string>
<string name="help_article_map_routes_name">Διαδρομές</string>
<string name="movement_speed">Ταχύτητα κίνησης</string>
<string name="auto_25_chars_route_tu_kr">Κάντε αναστροφή και μείνετε δεξιά</string>
<string name="shared_string_interface">Διεπαφή</string>
<string name="quick_action_verb_navigate">Πλοήγηση</string>
<string name="auto_25_chars_route_tr">Στρίψτε δεξιά</string>
<string name="auto_zoom_smooth">Ομαλό</string>
<string name="auto_25_chars_route_tu_kl">Κάντε αναστροφή και μείνετε αριστερά</string>
<string name="auto_25_chars_route_kl">Μείνετε αριστερά</string>
<string name="available_until">Διαθέσιμο μέχρι %1$s</string>
<string name="auto_25_chars_route_tu">Κάντε αναστροφή</string>
<string name="auto_25_chars_route_tsll">Στρίψτε ελαφρώς αριστερά</string>
</resources>
33 changes: 33 additions & 0 deletions OsmAnd/res/values-ka/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3254,4 +3254,37 @@
<string name="routing_attr_allow_private_name">პირადი წვდომის დაშვება</string>
<string name="routing_attr_avoid_shuttle_train_name">შატლის გარეშე</string>
<string name="routing_attr_prefer_unpaved_name">უპირატესობის მინიჭება დაუგებელი გზებისთვის</string>
<string name="save_as_new_track">შენახვა ახალ ტრეკად</string>
<string name="routing_attr_no_new_routing_name">არ გამოიყენო v1.9 გზის წესებ</string>
<string name="rendering_attr_coloredBuildings_name">შენობების გაფერადება ტიპის მიხედვით</string>
<string name="rendering_value_walkingRoutesScopeOSMC_description">შეღებვა ქსელთან ურთიერთობის მიხედვით.</string>
<string name="rendering_attr_contourColorScheme_description">კონტურის ხაზების ფერის სქემა</string>
<string name="routing_attr_avoid_shuttle_train_description">საგარეუბნო მატარებლების არიდება</string>
<string name="routing_attr_avoid_borders_description">ნაციონალური საზღვრების გადაკვეთის აცილება</string>
<string name="routing_attr_allow_skating_only_name">მხოლოდ საციგურაო გზების დაშვება</string>
<string name="public_transport_try_change_settings">სცადეთ, პარამეტრები შეცვალოთ.</string>
<string name="routing_attr_short_way_description">ოპტიმიზებულია უფრო მოკლე გზისთვის (ენერგიის დაზოგვა)</string>
<string name="rendering_attr_showLez_name">დაბალი გამონაბოლქვის ზონების ჩვენება</string>
<string name="mapillary_menu_title_pano">მხოლოდ 360° გამოსახულებების ჩვენება</string>
<string name="quick_action_interim_dialog">შუალედური დიალოგის ჩვენება</string>
<string name="rendering_attr_buildings15zoom_name">შენობები გადიდებაზე 15</string>
<string name="auto_split_recording_title">ჩანაწერების ავტოგაწყვეტა პაუზის შემდეგ</string>
<string name="routing_attr_avoid_ice_roads_fords_name">ყინულის გზების გარეშე</string>
<string name="reset_plugin_to_default">დამატების პარამეტრების ნაგულისხმევზე ჩამოყრა</string>
<string name="improve_coverage_mapillary">გააუმჯობესეთ სურათების დაფარვა Mapillary-სთან ერთად</string>
<string name="routing_attr_max_num_changes_description">მიუთითეთ ცვლილებების ზედა ზღვარი</string>
<string name="move_map_to_select_area">გადაიტანეთ რუკა საჭირო ალაგის მოსანიშნად.</string>
<string name="select_map_icon">ხატულა დასვენებისას</string>
<string name="select_navigation_icon">ხატულა მოძრაობისას</string>
<string name="context_menu_points_of_group">ჯგუფის ყველა წერტილი</string>
<string name="routing_attr_allow_private_description">წვდომის დაშვება პირად ალაგებზე.</string>
<string name="rendering_attr_hikingRoutesOSMC_description">ბილიკების რენდერი OSMC ტრეისებზე დაყრდნობით.</string>
<string name="routing_attr_avoid_subway_description">მიწისქვეშა და მსუბუქი მატარებლების თავიდან აცილება</string>
<string name="edit_profile_screen_options_subtitle">აირჩიეთ ეკრანის პარამეტრები ამ პროფილისთვის</string>
<string name="rendering_attr_showCycleNodeNetworkRoutes_name">ველოსიპედის გზების ქსელის კვანძების ჩვენება</string>
<string name="ui_customization_short_descr">მთავარი და კონტექსტური მენიუს პუნქტები</string>
<string name="select_data_to_import">აირჩიეთ შემოსატანი მონაცემები</string>
<string name="none_point_error">დაამატეთ ერთი წერტილი მაინც.</string>
<string name="routing_attr_avoid_ice_roads_fords_description">ყინულიანი გზების თავიდან არიდება.</string>
<string name="one_image_per_tile">ერთი გამოსახულების ფაილი ერთი ფილისთვის.</string>
</resources>
2 changes: 1 addition & 1 deletion OsmAnd/res/values-ro/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5882,5 +5882,5 @@
<string name="quick_action_navigation_view_desc">O comutare pentru a deschide sau închide vizualizarea de navigare.</string>
<string name="quick_action_navigation_view_title">Vizualizare navigare</string>
<string name="quick_action_switch_compass_desc">Un comutator pentru a schimba orientarea hărții.</string>
<string name="rendering_attr_alpineHiking_name">Grad de dificultate a traseelor de drumeție</string>
<string name="rendering_attr_alpineHiking_name">Grad de dificultate al traseelor de drumeție</string>
</resources>
4 changes: 3 additions & 1 deletion OsmAnd/res/values-ru/phrases.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4386,5 +4386,7 @@
<string name="poi_healthcare_speciality_psychotherapist">Специализация здравоохранения: психотерапевт</string>
<string name="poi_healthcare_speciality_clinic">Специализация здравоохранения: клиника</string>
<string name="poi_dressing_room">Раздевалка</string>

<string name="poi_diet_pescetarian_no">Пескетарианская диета: нет</string>
<string name="poi_cash_in_customers">Клиенты</string>
<string name="poi_engineer">Инженерный офис</string>
</resources>
Loading

0 comments on commit 9cb0df8

Please sign in to comment.