Module:Weather/sandbox - Revision history

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T10:06:22Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 10:06, 21 October 2022
Line 1:		Line 1:
	local p = {}		local p = {}

	require('~~Module:No globals~~')		require('strict')

	local degree = "°" -- used by addUnitNames()		local degree = "°" -- used by addUnitNames()

Erutuon: eliminate makeArrays

2017-10-21T21:14:30Z

eliminate makeArrays

@@ Line 161: / Line 161: @@
 -- Stick numbers into array. Find out if any have decimals.
 -- Throw an error if any are invalid.
-local function makeArray(parameter, format)
+local function _makeArray(format)
-	if not parameter then
+	return function(parameter)
-		return nil
+			return nil
 		end
 	end
 end
@@ Line 504: / Line 496: @@
 	local args = frame.args
 	local format = getFormat(args.input, args.output, args.palette, args.messages)
-	local a, b, c = makeArrays(args.a, args.b, args.c, format)
+	local makeArray = _makeArray(format)
 	local output = {}
 	if args[1] then
@@ Line 547: / Line 540: @@
 	local args = frame.args
 	local format = getFormat(args.input, args.output, args.palette, args.messages)
-	local a, b, c = makeArrays(args.a, args.b, args.c, format)
+	local makeArray = _makeArray(format)
 	local output = { "{| class=\"wikitable center nowrap\"" }
 	if format.cellFormat then

Erutuon: make output of makeArrays and makeArray clearer

2017-10-21T21:10:51Z

make output of makeArrays and makeArray clearer

← Previous revision		Revision as of 21:10, 21 October 2017
Line 161:		Line 161:
	-- Stick numbers into array. Find out if any have decimals.		-- Stick numbers into array. Find out if any have decimals.
	-- Throw an error if any are invalid.		-- Throw an error if any are invalid.
	local function makeArray(parameter~~, array~~, format)		local function makeArray(parameter, format)
		⚫	if not parameter then
			return nil
		⚫	end
	local array = {}		local array = {}
	-- If there are multiple parameters for numbers, and the first doesn't have		-- If there are multiple parameters for numbers, and the first doesn't have
Line 183:		Line 186:
	end		end

	local a, b, c		local function makeArrays(a, b, c, format)
		⚫	if not a then

	local function makeArrays(args, format)
	local parameter_a = args.a
	local parameter_b = args.b
	local parameter_c = args.c
⚫	if ~~parameter_a~~ then
⚫	a = makeArray(~~parameter_a,~~ a, format)
	else
	error('Please provide a set of numbers in parameter a')		error('Please provide a set of numbers in parameter a')
	end		end
		⚫	a = makeArray(a, format)
⚫	if ~~parameter_b~~ then
	b = makeArray(~~parameter_b,~~ b, format)		b = makeArray(b, format)
		⚫	c = makeArray(c, format)
	else
	addMessage("There is no content in parameter " .. monospace("b") .. ".")
⚫	end
	if parameter_c then
⚫	c = makeArray(~~parameter_c,~~ c, format)
	else
	addMessage("There is no content in parameter " .. monospace("c") .. ".")
	end
	return a, b, c		return a, b, c
	end		end
Line 433:		Line 422:
	-- Precision is 1 if any number has one or more decimals.		-- Precision is 1 if any number has one or more decimals.
	decimals = tonumber(outputFormat.decimals) and outputFormat.decimals or format.precision		decimals = tonumber(outputFormat.decimals) and outputFormat.decimals or format.precision
	if type(decimals) ~= 'string' then
	mw.logObject(format)
	end

	if tonumber(b) and tonumber(a) then		if tonumber(b) and tonumber(a) then
Line 445:		Line 431:
	values = { round(c, decimals), "" }		values = { round(c, decimals), "" }
	end		end

	mw.log("format.outputUnit = " .. tostring(format.outputUnit))
	if outputFormat.first == format.inputUnit then		if outputFormat.first == format.inputUnit then
	if outputFormat.convertUnits == true then		if outputFormat.convertUnits == true then
Line 516:		Line 502:

	function p.makeRow(frame)		function p.makeRow(frame)
	local format = getFormat(~~frame.~~args.input, ~~frame.~~args.output, ~~frame.~~args.palette, ~~frame.~~args.messages)		local args = frame.args
			local format = getFormat(args.input, args.output, args.palette, args.messages)
	makeArrays(~~frame~~.args, format)		local a, b, c = makeArrays(args.a, args.b, args.c, format)
	local output = {}		local output = {}
	if ~~frame.~~args[1] then		if args[1] then
	table.insert(output, "\n\|-")		table.insert(output, "\n\|-")
	table.insert(output, "\n! " .. ~~frame.~~args[1])		table.insert(output, "\n! " .. args[1])
	if ~~frame.~~args[2] then		if args[2] then
	table.insert(output, " !! " .. ~~frame.~~args[2])		table.insert(output, " !! " .. args[2])
	end		end
	end		end
Line 558:		Line 545:

	function p.makeTable(frame)		function p.makeTable(frame)
	local format = getFormat(~~frame.~~args.input, ~~frame.~~args.output, ~~frame.~~args.palette, ~~frame.~~args.messages)		local args = frame.args
			local format = getFormat(args.input, args.output, args.palette, args.messages)
	makeArrays(~~frame~~.args, format)		local a, b, c = makeArrays(args.a, args.b, args.c, format)
	local output = { "{\| class=\"wikitable center nowrap\"" }		local output = { "{\| class=\"wikitable center nowrap\"" }
	if format.cellFormat then		if format.cellFormat then

Erutuon: clean up number-getting

2017-10-21T20:59:26Z

clean up number-getting

Show changes

Erutuon: frame passed when only args are needed

2017-10-21T20:05:37Z

frame passed when only args are needed

← Previous revision		Revision as of 20:05, 21 October 2017
Line 149:		Line 149:
	local value = tonumber(value)		local value = tonumber(value)
	if unit == "C" then		if unit == "C" then
	addMessage(value .. " " .. degree .. unit .. " was converted.")
	return round(value * 9/5 + 32, decimals)		return round(value * 9/5 + 32, decimals)
	elseif unit == "F" then		elseif unit == "F" then
	addMessage(value .. " " .. degree .. unit .. " was converted.")
	return round((value - 32) * 5/9, decimals)		return round((value - 32) * 5/9, decimals)
	else		else
Line 164:		Line 162:

	-- Input parsing		-- Input parsing
	local function makeArray(parameter, array, ~~frame~~)		local function makeArray(parameter, array, args)
	local format = getFormat(~~frame.~~args.input, ~~frame.~~args.output, ~~frame.~~args.palette, ~~frame.~~args.messages)		local format = getFormat(args.input, args.output, args.palette, args.messages)
	local array = {}		local array = {}
	local hasDecimals = false		local hasDecimals = false
Line 202:		Line 200:
	local a, b, c		local a, b, c

	local function makeArrays(~~frame~~)		local function makeArrays(args)
	local format = getFormat(~~frame.~~args.input, ~~frame.~~args.output, ~~frame.~~args.palette, ~~frame.~~args.messages)		local format = getFormat(args.input, args.output, args.palette, args.messages)
	local parameter_a = ~~frame.~~args.a		local parameter_a = args.a
	local parameter_b = ~~frame.~~args.b		local parameter_b = args.b
	local parameter_c = ~~frame.~~args.c		local parameter_c = args.c
	if parameter_a then		if parameter_a then
	a = makeArray(parameter_a, a, ~~frame~~)		a = makeArray(parameter_a, a, args)
	else		else
	error('Please provide a set of numbers in parameter a')		error('Please provide a set of numbers in parameter a')
	end		end
	if parameter_b then		if parameter_b then
	b = makeArray(parameter_b, b, ~~frame~~)		b = makeArray(parameter_b, b, args)
	else		else
	addMessage("There is no content in parameter " .. monospace("b") .. ".")		addMessage("There is no content in parameter " .. monospace("b") .. ".")
	end		end
	if parameter_c then		if parameter_c then
	c = makeArray(parameter_c, c, ~~frame~~)		c = makeArray(parameter_c, c, args)
	else		else
	addMessage("There is no content in parameter " .. monospace("c") .. ".")		addMessage("There is no content in parameter " .. monospace("c") .. ".")
Line 261:		Line 259:
	local backgroundColor, textColor		local backgroundColor, textColor
	value = tonumber(value)		value = tonumber(value)
	if value ~~== nil~~ then		if not value then
	backgroundColor, textColor = 'FFF', '000'		backgroundColor, textColor = 'FFF', '000'
	addMessage("Value supplied to " .. monospace("temperatureColor") .. " is not recognized.")		addMessage("Value supplied to " .. monospace("temperatureColor") .. " is not recognized.")
Line 268:		Line 266:
	if value < min or value >= max then		if value < min or value >= max then
	textColor = 'FFF'		textColor = 'FFF'
			-- Else nil.
	else
	~~textColor = ''~~ -- This assumes that black text color is the default for most readers.		-- This assumes that black text color is the default for most readers.
	end		end

Line 287:		Line 285:
	end		end
	end		end
	backgroundColor = string.format('%02X%02X%02X', backgroundRGB~~[1], backgroundRGB[2], backgroundRGB[3]~~)		backgroundColor = string.format('%02X%02X%02X', unpack(backgroundRGB))
	end
	if textColor == "" then
⚫	return backgroundColor
	else
	return backgroundColor, textColor
	end		end
		⚫	return backgroundColor, textColor
	end		end

Line 535:		Line 529:
	function p.makeRow(frame)		function p.makeRow(frame)
	local format = getFormat(frame.args.input, frame.args.output, frame.args.palette, frame.args.messages)		local format = getFormat(frame.args.input, frame.args.output, frame.args.palette, frame.args.messages)
	makeArrays(frame)		makeArrays(frame.args)
	local output = {}		local output = {}
	if frame.args[1] then		if frame.args[1] then
Line 577:		Line 571:
	function p.makeTable(frame)		function p.makeTable(frame)
	local format = getFormat(frame.args.input, frame.args.output, frame.args.palette, frame.args.messages)		local format = getFormat(frame.args.input, frame.args.output, frame.args.palette, frame.args.messages)
	makeArrays(frame)		makeArrays(frame.args)
	local output = { "{\| class=\"wikitable center nowrap\"" }		local output = { "{\| class=\"wikitable center nowrap\"" }
	if format.cellFormat then		if format.cellFormat then

Erutuon: shortening

2017-10-21T19:39:34Z

shortening

← Previous revision		Revision as of 19:39, 21 October 2017
Line 80:		Line 80:
	end		end
	end		end
	local function setFormat(key, ~~formatVariable~~, ~~formatValue1, formatValue2~~)		local function setFormat(key, variable, value)
	if string.find(outputParameter, key) then		if string.find(outputParameter, key) then
	cellFormat[~~formatVariable~~] = ~~formatValue1~~		cellFormat[variable] = value
	else		else
	cellFormat[~~formatVariable~~] = ~~formatValue2~~		cellFormat[variable] = not value
	end		end
	end		end
Line 101:		Line 101:
	end		end
	end		end
	setFormat("unit", "unitNames", true~~, false~~)		setFormat("unit", "unitNames", true)
	setFormat("no ?color", "color", false~~, true~~)		setFormat("no ?color", "color", false)
	setFormat("sort", "sortable", true~~, false~~)		setFormat("sort", "sortable", true)
	setFormat("full ?size", "smallFont", false~~, true~~)		setFormat("full ?size", "smallFont", false)
	setFormat("no ?brackets", "brackets", false~~, true~~)		setFormat("no ?brackets", "brackets", false)
	setFormat("round", "decimals", "0", "")		setFormat("round", "decimals", "0", "")
	if string.find(outputParameter, "line break") then		if string.find(outputParameter, "line break") then

Erutuon: use booleans

2017-10-21T19:36:41Z

use booleans

Show changes

Erutuon: better argument order

2017-10-10T00:10:55Z

better argument order

Erutuon: make format variables have more local scope

2017-09-15T07:24:56Z

make format variables have more local scope

Show changes

Erutuon: unused argument

2017-09-15T06:11:23Z

unused argument

← Previous revision		Revision as of 06:11, 15 September 2017
Line 137:		Line 137:
	return string.format("%." .. decimals .. "f", value)		return string.format("%." .. decimals .. "f", value)
	else		else
	addMessage("Format was asked to operate on " .. tostring(value) .. ", which cannot be converted to a number."~~, 2~~)		addMessage("Format was asked to operate on " .. tostring(value) .. ", which cannot be converted to a number.")
	return ""		return ""
	end		end

← Previous revision		Revision as of 00:10, 10 October 2017
Line 142:		Line 142:
	end		end

	local function convert(value, ~~decimals~~, ~~unit~~) -- Unit is the unit being converted from~~. It defaults to inputUnit~~.		local function convert(value, unit, decimals) -- Unit is the unit being converted from.
	if not unit then		if not unit then
	error("No unit supplied to convert.", 2)		error("No unit supplied to convert.", 2)
Line 319:		Line 319:
	return colorCSS(temperatureColor(palette, value))		return colorCSS(temperatureColor(palette, value))
	elseif unit == 'F' then		elseif unit == 'F' then
	return colorCSS(temperatureColor(palette, convert(value~~, decimals~~, 'F')))		return colorCSS(temperatureColor(palette, convert(value, 'F', decimals)))
	else		else
	unitError(unit or "nil")		unitError(unit or "nil")
Line 348:		Line 348:
	return styleAttribute(palette, value)		return styleAttribute(palette, value)
	elseif unit == 'F' then		elseif unit == 'F' then
	return styleAttribute(palette, convert(value~~, 1~~, 'F', ~~format~~))		return styleAttribute(palette, convert(value, 'F', 1))
	else		else
	unitError(unit)		unitError(unit)
Line 466:		Line 466:
	if outputFormat.first == format.inputUnit then		if outputFormat.first == format.inputUnit then
	if outputFormat.convertUnits == "yes" then		if outputFormat.convertUnits == "yes" then
	convertedUnits = { addUnitNames(convert(values[1]~~, decimals~~, format.inputUnit), outputFormat.unitNames, format.outputUnit), addUnitNames(convert(values[2]~~, decimals~~, format.inputUnit), outputFormat.unitNames, format.outputUnit) }		convertedUnits = { addUnitNames(convert(values[1], format.inputUnit, decimals), outputFormat.unitNames, format.outputUnit), addUnitNames(convert(values[2], format.inputUnit, decimals), outputFormat.unitNames, format.outputUnit) }
	end		end
	values = { addUnitNames(values[1], outputFormat.unitNames, format.inputUnit), addUnitNames(values[2], outputFormat.unitNames, format.inputUnit) }		values = { addUnitNames(values[1], outputFormat.unitNames, format.inputUnit), addUnitNames(values[2], outputFormat.unitNames, format.inputUnit) }
Line 473:		Line 473:
	convertedUnits = { addUnitNames(values[1], outputFormat.unitNames, format.inputUnit), addUnitNames(values[2], outputFormat.unitNames, format.inputUnit) }		convertedUnits = { addUnitNames(values[1], outputFormat.unitNames, format.inputUnit), addUnitNames(values[2], outputFormat.unitNames, format.inputUnit) }
	end		end
	values = { addUnitNames(convert(values[1]~~, decimals~~, format.inputUnit), outputFormat.unitNames, format.outputUnit), addUnitNames(convert(values[2]~~, decimals~~, format.inputUnit), outputFormat.unitNames, format.outputUnit) }		values = { addUnitNames(convert(values[1], format.inputUnit, decimals), outputFormat.unitNames, format.outputUnit), addUnitNames(convert(values[2], format.inputUnit, decimals), outputFormat.unitNames, format.outputUnit) }
	else		else
	addMessage(monospace(tostring(outputFormat.first)) .. ", the value for " .. monospace("first") .. " in " .. monospace("outputFormat") .. " is not recognized.")		addMessage(monospace(tostring(outputFormat.first)) .. ", the value for " .. monospace("first") .. " in " .. monospace("outputFormat") .. " is not recognized.")
Line 501:		Line 501:
	colorCSS = outputFormat.color == "yes" and temperatureCSS(c, format.inputUnit, format.palette, format.inputUnit) or ""		colorCSS = outputFormat.color == "yes" and temperatureCSS(c, format.inputUnit, format.palette, format.inputUnit) or ""
	if tonumber(b) and tonumber(a) then		if tonumber(b) and tonumber(a) then
	local attributeValue = outputFormat.first == format.inputUnit and c or convert(c~~, decimals~~, format.inputUnit)		local attributeValue = outputFormat.first == format.inputUnit and c or convert(c, format.inputUnit, decimals)
	sortkey = outputFormat.sortable == "yes" and " data-sort-value=\"" .. attributeValue .. "\"" or ""		sortkey = outputFormat.sortable == "yes" and " data-sort-value=\"" .. attributeValue .. "\"" or ""
	titleAttribute = " title=\"Average temperature: " .. attributeValue .. " " .. degree .. outputFormat.first .. "\""		titleAttribute = " title=\"Average temperature: " .. attributeValue .. " " .. degree .. outputFormat.first .. "\""