Broken map
Markers for points
Fix problem where parcels with no id would be overwritten
use right api; fix missing function
Default to a point-based survey
Fix merge conflicts from require branch
fix typo in router