Merge GeoPoint specific mapping properties

Close #5505