Merge pull request #4106 from osmandapp/alex_branch

Fix #3884
This commit is contained in:
Alexey 2017-07-13 18:25:29 +03:00 committed by GitHub
commit 206ce404b0

View file

@ -1,6 +1,7 @@
package net.osmand.map; package net.osmand.map;
import net.osmand.OsmAndCollator;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher; import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapDataObject; import net.osmand.binary.BinaryMapDataObject;
@ -664,9 +665,11 @@ public class OsmandRegions {
} }
} }
Comparator<WorldRegion> nameComparator = new Comparator<WorldRegion>() { Comparator<WorldRegion> nameComparator = new Comparator<WorldRegion>() {
final net.osmand.Collator collator = OsmAndCollator.primaryCollator();
@Override @Override
public int compare(WorldRegion w1, WorldRegion w2) { public int compare(WorldRegion w1, WorldRegion w2) {
return w1.getLocaleName().compareTo(w2.getLocaleName()); return collator.compare(w1.getLocaleName(), w2.getLocaleName());
} }
}; };
sortSubregions(world, nameComparator); sortSubregions(world, nameComparator);