added Way, MapNode, and GeographicPoint classes
updated dataparser / merging stuff