Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

4 files changed, 9 insertions, 29 deletions

diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb
index 8071c5f0f..dd642c47d 100644
--- a/app/maps/connection_link_map.rb
+++ b/app/maps/connection_link_map.rb
@@ -21,7 +21,7 @@ class ConnectionLinkMap < ApplicationMap
       page << map.add_control( hover_control_display_name(:stop_areas_layer) )
       #page << map.add_layer(kml_layer(connection_link, :styleMap => StyleMap::ConnectionLinkStyleMap.new( :style => connection_link_style).style_map))
       #page << map.add_layer(kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map))
-      page << map.zoom_to_extent(bounds) if bounds
+      page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
     end
   end
 
@@ -30,11 +30,7 @@ class ConnectionLinkMap < ApplicationMap
   end
 
   def bounds
-    @bounds ||= 
-      begin
-        wgs84_bounds = Chouette::StopArea.bounds
-        OpenLayers::Bounds.new(wgs84_bounds.lower_corner.x, wgs84_bounds.lower_corner.y, wgs84_bounds.upper_corner.x, wgs84_bounds.upper_corner.y).transform(OpenLayers::Projection.new("EPSG:4326"), OpenLayers::Projection.new("EPSG:900913"))
-      end
+    @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(connection_link.stop_areas.collect(&:geometry).compact)
   end
 
 end
diff --git a/app/maps/line_map.rb b/app/maps/line_map.rb
index e451f452d..60e6cb4fc 100644
--- a/app/maps/line_map.rb
+++ b/app/maps/line_map.rb
@@ -22,17 +22,12 @@ class LineMap < ApplicationMap
       page << map.add_layer(:stop_areas_layer)
       page << map.add_control( hover_control_display_name(:stop_areas_layer) )
 
-      page << map.zoom_to_extent(bounds) if bounds
+      page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
     end
   end
 
   def bounds
-    @bounds ||= 
-      begin
-        wgs84_bounds = GeoRuby::SimpleFeatures::Point.bounds(line.stop_areas.map(&:geometry))
-        OpenLayers::Bounds.new(wgs84_bounds.lower_corner.x, wgs84_bounds.lower_corner.y, wgs84_bounds.upper_corner.x, wgs84_bounds.upper_corner.y).transform(OpenLayers::Projection.new("EPSG:4326"), OpenLayers::Projection.new("EPSG:900913")) if wgs84_bounds
-      end
-
+    @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(line.stop_areas.collect(&:geometry).compact)
   end
 
   def ready?
diff --git a/app/maps/network_map.rb b/app/maps/network_map.rb
index cee54ed1b..4271133bb 100644
--- a/app/maps/network_map.rb
+++ b/app/maps/network_map.rb
@@ -21,16 +21,12 @@ class NetworkMap < ApplicationMap
       page << map.add_control( hover_control_display_name(:stop_areas_layer) )
 
       #page << map.add_layer(kml_layer(network, :styleMap => StyleMap::NetworkStyleMap.new( :style => network_style).style_map))
-      page << map.zoom_to_extent(bounds) if bounds
+      page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
     end
   end
 
   def bounds
-    @bounds ||= 
-      begin
-        wgs84_bounds = Chouette::StopArea.bounds
-        OpenLayers::Bounds.new(wgs84_bounds.lower_corner.x, wgs84_bounds.lower_corner.y, wgs84_bounds.upper_corner.x, wgs84_bounds.upper_corner.y).transform(OpenLayers::Projection.new("EPSG:4326"), OpenLayers::Projection.new("EPSG:900913")) if wgs84_bounds
-      end
+    @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(network.stop_areas.collect(&:geometry).compact)
   end
 
   def ready?
diff --git a/app/maps/route_map.rb b/app/maps/route_map.rb
index c28c22e62..daa3de23f 100644
--- a/app/maps/route_map.rb
+++ b/app/maps/route_map.rb
@@ -17,23 +17,16 @@ class RouteMap < ApplicationMap
 
       #page << map.add_layer(kml_layer(line, :styleMap => StyleMap::LineStyleMap.new( :style => line_style).style_map))
       page << map.add_layer(kml_layer([route.referential, route.line, route], :styleMap => StyleMap::RouteStyleMap.new.style_map))
-      page << map.zoom_to_extent(bounds) if bounds
+      page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
     end
   end
 
   def ready?
-    route_bounds.present?
-  end
-
-  def route_bounds
-    @route_bound ||= (route.geometry.empty? ? Chouette::StopArea.bounds : route.geometry.envelope)
+    bounds.present?
   end
 
   def bounds
-    @bounds ||= OpenLayers::Bounds.new(
-        route_bounds.lower_corner.x, route_bounds.lower_corner.y, 
-        route_bounds.upper_corner.x, route_bounds.upper_corner.y).
-      transform(OpenLayers::Projection.new("EPSG:4326"), OpenLayers::Projection.new("EPSG:900913"))
+    @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(route.stop_areas.collect(&:geometry).compact)
   end
 
 end