Module:Epi - Revision history

Frietjes at 17:33, 15 October 2018

2018-10-15T17:33:50Z

← Previous revision		Revision as of 17:33, 15 October 2018
Line 103:		Line 103:

	local flip = (args['m'] or '1') == '2'		local flip = (args['m'] or '1') == '2'
	local elev = '\|' .. a .. r .. '\|' .. moft(elev_m, e, d, l, s, p, flip) ~~.. '\n'~~		local elev = '\|' .. a .. r .. '\|' .. moft(elev_m, e, d, l, s, p, flip)
	local prom = '\|' .. a .. r .. '\|' .. moft(prom_m, d, d, l, s, p, flip) ~~.. '\n'~~		local prom = '\|' .. a .. r .. '\|' .. moft(prom_m, d, d, l, s, p, flip)
	local iso = '\|' .. a .. r .. '\|' .. kmomi(iso_km, l, s, p, flip) ~~.. '\n'~~		local iso = '\|' .. a .. r .. '\|' .. kmomi(iso_km, l, s, p, flip)
	return elev .. prom .. iso		return elev .. '\|' .. prom .. '\|' .. iso
	end		end

Frietjes: adjust sort sort key

2018-10-15T17:30:17Z

adjust sort sort key

← Previous revision		Revision as of 17:30, 15 October 2018
Line 21:		Line 21:
	sortkey = string.format('%d', prefix) .. string.format('%015.0f', math.floor(outvalue * 10^(14-mag)))		sortkey = string.format('%d', prefix) .. string.format('%015.0f', math.floor(outvalue * 10^(14-mag)))
	end		end
	return '<span style="display:none">' .. sortkey .. '♠</span>'		return '<span style="display:none" data-sort-value="' .. sortkey .. '♠"></span>'
	end		end

Frietjes at 16:52, 15 October 2018

2018-10-15T16:52:37Z

← Previous revision		Revision as of 16:52, 15 October 2018
Line 31:		Line 31:
	so, sc = '<span style="color:red">', '</span>'		so, sc = '<span style="color:red">', '</span>'
	end		end
	local n2 = formatnum(rnd(n1/fac,d)) .. ' ' .. u2		local n2 = formatnum(rnd(n1/fac,tonumber(d) or 0)) .. ' ' .. u2
	if fmt then		if fmt then
	n1 = formatnum(rnd(n1,e)) .. ' ' .. u1		n1 = formatnum(rnd(n1,tonumber(e) or 0)) .. ' ' .. u1
	else		else
	n1 = rnd(n1,e) .. ' ' .. u1		n1 = rnd(n1,tonumber(e) or 0) .. ' ' .. u1
	end		end
	if flip then		if flip then

Frietjes at 16:46, 15 October 2018

2018-10-15T16:46:03Z

← Previous revision		Revision as of 16:46, 15 October 2018
Line 31:		Line 31:
	so, sc = '<span style="color:red">', '</span>'		so, sc = '<span style="color:red">', '</span>'
	end		end
	local n2 = rnd(n1/fac,d) .. ' ' .. u2		local n2 = formatnum(rnd(n1/fac,d)) .. ' ' .. u2
	if fmt then		if fmt then
	n1 = formatnum(rnd(n1,e)) .. ' ' .. u1		n1 = formatnum(rnd(n1,e)) .. ' ' .. u1

Frietjes at 16:44, 15 October 2018

2018-10-15T16:44:47Z

← Previous revision		Revision as of 16:44, 15 October 2018
Line 1:		Line 1:
	local p = {}		local p = {}
			local lang = mw.getContentLanguage()

	local function formatnum(num)		local function formatnum(num)

Frietjes at 16:44, 15 October 2018

2018-10-15T16:44:17Z

← Previous revision		Revision as of 16:44, 15 October 2018
Line 1:		Line 1:
	local p = {}		local p = {}

			local function formatnum(num)
			return lang:parseFormattedNumber(num) and lang:formatNum(lang:parseFormattedNumber(num)) or num
			end

	local function ntsh(outvalue)		local function ntsh(outvalue)
Line 19:		Line 23:
	end		end

	local function cvt(n1, u1, e, u2, d, fac, l, flip)		local function cvt(n1, u1, e, u2, d, fac, fmt, l, flip)

	local rnd = require('Module:Math')._round		local rnd = require('Module:Math')._round
Line 27:		Line 31:
	end		end
	local n2 = rnd(n1/fac,d) .. ' ' .. u2		local n2 = rnd(n1/fac,d) .. ' ' .. u2
			if fmt then
⚫	n1 = rnd(n1,e) .. ' ' .. u1
			n1 = formatnum(rnd(n1,e)) .. ' ' .. u1
			else
		⚫	n1 = rnd(n1,e) .. ' ' .. u1
			end
	if flip then		if flip then
	if l == '1' then		if l == '1' then
Line 48:		Line 56:
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
			fmt = true
⚫	return ntsh(n) .. cvt(n, 'm', e, 'ft', d, 0.3048, l, flip)
			if (math.abs(n) > 900) and (math.abs(n) < 9000) then fmt = false end
		⚫	return ntsh(n) .. cvt(n, 'm', e, 'ft', d, 0.3048, fmt, l, flip)
	end		end
	return ntsh(0) .. s .. p .. n .. s		return ntsh(0) .. s .. p .. n .. s
Line 56:		Line 66:
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
			local fmt = true
	local e, d = 0, 0		local e, d = 0, 0
	if n < 19.995 then		if n < 19.995 then
Line 67:		Line 78:
	d = 1		d = 1
	end		end
	return ntsh(n * 1000) .. cvt(n, 'km', e, 'mi', d, 1.609344, l, flip)		return ntsh(n * 1000) .. cvt(n, 'km', e, 'mi', d, 1.609344, fmt, l, flip)
	end		end
	return ntsh(-1e10) .. s .. p .. n .. s		return ntsh(-1e10) .. s .. p .. n .. s

Frietjes at 16:33, 15 October 2018

2018-10-15T16:33:51Z

← Previous revision		Revision as of 16:33, 15 October 2018
Line 14:		Line 14:
	outvalue = outvalue + 10^(mag+1)		outvalue = outvalue + 10^(mag+1)
	end		end
	sortkey = format('%d', prefix) .. format('%015.0f', floor(outvalue * 10^(14-mag)))		sortkey = string.format('%d', prefix) .. string.format('%015.0f', math.floor(outvalue * 10^(14-mag)))
	end		end
	return '<span style="display:none">' .. sortkey .. '♠</span>'		return '<span style="display:none">' .. sortkey .. '♠</span>'

Frietjes at 16:32, 15 October 2018

2018-10-15T16:32:51Z

← Previous revision		Revision as of 16:32, 15 October 2018
Line 6:		Line 6:
	sortkey = '5000000000000000000'		sortkey = '5000000000000000000'
	else		else
	local mag = floor(log10(abs(outvalue)) + 1e-14)		local mag = math.floor(math.log10(math.abs(outvalue)) + 1e-14)
	local prefix		local prefix
	if outvalue > 0 then		if outvalue > 0 then

Frietjes: add ntsh code copied from Template:convert, might work out-of-context?

2018-10-15T16:31:16Z

add ntsh code copied from Template:convert, might work out-of-context?

← Previous revision		Revision as of 16:31, 15 October 2018
Line 1:		Line 1:
	local p = {}		local p = {}

	local function ntsh(~~frame, n, notnum, scale~~)		local function ntsh(outvalue)
			-- This code was copied from [[Template:Convert]]
	if ~~tonumber(n)~~ == ~~nil~~ then		if outvalue == 0 then
	return frame:expandTemplate{ title = 'ntsh', args = {notnum}}
			sortkey = '5000000000000000000'
	else		else
			local mag = floor(log10(abs(outvalue)) + 1e-14)
	return frame:expandTemplate{ title = 'ntsh', args = {tonumber(n)*scale}}
			local prefix
			if outvalue > 0 then
			prefix = 7000 + mag
			else
			prefix = 2999 - mag
			outvalue = outvalue + 10^(mag+1)
			end
			sortkey = format('%d', prefix) .. format('%015.0f', floor(outvalue * 10^(14-mag)))
	end		end
			return '<span style="display:none">' .. sortkey .. '♠</span>'
	end		end

Line 35:		Line 45:
	end		end

	local function moft(~~frame,~~ n, e, d, l, s, p, flip)		local function moft(n, e, d, l, s, p, flip)
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
	return ntsh(~~frame,~~ n~~, '0', 1~~) .. cvt(n, 'm', e, 'ft', d, 0.3048, l, flip)		return ntsh(n) .. cvt(n, 'm', e, 'ft', d, 0.3048, l, flip)
	end		end
	return ntsh(~~frame, n, '~~0~~', 1~~) .. s .. p .. n .. s		return ntsh(0) .. s .. p .. n .. s
	end		end

	local function kmomi(~~frame,~~ n, l, s, p, flip)		local function kmomi(n, l, s, p, flip)
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
Line 57:		Line 67:
	d = 1		d = 1
	end		end
	return ntsh(~~frame,~~ n, ~~'-1e10',~~ 1000) .. cvt(n, 'km', e, 'mi', d, 1.609344, l, flip)		return ntsh(n * 1000) .. cvt(n, 'km', e, 'mi', d, 1.609344, l, flip)
	end		end
	return ntsh(~~frame, n, '~~-1e10~~', 1000~~) .. s .. p .. n .. s		return ntsh(-1e10) .. s .. p .. n .. s
	end		end

Line 80:		Line 90:
	end		end

	local elev, prom, iso = '', '', ''
	local flip = (args['m'] or '1') == '2'		local flip = (args['m'] or '1') == '2'
	elev = '\|' .. a .. r .. '\|' .. moft(~~frame,~~elev_m, e, d, l, s, p, flip) .. '\n'		local elev = '\|' .. a .. r .. '\|' .. moft(elev_m, e, d, l, s, p, flip) .. '\n'
	prom = '\|' .. a .. r .. '\|' .. moft(~~frame,~~prom_m, d, d, l, s, p, flip) .. '\n'		local prom = '\|' .. a .. r .. '\|' .. moft(prom_m, d, d, l, s, p, flip) .. '\n'
	iso = '\|' .. a .. r .. '\|' .. kmomi(~~frame,~~iso_km, l, s, p, flip) .. '\n'		local iso = '\|' .. a .. r .. '\|' .. kmomi(iso_km, l, s, p, flip) .. '\n'
	return elev .. prom .. iso		return elev .. prom .. iso
	end		end

Frietjes at 16:13, 15 October 2018

2018-10-15T16:13:59Z

← Previous revision		Revision as of 16:13, 15 October 2018
Line 1:		Line 1:
	local p = {}		local p = {}

	local function ntsh(n, notnum, scale)		local function ntsh(frame, n, notnum, scale)
	if tonumber(n) == nil then		if tonumber(n) == nil then
	return frame:expandTemplate{ title = 'ntsh', args = {notnum}}		return frame:expandTemplate{ title = 'ntsh', args = {notnum}}
Line 35:		Line 35:
	end		end

	local function moft(n, e, d, l, s, p, flip)		local function moft(frame, n, e, d, l, s, p, flip)
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
	return cvt(n, 'm', e, 'ft', d, 0.3048, l, flip)		return ntsh(frame, n, '0', 1) .. cvt(n, 'm', e, 'ft', d, 0.3048, l, flip)
	end		end
	return ntsh(n, '0', 1) .. s .. p .. n .. s		return ntsh(frame, n, '0', 1) .. s .. p .. n .. s
	end		end

	local function kmomi(n, l, s, p, flip)		local function kmomi(frame, n, l, s, p, flip)
	if tonumber(n) then		if tonumber(n) then
	n = tonumber(n)		n = tonumber(n)
Line 57:		Line 57:
	d = 1		d = 1
	end		end
	return cvt(n, 'km', e, 'mi', d, 1.609344, l, flip)		return ntsh(frame, n, '-1e10', 1000) .. cvt(n, 'km', e, 'mi', d, 1.609344, l, flip)
	end		end
	return ntsh(n, '-1e10', 1000) .. s .. p .. n .. s		return ntsh(frame, n, '-1e10', 1000) .. s .. p .. n .. s
	end		end

Line 82:		Line 82:
	local elev, prom, iso = '', '', ''		local elev, prom, iso = '', '', ''
	local flip = (args['m'] or '1') == '2'		local flip = (args['m'] or '1') == '2'
	elev = '\|' .. a .. r .. '\|' .. moft(elev_m, e, d, l, s, p, flip) .. '\n'		elev = '\|' .. a .. r .. '\|' .. moft(frame,elev_m, e, d, l, s, p, flip) .. '\n'
	prom = '\|' .. a .. r .. '\|' .. moft(prom_m, d, d, l, s, p, flip) .. '\n'		prom = '\|' .. a .. r .. '\|' .. moft(frame,prom_m, d, d, l, s, p, flip) .. '\n'
	iso = '\|' .. a .. r .. '\|' .. kmomi(iso_km, l, s, p, flip) .. '\n'		iso = '\|' .. a .. r .. '\|' .. kmomi(frame,iso_km, l, s, p, flip) .. '\n'
	return elev .. prom .. iso		return elev .. prom .. iso
	end		end