app/views/bnb_blazer/queries/run.html.haml in bnb_blazer-0.13.0 vs app/views/bnb_blazer/queries/run.html.haml in bnb_blazer-0.14.0

- old
+ new

@@ -23,11 +23,11 @@ %small{:class => "check-state #{check.state.parameterize.gsub("-", "_")}"}= link_to check.state.upcase, edit_check_path(check) - if check.try(:message) · #{check.message} - if @query && @result.forecastable? && !params[:forecast] · - \#{link_to "Forecast", query_path(@query, {forecast: "t"}.merge(variable_params(@query)))} + \#{link_to "Forecast", query_path(@query, params: {forecast: "t"}.merge(variable_params(@query)))} - if @forecast_error .alert.alert-danger= @forecast_error - if @cohort_error .alert.alert-info= @cohort_error - if @rows.any? @@ -54,15 +54,17 @@ - series_library[target_index - 1] = {pointStyle: "line", hitRadius: 5, borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} - if @forecast - color = "#54a3ee" - series_library[1] = {borderDash: [8], borderColor: color, pointBackgroundColor: color, backgroundColor: color, pointHoverBackgroundColor: color} - if blazer_maps? && @markers.any? - #map{:style => "height: #{@only_chart ? 300 : 500}px;"} + - map_id = SecureRandom.hex + = content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" :javascript #{blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token} #{blazer_js_var "markers", @markers} + #{blazer_js_var "mapId", map_id } L.mapbox.accessToken = mapboxAccessToken; - var map = L.mapbox.map('map') + var map = L.mapbox.map(mapId) .addLayer(L.mapbox.styleLayer('mapbox://styles/mapbox/streets-v11')); var featureLayer = L.mapbox.featureLayer().addTo(map); var geojson = []; for (var i = 0; i < markers.length; i++) { var marker = markers[i];