160819 Map & Graphic-edit