Add temp files '*~' to .gitignore
Merge remote-tracking branch 'upstream/master'
Add geoLocation, geoLocationPoint, and geoLocationBox models and MySQL tables

GeoLocation has a polymorphic association with geoLocationPoint and
geoLocationBox. A geoLocationBox or geoLocationPoint can have many
geoLocations, and a record can have one geoLocation. The MySQL tables
for Points and Boxes make use of the rgeo, rgeo-activerecord, and
activerecord-mysql2spatial-adapter gems. This allows the table to
store coordinates as the spatial data types 'point' and 'polygon'.
Rgeo may require the use of the GEOS library
(http://trac.osgeo.org/geos).
Add geoLocation and geoLocationPlace to the new record form

This includes properly associating GeoLocation with Record. Also,
a javascript asset was added in preparation for map display.
Add Leaflet map to Record form

Leaflet code from vendor added, as well as CSS for the map. When
the user selects the geoLocationPoint button, the map appears.
Associate geoLocation fields directly with Record

The geoLocation table has been removed in favor of direct associations
between Record and GeoLocationPoint/GeoLocationBox. GeoLocationPlace
is now a checkbox which, if the submitter opts in, will assign
GeoLocationPlace to be "Orange County (Calif.)" and will reveal the
other geoLocation fields.
Destroy geoLocationPoints if superseded by other geospatialType

Before Record and its children are validated, geoLocationPoints are
checked against the selected geospatialType (points/box/none), and for
blank fields. Unused or superseded Points are marked for destruction.

Client-side, Point latitudes and longitudes must be within the range of
valid coordinates. These fields are also checked during db validation.
Set geographic fields' visibility for Record edits

When editing a Record, the geographic fields are automatically
expanded if the Record previously included geographic information.
Similarly, the fields belonging to the correct geospatialType
(Point/Box) are automatically visible.

Code was added to the Record model to generate Datacite's
geoLocations in XML.
Add revised schema file to changes
Install Leaflet.draw toolbars and drawing functions

When the user elects to provide geoLocationPoints or a geoLocationBox,
the correct Leaflet.draw tool will allow them to draw markers or
rectangles on the map. When drawing a rectangle, the coordinates of
the SW and NE corners will be automatically added to the Box form
fields.
Differentiate between Leaflet featureLayers

Leaflet now switches between editing a layer of <= 25 markers and
a layer of 0-1 rectangle. The visibility of these layers toggles
when geoLocation type is chosen.

Also, Leaflet default images have been added to the vendor assets.
Fix enforcement of map drawing limitations

The previous system of "grey-ing out" the drawing tool was buggy.
Instead, JQuery toggles the visibility of the Draw toolbar itself
when the limit of geospatial objects on the map has been reached.

Also, the geoLocationBox form fields are now updated when the
drawn rectangle is edited. Entering coordinates into the form
will trigger the creation of a new rectangle if one did not
previously exist.
Merge remote-tracking branch 'upstream/master'
Prepare for merge
Merge branch 'master' into geoLocation-metadata-submission

Conflicts:
	LICENSE
	README.rdoc
	READ_ME.txt
	app/assets/images/dash_ucla_logo.png
	app/controllers/records_controller.rb
	app/models/record.rb
Set Point fields on marker creation

When a marker is created, it is connected to the first Point's
fields via hash variable. The Point's lat and lng fields are then
set to the marker's coordinates. Currently, each marker created
will overwrite the previous marker's coordinates in the first
Point's fields.

Markers are highlighted using a differently colored icon image
when moused over.
Add new coordinate fields when a marker is created

Rather than try to link markers with existing Point fields, the
submission form is now set to create new Point fields on
successful marker creation. These new fields are the same as the
regular Points fields, except these cannot be edited by the user,
and are tied to the original coordinates of the marker.

(However, editing the marker will not yet affect the associated
Point fields.)
Completed hybrid Points creation

When Point fields or markers are indicated for removal, the draw
tool will be shown or hidden accordingly. Also, the button to add
new Point fields is disabled whenever the limit on the number of
Points has been reached. When a marker is deleted, its corresponding
disabled Point fields will also be removed.
Merge remote-tracking branch 'upstream/master' into geoLocation-metadata-submission
Merge pull request #5 from amclark42/geoLocation-metadata-submission

Geo location metadata submission