Module:Road data/util - Revision history

Isabelle Belato: Changed protection settings for "Module:Road data/util": Highly visible template; requested at WP:RfPP ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2023-05-30T20:52:14Z

Changed protection settings for "Module:Road data/util": Highly visible template; requested at WP:RfPP ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 20:52, 30 May 2023
(No difference)

MusikAnimal: Changed protection level for "Module:Road data/util": High-risk Lua module: allow extended confirmed editors to edit ([Edit=Require extended confirmed access] (indefinite))

2017-10-10T17:34:38Z

Changed protection level for "Module:Road data/util": High-risk Lua module: allow extended confirmed editors to edit ([Edit=Require extended confirmed access] (indefinite))

← Previous revision	Revision as of 17:34, 10 October 2017
(No difference)

MusikAnimal: Protected "Module:Road data/util": High-risk module ([Edit=Require template editor access] (indefinite))

2017-10-10T17:19:53Z

Protected "Module:Road data/util": High-risk module ([Edit=Require template editor access] (indefinite))

← Previous revision	Revision as of 17:19, 10 October 2017
(No difference)

Chinissai: Corrected default precision.

2016-12-05T01:07:44Z

Corrected default precision.

← Previous revision		Revision as of 01:07, 5 December 2016
Line 96:		Line 96:
	-- Adjust precision based on multiplier, as done in {{convert}}.		-- Adjust precision based on multiplier, as done in {{convert}}.
	prec = prec - order(multiplier / 0.2)		prec = prec - order(multiplier / 0.2)
	-- Add another digit of precision to handle result with one significant digit.
	prec = prec + 1
	end		end


	local converted = distance * multiplier		local converted = distance * multiplier
	local ~~rounded~~ = ~~round~~(converted~~, prec~~)		local magnitude = order(converted)
			if prec <= -magnitude then
	if not desiredPrec and precision(rounded) - 1 ~= -order(converted) then
	-- If the result has ~~more~~ ~~than~~ two significant digits~~, remove a digit from the precision~~.		-- Ensure the result has at least two significant digits.
	prec = ~~prec~~ - 1		prec = -magnitude + 1
	rounded = round(converted, prec)
	end		end
	return ~~rounded~~		return round(converted, prec)
	end		end

Chinissai: Better handling of conversion precision.

2016-11-17T14:33:55Z

Better handling of conversion precision.

← Previous revision		Revision as of 14:33, 17 November 2016
Line 75:		Line 75:
	end		end

	local function ~~convertedPrecision~~(distance, multiplier)		local function convert(distance, multiplier, desiredPrec)
	if type(distance) ~= "string" then		if type(distance) ~= "string" then
	error("distance is not a string")		error("distance is not a string")
Line 88:		Line 88:
	-- This function returns the order of magnitude of a given string representing a number.		-- This function returns the order of magnitude of a given string representing a number.
	local order = math._order		local order = math._order
			-- This function rounds a given number to the given number of digits.
⚫	local prec = precision(distance)
	local ~~ord~~ = ~~order(distance)~~		local round = math._precision_format

	if prec == -ord then
		⚫	local prec = desiredPrec or precision(distance)
⚫	-- If the ~~distance~~ has ~~only~~ ~~one~~ significant ~~digit~~, ~~add~~ a digit to the precision.
			if not desiredPrec then
			local ord = order(distance)
		⚫	-- Adjust precision based on multiplier, as done in {{convert}}.
			prec = prec - order(multiplier / 0.2)
			-- Add another digit of precision to handle result with one significant digit.
	prec = prec + 1		prec = prec + 1
	end		end

⚫	-- Adjust precision based on multiplier, as done in {{convert}}.
	~~prec~~ = ~~prec~~ - ~~order(~~multiplier ~~/ 0.2)~~		local converted = distance * multiplier
			local rounded = round(converted, prec)
⚫	return ~~prec~~
			if not desiredPrec and precision(rounded) - 1 ~= -order(converted) then
		⚫	-- If the result has more than two significant digits, remove a digit from the precision.
			prec = prec - 1
			rounded = round(converted, prec)
			end
		⚫	return rounded
	end		end

Line 157:		Line 168:
	if mi_ then		if mi_ then
	-- If `mi` is indeed a number, compute and round the length in kilometers.		-- If `mi` is indeed a number, compute and round the length in kilometers.
	~~km_~~ = mi_ * kmPerMile		km = convert(mi, kmPerMile, prec)
	km = ~~round~~(~~km_~~, ~~prec~~ or ~~convertedPrecision(mi~~, ~~kmPerMile)~~)		m = convert(mi, kmPerMile * 1000, prec)
	m = round(km_ * 1000,
	prec or convertedPrecision(mi, kmPerMile * 1000))
	-- format mi (insert separators as in 1,000)		-- format mi (insert separators as in 1,000)
	mi = round(mi_, precision(mi))		mi = round(mi_, precision(mi))
Line 174:		Line 183:
	if km_ then		if km_ then
	-- If `km` is indeed a number, compute and round the length in miles.		-- If `km` is indeed a number, compute and round the length in miles.
	mi = ~~round~~(~~km_~~ / kmPerMile,		mi = convert(km, 1 / kmPerMile, prec)
	~~prec~~ or ~~convertedPrecision~~(km, 1 / kmPerMile))		ft = convert(km, ftPerMile / kmPerMile, prec)
	ft = round(km_ * ftPerMile / kmPerMile,
	prec or convertedPrecision(km, ftPerMile / kmPerMile))
	-- format km (insert separators as in 1,000)		-- format km (insert separators as in 1,000)
	km = round(km_, precision(km))		km = round(km_, precision(km))

Chinissai: Added overwrite option for addAll.

2016-05-20T10:59:51Z

Added overwrite option for addAll.

← Previous revision		Revision as of 10:59, 20 May 2016
Line 7:		Line 7:
	---		---
	-- Add all entries in `arr` into `target`.		-- Add all entries in `arr` into `target`.
	-- An error is raised if any key in `arr` is already in `target`.		-- An error is raised if `overwrite` is not true
			-- and any key in `arr` is already in `target`.
	function util.addAll(target, arr)		function util.addAll(target, arr, overwrite)
	if type(target) ~= "table" then		if type(target) ~= "table" then
	error("target is not a table")		error("target is not a table")
	end		end
	for key,value in pairs(arr) do		for key,value in pairs(arr) do
	if target[key] == nil then		if overwrite or target[key] == nil then
	target[key] = value		target[key] = value
	else		else

Chinissai: Added safeguard code.

2016-05-11T16:43:28Z

Added safeguard code.

← Previous revision		Revision as of 16:43, 11 May 2016
Line 9:		Line 9:
	-- An error is raised if any key in `arr` is already in `target`.		-- An error is raised if any key in `arr` is already in `target`.
	function util.addAll(target, arr)		function util.addAll(target, arr)
			if type(target) ~= "table" then
			error("target is not a table")
			end
	for key,value in pairs(arr) do		for key,value in pairs(arr) do
	if target[key] == nil then		if target[key] == nil then
Line 22:		Line 25:
	local t2 = type(e2)		local t2 = type(e2)
	if t1 ~= t2 then return t1 < t2 end		if t1 ~= t2 then return t1 < t2 end
			if t1 == "function" then
			error("Unexpected function type")
			end
	return e1 < e2		return e1 < e2
	end		end
Line 27:		Line 33:
	local arrayToStringAux		local arrayToStringAux
	arrayToStringAux = function(arr, indent)		arrayToStringAux = function(arr, indent)
			if type(arr) ~= "table" then
			error("arr is not a table")
			end
			if type(indent) ~= "number" then
			error("indent is not a number")
			end
	local result = {}		local result = {}
	local keys = {}		local keys = {}
Line 63:		Line 75:

	local function convertedPrecision(distance, multiplier)		local function convertedPrecision(distance, multiplier)
			if type(distance) ~= "string" then
			error("distance is not a string")
			end
			if type(multiplier) ~= "number" then
			error("multiplier is not a number")
			end
	-- Import math functions.		-- Import math functions.
	local math = require "Module:Math"		local math = require "Module:Math"
Line 83:		Line 101:
	Convert length specified in one unit (mi or km) to length in the other unit.		Convert length specified in one unit (mi or km) to length in the other unit.
	@param #map<#string, #string> lengths		@param #map<#string, #string> lengths
	a map from unit to distance (as a string) in that unit		a map from unit to distance (as a string) in that unit;
			may contain entry `prec` indicating desired conversion precision
	@param #string blank text to be used if length is unspecified		@param #string blank text to be used if length is unspecified
	@return #table a table containing the conversion result:		@return #table a table containing the conversion result:
⚫	mi = length in miles;
⚫	km = length in kilometers;
	orig = source unit;		orig = source unit;
	comp = target unit;		comp = target unit;
		⚫	mi = length in miles;
			ft = converted length in feet;
		⚫	km = length in kilometers;
			m = converted length in meters;
	error = error message, if any		error = error message, if any
	]]		]]
Line 177:		Line 198:
	--- Generates wikitext error messages.		--- Generates wikitext error messages.
	function util.err(msg)		function util.err(msg)
			if msg == nil then
			error("Unspecified error message")
			end
	return format('<strong class="error">Error: %s</strong>', msg)		return format('<strong class="error">Error: %s</strong>', msg)
	end		end

Chinissai: Removed continuation.

2016-05-07T10:54:44Z

Removed continuation.

← Previous revision		Revision as of 10:54, 7 May 2016
Line 85:		Line 85:
	a map from unit to distance (as a string) in that unit		a map from unit to distance (as a string) in that unit
	@param #string blank text to be used if length is unspecified		@param #string blank text to be used if length is unspecified
	@param cont if specified, a function to be applied to the result before returned
	@return #table a table containing the conversion result:		@return #table a table containing the conversion result:
	mi = length in miles;		mi = length in miles;
Line 93:		Line 92:
	error = error message, if any		error = error message, if any
	]]		]]
	function util.convertLengths(lengths, blank~~, cont~~)		function util.convertLengths(lengths, blank)
	-- Import math functions.		-- Import math functions.
	local math = require "Module:Math"		local math = require "Module:Math"
Line 172:		Line 171:
	local error = concat(errMsg)		local error = concat(errMsg)
	if error == "" then error = nil end		if error == "" then error = nil end
		⚫	return {mi = mi, ft = ft, km = km, m = m, orig = orig, comp = comp,
	cont = cont or function(x) return x end
⚫	return ~~cont~~{mi = mi, ft = ft, km = km, m = m, orig = orig, comp = comp,
	error = error}		error = error}
	end		end

Chinissai: More refactoring.

2016-05-07T10:45:15Z

More refactoring.

← Previous revision		Revision as of 10:45, 7 May 2016
Line 74:		Line 74:
	-- If the distance has only one significant digit, add a digit to the precision.		-- If the distance has only one significant digit, add a digit to the precision.
	prec = prec + 1		prec = prec + 1
	end
	if multiplier <= 0 then
	error("Nonpositive multiplier: " .. multiplier)
	end		end
	-- Adjust precision based on multiplier, as done in {{convert}}.		-- Adjust precision based on multiplier, as done in {{convert}}.
	~~while~~ multiplier < 0.2 do		prec = prec - order(multiplier / 0.2)
	prec = prec + 1
	multiplier = multiplier * 10
	end
	while multiplier > 2 do
	prec = prec - 1
	multiplier = multiplier / 10
	end
	return prec		return prec
	end		end

Chinissai: Corrected convertedPrecision.

2016-05-07T10:32:26Z

Corrected convertedPrecision.

← Previous revision		Revision as of 10:32, 7 May 2016
Line 71:		Line 71:
	local prec = precision(distance)		local prec = precision(distance)
	local ord = order(distance)		local ord = order(distance)
		⚫	if prec == -ord then
	local minprec = prec
⚫	if ~~minprec~~ == -ord then
	-- If the distance has only one significant digit, add a digit to the precision.		-- If the distance has only one significant digit, add a digit to the precision.
	~~minprec~~ = ~~minprec~~ + 1		prec = prec + 1
	end		end
	if multiplier <= 0 then		if multiplier <= 0 then
	error("Nonpositive multiplier: " .. multiplier)		error("Nonpositive multiplier: " .. multiplier)
	end		end
			-- Adjust precision based on multiplier, as done in {{convert}}.
	while multiplier < 0.2 do		while multiplier < 0.2 do
	prec = prec + 1		prec = prec + 1
Line 87:		Line 87:
	multiplier = multiplier / 10		multiplier = multiplier / 10
	end		end
	return prec ~~> minprec and prec or minprec~~		return prec
	end		end