Merge pull request #4354 from osmandapp/arabic_fix

Fix arabic search
osmandapp · Feb 5, 2025 · d9ad0e7 · d9ad0e7
2 parents cae434d + cfd4163
commit d9ad0e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/Common/OACollatorStringMatcher.m b/Sources/Common/OACollatorStringMatcher.m
@@ -48,11 +48,11 @@ - (BOOL) matches:(NSString *)name
 + (BOOL) cmatches:(NSString *)fullName part:(NSString *)part mode:(StringMatcherMode)mode
 {
     if ([OAArabicNormalizer isSpecialArabic:fullName]) {
-        fullName = [OAArabicNormalizer normalize:fullName];
+        fullName = [OAArabicNormalizer normalize:fullName] ?: fullName;
     }
 
     if ([OAArabicNormalizer isSpecialArabic:part]) {
-        part = [OAArabicNormalizer normalize:part];
+        part = [OAArabicNormalizer normalize:part] ?: part;
     }
     switch (mode)
     {

diff --git a/Sources/Search/OASearchCoreFactory.mm b/Sources/Search/OASearchCoreFactory.mm
@@ -480,7 +480,7 @@ - (void) searchByName:(OASearchPhrase *)phrase resultMatcher:(OASearchResultMatc
     {
         NSString *wordToSearch = [phrase getUnknownWordToSearch];
         if ([OAArabicNormalizer isSpecialArabic:wordToSearch]) {
-            wordToSearch = [OAArabicNormalizer normalize:wordToSearch];
+            wordToSearch = [OAArabicNormalizer normalize:wordToSearch] ?: wordToSearch;
         }
 
         if (wordToSearch.length == 0)
@@ -727,7 +727,7 @@ - (BOOL) search:(OASearchPhrase *)phrase resultMatcher:(OASearchResultMatcher *)
 
     NSString *searchWord = [phrase getUnknownWordToSearch];
     if ([OAArabicNormalizer isSpecialArabic:searchWord]) {
-        searchWord = [OAArabicNormalizer normalize:searchWord];
+        searchWord = [OAArabicNormalizer normalize:searchWord] ?: searchWord;
     }
     OANameStringMatcher *nm = [phrase getMainUnknownNameStringMatcher];