Names of rivers not rendered

I am interested in river sports, but river names are rendered only at very high zoom levels so it is almost impossible to find river name at appropriate zoom level. It is not possible to change this behaviour in rendertheme, it looks that the zoom-min is not respected.

This is probably caused by very cautious algorithm for text rendering in mapsforge/map/layer/renderer/WayDecorator.java (in current mapsforge), where it tries to find straight segment long enough to fit the caption in. This works with streets (often), but not with curvy features, like rivers and streams. (the for loop at line 149 in current github version does not check, if the name was rendered at all).

As I found that locus diverged from mapforge codebase and I use mainly locus, I do write here and not to mapsforge.

It would be nice, if in the case of failure, the name will be rendered on longest segment on given tile, so it appears at least once on tile. Or even simpler heuristics, like if it fails to render on tile, than put it on the middle segment, who cares, but loosing names only due to picky algorithm is annoying.