Fix encoder
Merge branch 'master' of github.com:osmandapp/OsmAnd-tools