test query extra
merge changes from upstream
overpass query as global var
overpass queries to top
moved loadPoi to map.js
minor cleanup