Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prepare_importing_finish

Browse source 
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
This commit is contained in:
veliymolfar 2020-02-28 11:48:51 +02:00
commit d64684fbff
4 changed files with 28374 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
View file

@ -888,14 +888,10 @@ public class SearchUICore {
} }
double s1 = o1.getSearchDistance(loc, 1); double s1 = o1.getSearchDistance(loc, 1);
double s2 = o2.getSearchDistance(loc, 1); double s2 = o2.getSearchDistance(loc, 1);
if (o1.parentSearchResult != null && o2.parentSearchResult != null) { double ps1 = o1.parentSearchResult == null ? 0 : o1.parentSearchResult.getSearchDistance(loc);
if (o1.parentSearchResult == o2.parentSearchResult) { double ps2 = o2.parentSearchResult == null ? 0 : o2.parentSearchResult.getSearchDistance(loc);
int cmp = collator.compare(localeName1, localeName2); if (ps1 != ps2) {
if (cmp != 0) { return Double.compare(ps1, ps2);
return cmp;
}
}
return Double.compare(s1, s2);
} }
int cmp = collator.compare(localeName1, localeName2); int cmp = collator.compare(localeName1, localeName2);
if (cmp != 0) { if (cmp != 0) {

28349
OsmAnd-java/src/test/resources/search/free_street_portland.json Normal file
View file

File diff suppressed because it is too large Load diff

20
OsmAnd/res/drawable/ic_logo_wikimedia.xml Normal file
View file

@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M27,16C27,22.0751 22.0751,27 16,27C9.9249,27 5,22.0751 5,16C5,12.708 6.4461,9.7537 8.7378,7.7379L10.8651,9.8652C9.1137,11.3327 8,13.5363 8,16C8,20.4183 11.5817,24 16,24C20.4183,24 24,20.4183 24,16C24,13.5363 22.8863,11.3327 21.1349,9.8652L23.2622,7.7379C25.5539,9.7537 27,12.708 27,16ZM16.0524,5.0001C16.0349,5 16.0175,5 16,5C15.9825,5 15.9651,5 15.9476,5.0001H16.0524Z"
android:fillColor="#006699"
android:fillType="evenOdd"/>
<path
android:pathData="M12.2868,11.2868C10.894,12.3855 10,14.0884 10,16C10,18.973 12.1623,21.441 15,21.917V14L12.2868,11.2868ZM17,21.9171C19.8377,21.441 22,18.973 22,16C22,14.0883 21.106,12.3855 19.7132,11.2867L17,14V21.9171Z"
android:fillColor="#339966"
android:fillType="evenOdd"/>
<path
android:pathData="M16,7m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:fillColor="#990000"/>
</vector>

2
OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
View file

@ -101,7 +101,7 @@ public class ImportSettingsFragment extends BaseOsmAndFragment
expandableList = root.findViewById(R.id.list); expandableList = root.findViewById(R.id.list);
ViewCompat.setNestedScrollingEnabled(expandableList, true); ViewCompat.setNestedScrollingEnabled(expandableList, true);
View header = inflater.inflate(R.layout.list_item_description_header, null); View header = inflater.inflate(R.layout.list_item_description_header, null);
description = header.findViewById(R.id.description); TextView description = header.findViewById(R.id.description);
description.setText(R.string.select_data_to_import); description.setText(R.string.select_data_to_import);
expandableList.addHeaderView(header); expandableList.addHeaderView(header);
continueBtn.setOnClickListener(this); continueBtn.setOnClickListener(this);