diff --git a/app/controllers/loading_setups_controller.rb b/app/controllers/loading_setups_controller.rb index 642816c..707ef83 100644 --- a/app/controllers/loading_setups_controller.rb +++ b/app/controllers/loading_setups_controller.rb @@ -9,10 +9,10 @@ class LoadingSetupsController < ApplicationController end def update - permitted = params.fetch(:setup, {}).permit(:fuel_lb_per_gal, stations: %i[name arm max fuel], envelope: %i[weight cg]) + permitted = params.fetch(:setup, {}).permit(:fuel_lb_per_gal, :envelope_unit, stations: %i[name arm max fuel], envelope: %i[weight cg]) @setup = LoadingSetup.from_params(permitted.to_h) if @setup.valid? - @aircraft.update!(loading_stations: @setup.stations_json, cg_envelope: @setup.envelope) + @aircraft.update!(loading_stations: @setup.stations_json, cg_envelope: @setup.envelope.map { |w, cg| [ w.to_f, cg.to_f ] }) log_event("aircraft", "Loading stations and CG envelope updated") redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Loading setup saved." else diff --git a/app/models/loading_setup.rb b/app/models/loading_setup.rb index ec0c59c..0b332b1 100644 --- a/app/models/loading_setup.rb +++ b/app/models/loading_setup.rb @@ -1,31 +1,52 @@ # Loading stations (name, arm, maximum, fuel or not) and the CG envelope # (weight/CG points in order around the boundary), as entered from the POH. +# The envelope is stored as CG in inches; it can be entered as moment in +# lb-in/1000 (how many POH charts and Garmin Pilot give it) and is shown +# back the way it was entered. class LoadingSetup include ActiveModel::Model Station = Data.define(:name, :arm, :max, :fuel) + ENVELOPE_UNITS = { "cg" => "CG (inches aft of datum)", "moment" => "Moment (lb-in / 1000)" }.freeze + attr_accessor :stations, :envelope, :fuel_lb_per_gal + attr_writer :envelope_unit + + def envelope_unit = ENVELOPE_UNITS.key?(@envelope_unit) ? @envelope_unit : "cg" + def moment? = envelope_unit == "moment" + + # The envelope as entered: [weight, CG in] or [weight, moment / 1000]. + def entered_envelope + return envelope unless moment? + envelope.map { |w, cg| [ w, (w * cg / 1000).round(3) ] } + end def self.from_aircraft(aircraft) data = aircraft.loading_stations.is_a?(Hash) ? aircraft.loading_stations : {} new(stations: Array(data["stations"]).map { Station.new(name: _1["name"], arm: _1["arm"].to_d, max: _1["max"]&.to_d, fuel: _1["fuel"] == true) }, envelope: Array(aircraft.cg_envelope).map { [ _1[0].to_d, _1[1].to_d ] }, - fuel_lb_per_gal: (data["fuel_lb_per_gal"] || 6).to_d) + fuel_lb_per_gal: (data["fuel_lb_per_gal"] || 6).to_d, envelope_unit: data["envelope_unit"]) end # From the edit form: blank rows are ignored. def self.from_params(p) rows = Array(p["stations"]&.values).reject { _1["name"].to_s.strip.empty? && _1["arm"].to_s.strip.empty? } points = Array(p["envelope"]&.values).reject { _1["weight"].to_s.strip.empty? && _1["cg"].to_s.strip.empty? } - setup = new(fuel_lb_per_gal: p["fuel_lb_per_gal"].presence&.to_d || 6, stations: [], envelope: []) + setup = new(fuel_lb_per_gal: p["fuel_lb_per_gal"].presence&.to_d || 6, stations: [], envelope: [], envelope_unit: p["envelope_unit"]) setup.instance_variable_set(:@raw_stations, rows) setup.instance_variable_set(:@raw_envelope, points) setup.stations = rows.filter_map do |r| next unless numeric?(r["arm"]) Station.new(name: r["name"].to_s.strip.first(40), arm: r["arm"].to_d, max: numeric?(r["max"]) ? r["max"].to_d : nil, fuel: r["fuel"] == "1") end - setup.envelope = points.filter_map { numeric?(_1["weight"]) && numeric?(_1["cg"]) ? [ _1["weight"].to_d, _1["cg"].to_d ] : nil } + setup.envelope = points.filter_map do |pt| + next unless numeric?(pt["weight"]) && numeric?(pt["cg"]) + weight = pt["weight"].to_d + value = pt["cg"].to_d + next [ weight, value ] unless setup.moment? + [ weight, weight.positive? ? (value * 1000 / weight).round(4) : value ] + end setup end @@ -37,11 +58,12 @@ class LoadingSetup errors.add(:base, "Every station needs a name and a numeric arm (inches)") if raw_s.size != stations.size || stations.any? { _1.name.blank? } errors.add(:base, "Every envelope point needs a numeric weight and CG") if raw_e.size != envelope.size errors.add(:base, "The CG envelope needs at least 3 points, or none") if envelope.size.between?(1, 2) + errors.add(:base, "Envelope weights must be more than 0") if envelope.any? { |w, _| !w.positive? } errors.add(:base, "Fuel weight per gallon must be between 4 and 9 lb") unless fuel_lb_per_gal.to_d.between?(4, 9) end def stations_json - { "fuel_lb_per_gal" => fuel_lb_per_gal.to_f, + { "fuel_lb_per_gal" => fuel_lb_per_gal.to_f, "envelope_unit" => envelope_unit, "stations" => stations.map { { "name" => _1.name, "arm" => _1.arm.to_f, "max" => _1.max&.to_f, "fuel" => _1.fuel } } } end diff --git a/app/views/loading_setups/edit.html.erb b/app/views/loading_setups/edit.html.erb index 46d92e0..184afd9 100644 --- a/app/views/loading_setups/edit.html.erb +++ b/app/views/loading_setups/edit.html.erb @@ -1,7 +1,7 @@ <% content_for :title, "#{@aircraft.tail_number} Loading setup" %> <%= render "shared/aircraft_header", aircraft: @aircraft %> <% stations = @setup.stations + Array.new([ 8 - @setup.stations.size, 2 ].max) { nil } %> -<% points = @setup.envelope + Array.new([ 10 - @setup.envelope.size, 2 ].max) { nil } %> +<% points = @setup.entered_envelope + Array.new([ 10 - @setup.envelope.size, 2 ].max) { nil } %> <%= form_with url: aircraft_loading_setup_path(@aircraft), method: :patch, class: "card card-body max-w-3xl space-y-5" do %>