Merge branch 'osmandapp:master' into hardy_Afa

sonora · Jan 20, 2025 · ada678f · ada678f
2 parents c9aeb5c + 6734c7f
commit ada678f
Show file tree

Hide file tree

Showing 34 changed files with 385 additions and 167 deletions.
diff --git a/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
@@ -195,7 +195,7 @@ private static String alignChars(String fullText) {
 		return fullText;
 	}
 
-	public static boolean isSpace(char c){
+	private static boolean isSpace(char c){
 		return !Character.isLetter(c) && !Character.isDigit(c);
 	}
 

diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java b/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java
@@ -1,6 +1,5 @@
 package net.osmand.binary;
 
-import net.osmand.CollatorStringMatcher;
 import net.osmand.CollatorStringMatcher.StringMatcherMode;
 import net.osmand.PlatformUtil;
 import net.osmand.ResultMatcher;
@@ -200,7 +199,7 @@ public List<String> prepareStreetName(String s, boolean addCommonWords) {
 		List<String> ls = new ArrayList<String>();
 		int beginning = 0;
 		for (int i = 1; i < s.length(); i++) {
-			if (CollatorStringMatcher.isSpace(s.charAt(i))) {
+			if (Character.isWhitespace(s.charAt(i))) {
 				addWord(ls, s.substring(beginning, i), addCommonWords);
 				beginning = i + 1;
 			} else if (s.charAt(i) == '(') {

diff --git a/OsmAnd/res/drawable/ic_action_lanes_outlined.xml b/OsmAnd/res/drawable/ic_action_lanes_outlined.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,12L8,8L5,12L7,12V16H9V12L11,12Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M19,12L16,8L13,12L15,12V16H17V12L19,12Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H20C21.1046,4 22,4.8954 22,6V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6ZM4,6H20V18H4V6Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_speed_limit.xml b/OsmAnd/res/drawable/ic_action_speed_limit.xml
@@ -4,16 +4,15 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeAlpha="0.2"
-      android:fillColor="#ffffff"
-      android:fillAlpha="0.2"/>
+      android:pathData="M9.7499,13.622V14C9.7499,14.6904 9.1903,15.25 8.4999,15.25H7.9999V16.75H8.4999C10.0187,16.75 11.2499,15.5188 11.2499,14V11.5093L11.2499,11.5L11.25,9.5C11.25,8.2574 10.2426,7.25 9,7.25C7.7573,7.25 6.75,8.2573 6.75,9.5V11.5C6.75,12.7427 7.7573,13.75 9,13.75C9.2629,13.75 9.5153,13.7049 9.7499,13.622ZM9.7499,11.5054C9.747,11.9171 9.4124,12.25 9,12.25C8.5857,12.25 8.25,11.9142 8.25,11.5V9.5C8.25,9.0858 8.5857,8.75 9,8.75C9.4142,8.75 9.75,9.0858 9.75,9.5L9.7499,11.5054Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
   <path
-      android:pathData="M12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20ZM12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
-      android:fillColor="#ffffff"
+      android:pathData="M12.2499,9.5C12.2499,8.2574 13.2573,7.25 14.4999,7.25C15.7425,7.25 16.7499,8.2574 16.7499,9.5V14.5C16.7499,15.7426 15.7425,16.75 14.4999,16.75C13.2573,16.75 12.2499,15.7426 12.2499,14.5V9.5ZM14.4999,8.75C14.0857,8.75 13.7499,9.0858 13.7499,9.5V14.5C13.7499,14.9142 14.0857,15.25 14.4999,15.25C14.9141,15.25 15.2499,14.9142 15.2499,14.5V9.5C15.2499,9.0858 14.9141,8.75 14.4999,8.75Z"
+      android:fillColor="#727272"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="M10,8C8.3432,8 7,9.3432 7,11V14C7,15.1046 7.8954,16 9,16H10C11.1046,16 12,15.1046 12,14V13.5C12,14.8807 13.1193,16 14.5,16C15.8807,16 17,14.8807 17,13.5V10.5C17,9.1193 15.8807,8 14.5,8C13.1193,8 12,9.1193 12,10.5V13C12,11.8954 11.1046,11 10,11H9C9,10.4477 9.4477,10 10,10H11V8H10ZM9,14V13H10V14H9ZM14.5,14C14.2239,14 14,13.7761 14,13.5V10.5C14,10.2239 14.2239,10 14.5,10C14.7761,10 15,10.2239 15,10.5V13.5C15,13.7761 14.7761,14 14.5,14Z"
-      android:fillColor="#ffffff"
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#727272"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/OsmAnd/res/drawable/ic_action_steep_ascent.xml b/OsmAnd/res/drawable/ic_action_steep_ascent.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.9267,13.7862L15,10.0932L10.7937,9.5998L11.5075,11.0009L7.6646,12.9224L8.3354,14.264L12.1885,12.3374L12.9267,13.7862Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M4.5886,18.7057L4.423,19H19.577L16.157,12.9215L4.5886,18.7057Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M22.6976,18.4589L14.2317,3.3094C13.7799,2.5009 12.9262,2 12,2C11.0738,2 10.2201,2.5009 9.7683,3.3094L1.3024,18.4589C1.1041,18.8137 1,19.2134 1,19.6199C1,20.9344 2.0656,22 3.3801,22H20.6199C21.9344,22 23,20.9344 23,19.6199C23,19.2134 22.8959,18.8137 22.6976,18.4589ZM20.9532,19.4068L12.4314,4.2601C12.3469,4.1001 12.1809,4 12,4C11.8191,4 11.6531,4.1001 11.5686,4.2601L3.0468,19.4068C3.0161,19.465 3,19.5298 3,19.5956C3,19.8189 3.1811,20 3.4044,20H20.5956C20.8189,20 21,19.8189 21,19.5956C21,19.5298 20.9839,19.465 20.9532,19.4068Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_uneven_road.xml b/OsmAnd/res/drawable/ic_action_uneven_road.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,17V19H19V17H18C17.5858,17 17.3431,16.6569 17.0589,16.2548C16.6569,15.6863 16.1716,15 15,15C13.8284,15 13.3431,15.6863 12.9411,16.2548C12.6569,16.6569 12.4142,17 12,17C11.5858,17 11.3431,16.6569 11.0589,16.2548C10.6569,15.6863 10.1716,15 9,15C7.8284,15 7.3432,15.6863 6.9411,16.2548C6.6568,16.6569 6.4142,17 6,17H5Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M22.6976,18.4589L14.2317,3.3094C13.7799,2.5009 12.9262,2 12,2C11.0738,2 10.2201,2.5009 9.7683,3.3094L1.3024,18.4589C1.1041,18.8137 1,19.2134 1,19.6199C1,20.9344 2.0656,22 3.3801,22H20.6199C21.9344,22 23,20.9344 23,19.6199C23,19.2134 22.8959,18.8137 22.6976,18.4589ZM20.9532,19.4068L12.4314,4.2601C12.3469,4.1001 12.1809,4 12,4C11.8191,4 11.6531,4.1001 11.5686,4.2601L3.0468,19.4068C3.0161,19.465 3,19.5298 3,19.5956C3,19.8189 3.1811,20 3.4044,20H20.5956C20.8189,20 21,19.8189 21,19.5956C21,19.5298 20.9839,19.465 20.9532,19.4068Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>