diff options
| author | Alban Peignier | 2018-03-22 15:48:36 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-03-23 17:21:56 +0100 |
| commit | a4c0a3c90bf08b072af2afafd354b424af87d585 (patch) | |
| tree | abfff94dac5df605f19b2487e58b98882a849759 | |
| parent | 6d485b9bae94c1251c5e3f89219fcd29128c49d6 (diff) | |
| download | chouette-core-a4c0a3c90bf08b072af2afafd354b424af87d585.tar.bz2 | |
Remove maps code. Refs #6296
43 files changed, 3 insertions, 1098 deletions
diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb index 19b3eb742..4321ab37a 100644 --- a/app/controllers/access_links_controller.rb +++ b/app/controllers/access_links_controller.rb @@ -18,7 +18,6 @@ class AccessLinksController < ChouetteController end def show - @map = AccessLinkMap.new(resource).with_helpers(self) @access_point = Chouette::AccessPoint.find(params[:access_point_id]) #@access_link = Chouette::AccessLink.find(params[:id]) @stop_area = @access_link.stop_area diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb index 112a13a86..5d9ee8de8 100644 --- a/app/controllers/access_points_controller.rb +++ b/app/controllers/access_points_controller.rb @@ -22,7 +22,6 @@ class AccessPointsController < ChouetteController end def show - map.editable = false @generic_access_links = @access_point.generic_access_link_matrix @detail_access_links = @access_point.detail_access_link_matrix show! do |format| @@ -38,7 +37,6 @@ class AccessPointsController < ChouetteController def edit access_point.position ||= access_point.default_position - map.editable = true edit! end @@ -47,10 +45,6 @@ class AccessPointsController < ChouetteController alias_method :access_point, :resource - def map - @map = AccessPointMap.new(access_point).with_helpers(self) - end - def collection @q = parent.access_points.search(params[:q]) @access_points ||= diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb index f14868776..a7f9758e8 100644 --- a/app/controllers/connection_links_controller.rb +++ b/app/controllers/connection_links_controller.rb @@ -24,7 +24,6 @@ class ConnectionLinksController < ChouetteController end def show - @map = ConnectionLinkMap.new(resource).with_helpers(self) show! end diff --git a/app/controllers/group_of_lines_controller.rb b/app/controllers/group_of_lines_controller.rb index 46d9d077f..353cff2dc 100644 --- a/app/controllers/group_of_lines_controller.rb +++ b/app/controllers/group_of_lines_controller.rb @@ -11,7 +11,6 @@ class GroupOfLinesController < ChouetteController belongs_to :line_referential def show - @map = GroupOfLineMap.new(resource).with_helpers(self) @lines = resource.lines.order(:name) show! end diff --git a/app/controllers/journey_patterns_controller.rb b/app/controllers/journey_patterns_controller.rb index 881ab6630..85b6a85ce 100644 --- a/app/controllers/journey_patterns_controller.rb +++ b/app/controllers/journey_patterns_controller.rb @@ -29,7 +29,6 @@ class JourneyPatternsController < ChouetteController end def show - @map = JourneyPatternMap.new(journey_pattern).with_helpers(self) @stop_points = journey_pattern.stop_points.paginate(:page => params[:page]) show! end diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb index 1c69b1240..bb2ca9f7f 100644 --- a/app/controllers/networks_controller.rb +++ b/app/controllers/networks_controller.rb @@ -11,8 +11,6 @@ class NetworksController < ChouetteController belongs_to :line_referential def show - @map = NetworkMap.new(resource).with_helpers(self) - show! do @network = @network.decorate(context: { line_referential: line_referential diff --git a/app/controllers/referential_group_of_lines_controller.rb b/app/controllers/referential_group_of_lines_controller.rb index 1294fc5d5..66bb71b36 100644 --- a/app/controllers/referential_group_of_lines_controller.rb +++ b/app/controllers/referential_group_of_lines_controller.rb @@ -11,7 +11,6 @@ class ReferentialGroupOfLinesController < ChouetteController belongs_to :referential def show - @map = GroupOfLineMap.new(resource).with_helpers(self) @lines = resource.lines.order(:name) show! end diff --git a/app/controllers/referential_networks_controller.rb b/app/controllers/referential_networks_controller.rb index fe00a99df..3b76deba1 100644 --- a/app/controllers/referential_networks_controller.rb +++ b/app/controllers/referential_networks_controller.rb @@ -10,8 +10,6 @@ class ReferentialNetworksController < ChouetteController belongs_to :referential, :parent_class => Referential def show - @map = NetworkMap.new(resource).with_helpers(self) - show! do @network = ReferentialNetworkDecorator.decorate( @network, diff --git a/app/controllers/referential_stop_areas_controller.rb b/app/controllers/referential_stop_areas_controller.rb index 0ed330180..fa09bb773 100644 --- a/app/controllers/referential_stop_areas_controller.rb +++ b/app/controllers/referential_stop_areas_controller.rb @@ -50,22 +50,14 @@ class ReferentialStopAreasController < ChouetteController end def new - @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) - @map.editable = true new! end def create - @map = StopAreaMap.new(Chouette::StopArea.new).with_helpers(self) - @map.editable = true - create! end def show - map.editable = false - @access_points = @stop_area.access_points - show! do |format| unless stop_area.position or params[:default] or params[:routing] format.kml { @@ -80,13 +72,11 @@ class ReferentialStopAreasController < ChouetteController def edit edit! do stop_area.position ||= stop_area.default_position - map.editable = true end end def update stop_area.position ||= stop_area.default_position - map.editable = true update! end @@ -107,10 +97,6 @@ class ReferentialStopAreasController < ChouetteController alias_method :stop_area, :resource - def map - @map = StopAreaMap.new(stop_area).with_helpers(self) - end - def collection @q = parent.present? ? parent.stop_areas.search(params[:q]) : referential.stop_areas.search(params[:q]) diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index 418ba3751..96a23c938 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -32,8 +32,6 @@ class RoutesController < ChouetteController end def show - @map = RouteMap.new(route).with_helpers(self) - @route_sp = route.stop_points if sort_sp_column && sort_sp_direction @route_sp = @route_sp.order(sort_sp_column + ' ' + sort_sp_direction) diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb index a71392344..d0d9f652d 100644 --- a/app/controllers/stop_areas_controller.rb +++ b/app/controllers/stop_areas_controller.rb @@ -65,22 +65,15 @@ class StopAreasController < ChouetteController def new authorize resource_class - # @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) - # @map.editable = true new! end def create authorize resource_class - # @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) - # @map.editable = true - create! end def show - # map.editable = false - # @access_points = @stop_area.access_points show! do |format| unless stop_area.position or params[:default] or params[:routing] format.kml { @@ -95,9 +88,7 @@ class StopAreasController < ChouetteController def edit authorize stop_area - edit! do - map.editable = true - end + super end def destroy @@ -107,8 +98,6 @@ class StopAreasController < ChouetteController def update authorize stop_area - map.editable = true - update! end @@ -129,10 +118,6 @@ class StopAreasController < ChouetteController alias_method :stop_area, :resource alias_method :stop_area_referential, :parent - def map - @map = StopAreaMap.new(stop_area).with_helpers(self) - end - def collection scope = parent.present? ? parent.stop_areas : referential.stop_areas scope = ransack_status(scope) diff --git a/app/maps/access_link_map.rb b/app/maps/access_link_map.rb deleted file mode 100644 index 544a1e792..000000000 --- a/app/maps/access_link_map.rb +++ /dev/null @@ -1,29 +0,0 @@ - -class AccessLinkMap < ApplicationMap - - attr_reader :access_link, :access_link_style - - def initialize(access_link, access_link_style = nil) - @access_link = access_link - @access_link_style = access_link_style - end - - def customize_map(map, page) - 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 => 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 => 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 - - def ready? - Chouette::StopArea.bounds.present? - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds([access_link.stop_area.geometry,access_link.access_point.geometry].compact) - end - -end diff --git a/app/maps/access_point_map.rb b/app/maps/access_point_map.rb deleted file mode 100644 index 3f0013738..000000000 --- a/app/maps/access_point_map.rb +++ /dev/null @@ -1,56 +0,0 @@ -class AccessPointMap < ApplicationMap - - attr_reader :access_point - - attr_accessor :editable - alias_method :editable?, :editable - - def initialize(access_point) - @access_point = access_point - end - - def customize_map(map, page) - 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) - page.assign "parent_layer", kml_layer(access_point.stop_area, :style_map => Design::StopAreasStyleMap.new(helpers).style_map) - page << map.add_layer(:parent_layer) - - - if editable? - page.assign "referential_projection", projection_type.present? ? projection("EPSG:" + projection_type) : JsVar.new("undefined") - # TODO virer ce code inline - page << <<EOF - edit_access_point_layer.events.on({ - 'featuremodified': function(event) { - geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); - $('#access_point_coordinates').val(geometry.y.toString()+ ","+ geometry.x.toString()); - - if(referential_projection != undefined) - { - projection_geometry = event.feature.geometry.clone().transform(new OpenLayers.Projection("EPSG:900913"), referential_projection ); - $('#access_point_projection_xy').val(projection_geometry.x.toString()+ ","+ projection_geometry.y.toString()); } - } - }); -EOF - page << map.add_control(OpenLayers::Control::ModifyFeature.new(:edit_access_point_layer, :mode => 8, :autoActivate => true)) - - else - page << map.add_control( hover_control_display_name(:parent_layer) ) - end - - page << map.set_center(center.to_google.to_openlayers, 16, false, true) - end - - def projection_type - access_point.referential.projection_type - end - - def ready? - center.present? - end - - def center - access_point.geometry or access_point.default_position - end - -end diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb deleted file mode 100644 index 19b9038ec..000000000 --- a/app/maps/application_map.rb +++ /dev/null @@ -1,188 +0,0 @@ -class ApplicationMap - - include MapLayers - include MapLayers::ViewHelpers - - attr_accessor :helpers - cattr_accessor :ign_api_key - - def helpers - @helpers ||= Helpers.new - end - - # For example, in a controller : - # - # @map = MyMap.new(...).with_helpers(self) - # - def with_helpers(helpers) - self.helpers = helpers - self - end - - def geoportail_key - if ( Rails.application.secrets.respond_to? :geoportail_api_key) - return Rails.application.secrets.geoportail_api_key - end - return nil - end - - class Helpers - include ActionDispatch::Routing::UrlFor - include Rails.application.routes.url_helpers - end - - def projection(name) - OpenLayers::Projection.new(name) - end - - def controls - [ OpenLayers::Control::LayerSwitcher.new(:ascending => true), - OpenLayers::Control::ScaleLine.new, - OpenLayers::Control::Navigation.new, - OpenLayers::Control::PanZoomBar.new, - OpenLayers::Control::Attribution.new] - end - - def id - "map" - end - - def map - @map ||= MapLayers::Map.new(id, :projection => projection("EPSG:900913"), :controls => controls) do |map, page| - if self.geoportail_key - page << map.add_layer(geoportail_ortho_wmts) - page << map.add_layer(geoportail_scans_wmts) - page << map.add_layer(geoportail_cadastre_wmts) - end - - page << map.add_layer(MapLayers::OSM_MAPNIK) - #page << map.add_layers([geoportail_scans, geoportail_ortho]) - page << map.add_layer(google_physical) - page << map.add_layer(google_streets) - page << map.add_layer(google_hybrid) - page << map.add_layer(google_satellite) - - customize_map(map,page) if respond_to?( :customize_map) - end - end - - def name - self.class.name.underscore.gsub(/_map$/, '') - end - alias_method :default_class, :name - - def to_html(options = {}) - if not respond_to?(:ready?) or ready? - expand = options[:no_fullscreen] ? '' : "<button type=\"button\" data-ce-id=\"#{id}\" data-ce-action=\"map-fullscreen\" class=\"ce-MapExpandBlock\"><i class=\"fa fa-expand\"></i></button>" - "<div id=\"#{id}\" class=\"#{default_class}\">#{expand}</div>#{map.to_html(options)}".html_safe - end - end - - def kml - OpenLayers::Format::KML.new :extractStyles => true, :extractAttributes => true, :maxDepth => 2 - end - def geoportail_cadastre_wmts - OpenLayers::Layer::WMTS.new( geoportail_options.update(:name => I18n.t("maps.ign_cadastre"), - :format => "image/png", - :layer => "CADASTRALPARCELS.PARCELS")) - end - - def geoportail_ortho_wmts - OpenLayers::Layer::WMTS.new( geoportail_options.update(:name => I18n.t("maps.ign_ortho"), - :layer => "ORTHOIMAGERY.ORTHOPHOTOS")) - end - - def geoportail_scans_wmts - OpenLayers::Layer::WMTS.new( geoportail_options.update(:name => I18n.t("maps.ign_map"), - :layer => "GEOGRAPHICALGRIDSYSTEMS.MAPS")) - end - - def geoportail_options - { :url => "http://gpp3-wxs.ign.fr/#{self.geoportail_key}/wmts", - :matrixSet => "PM", - :style => "normal", - :numZoomLevels => 19, - :group => "IGN", - :attribution => 'Map base: ©IGN <a href="http://www.geoportail.fr/" target="_blank"><img src="http://api.ign.fr/geoportail/api/js/2.0.0beta/theme/geoportal/img/logo_gp.gif"></a> <a href="http://www.geoportail.gouv.fr/depot/api/cgu/licAPI_CGUF.pdf" alt="TOS" title="TOS" target="_blank">Terms of Service</a>'} - end - - def strategy_fixed - OpenLayers::Strategy::Fixed.new :preload => true - end - - def google_physical - OpenLayers::Layer::Google.new(I18n.t("maps.google_physical"), - :type => :"google.maps.MapTypeId.TERRAIN") - end - - def google_streets - OpenLayers::Layer::Google.new I18n.t("maps.google_streets"), :numZoomLevels => 20 - end - - def google_hybrid - OpenLayers::Layer::Google.new I18n.t("maps.google_hybrid"), :type => :"google.maps.MapTypeId.HYBRID", :numZoomLevels => 20 - end - - def google_satellite - OpenLayers::Layer::Google.new I18n.t("maps.google_satellite"), :type => :"google.maps.MapTypeId.SATELLITE", :numZoomLevels => 22 - end - - def hover_control_display_name(layer) - OpenLayers::Control::SelectFeature.new( layer, { - :autoActivate => true, - :hover => true, - :renderIntent => "temporary", - :eventListeners => { - :featurehighlighted => JsExpr.new("function(e) { - var feature = e.feature ; - if (feature.attributes.inactive != undefined) - return; - var stop_area_type_label = ''; - if (feature.attributes.stop_area_type_label != undefined) - stop_area_type_label = feature.attributes.stop_area_type_label; - var popup = new OpenLayers.Popup.Anchored('chicken', - new OpenLayers.LonLat(feature.geometry.x, feature.geometry.y), - null, - \"<div class='popup_hover'><p><b>\" + feature.attributes.name +\"</b></p>\" + stop_area_type_label + \"</div> \", null, false, null); - popup.autoSize = true; - popup.displayClass = 'popup_hover'; - - feature.popup = popup; - map.addPopup(popup); - }"), - :featureunhighlighted => JsExpr.new("function(e) { - var feature = e.feature; - if (feature.attributes.inactive != undefined) - return; - map.removePopup(feature.popup); - feature.popup.destroy(); - feature.popup = null; - }") - } } ) - end - - def kml_layer(url_or_object, options_or_url_options = {}, options = nil) - unless options - url_options = {} - options = options_or_url_options - else - url_options = options_or_url_options - end - - url_options = url_options.merge(:format => :kml) - - url = - case url_or_object - when String - url_or_object - when Array - helpers.polymorphic_path_patch( helpers.polymorphic_path(url_or_object, url_options)) - else - helpers.polymorphic_path_patch( helpers.polymorphic_path([url_or_object.referential, url_or_object], url_options)) - end - - protocol = OpenLayers::Protocol::HTTP.new :url => url, :format => kml - OpenLayers::Layer::Vector.new name, {:projection => projection("EPSG:4326"), :strategies => [strategy_fixed], :protocol => protocol, :displayInLayerSwitcher => false}.merge(options) - end - -end diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb deleted file mode 100644 index 82050c4da..000000000 --- a/app/maps/connection_link_map.rb +++ /dev/null @@ -1,27 +0,0 @@ - -class ConnectionLinkMap < ApplicationMap - - attr_reader :connection_link, :connection_link_style - - def initialize(connection_link, connection_link_style = nil) - @connection_link = connection_link - @connection_link_style = connection_link_style - end - - def customize_map(map, page) - 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 => 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 - - def ready? - Chouette::StopArea.bounds.present? - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(connection_link.stop_areas.collect(&:geometry).compact) - end - -end diff --git a/app/maps/design/access_link_style_map.rb b/app/maps/design/access_link_style_map.rb deleted file mode 100644 index 742f7ed0e..000000000 --- a/app/maps/design/access_link_style_map.rb +++ /dev/null @@ -1,43 +0,0 @@ -class Design::AccessLinkStyleMap < Design::GenericStyleMap - attr_accessor :style - - def initialize(helpers,options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def default_style - { - :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -10, - :strokeColor => "#000000", - :strokeOpacity => 1, - :strokeWidth => 3, - :strokeLineCap => "round", - :strokeDashstyle => "solid", - :externalGraphic => @helpers.assets_path_patch( "map/${positionType}.png"), - :graphicWidth => 36, - :graphicHeight => 36, - :graphicOpacity => 1, - :graphicXOffset => -18, - :graphicYOffset => -18, - :display => true - } - end - - def context - context = { - :positionType => :" function(feature) { if (feature.attributes.departure != undefined) { return 'departure'; } else { return 'arrival'; }} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context})) - end - -end - diff --git a/app/maps/design/access_points_style_map.rb b/app/maps/design/access_points_style_map.rb deleted file mode 100644 index f7740006d..000000000 --- a/app/maps/design/access_points_style_map.rb +++ /dev/null @@ -1,58 +0,0 @@ -class Design::AccessPointsStyleMap < Design::GenericStyleMap - attr_accessor :style, :context, :temporary - - def default_style - raise "Helpers nil" if @helpers.nil? - {:label => "${label}", - :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -20, - :pointRadius => 1, - :externalGraphic => @helpers.assets_path_patch( "map/access_${accessType}.png"), - :graphicWidth => 25, - :graphicHeight => 25, - :graphicOpacity => 1, - :graphicXOffset => -12.5, - :graphicYOffset => -12.5 } - end - def temporary_style - raise "Helpers nil" if @helpers.nil? - {:label => "${label}", - :fontColor => "darkblue", - :fontSize => "12px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -20, - :pointRadius => 1, - :externalGraphic => @helpers.assets_path_patch( "map/access_${accessType}.png"), - :graphicWidth => 25, - :graphicHeight => 25, - :graphicOpacity => 1, - :graphicXOffset => -12.5, - :graphicYOffset => -12.5 } - end - - def initialize(helpers,options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - @temporary = options[:style].present? ? temporary_style.merge(options[:style]) : temporary_style - end - - - def context - { - :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ", - :accessType => :" function(feature) { return feature.attributes.access_point_type.toLowerCase();} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), - :temporary => OpenLayers::Style.new(temporary, { :context => context}) ) - end - -end diff --git a/app/maps/design/connection_link_style_map.rb b/app/maps/design/connection_link_style_map.rb deleted file mode 100644 index 88eeb9457..000000000 --- a/app/maps/design/connection_link_style_map.rb +++ /dev/null @@ -1,43 +0,0 @@ -class Design::ConnectionLinkStyleMap < Design::GenericStyleMap - attr_accessor :style - - def initialize(helpers,options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def default_style - { - :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -15, - :strokeColor => "#000000", - :strokeOpacity => 1, - :strokeWidth => 3, - :strokeLineCap => "round", - :strokeDashstyle => "solid", - :externalGraphic => @helpers.assets_path_patch( "map/${positionType}.png"), - :graphicWidth => 36, - :graphicHeight => 36, - :graphicOpacity => 1, - :graphicXOffset => -18, - :graphicYOffset => -18, - :display => true - } - end - - def context - context = { - :positionType => :" function(feature) { if (feature.attributes.departure != undefined) { return 'departure'; } else { return 'arrival'; }} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context})) - end - -end - diff --git a/app/maps/design/edit_access_point_style_map.rb b/app/maps/design/edit_access_point_style_map.rb deleted file mode 100644 index 48c293470..000000000 --- a/app/maps/design/edit_access_point_style_map.rb +++ /dev/null @@ -1,46 +0,0 @@ -class Design::EditAccessPointStyleMap < Design::GenericStyleMap - attr_accessor :style - - def default_style - { :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -15, - :pointRadius => 4, - :fillColor => "white", - :fillOpacity => 1, - :strokeColor => "black", - :strokeOpacity => 1, - :strokeWidth => 2 } - end - - def select_style - { :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :pointRadius => 4, - :fillColor => "#86b41d", - :fillOpacity => 1, - :strokeColor => "black", - :strokeOpacity => 1, - :strokeWidth => 2 } - end - - def initialize(helpers, options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def context - { - :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), :select => OpenLayers::Style.new(style.merge( select_style), { :context => context})) - end - -end diff --git a/app/maps/design/edit_stop_area_style_map.rb b/app/maps/design/edit_stop_area_style_map.rb deleted file mode 100644 index 2431f8a0f..000000000 --- a/app/maps/design/edit_stop_area_style_map.rb +++ /dev/null @@ -1,46 +0,0 @@ -class Design::EditStopAreaStyleMap < Design::GenericStyleMap - attr_accessor :style - - def default_style - { :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -15, - :pointRadius => 4, - :fillColor => "white", - :fillOpacity => 1, - :strokeColor => "black", - :strokeOpacity => 1, - :strokeWidth => 2 } - end - - def select_style - { :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :pointRadius => 4, - :fillColor => "#86b41d", - :fillOpacity => 1, - :strokeColor => "black", - :strokeOpacity => 1, - :strokeWidth => 2 } - end - - def initialize(helpers, options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def context - { - :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), :select => OpenLayers::Style.new(style.merge( select_style), { :context => context})) - end - -end diff --git a/app/maps/design/generic_style_map.rb b/app/maps/design/generic_style_map.rb deleted file mode 100644 index 0056cc964..000000000 --- a/app/maps/design/generic_style_map.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Design::GenericStyleMap - include MapLayers - include MapLayers::ViewHelpers - -end diff --git a/app/maps/design/journey_pattern_style_map.rb b/app/maps/design/journey_pattern_style_map.rb deleted file mode 100644 index b5323d6ae..000000000 --- a/app/maps/design/journey_pattern_style_map.rb +++ /dev/null @@ -1,50 +0,0 @@ -class Design::JourneyPatternStyleMap < Design::GenericStyleMap - attr_accessor :style - - def initialize(helpers, options = {}) - @helpers = helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def select_style - default_style.merge externalGraphic: @helpers.assets_path_patch( "map/stop_area_hover.png") - end - - def default_style - { - label: "${label}", - fontColor: "black", - fontSize: "14px", - fontWeight: "bold", - labelAlign: "ct", - labelXOffset: 0, - labelYOffset: -15, - strokeColor: "#000000", - strokeOpacity: 1, - strokeWidth: 3, - strokeLineCap: "round", - strokeDashstyle: "solid", - externalGraphic: @helpers.assets_path_patch( "map/${positionType}.png"), - graphicWidth: 12, - graphicHeight: 12, - graphicOpacity: 1, - graphicXOffset: -6, - graphicYOffset: -6, - display: true - } - end - - def context - { - label: :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ", - positionType: :" function(feature) { if (feature.attributes.iconCode != undefined) {return feature.attributes.iconCode;} else { return '';} } " - } - end - - def style_map - OpenLayers::StyleMap.new( - default: OpenLayers::Style.new(style, { context: context}), - select: OpenLayers::Style.new(style.merge( select_style), { context: context})) - end - -end diff --git a/app/maps/design/line_style_map.rb b/app/maps/design/line_style_map.rb deleted file mode 100644 index e1d76078c..000000000 --- a/app/maps/design/line_style_map.rb +++ /dev/null @@ -1,28 +0,0 @@ -class Design::LineStyleMap < Design::GenericStyleMap - attr_accessor :style, :line_priority, :line_color - - def initialize(helpers,options = {}) - @helpers= helpers - @line_color = options[:line_color] - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def stroke_width - stroke_width = 3 - end - - def default_style - style = { - :strokeColor => line_color || "#000000", - :strokeOpacity => 1, - :strokeWidth => stroke_width, - :strokeLineCap => "round", - :strokeDashstyle => "solid", - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style)) - end - -end diff --git a/app/maps/design/route_style_map.rb b/app/maps/design/route_style_map.rb deleted file mode 100644 index 35585e81e..000000000 --- a/app/maps/design/route_style_map.rb +++ /dev/null @@ -1,47 +0,0 @@ -class Design::RouteStyleMap < Design::GenericStyleMap - attr_accessor :style - - def initialize(helpers,options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - end - - def select_style - default_style.merge :externalGraphic => @helpers.assets_path_patch( "map/stop_area_hover.png") - end - def default_style - { - :label => "${label}", - :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -15, - :strokeColor => "#000000", - :strokeOpacity => 1, - :strokeWidth => 3, - :strokeLineCap => "round", - :strokeDashstyle => "solid", - :externalGraphic => @helpers.assets_path_patch( "map/${positionType}.png"), - :graphicWidth => 12, - :graphicHeight => 12, - :graphicOpacity => 1, - :graphicXOffset => -6, - :graphicYOffset => -6, - :display => true - } - end - - def context - context = { - :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ", - :positionType => :" function(feature) { if (feature.attributes.departure != undefined) { return 'stop_area_green'; } else if (feature.attributes.arrival != undefined) { return 'stop_area_red'; } else { return 'stop_area_black'; }} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), :select => OpenLayers::Style.new(style.merge( select_style), { :context => context})) - end - -end diff --git a/app/maps/design/stop_areas_style_map.rb b/app/maps/design/stop_areas_style_map.rb deleted file mode 100644 index f45c423e2..000000000 --- a/app/maps/design/stop_areas_style_map.rb +++ /dev/null @@ -1,59 +0,0 @@ -class Design::StopAreasStyleMap < Design::GenericStyleMap - attr_accessor :style, :context, :temporary - - def default_style - raise "Helpers nil" if @helpers.nil? - {:label => "${label}", - :fontColor => "black", - :fontSize => "11px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -20, - :pointRadius => 1, - :externalGraphic => @helpers.assets_path_patch( "map/${areaType}.png"), - :graphicWidth => 25, - :graphicHeight => 25, - :graphicOpacity => 1, - :graphicXOffset => -12.5, - :graphicYOffset => -12.5 } - end - def temporary_style - raise "Helpers nil" if @helpers.nil? - {:label => "${label}", - :fontColor => "darkblue", - :fontSize => "12px", - :fontWeight => "bold", - :labelAlign => "ct", - :labelXOffset => 0, - :labelYOffset => -20, - :pointRadius => 1, - :externalGraphic => @helpers.assets_path_patch( "map/${areaType}.png"), - :graphicWidth => 25, - :graphicHeight => 25, - :graphicOpacity => 1, - :graphicXOffset => -12.5, - :graphicYOffset => -12.5 } - end - - - def initialize(helpers,options = {}) - @helpers= helpers - @style = options[:style].present? ? default_style.merge(options[:style]) : default_style - @temporary = options[:style].present? ? temporary_style.merge(options[:style]) : temporary_style - end - - - def context - { - :label => :" function(feature) {if(feature.layer.map.getZoom() > 13) { return feature.attributes.name;} else {return '';}} ", - :areaType => :" function(feature) { return feature.attributes.stop_area_type.toLowerCase();} " - } - end - - def style_map - OpenLayers::StyleMap.new(:default => OpenLayers::Style.new(style, { :context => context}), - :temporary => OpenLayers::Style.new(temporary, { :context => context}) ) - end - -end diff --git a/app/maps/group_of_line_map.rb b/app/maps/group_of_line_map.rb deleted file mode 100644 index b9c174cb9..000000000 --- a/app/maps/group_of_line_map.rb +++ /dev/null @@ -1,26 +0,0 @@ -class GroupOfLineMap < ApplicationMap - - attr_reader :group_of_line, :group_of_line_style - - def initialize(group_of_line, group_of_line_style = nil) - @group_of_line = group_of_line - @group_of_line_style = group_of_line_style - end - - def customize_map(map, page) - 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) ) - page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(group_of_line.stop_areas.collect(&:geometry).compact) - end - - def ready? - Chouette::StopArea.bounds.present? - end - -end diff --git a/app/maps/journey_pattern_map.rb b/app/maps/journey_pattern_map.rb deleted file mode 100644 index 9a0da5743..000000000 --- a/app/maps/journey_pattern_map.rb +++ /dev/null @@ -1,29 +0,0 @@ -class JourneyPatternMap < ApplicationMap - - attr_reader :journey_pattern, :style - - def initialize(journey_pattern, style = nil) - @journey_pattern = journey_pattern - @style = style - end - - def customize_map(map, page) - layer = kml_layer([journey_pattern.referential, journey_pattern.route.line, journey_pattern.route, journey_pattern], { setLayerIndex: 999, styleMap: Design::JourneyPatternStyleMap.new(helpers).style_map, rendererOptions: { zIndexing: true } }) - page.assign 'journeyPatternLayer', layer - page.assign 'selectFeature', OpenLayers::Control::SelectFeature.new(:journeyPatternLayer) - - page << map.add_layer(:journeyPatternLayer) - page << map.add_control(hover_control_display_name(:journeyPatternLayer)) - page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds - end - - def ready? - bounds.present? - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(journey_pattern.route.stop_areas.collect(&:geometry).compact) - end - -end - diff --git a/app/maps/line_map.rb b/app/maps/line_map.rb deleted file mode 100644 index 1acde11ff..000000000 --- a/app/maps/line_map.rb +++ /dev/null @@ -1,29 +0,0 @@ - -class LineMap < ApplicationMap - - attr_reader :line, :line_style - - def initialize(line, line_style = nil) - @line = line - @line_style = line_style - end - - def customize_map(map, page) - page << map.add_layer(kml_layer(line, :styleMap => Design::LineStyleMap.new( :style => line_style).style_map)) - page.assign "stop_areas_layer", kml_layer([line.line_referential, 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) ) - page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(line.stop_areas.collect(&:geometry).compact) - end - - def ready? - bounds.present? - end - -end diff --git a/app/maps/network_map.rb b/app/maps/network_map.rb deleted file mode 100644 index 109e390d0..000000000 --- a/app/maps/network_map.rb +++ /dev/null @@ -1,26 +0,0 @@ -class NetworkMap < ApplicationMap - - attr_reader :network, :network_style - - def initialize(network, network_style = nil) - @network = network - @network_style = network_style - end - - def customize_map(map, page) - 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) ) - page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(network.stop_areas.collect(&:geometry).compact) - end - - def ready? - Chouette::StopArea.bounds.present? - end - -end diff --git a/app/maps/route_map.rb b/app/maps/route_map.rb deleted file mode 100644 index bdd6c4a56..000000000 --- a/app/maps/route_map.rb +++ /dev/null @@ -1,31 +0,0 @@ -class RouteMap < ApplicationMap - - attr_reader :route, :style - - def initialize(route, style = nil) - @route = route - @style = style - end - - def customize_map(map, page) - layer = kml_layer([route.referential, route.line, route], :styleMap => Design::RouteStyleMap.new(helpers, {context: context = {label: ""}}).style_map) - page.assign "routeLayer", layer - selectFeature = OpenLayers::Control::SelectFeature.new( :routeLayer) - - page << map.add_layer( :routeLayer) - page << map.add_control( hover_control_display_name(:routeLayer) ) - - page.assign "selectFeature", selectFeature - page << map.zoom_to_extent(bounds.to_google.to_openlayers) if bounds - end - - def ready? - bounds.present? - end - - def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(route.stop_areas.collect(&:geometry).compact) - end - -end - diff --git a/app/maps/stop_area_map.rb b/app/maps/stop_area_map.rb deleted file mode 100644 index 07321834b..000000000 --- a/app/maps/stop_area_map.rb +++ /dev/null @@ -1,145 +0,0 @@ -class StopAreaMap < ApplicationMap - - attr_reader :stop_area - - attr_accessor :editable - alias_method :editable?, :editable - - def initialize(stop_area) - @stop_area = stop_area - end - - def customize_map(map, page) - if stop_area.children.present? - page.assign "children_layer", kml_layer(stop_area, { :children => true }, :style_map => Design::StopAreasStyleMap.new(helpers).style_map) - page << map.add_layer(:children_layer) - page << map.add_control( hover_control_display_name(:children_layer) ) - end - if stop_area.routing_stops.present? - 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 - - - if stop_area.new_record? - page << <<EOF - var createStyleMap = function() { - var defProp = {strokeColor: "black", strokeOpacity: 1, strokeWidth: 2, fillColor: "white", fillOpacity: 1}; - var defStyle = OpenLayers.Util.applyDefaults(defProp, OpenLayers.Feature.Vector.style["default"]); - return new OpenLayers.StyleMap({'default': defStyle}); - }; - var edit_stop_area_layer = new OpenLayers.Layer.Vector( "edit_stop_area_layer", {styleMap: createStyleMap()}); - -EOF - else - page.assign "edit_stop_area_layer", kml_layer(stop_area, { :default => editable? }, :style_map => Design::EditStopAreaStyleMap.new(helpers).style_map) - end - - page << <<EOF - var createAddressStyleMap = function() { - var defProp = {fill: false, stroke: false, label: "\uf041", labelAlign: "cb", labelXOffset: 0, labelYOffset: 0, fontSize:"20px", fontOpacity: 1, fontFamily: "FontAwesome", labelOutlineWidth: 2}; - var defStyle = OpenLayers.Util.applyDefaults(defProp, OpenLayers.Feature.Vector.style["default"]); - return new OpenLayers.StyleMap({'default': defStyle, }); - }; - var address_layer = new OpenLayers.Layer.Vector( "address_layer", {styleMap: createAddressStyleMap()}); - - var removeAddress = function() { - address_layer.destroyFeatures(); - }; - - var addAddress = function( lat, lng, name ) { - var wgs84point = new OpenLayers.Geometry.Point( lat, lng); - var point = transformedGeometry( wgs84point, "EPSG:4326", "EPSG:900913" ) - var feature = new OpenLayers.Feature.Vector( point, { name: name}); - address_layer.addFeatures( [feature]); - - var bounds = new OpenLayers.Bounds(); - bounds.extend( feature.geometry.getBounds()); - for (var x in edit_stop_area_layer.features) { - bounds.extend( edit_stop_area_layer.features[x].geometry.getBounds()); - } - map.zoomToExtent(bounds.scale(2), true); - }; - var transformedGeometry = function( geometry, origin, target ) { - return geometry.clone().transform( new OpenLayers.Projection( origin ), new OpenLayers.Projection( target )); - } -EOF - page << map.add_layer(:address_layer) - page << map.add_layer(:edit_stop_area_layer) - - if editable? - page.assign "referential_projection", projection_type.present? ? projection("EPSG:" + projection_type) : JsVar.new("undefined") - - # TODO virer ce code inline - page << <<EOF - - var getEventWGS84 = function( event) { - return transformedGeometry( event.geometry, "EPSG:900913", "EPSG:4326"); - } - var getEventProjection = function( event, projCode) { - return transformedGeometry( event.geometry, "EPSG:900913", projCode); - } - var updateStopAreaCoordinates = function( event ) { - var geometry = getEventWGS84( event ); - $('#stop_area_coordinates').val( geometry.y.toString()+ ","+ geometry.x.toString()); - } - var updateStopAreaProjectionXY = function( event, projCode ) { - var geometry = getEventProjection( event, projCode); - $('#stop_area_projection_xy').val( geometry.x.toString()+ ","+ geometry.y.toString()); - } - - var drawControl = new OpenLayers.Control.DrawFeature( edit_stop_area_layer, OpenLayers.Handler.Point, - { featureAdded: function(event) { - console.log( "featureAdded" ); - updateStopAreaCoordinates( event); - if( typeof referential_projection !== 'undefined') { - updateStopAreaProjectionXY( event, referential_projection.projCode); - } - this.deactivate(); - } - }); - - var dragControl = new OpenLayers.Control.DragFeature( edit_stop_area_layer, - { autoActivate: true, - onComplete: function(event) { - updateStopAreaCoordinates( event); - if( typeof referential_projection !== 'undefined') { - updateStopAreaProjectionXY( event, referential_projection.projCode); - } - }, - }); - map.addControl( dragControl); - map.addControl( drawControl); -EOF - - if stop_area.new_record? - page << <<EOF - drawControl.activate(); -EOF - end - end - - page << map.set_center(center.to_google.to_openlayers, 16, false, true) - end - end - - def projection_type - stop_area.projection - end - - def ready? - center.present? - end - - def center - stop_area.geometry or stop_area.default_position - end - - def bounds - # for ITL only - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds(stop_area.routing_stops.collect(&:geometry).compact) - end - -end diff --git a/app/views/access_links/show.html.slim b/app/views/access_links/show.html.slim index 59f72a55f..ebc801313 100644 --- a/app/views/access_links/show.html.slim +++ b/app/views/access_links/show.html.slim @@ -1,8 +1,6 @@ = title_tag t('access_links.show.title', access_link: @access_link.name ) .access_link_show - = @map.to_html - .summary p label = "#{@access_link.human_attribute_name('access_link_type')} : " diff --git a/app/views/access_points/_form.html.slim b/app/views/access_points/_form.html.slim index 5ba7a6863..5c0c59174 100644 --- a/app/views/access_points/_form.html.slim +++ b/app/views/access_points/_form.html.slim @@ -1,6 +1,4 @@ .container-fluid - = @map.to_html if @map - = semantic_form_for [@referential, @stop_area, @access_point] do |form| = form.inputs do = form.input :id, as: :hidden diff --git a/app/views/access_points/show.html.slim b/app/views/access_points/show.html.slim index 7c87fa16e..1c46e2b5c 100644 --- a/app/views/access_points/show.html.slim +++ b/app/views/access_points/show.html.slim @@ -1,8 +1,6 @@ = title_tag t('access_points.show.title', access_point: @access_point.name) .access_point_show - = @map.to_html if @access_point.long_lat_type != nil - .summary p label = "#{@access_point.human_attribute_name('comment')} : " @@ -92,7 +90,7 @@ div div.access_link_pairs table = render partial: 'access_link_pairs/access_link_pair', collection: access_links_pairs(@detail_access_links) - + - content_for :sidebar do ul.actions li diff --git a/app/views/connection_links/show.html.slim b/app/views/connection_links/show.html.slim index 5d8864bb5..ca6593131 100644 --- a/app/views/connection_links/show.html.slim +++ b/app/views/connection_links/show.html.slim @@ -1,8 +1,6 @@ = title_tag t('connection_links.show.title', :connection_link => @connection_link.name) .connection_link_show - = @map.to_html - .summary p label = "#{@connection_link.human_attribute_name(:departure)} : " diff --git a/app/views/group_of_lines/show.html.slim b/app/views/group_of_lines/show.html.slim index de215bfa0..a447a345d 100644 --- a/app/views/group_of_lines/show.html.slim +++ b/app/views/group_of_lines/show.html.slim @@ -3,8 +3,6 @@ = title_tag t('group_of_lines.show.title', :group_of_line => @group_of_line.name ) .group_of_line_show - = @map.to_html - .summary p label = "#{@group_of_line.human_attribute_name('registration_number')} : " diff --git a/app/views/journey_patterns/show.html.slim b/app/views/journey_patterns/show.html.slim index a77536130..cff0321ec 100644 --- a/app/views/journey_patterns/show.html.slim +++ b/app/views/journey_patterns/show.html.slim @@ -1,8 +1,6 @@ = title_tag t('journey_patterns.show.title', journey_pattern: journey_name( @journey_pattern), route: @route.name ) .journey_pattern_show - = @map.to_html - .summary p label = "#{@journey_pattern.human_attribute_name(:name)} : " diff --git a/app/views/referential_group_of_lines/show.html.slim b/app/views/referential_group_of_lines/show.html.slim index 504af0187..61a762350 100644 --- a/app/views/referential_group_of_lines/show.html.slim +++ b/app/views/referential_group_of_lines/show.html.slim @@ -2,8 +2,6 @@ = title_tag t('group_of_lines.show.title', :group_of_line => @group_of_line.name ) .group_of_line_show - = @map.to_html - .summary p label = "#{@group_of_line.human_attribute_name('registration_number')} : " diff --git a/app/views/referential_stop_areas/_form.html.slim b/app/views/referential_stop_areas/_form.html.slim index 8181ec3f3..3921c8bf1 100644 --- a/app/views/referential_stop_areas/_form.html.slim +++ b/app/views/referential_stop_areas/_form.html.slim @@ -1,9 +1,6 @@ = semantic_form_for [@referential, @stop_area] do |form| .row .container-fluid - - if !manage_itl && @map - = @map.to_html - = form.inputs do = form.input :id, as: :hidden = form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.name")} diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim index d6682ef70..1cba88f94 100644 --- a/app/views/stop_areas/_form.html.slim +++ b/app/views/stop_areas/_form.html.slim @@ -1,9 +1,7 @@ = simple_form_for [@stop_area_referential, @stop_area], html: {class: 'form-horizontal', id: 'stop_area_form'}, wrapper: :horizontal_form do |f| .row .col-lg-12 - /- if !manage_itl && @map - if !manage_itl - /= @map.to_html = f.input :id, as: :hidden = f.input :name, :input_html => {:title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.name")} - if has_feature?(:stop_area_localized_names) diff --git a/spec/controllers/routes_controller_spec.rb b/spec/controllers/routes_controller_spec.rb index f8e8697ec..e4dc6bc23 100644 --- a/spec/controllers/routes_controller_spec.rb +++ b/spec/controllers/routes_controller_spec.rb @@ -68,14 +68,8 @@ RSpec.describe RoutesController, type: :controller do end it_behaves_like "route, line and referential linked" - - it "assigns RouteMap.new(route) as @map" do - expect(assigns[:map]).to be_an_instance_of(RouteMap) - expect(assigns[:map].route).to eq(route) - end end - describe "POST /duplicate" do let!( :route_prime ){ route } diff --git a/spec/features/connection_links_spec.rb b/spec/features/connection_links_spec.rb index 2f6283dcd..7e95aeb13 100644 --- a/spec/features/connection_links_spec.rb +++ b/spec/features/connection_links_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 RSpec.describe "ConnectionLinks", type: :feature do login_user @@ -19,14 +20,6 @@ RSpec.describe "ConnectionLinks", type: :feature do click_link "#{connection_links.first.name}" expect(page).to have_content(connection_links.first.name) end - - it "display map" do - allow(subject).to receive(:stop_areas).and_return(Array.new(2) { create(:stop_area) }) - visit referential_connection_links_path(referential) - click_link "#{connection_links.first.name}" - expect(page).to have_selector("#map.connection_link") - end - end describe "new" do diff --git a/spec/features/group_of_lines_spec.rb b/spec/features/group_of_lines_spec.rb index 8b88e6e9e..6b2f1968a 100644 --- a/spec/features/group_of_lines_spec.rb +++ b/spec/features/group_of_lines_spec.rb @@ -40,12 +40,6 @@ describe "Group of lines", :type => :feature do click_link subject.name expect(page).to have_content(subject.name) end - - it "display map" do - visit line_referential_group_of_lines_path(line_referential) - click_link "#{subject.name}" - expect(page).to have_selector("#map.group_of_line") - end end # Fixme #1780 |
