diff options
Diffstat (limited to 'app/maps/network_map.rb')
| -rw-r--r-- | app/maps/network_map.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/maps/network_map.rb b/app/maps/network_map.rb index 760948a2a..cee54ed1b 100644 --- a/app/maps/network_map.rb +++ b/app/maps/network_map.rb @@ -2,8 +2,7 @@ class NetworkMap < ApplicationMap attr_reader :referential, :network, :network_style - def initialize(referential, network, network_style = nil) - @referential = referential + def initialize(network, network_style = nil) @network = network @network_style = network_style end @@ -16,7 +15,7 @@ class NetworkMap < ApplicationMap page << map.add_layer(google_hybrid) page << map.add_layer(google_satellite) - page.assign "stop_areas_layer", kml_layer(polymorphic_path([referential, network, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map) + page.assign "stop_areas_layer", kml_layer([network.referential, network, :stop_areas], :styleMap => StyleMap::StopAreasStyleMap.new.style_map) page << map.add_layer(:stop_areas_layer) page << map.add_control( hover_control_display_name(:stop_areas_layer) ) @@ -27,9 +26,11 @@ class NetworkMap < ApplicationMap end def bounds - wgs84_bounds = Chouette::StopArea.bounds - @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")) - + @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 end def ready? |