creation of map page and update of json data
conflict fixes