Switched to an Inheritance over a OneToOne relation between GPS/Address and all location-based objects.  Also re-tuned JSON dumps (esp. for buildings)