changed mapwidget and macros to support new cgeo javascript