campfire_logic 1.2.1 → 2.0.0

data/VERSION

@@ -1 +1 @@
-1.2.1
+2.0.0

data/app/views/shared/_map.html.erb

@@ -1,4 +1,4 @@
-<%# requires local variables: locations AND place; Adapted from http://code.google.com/apis/maps/documentation/javascript/examples/icon-complex.html -%>
+<%# requires local variables: locations AND place (but latter can be nil); Adapted from http://code.google.com/apis/maps/documentation/javascript/examples/icon-complex.html -%>
 <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script>
   var directionsDisplay = new google.maps.DirectionsRenderer();
@@ -14,19 +14,8 @@
   var markers = [];
   var openWindow;
 
-  function initializeMap(id) {
-    var myOptions = {
-      zoom: <%= place && place.zoom_level || 4 -%>,
-  <%- if place && place.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.coordinates[1] -%>, <%= place.coordinates[0] -%>),
-  <%- elsif place && place.parent && place.parent.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.parent.coordinates[1] -%>, <%= place.parent.coordinates[0] -%>),
-  <%- else -%>
-      center: new google.maps.LatLng(37.09024, -95.712891),
-  <%- end -%>
-      mapTypeId: google.maps.MapTypeId.ROADMAP
-    };
-    map = new google.maps.Map(document.getElementById(id), myOptions);
+  function initializeMap(id, options) {
+    map = new google.maps.Map(document.getElementById(id), options);
     directionsDisplay.setMap(map);
     directionsDisplay.setPanel($('#directions_panel')[0]);
     for (var i = 0; i < locations.length; i++) {
@@ -36,6 +25,7 @@
       });
       attachBalloon(i, locations[i][3]);
     }
+    map.fitBounds(calcBounds());
   }
 
   function attachBalloon(i, content) {
@@ -51,6 +41,14 @@
     });
   }
 
+  function calcBounds() {
+    var latLngList = [<%= locations.map{ |l| "new google.maps.LatLng(#{l.coordinates[1]}, #{l.coordinates[0]})" } * ', ' %>]
+    var bounds = new google.maps.LatLngBounds();
+    for (var i = 0; i < latLngList.length; i++)
+      bounds.extend(latLngList[i]);
+    return bounds;
+  }
+
   function calcRoute(start, end) {
     var request = {
       origin: start,

data/campfire_logic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "1.2.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: 
   segments: 
-  - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Roderick Monje