gmaps4rails 1.0.1 → 1.0.2

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -1,11 +1,11 @@
 <% #thanks to enable_css, user can avoid this css to be loaded
-if enable_css == true && options[:scripts].nil? %>
+if enable_css == true and options[:scripts].nil? %>
 	<% content_for :head do %>
 	<%= stylesheet_link_tag 'gmaps4rails' %>
 	<% end %>
 <% end %>
 <% content_for :scripts do %>
-<% if enable_js == true &&  options[:scripts].try(:to_sym) != :none %>
+<% if enable_js == true and options[:scripts].try(:to_sym) != :none %>
   <% case options[:map_options].try(:[], :provider) %>
   <% when "openlayers" %>
     <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
@@ -50,11 +50,9 @@ if enable_css == true && options[:scripts].nil? %>
   <!-- TODO: change this style dynamically -->  
 </div>
 <% when "bing" %>
-<div id="<%= gmaps_container_id(options) %>" > 
-  <div id="<%= gmaps_map_id(options) %>" class="bing_map"></div>
-</div>
+  <div id="<%= gmaps_map_id(options) %>" class="<%= gmaps_map_class(options) %>"></div>
 <% else %>
-<div class="<%= gmaps_container_id(options) %>"> 
+<div class="<%= gmaps_container_class(options) %>"> 
   <div id="<%= gmaps_map_id(options) %>" class="<%= gmaps_map_class(options) %>"></div>
 </div>
 <% end %>

data/lib/gmaps4rails/helper/gmaps4rails_helper.rb

@@ -25,11 +25,12 @@ module Gmaps4railsHelper
     options[:map_options].try(:[], :id) || Gmaps4rails::DEFAULT_MAP_ID
   end
   
-  def gmaps_container_id(options)
-    options[:map_options].try(:[], :container_id) || "map_container"
+  def gmaps_container_class(options)
+    options[:map_options].try(:[], :container_class) || "map_container"
   end
   
   def gmaps_map_class(options)
-    options[:map_options].try(:[], :class) || "gmaps4rails_map"
+    default_class = options[:map_options].try(:[], :provider) == "bing" ? "bing_map" : "gmaps4rails_map"
+    options[:map_options].try(:[], :class) || default_class
   end
 end

data/public/javascripts/gmaps4rails/gmaps4rails.base.js

@@ -429,7 +429,7 @@ function Gmaps4Rails() {
   ////////////////////////////////////////////////////
 
   //to make the map fit the different LatLng points
-  this.adjustMapToBounds = function(latlng) {
+  this.adjustMapToBounds = function() {
 
     //FIRST_STEP: retrieve all bounds
     //create the bounds object only if necessary
@@ -464,6 +464,7 @@ function Gmaps4Rails() {
     //in every case, I've to take into account the bounds set up by the user	
     for (var i = 0; i < this.map_options.bounds.length; ++i) {
       //create points from bounds provided
+      //TODO:only works with google maps
       var bound = this.createLatLng(this.map_options.bounds[i].lat, this.map_options.bounds[i].lng);
       this.boundsObject.extend(bound);
     }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack