Amenity types
Refactor poi encoder
Update rendering types for new Android version & new map creator
Fix creation of old maps