Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-04-25 16:00:38 +02:00
commit d5bec4f3a6
2 changed files with 2 additions and 0 deletions

View file

@ -218,6 +218,7 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
public void itemSelected(Street obj) {
if(!Algorithms.objectEquals(settings.getLastSearchedCity(), obj.getCity().getId())) {
settings.setLastSearchedCity(obj.getCity().getId(), obj.getCity().getName(region.useEnglishNames()), obj.getLocation());
region.addCityToPreloadedList(obj.getCity());
}
settings.setLastSearchedStreet(obj.getName(region.useEnglishNames()), obj.getLocation());
// if(obj.getBuildings().size() == 0){

View file

@ -92,6 +92,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
int locationY = tb.getPixYFromLatNoRot(ip.getLatitude());
canvas.rotate(-tb.getRotate(), locationX, locationY);
canvas.drawBitmap(intermediatePoint, locationX - marginX, locationY - marginY, bitmapPaint);
marginX = intermediatePoint.getWidth() / 5;
canvas.drawText(index + "", locationX + marginX, locationY - 3 * marginY / 5, textPaint);
canvas.rotate(tb.getRotate(), locationX, locationY);
}