merge branch validation

19 files changed, 27 insertions, 27 deletions

diff --git a/app/maps/access_link_map.rb b/app/maps/access_link_map.rb
index fcca1250f..35873a9b1 100644
--- a/app/maps/access_link_map.rb
+++ b/app/maps/access_link_map.rb
@@ -9,11 +9,11 @@ class AccessLinkMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "access_points_layer", kml_layer([access_link.referential, access_link.access_point], :styleMap => StyleMap::AccessPointsStyleMap.new(helpers).style_map) 
+    page.assign "access_points_layer", kml_layer([access_link.referential, access_link.access_point], :styleMap => Design::AccessPointsStyleMap.new(helpers).style_map) 
     page << map.add_layer(:access_points_layer)
-    page.assign "stop_areas_layer", kml_layer([access_link.referential, access_link.stop_area], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map) 
+    page.assign "stop_areas_layer", kml_layer([access_link.referential, access_link.stop_area], :styleMap => Design::StopAreasStyleMap.new(helpers).style_map) 
     page << map.add_layer(:stop_areas_layer)
-    page << map.add_layer( kml_layer([access_link.referential, access_link.access_point, access_link], :styleMap => StyleMap::AccessLinkStyleMap.new(helpers).style_map))
+    page << map.add_layer( kml_layer([access_link.referential, access_link.access_point, access_link], :styleMap => Design::AccessLinkStyleMap.new(helpers).style_map))
     page << map.add_control( hover_control_display_name([:access_points_layer,:stop_areas_layer]) )
     page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
   end
diff --git a/app/maps/access_point_map.rb b/app/maps/access_point_map.rb
index c1fbd2a16..f31dcf5a3 100644
--- a/app/maps/access_point_map.rb
+++ b/app/maps/access_point_map.rb
@@ -10,9 +10,9 @@ class AccessPointMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "parent_layer", kml_layer(access_point.stop_area,  :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+    page.assign "parent_layer", kml_layer(access_point.stop_area,  :style_map => Design::StopAreasStyleMap.new(helpers).style_map)
     page << map.add_layer(:parent_layer)
-    page.assign "edit_access_point_layer", kml_layer(access_point, { :default => editable? }, :style_map => StyleMap::EditAccessPointStyleMap.new(helpers).style_map)
+    page.assign "edit_access_point_layer", kml_layer(access_point, { :default => editable? }, :style_map => Design::EditAccessPointStyleMap.new(helpers).style_map)
     page << map.add_layer(:edit_access_point_layer)
     
     
diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb
index 9318ec90f..82050c4da 100644
--- a/app/maps/connection_link_map.rb
+++ b/app/maps/connection_link_map.rb
@@ -9,9 +9,9 @@ class ConnectionLinkMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "stop_areas_layer", kml_layer([connection_link.referential, connection_link, :stop_areas], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map) 
+    page.assign "stop_areas_layer", kml_layer([connection_link.referential, connection_link, :stop_areas], :styleMap => Design::StopAreasStyleMap.new(helpers).style_map) 
     page << map.add_layer(:stop_areas_layer)
-    page << map.add_layer( kml_layer([connection_link.referential, connection_link], :styleMap => StyleMap::ConnectionLinkStyleMap.new(helpers).style_map))
+    page << map.add_layer( kml_layer([connection_link.referential, connection_link], :styleMap => Design::ConnectionLinkStyleMap.new(helpers).style_map))
     page << map.add_control( hover_control_display_name(:stop_areas_layer) )
     page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
   end
diff --git a/app/maps/style_map/access_link_style_map.rb b/app/maps/design/access_link_style_map.rb
index 07ef5952b..742f7ed0e 100644
--- a/app/maps/style_map/access_link_style_map.rb
+++ b/app/maps/design/access_link_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::AccessLinkStyleMap < StyleMap::GenericStyleMap
+class Design::AccessLinkStyleMap < Design::GenericStyleMap
   attr_accessor :style
 
   def initialize(helpers,options = {})
diff --git a/app/maps/style_map/access_points_style_map.rb b/app/maps/design/access_points_style_map.rb
index 57cf8dfb3..f7740006d 100644
--- a/app/maps/style_map/access_points_style_map.rb
+++ b/app/maps/design/access_points_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::AccessPointsStyleMap < StyleMap::GenericStyleMap
+class Design::AccessPointsStyleMap < Design::GenericStyleMap
   attr_accessor :style, :context, :temporary
   
   def default_style
diff --git a/app/maps/style_map/connection_link_style_map.rb b/app/maps/design/connection_link_style_map.rb
index 99393fc08..88eeb9457 100644
--- a/app/maps/style_map/connection_link_style_map.rb
+++ b/app/maps/design/connection_link_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::ConnectionLinkStyleMap < StyleMap::GenericStyleMap
+class Design::ConnectionLinkStyleMap < Design::GenericStyleMap
   attr_accessor :style
 
   def initialize(helpers,options = {})
diff --git a/app/maps/style_map/edit_access_point_style_map.rb b/app/maps/design/edit_access_point_style_map.rb
index 83f9298e8..48c293470 100644
--- a/app/maps/style_map/edit_access_point_style_map.rb
+++ b/app/maps/design/edit_access_point_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::EditAccessPointStyleMap < StyleMap::GenericStyleMap
+class Design::EditAccessPointStyleMap < Design::GenericStyleMap
   attr_accessor :style
   
   def default_style
diff --git a/app/maps/style_map/edit_stop_area_style_map.rb b/app/maps/design/edit_stop_area_style_map.rb
index 38f18f04a..2431f8a0f 100644
--- a/app/maps/style_map/edit_stop_area_style_map.rb
+++ b/app/maps/design/edit_stop_area_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::EditStopAreaStyleMap < StyleMap::GenericStyleMap
+class Design::EditStopAreaStyleMap < Design::GenericStyleMap
   attr_accessor :style
   
   def default_style
diff --git a/app/maps/style_map/generic_style_map.rb b/app/maps/design/generic_style_map.rb
index c905cd00d..0056cc964 100644
--- a/app/maps/style_map/generic_style_map.rb
+++ b/app/maps/design/generic_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::GenericStyleMap
+class Design::GenericStyleMap
   include MapLayers
   include MapLayers::ViewHelpers
 
diff --git a/app/maps/style_map/journey_pattern_style_map.rb b/app/maps/design/journey_pattern_style_map.rb
index 5a06b5c18..1b5766f81 100644
--- a/app/maps/style_map/journey_pattern_style_map.rb
+++ b/app/maps/design/journey_pattern_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::JourneyPatternStyleMap < StyleMap::GenericStyleMap
+class Design::JourneyPatternStyleMap < Design::GenericStyleMap
   attr_accessor :style
 
   def initialize(helpers, options = {})
diff --git a/app/maps/style_map/line_style_map.rb b/app/maps/design/line_style_map.rb
index acc307df4..e1d76078c 100644
--- a/app/maps/style_map/line_style_map.rb
+++ b/app/maps/design/line_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::LineStyleMap < StyleMap::GenericStyleMap
+class Design::LineStyleMap < Design::GenericStyleMap
   attr_accessor :style, :line_priority, :line_color
 
   def initialize(helpers,options = {})
diff --git a/app/maps/style_map/route_style_map.rb b/app/maps/design/route_style_map.rb
index 1d9ab12f0..a8042c527 100644
--- a/app/maps/style_map/route_style_map.rb
+++ b/app/maps/design/route_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::RouteStyleMap < StyleMap::GenericStyleMap
+class Design::RouteStyleMap < Design::GenericStyleMap
   attr_accessor :style
 
   def initialize(helpers,options = {})
diff --git a/app/maps/style_map/stop_areas_style_map.rb b/app/maps/design/stop_areas_style_map.rb
index f23b58136..f45c423e2 100644
--- a/app/maps/style_map/stop_areas_style_map.rb
+++ b/app/maps/design/stop_areas_style_map.rb
@@ -1,4 +1,4 @@
-class StyleMap::StopAreasStyleMap < StyleMap::GenericStyleMap
+class Design::StopAreasStyleMap < Design::GenericStyleMap
   attr_accessor :style, :context, :temporary
   
   def default_style
diff --git a/app/maps/group_of_line_map.rb b/app/maps/group_of_line_map.rb
index df1708597..b9c174cb9 100644
--- a/app/maps/group_of_line_map.rb
+++ b/app/maps/group_of_line_map.rb
@@ -8,7 +8,7 @@ class GroupOfLineMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "stop_areas_layer", kml_layer([group_of_line.referential, group_of_line], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+    page.assign "stop_areas_layer", kml_layer([group_of_line.referential, group_of_line], :styleMap => Design::StopAreasStyleMap.new(helpers).style_map)
 
     page << map.add_layer(:stop_areas_layer)
     page << map.add_control( hover_control_display_name(:stop_areas_layer) )
diff --git a/app/maps/journey_pattern_map.rb b/app/maps/journey_pattern_map.rb
index 075019c79..e1cf54a6a 100644
--- a/app/maps/journey_pattern_map.rb
+++ b/app/maps/journey_pattern_map.rb
@@ -8,7 +8,7 @@ class JourneyPatternMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    layer = kml_layer([journey_pattern.referential, journey_pattern.route.line, journey_pattern.route, journey_pattern], :styleMap => StyleMap::JourneyPatternStyleMap.new(helpers).style_map)
+    layer = kml_layer([journey_pattern.referential, journey_pattern.route.line, journey_pattern.route, journey_pattern], :styleMap => Design::JourneyPatternStyleMap.new(helpers).style_map)
     page.assign "journeyPatternLayer", layer
 
     selectFeature = OpenLayers::Control::SelectFeature.new( :journeyPatternLayer)
diff --git a/app/maps/line_map.rb b/app/maps/line_map.rb
index 3bc229555..8d79bfe0b 100644
--- a/app/maps/line_map.rb
+++ b/app/maps/line_map.rb
@@ -9,8 +9,8 @@ class LineMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page << map.add_layer(kml_layer(line, :styleMap => StyleMap::LineStyleMap.new( :style => line_style).style_map))
-    page.assign "stop_areas_layer", kml_layer([line.referential, line], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+    page << map.add_layer(kml_layer(line, :styleMap => Design::LineStyleMap.new( :style => line_style).style_map))
+    page.assign "stop_areas_layer", kml_layer([line.referential, line], :styleMap => Design::StopAreasStyleMap.new(helpers).style_map)
 
 
     page << map.add_layer(:stop_areas_layer)
diff --git a/app/maps/network_map.rb b/app/maps/network_map.rb
index ec23f62c9..109e390d0 100644
--- a/app/maps/network_map.rb
+++ b/app/maps/network_map.rb
@@ -8,7 +8,7 @@ class NetworkMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    page.assign "stop_areas_layer", kml_layer([network.referential, network], :styleMap => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+    page.assign "stop_areas_layer", kml_layer([network.referential, network], :styleMap => Design::StopAreasStyleMap.new(helpers).style_map)
 
     page << map.add_layer(:stop_areas_layer)
     page << map.add_control( hover_control_display_name(:stop_areas_layer) )
diff --git a/app/maps/route_map.rb b/app/maps/route_map.rb
index fc1a7d93e..5acb1ad76 100644
--- a/app/maps/route_map.rb
+++ b/app/maps/route_map.rb
@@ -8,7 +8,7 @@ class RouteMap < ApplicationMap
   end
 
   def customize_map(map, page)
-    layer = kml_layer([route.referential, route.line, route], :styleMap => StyleMap::RouteStyleMap.new(helpers).style_map)
+    layer = kml_layer([route.referential, route.line, route], :styleMap => Design::RouteStyleMap.new(helpers).style_map)
     page.assign "routeLayer", layer
     selectFeature = OpenLayers::Control::SelectFeature.new( :routeLayer)
 
diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb
index b2e04779a..6c3dd5feb 100644
--- a/app/maps/stop_area_map.rb
+++ b/app/maps/stop_area_map.rb
@@ -10,21 +10,21 @@ class StopAreaMap < ApplicationMap
   end
 
   def customize_map(map, page)
-      page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => StyleMap::EditStopAreaStyleMap.new(helpers).style_map)
+      page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => Design::EditStopAreaStyleMap.new(helpers).style_map)
       page << map.add_layer(:edit_stop_area_layer)
 
       if stop_area.children.present?
-        page.assign "children_layer", kml_layer(stop_area, { :children => true }, :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+        page.assign "children_layer", kml_layer(stop_area, { :children => true }, :style_map => Design::StopAreasStyleMap.new(helpers).style_map)
         page << map.add_layer(:children_layer)
       end
       if stop_area.routing_stops.present?
-        page.assign "routing_layer", kml_layer(stop_area, { :routing => true }, :style_map => StyleMap::StopAreasStyleMap.new(helpers).style_map)
+        page.assign "routing_layer", kml_layer(stop_area, { :routing => true }, :style_map => Design::StopAreasStyleMap.new(helpers).style_map)
         page << map.add_layer(:routing_layer)
         page << map.add_control( hover_control_display_name(:routing_layer) )
         page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds
       else
       
-        page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => StyleMap::EditStopAreaStyleMap.new(helpers).style_map)
+        page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => Design::EditStopAreaStyleMap.new(helpers).style_map)
         page << map.add_layer(:edit_stop_area_layer)
       
         if editable?