Merge remote-tracking branch 'origin/master'

SpeciesFileGroup · Jan 22, 2015 · 0bbc710 · 0bbc710
2 parents a051827 + d623390
commit 0bbc710
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/assets/javascripts/maps.js b/app/assets/javascripts/maps.js
@@ -63,6 +63,8 @@ initialize = function () {
 
     get_Data();
     get_window_center();
+    document.getElementById('map_coords').text = 'Center: \xA0 \xA0 \xA0 \xA0Latitude = ' + center_lat.toFixed(6) + ' , Longitude = ' + center_long.toFixed(6);
+
     map.setCenter(center_lat_long);
     map.setZoom(gzoom);
 
@@ -100,7 +102,7 @@ initialize = function () {
         var mapLatLng = event.latLng;
         lat = mapLatLng.lat();
         lng = mapLatLng.lng();
-        document.getElementById('taxonworks_link').text = 'TaxonWorks  Latitude = ' + lat + ' , Longitude = ' + lng;
+        document.getElementById('map_coords').text = 'Coordinates: Latitude = ' + lat.toFixed(6) + ' , Longitude = ' + lng.toFixed(6);
     });
 };
 

diff --git a/app/views/geographic_areas/_attributes.html.erb b/app/views/geographic_areas/_attributes.html.erb
@@ -54,16 +54,18 @@
   </p>
 
   <% if @geographic_area.geographic_items.count > 0 -%>
-    <p>
-      <strong>"Default" shape:</strong>
-      <%= link_to('(Collecting events within)', tasks_gis_locality_within_path(@geographic_area.geographic_items.first.id)) %>
+      <p>
+        <strong>"Default" shape:</strong>
+        <%= link_to('(Collecting events within)', tasks_gis_locality_within_path(@geographic_area.geographic_items.first.id)) %>
+
       <div id="map_canvas" style="width:512px; height: 256px;"></div>
-    </p>
+      <a id="map_coords"></a>
+      </p>
 
-    <!--<p>-->
+      <!--<p>-->
       <!--<strong> Geographic items within: </strong>-->
       <!--<%#= geographic_item_links(GeographicArea.find_others_contained_within(@geographic_area.geographic_items.first)) -%>-->
-    <!--</p>-->
+      <!--</p>-->
 
   <% end %>