We are building out functionality to allow multiple locations associated with a content node. The idea is to make location nodes, changing nothing to the location module, but making a new module which will facilitate in the creation of and association between location nodes to their content nodes.

We plan to allow node publishers to create and relate location nodes during the node creation process, via the location drop down on the node form. The mockups depict a gmap will make it possible to select a location when multiple locations are found based on the user's initial query. The query is done in one single text field to make things simpler. Based on the results of the address query, the latitude and longitude boxes are populated if there is an exact match (using the geocoder API from google) or when a user clicks on a marker from the gmap when there are multiple results.
The user can then click to add the location, then query again, and add as many locations as needed. If a user wants to delete a location, they can do so, then add another location, etc., all without reloading the page.