Module:Weather box/row/sandbox - Revision history

Johnuniq: restore version at 03:00, 1 June 2023 to remove temporary tests

2023-12-07T05:26:10Z

restore version at 03:00, 1 June 2023 to remove temporary tests

← Previous revision		Revision as of 05:26, 7 December 2023
Line 148:		Line 148:

	local function getInputs(args, group_name, suffix, include_space)		local function getInputs(args, group_name, suffix, include_space)
	local month_names = { 'ND', 'DD', 'DJ', 'JJ', 'JF', 'FF', ~~'FM', 'MM', 'MA', 'AA', 'AY', 'YY', 'YU', 'UU', 'UL', 'LL', 'LG', 'GG', 'GS', 'SS', 'SO', 'OO', 'ON', 'year' }~~		local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
			'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'year' }
	local str		local str
	local values = {}		local values = {}
Line 191:		Line 192:
	local p1, p2, variant		local p1, p2, variant
	p1 = 0		p1 = 0
	for i = 1, 24 do		for i = 1, 12 do
	if not values[i]:isValid() then		if not values[i]:isValid() then
	return Value.new()		return Value.new()
Line 209:		Line 210:
	local value = Value.new(total)		local value = Value.new(total)
	if mode == 'avg' then		if mode == 'avg' then
	value:setNumberRounded(total / 24, p1)		value:setNumberRounded(total / 12, p1)
	end		end
	value.variant = variant		value.variant = variant
Line 215:		Line 216:
	elseif mode == 'min' then		elseif mode == 'min' then
	local target		local target
	for i = 1, 24 do		for i = 1, 12 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number < target.number then		if target == nil or values[i].number < target.number then
Line 225:		Line 226:
	elseif mode == 'max' then		elseif mode == 'max' then
	local target		local target
	for i = 1, 24 do		for i = 1, 12 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number > target.number then		if target == nil or values[i].number > target.number then
Line 239:		Line 240:

	local function reconcileTemperature(C_values, F_values)		local function reconcileTemperature(C_values, F_values)
	for i = 1, 25 do		for i = 1, 13 do
	local p		local p
	if C_values[i].string == '' then		if C_values[i].string == '' then
Line 257:		Line 258:
	local function reconcilePrecipitation(M_values, I_values, prefer_cm)		local function reconcilePrecipitation(M_values, I_values, prefer_cm)
	local v_class = 0		local v_class = 0
	for i = 1, 25 do		for i = 1, 13 do
	if M_values[i].variant == 1 then		if M_values[i].variant == 1 then
	v_class = 1		v_class = 1
Line 271:		Line 272:
	end		end
	end		end
	for i = 1, 25 do		for i = 1, 13 do
	local units		local units
	if M_values[i].string == '' then		if M_values[i].string == '' then
Line 345:		Line 346:
	return ''		return ''
	end		end
	if first_values[25].string == '' then		if first_values[13].string == '' then
	first_values[25] = getAnnualValue(first_values, annual_mode)		first_values[13] = getAnnualValue(first_values, annual_mode)
	end		end
	if second_values ~= nil then		if second_values ~= nil then
	if second_values[25].string == '' then		if second_values[13].string == '' then
	second_values[25] = getAnnualValue(second_values, annual_mode)		second_values[13] = getAnnualValue(second_values, annual_mode)
	end		end
	end		end
	color_scheme = wbc.interpret_color_code(color_scheme)		color_scheme = wbc.interpret_color_code(color_scheme)
	color_values = {}		color_values = {}
	local month_adj = { ~~1, 1, 1, 16~~/15, ~~1, 1, 1, 16~~/15, ~~1, 1, 1, 16~~/15, 1, ~~1, 1, 16~~/15, 1, ~~1, 1, 16/15, 1, 1, 1, 15.25/15 }~~		local month_adj = { 31/30, 28.25/30, 31/30, 1, 31/30, 1,
			31/30, 31/30, 1, 31/30, 1, 31/30, 365.25/30 }
	for i = 1, 25 do		for i = 1, 13 do
	if first_values[i]:isValid() then		if first_values[i]:isValid() then
	local adj = scale_factor		local adj = scale_factor

TekXS at 03:37, 8 September 2023

2023-09-08T03:37:19Z

← Previous revision		Revision as of 03:37, 8 September 2023
Line 148:		Line 148:

	local function getInputs(args, group_name, suffix, include_space)		local function getInputs(args, group_name, suffix, include_space)
	local month_names = { '~~Jan~~', '~~Feb~~', '~~Mar~~', '~~Apr~~', '~~May~~', '~~Jun~~',		local month_names = { 'ND', 'DD', 'DJ', 'JJ', 'JF', 'FF', 'FM', 'MM', 'MA', 'AA', 'AY', 'YY', 'YU', 'UU', 'UL', 'LL', 'LG', 'GG', 'GS', 'SS', 'SO', 'OO', 'ON', 'year' }
	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'year' }
	local str		local str
	local values = {}		local values = {}
Line 192:		Line 191:
	local p1, p2, variant		local p1, p2, variant
	p1 = 0		p1 = 0
	for i = 1, 12 do		for i = 1, 24 do
	if not values[i]:isValid() then		if not values[i]:isValid() then
	return Value.new()		return Value.new()
Line 210:		Line 209:
	local value = Value.new(total)		local value = Value.new(total)
	if mode == 'avg' then		if mode == 'avg' then
	value:setNumberRounded(total / 12, p1)		value:setNumberRounded(total / 24, p1)
	end		end
	value.variant = variant		value.variant = variant
Line 216:		Line 215:
	elseif mode == 'min' then		elseif mode == 'min' then
	local target		local target
	for i = 1, 12 do		for i = 1, 24 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number < target.number then		if target == nil or values[i].number < target.number then
Line 226:		Line 225:
	elseif mode == 'max' then		elseif mode == 'max' then
	local target		local target
	for i = 1, 12 do		for i = 1, 24 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number > target.number then		if target == nil or values[i].number > target.number then
Line 240:		Line 239:

	local function reconcileTemperature(C_values, F_values)		local function reconcileTemperature(C_values, F_values)
	for i = 1, 13 do		for i = 1, 25 do
	local p		local p
	if C_values[i].string == '' then		if C_values[i].string == '' then
Line 258:		Line 257:
	local function reconcilePrecipitation(M_values, I_values, prefer_cm)		local function reconcilePrecipitation(M_values, I_values, prefer_cm)
	local v_class = 0		local v_class = 0
	for i = 1, 13 do		for i = 1, 25 do
	if M_values[i].variant == 1 then		if M_values[i].variant == 1 then
	v_class = 1		v_class = 1
Line 272:		Line 271:
	end		end
	end		end
	for i = 1, 13 do		for i = 1, 25 do
	local units		local units
	if M_values[i].string == '' then		if M_values[i].string == '' then
Line 346:		Line 345:
	return ''		return ''
	end		end
	if first_values[13].string == '' then		if first_values[25].string == '' then
	first_values[13] = getAnnualValue(first_values, annual_mode)		first_values[25] = getAnnualValue(first_values, annual_mode)
	end		end
	if second_values ~= nil then		if second_values ~= nil then
	if second_values[13].string == '' then		if second_values[25].string == '' then
	second_values[13] = getAnnualValue(second_values, annual_mode)		second_values[25] = getAnnualValue(second_values, annual_mode)
	end		end
	end		end
	color_scheme = wbc.interpret_color_code(color_scheme)		color_scheme = wbc.interpret_color_code(color_scheme)
	color_values = {}		color_values = {}
	local month_adj = { 31/30, ~~28.25~~/30, 31/30, 1, 31/30, 1,		local month_adj = { 1, 1, 1, 16/15, 1, 1, 1, 16/15, 1, 1, 1, 16/15, 1, 1, 1, 16/15, 1, 1, 1, 16/15, 1, 1, 1, 15.25/15 }
		⚫	for i = 1, 25 do
	31/30, 31/30, 1, 31/30, 1, 31/30, 365.25/30 }
⚫	for i = 1, 13 do
	if first_values[i]:isValid() then		if first_values[i]:isValid() then
	local adj = scale_factor		local adj = scale_factor

Johnuniq: minor tweak to reduce duplication

2023-06-01T03:00:14Z

minor tweak to reduce duplication

← Previous revision		Revision as of 03:00, 1 June 2023
Line 125:		Line 125:
	local result = {'\|- style="text-align: center;"\n! scope="row" style="height: 16px;" \| ', label, "\n"}		local result = {'\|- style="text-align: center;"\n! scope="row" style="height: 16px;" \| ', label, "\n"}
	for i = 1, 13 do		for i = 1, 13 do
			table.insert(result,
	~~local color_str~~ = color_values[i]		'\|style="' .. color_values[i] ..
	if i == 13 then
	~~table.insert~~(~~result,~~ ~~table.concat( {'\|style~~=~~"',~~ ~~color_str,~~ ' border-left-width:medium" ~~class="notheme"\|~~ '} ))		(i == 13 and ' border-left-width:medium"' or '"') ..
			' class="notheme"\| '
	else
			)
	table.insert(result, table.concat( {'\|style="', color_str, '" class="notheme"\| '} ))
	end
	local display = first_values[i]:getDisplay()		local display = first_values[i]:getDisplay()
	if display then		if display then

Johnuniq: update from Module:Weather box/row: the recent tweaks gave an incorrect result for an empty parameter

2023-06-01T02:59:10Z

update from Module:Weather box/row: the recent tweaks gave an incorrect result for an empty parameter

← Previous revision		Revision as of 02:59, 1 June 2023
Line 109:		Line 109:
	return flag		return flag
	elseif type(flag) == 'string' then		elseif type(flag) == 'string' then
			flag = flag:lower()
	return require("Module:Yesno")(flag, true) or false
			if flag == '0' or flag == 'false' or
			flag == '' or flag == 'no' or
			flag == 'n' then
			return false
			else
			return true
			end
	else		else
	return error('Flag type not valid')		return error('Flag type not valid')

Lemondoge: oops

2023-04-12T13:32:04Z

oops

← Previous revision		Revision as of 13:32, 12 April 2023
Line 109:		Line 109:
	return flag		return flag
	elseif type(flag) == 'string' then		elseif type(flag) == 'string' then
	return ~~not~~ require("Module:Yesno")(flag, true)		return require("Module:Yesno")(flag, true) or false
	else		else
	return error('Flag type not valid')		return error('Flag type not valid')

Lemondoge: oops, accidentally saved early. Change was that I used Module:Yesno, and simplified a return statement

2023-04-12T13:30:30Z

oops, accidentally saved early. Change was that I used Module:Yesno, and simplified a return statement

← Previous revision		Revision as of 13:30, 12 April 2023
Line 109:		Line 109:
	return flag		return flag
	elseif type(flag) == 'string' then		elseif type(flag) == 'string' then
			return not require("Module:Yesno")(flag, true)
	flag = flag:lower()
	if flag == '0' or flag == 'false' or
	flag == '' or flag == 'no' or
	flag == 'n' then
	return false
	else
	return true
	end
	else		else
	return error('Flag type not valid')		return error('Flag type not valid')

Lemondoge: Synced; slight simplification and use of

2023-04-12T13:28:11Z

Synced; slight simplification and use of

← Previous revision		Revision as of 13:28, 12 April 2023
Line 127:		Line 127:
	local color_str = color_values[i]		local color_str = color_values[i]
	if i == 13 then		if i == 13 then
	table.insert(result, table.concat( {'\|style="', color_str, ' border-left-width:medium" \| '} ))		table.insert(result, table.concat( {'\|style="', color_str, ' border-left-width:medium" class="notheme"\| '} ))
	else		else
	table.insert(result, table.concat( {'\|style="', color_str, '" \| '} ))		table.insert(result, table.concat( {'\|style="', color_str, '" class="notheme"\| '} ))
	end		end
	local display = first_values[i]:getDisplay()		local display = first_values[i]:getDisplay()

Johnuniq: restore better way to set default options

2022-07-01T10:50:36Z

restore better way to set default options

← Previous revision		Revision as of 10:50, 1 July 2022
Line 150:		Line 150:
	local function getInputs(args, group_name, suffix, include_space)		local function getInputs(args, group_name, suffix, include_space)
	local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',		local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec~~', 'Thi~~', 'year' }		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'year' }
	local str		local str
	local values = {}		local values = {}
Line 193:		Line 193:
	local p1, p2, variant		local p1, p2, variant
	p1 = 0		p1 = 0
	for i = 1, 13 do		for i = 1, 12 do
	if not values[i]:isValid() then		if not values[i]:isValid() then
	return Value.new()		return Value.new()
Line 211:		Line 211:
	local value = Value.new(total)		local value = Value.new(total)
	if mode == 'avg' then		if mode == 'avg' then
	value:setNumberRounded(total / 13, p1)		value:setNumberRounded(total / 12, p1)
	end		end
	value.variant = variant		value.variant = variant
Line 217:		Line 217:
	elseif mode == 'min' then		elseif mode == 'min' then
	local target		local target
	for i = 1, 13 do		for i = 1, 12 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number < target.number then		if target == nil or values[i].number < target.number then
Line 227:		Line 227:
	elseif mode == 'max' then		elseif mode == 'max' then
	local target		local target
	for i = 1, 13 do		for i = 1, 12 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number > target.number then		if target == nil or values[i].number > target.number then
Line 241:		Line 241:

	local function reconcileTemperature(C_values, F_values)		local function reconcileTemperature(C_values, F_values)
	for i = 1, 14 do		for i = 1, 13 do
	local p		local p
	if C_values[i].string == '' then		if C_values[i].string == '' then
	if F_values[i]:isValid() then		if F_values[i]:isValid() then
	p = F_values[i]:getPrecision()		p = F_values[i]:getPrecision()
	C_values[i]:setNumberRounded( (F_values[i].number - 32)*5/9, p )		C_values[i]:setNumberRounded((F_values[i].number - 32)*5/9, p)
	end		end
	elseif F_values[i].string == '' then		elseif F_values[i].string == '' then
	if C_values[i]:isValid() then		if C_values[i]:isValid() then
	p = C_values[i]:getPrecision()		p = C_values[i]:getPrecision()
	F_values[i]:setNumberRounded( C_values[i].number*9/5 + 32, p )		F_values[i]:setNumberRounded(C_values[i].number*9/5 + 32, p)
	end		end
	end		end
Line 259:		Line 259:
	local function reconcilePrecipitation(M_values, I_values, prefer_cm)		local function reconcilePrecipitation(M_values, I_values, prefer_cm)
	local v_class = 0		local v_class = 0
	for i = 1, 14 do		for i = 1, 13 do
	if M_values[i].variant == 1 then		if M_values[i].variant == 1 then
	v_class = 1		v_class = 1
Line 273:		Line 273:
	end		end
	end		end
	for i = 1, 14 do		for i = 1, 13 do
	local units		local units
	if M_values[i].string == '' then		if M_values[i].string == '' then
Line 306:		Line 306:
	local color_values		local color_values
	local color_scheme = definition.color_scheme or 't'		local color_scheme = definition.color_scheme or 't'
	local scale_factor = math_mod._cleanNumber( definition.scale_factor ) or 1		local scale_factor = math_mod._cleanNumber(definition.scale_factor) or 1
	local date_mode = checkFlag( definition.date_mode, false )		local date_mode = checkFlag(definition.date_mode, false)
	local label = definition.label or ''		local label = definition.label or ''
	local annual_mode = (definition.annual_mode or 'avg'):lower()		local annual_mode = (definition.annual_mode or 'avg'):lower()
	local include_space = checkFlag( definition.include_space, true )		local include_space = checkFlag(definition.include_space, true)
	local second_line = checkFlag( definition.second_line, false )		local second_line = checkFlag(definition.second_line, false)
	local prefer_cm = checkFlag( definition.prefer_cm, false )		local prefer_cm = checkFlag(definition.prefer_cm, false)
	local imperial_first = checkFlag( args['imperial first'] )		local imperial_first = checkFlag(args['imperial first'])
	local metric_first = checkFlag( args['metric first'] )		local metric_first = checkFlag(args['metric first'])
	local wantSingleLine = options.wantSingleLine or checkFlag( args['single line'] )		local wantSingleLine = options.wantSingleLine or checkFlag(args['single line'])
	local trace = args.trace		local trace = args.trace
	if trace and trace ~= '' then		if trace and trace ~= '' then
Line 338:		Line 338:
	end		end
	local good = false		local good = false
	for i = 1, 14 do		for i = 1, 13 do
	if first_values[i].string ~= '' then		if first_values[i].string ~= '' then
	good = true		good = true
Line 347:		Line 347:
	return ''		return ''
	end		end
	if first_values[14].string == '' then		if first_values[13].string == '' then
	first_values[14] = getAnnualValue(first_values, annual_mode)		first_values[13] = getAnnualValue(first_values, annual_mode)
	end		end
	if second_values ~= nil then		if second_values ~= nil then
	if second_values[14].string == '' then		if second_values[13].string == '' then
	second_values[14] = getAnnualValue(second_values, annual_mode)		second_values[13] = getAnnualValue(second_values, annual_mode)
	end		end
	end		end
	color_scheme = wbc.interpret_color_code(color_scheme)		color_scheme = wbc.interpret_color_code(color_scheme)
	color_values = {}		color_values = {}
	local month_adj = { 1, 1, 1, 1, 1, 1,		local month_adj = { 31/30, 28.25/30, 31/30, 1, 31/30, 1,
	1, 1, 1, 1, 1, ~~1, 29.2421875~~/28, 365.~~2421875~~/28 }		31/30, 31/30, 1, 31/30, 1, 31/30, 365.25/30 }
	for i = 1, 14 do		for i = 1, 13 do
	if first_values[i]:isValid() then		if first_values[i]:isValid() then
	local adj = scale_factor		local adj = scale_factor

2804:7F4:C883:7EAF:B0F7:302B:DFBC:8FF7: Testing in the sandbox

2021-04-07T04:15:03Z

Testing in the sandbox

← Previous revision		Revision as of 04:15, 7 April 2021
Line 150:		Line 150:
	local function getInputs(args, group_name, suffix, include_space)		local function getInputs(args, group_name, suffix, include_space)
	local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',		local month_names = { 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
	'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'year' }		'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Thi', 'year' }
	local str		local str
	local values = {}		local values = {}
Line 193:		Line 193:
	local p1, p2, variant		local p1, p2, variant
	p1 = 0		p1 = 0
	for i = 1, 12 do		for i = 1, 13 do
	if not values[i]:isValid() then		if not values[i]:isValid() then
	return Value.new()		return Value.new()
Line 211:		Line 211:
	local value = Value.new(total)		local value = Value.new(total)
	if mode == 'avg' then		if mode == 'avg' then
	value:setNumberRounded(total / 12, p1)		value:setNumberRounded(total / 13, p1)
	end		end
	value.variant = variant		value.variant = variant
Line 217:		Line 217:
	elseif mode == 'min' then		elseif mode == 'min' then
	local target		local target
	for i = 1, 12 do		for i = 1, 13 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number < target.number then		if target == nil or values[i].number < target.number then
Line 227:		Line 227:
	elseif mode == 'max' then		elseif mode == 'max' then
	local target		local target
	for i = 1, 12 do		for i = 1, 13 do
	if values[i]:isValid() then		if values[i]:isValid() then
	if target == nil or values[i].number > target.number then		if target == nil or values[i].number > target.number then
Line 241:		Line 241:

	local function reconcileTemperature(C_values, F_values)		local function reconcileTemperature(C_values, F_values)
	for i = 1, 13 do		for i = 1, 14 do
	local p		local p
	if C_values[i].string == '' then		if C_values[i].string == '' then
Line 259:		Line 259:
	local function reconcilePrecipitation(M_values, I_values, prefer_cm)		local function reconcilePrecipitation(M_values, I_values, prefer_cm)
	local v_class = 0		local v_class = 0
	for i = 1, 13 do		for i = 1, 14 do
	if M_values[i].variant == 1 then		if M_values[i].variant == 1 then
	v_class = 1		v_class = 1
Line 273:		Line 273:
	end		end
	end		end
	for i = 1, 13 do		for i = 1, 14 do
	local units		local units
	if M_values[i].string == '' then		if M_values[i].string == '' then
Line 338:		Line 338:
	end		end
	local good = false		local good = false
	for i = 1, 13 do		for i = 1, 14 do
	if first_values[i].string ~= '' then		if first_values[i].string ~= '' then
	good = true		good = true
Line 347:		Line 347:
	return ''		return ''
	end		end
	if first_values[13].string == '' then		if first_values[14].string == '' then
	first_values[13] = getAnnualValue(first_values, annual_mode)		first_values[14] = getAnnualValue(first_values, annual_mode)
	end		end
	if second_values ~= nil then		if second_values ~= nil then
	if second_values[13].string == '' then		if second_values[14].string == '' then
	second_values[13] = getAnnualValue(second_values, annual_mode)		second_values[14] = getAnnualValue(second_values, annual_mode)
	end		end
	end		end
	color_scheme = wbc.interpret_color_code(color_scheme)		color_scheme = wbc.interpret_color_code(color_scheme)
	color_values = {}		color_values = {}
	local month_adj = { ~~31/30~~, ~~28.25/30~~, ~~31/30~~, 1, ~~31/30~~, 1,		local month_adj = { 1, 1, 1, 1, 1, 1,
	~~31/30~~, ~~31/30~~, 1, ~~31/30~~, 1, 31/30, 365.25/30 }		1, 1, 1, 1, 1, 1, 29.2421875/28, 365.2421875/28 }
	for i = 1, 13 do		for i = 1, 14 do
	if first_values[i]:isValid() then		if first_values[i]:isValid() then
	local adj = scale_factor		local adj = scale_factor

Johnuniq: better way to set default options

2020-06-10T11:42:56Z

better way to set default options

← Previous revision		Revision as of 11:42, 10 June 2020
Line 299:		Line 299:

	local function _buildRow(definition, args, options)		local function _buildRow(definition, args, options)
			options = options or {}
	local wbc = require('Module:Weather box/colors' .. (options.sandbox or ''))		local wbc = require('Module:Weather box/colors' .. (options.sandbox or ''))
	local mode = (definition.mode or 'basic'):lower()		local mode = (definition.mode or 'basic'):lower()
Line 387:		Line 388:

	local function buildRow(frame)		local function buildRow(frame)
	return _buildRow(frame.args, frame:getParent().args~~, {}~~) -- row definition, template parameters~~, options~~		return _buildRow(frame.args, frame:getParent().args) -- row definition, template parameters
	end		end