AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed localized Feature type.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2024-01-20 00:13:51 -03:00
parent 725650eaaf
commit 2754d55f5e
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/app/src/main/java/app/organicmaps/search/SearchFragment.java
View file

@ -397,11 +397,8 @@ public class SearchFragment extends BaseMwmFragment
if (RoutingController.get().isWaitingPoiPick())
{
SearchResult.Description description = result.description;
String subtitle = description != null
? Utils.getLocalizedFeatureType(requireContext(), description.featureType)
: "";
String title = TextUtils.isEmpty(result.name) ? subtitle : "";
final String subtitle = (result.description != null) ? result.description.localizedFeatureType : "";
final String title = TextUtils.isEmpty(result.name) ? subtitle : result.name;
final MapObject point = MapObject.createMapObject(FeatureId.EMPTY, MapObject.SEARCH,
title, subtitle, result.lat, result.lon);

11
android/app/src/main/java/app/organicmaps/search/SearchResult.java
View file

@ -40,7 +40,7 @@ public class SearchResult
public static class Description
{
public final FeatureId featureId;
public final String featureType;
public final String localizedFeatureType;
public final String region;
public final Distance distance;
@ -56,7 +56,7 @@ public class SearchResult
boolean hasPopularityHigherPriority)
{
this.featureId = featureId;
this.featureType = featureType;
this.localizedFeatureType = featureType;
this.region = region;
this.distance = distance;
this.description = description;
@ -114,11 +114,8 @@ public class SearchResult
public String getTitle(@NonNull Context context)
{
String title = name;
if (TextUtils.isEmpty(title))
{
title = description != null ? description.featureType : "";
}
if (TextUtils.isEmpty(title) && description != null)
title = description.localizedFeatureType;
return title;
}