Module:Road data - Revision history

Lectonar: Changed protection settings for "Module:Road data": High-risk template or module ([Edit=Require template editor access] (indefinite))

2023-05-30T11:19:55Z

Changed protection settings for "Module:Road data": High-risk template or module ([Edit=Require template editor access] (indefinite))

← Previous revision	Revision as of 11:19, 30 May 2023
(No difference)

Fredddie: add back

2023-01-13T03:40:49Z

add back

← Previous revision		Revision as of 03:40, 13 January 2023
Line 167:		Line 167:
	size = format("%s%d", landscape and "x" or "", sizeModule)		size = format("%s%d", landscape and "x" or "", sizeModule)
	end		end
	local shieldCode = format("[[File:%s\|%s\|link=\|alt=]]", shield[1], size)		local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

Fredddie: quick test

2023-01-13T03:39:19Z

quick test

← Previous revision		Revision as of 03:39, 13 January 2023
Line 84:		Line 84:
	end		end

	local shieldsize = ~~size(route)~~		local shieldsize = sizeModule

	local banner = parser(route, 'banner') or {}		local banner = parser(route, 'banner') or {}
Line 165:		Line 165:
	size = concat(sizeparts)		size = concat(sizeparts)
	else		else
	size = format("%s%d", landscape and "x" or "", ~~defaultShieldSize~~)		size = format("%s%d", landscape and "x" or "", sizeModule)
	end		end
	local shieldCode = format("[[File:%s\|%~~spx~~\|link=\|alt=]]", shield[1], size)		local shieldCode = format("[[File:%s\|%s\|link=\|alt=]]", shield[1], size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

	for _,banner in ipairs(banners) do		for _,banner in ipairs(banners) do
	if shieldExists(banner[1]) then		if shieldExists(banner[1]) then
	shieldCode = format("[[File:%s\|%~~spx~~\|link=\|alt=]]<br>%s",		shieldCode = format("[[File:%s\|%s\|link=\|alt=]]<br>%s",
	banner[1],		banner[1],
	banner[2],		banner[2],

Fredddie: undo

2023-01-13T03:35:54Z

undo

← Previous revision		Revision as of 03:35, 13 January 2023
Line 18:		Line 18:

	-- Shields		-- Shields
	local defaultShieldSize = ~~sizeModule~~		local defaultShieldSize = 24

	local function addContextBanner(route, name, suffix, bannerSpec)		local function addContextBanner(route, name, suffix, bannerSpec)
Line 167:		Line 167:
	size = format("%s%d", landscape and "x" or "", defaultShieldSize)		size = format("%s%d", landscape and "x" or "", defaultShieldSize)
	end		end
	local shieldCode = format("[[File:%s\|%s\|link=\|alt=]]", shield[1], size)		local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

Fredddie: fix

2023-01-13T03:33:04Z

fix

← Previous revision		Revision as of 03:33, 13 January 2023
Line 18:		Line 18:

	-- Shields		-- Shields
	local defaultShieldSize = 20		local defaultShieldSize = sizeModule

	local function addContextBanner(route, name, suffix, bannerSpec)		local function addContextBanner(route, name, suffix, bannerSpec)
Line 165:		Line 165:
	size = concat(sizeparts)		size = concat(sizeparts)
	else		else
	size = format("%s%d", landscape and "x" or "", defaultShieldSize * scale)		size = format("%s%d", landscape and "x" or "", defaultShieldSize)
	end		end
	local shieldCode = format("[[File:%s\|%~~spx~~\|link=\|alt=]]", shield[1], size)		local shieldCode = format("[[File:%s\|%s\|link=\|alt=]]", shield[1], size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

Fredddie: synch from sandbox

2021-09-11T12:47:26Z

synch from sandbox

← Previous revision		Revision as of 12:47, 11 September 2021
Line 67:		Line 67:
	end		end

	local function shieldSpec(route, mainShield)		local function shieldSpec(route, mainShield, shieldList)
	local shieldSpec = {}		local shieldSpec = {}

	local shield		local shield
	if mainShield then shield = parser(route, "shieldmain") end		if mainShield then shield = parser(route, "shieldmain") end
			if shieldList then shield = parser(route, "shieldlist") end
	if not shield then shield = parser(route, 'shield') or '' end		if not shield then shield = parser(route, 'shield') or '' end
	if shield == '' then return shieldSpec end		if shield == '' then return shieldSpec end
Line 180:		Line 181:
	end		end

	function p.shield(route, scale, showLink, mainShield)		function p.shield(route, scale, showLink, mainShield, shieldList)
	missingShields = {}		missingShields = {}
	if route.rdt then		if route.rdt then
Line 189:		Line 190:

	local rendered = {}		local rendered = {}
	for _,entry in ipairs(shieldSpec(route, mainShield)) do		for _,entry in ipairs(shieldSpec(route, mainShield, shieldList)) do
	insert(rendered, render(entry, scale, showLink))		insert(rendered, render(entry, scale, showLink))
	end		end

Fredddie: partial rv

2021-07-22T14:42:23Z

partial rv

← Previous revision		Revision as of 14:42, 22 July 2021
Line 15:		Line 15:
	local parser = parserModule.parser		local parser = parserModule.parser
	local util = require("Module:Road data/util")		local util = require("Module:Road data/util")
	local sizeModule = require("Module:Road data/size").size({style = "~~jcttest~~"})		local sizeModule = require("Module:Road data/size").size({style = "jct"})

	-- Shields		-- Shields
			local defaultShieldSize = 20

	local function addContextBanner(route, name, suffix, bannerSpec)		local function addContextBanner(route, name, suffix, bannerSpec)
	local bannerModule = 'Module:Road data/banners/' .. string.upper(route.country)		local bannerModule = 'Module:Road data/banners/' .. string.upper(route.country)
Line 48:		Line 50:
	local bannerSizeIsNotTable = type(bannerSize) ~= "table"		local bannerSizeIsNotTable = type(bannerSize) ~= "table"
	for i,filename in ipairs(banner) do		for i,filename in ipairs(banner) do
	local bannersize = bannerSizeIsNotTable and bannerSize or bannerSize[i] or ~~sizeModule~~		local bannersize = bannerSizeIsNotTable and bannerSize or bannerSize[i] or defaultShieldSize
	insert(banners, {filename, bannersize})		insert(banners, {filename, bannersize})
	end		end
Line 101:		Line 103:
	local shieldBannerSize =		local shieldBannerSize =
	bannersizeIsNotTable and bannersize		bannersizeIsNotTable and bannersize
	or (bannersize[i] or bannersize.all or ~~sizeModule~~)		or (bannersize[i] or bannersize.all or defaultShieldSize)
	local shieldBannerSuffix = bannersuffix and (bannersuffixIsNotTable and bannersuffix or bannersuffix[i])		local shieldBannerSuffix = bannersuffix and (bannersuffixIsNotTable and bannersuffix or bannersuffix[i])
	insert(shieldSpec, {		insert(shieldSpec, {
Line 145:		Line 147:
	local shield = shieldEntry.shield		local shield = shieldEntry.shield
	local banners = shieldEntry.banners		local banners = shieldEntry.banners
	local exists = shieldExists(shield[1])		local exists, landscape = shieldExists(shield[1])
	if not exists then return '' end		if not exists then return '' end

	local orientation = parser(shieldEntry, 'orientation')

	local function landscape(shieldEntry)
	if orientation == "upright" then
	return nil
	else return "x"
⚫	end
⚫	end

	local landscape = landscape(shieldEntry)

	local size		local size
	if shield[2] then		if shield[2] then
			local width, height = mw.ustring.match(shield[2], "(%d)x?(%d)")
⚫	size = format("%s%d", landscape, ~~sizeModule~~ * scale)
			width = tonumber(width)
			height = tonumber(height)
			local sizeparts = {}
			if width then
			insert(sizeparts, format("%d", width * scale))
		⚫	end
			if height then
			insert(sizeparts, format("x%d", height * scale))
		⚫	end
			size = concat(sizeparts)
			else
		⚫	size = format("%s%d", landscape and "x" or "", defaultShieldSize * scale)
	end		end
	local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], size~~, shield[1]~~)		local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

Line 181:		Line 184:
	if route.rdt then		if route.rdt then
	local shieldSize = mw.ustring.match(route.rdt, '^(%d+)$') or 17		local shieldSize = mw.ustring.match(route.rdt, '^(%d+)$') or 17
	scale = shieldSize/~~sizeModule~~		scale = shieldSize/defaultShieldSize
	end		end
	scale = scale or 1		scale = scale or 1

Fredddie: Restored revision 1034873451 by Fredddie (talk)

2021-07-22T09:29:33Z

Restored revision 1034873451 by Fredddie (talk)

← Previous revision		Revision as of 09:29, 22 July 2021
Line 152:		Line 152:
	local function landscape(shieldEntry)		local function landscape(shieldEntry)
	if orientation == "upright" then		if orientation == "upright" then
	return ""		return nil
	else return "x"		else return "x"
	end		end
Line 163:		Line 163:
	size = format("%s%d", landscape, sizeModule * scale)		size = format("%s%d", landscape, sizeModule * scale)
	end		end
	local shieldCode = format("[[File:%s\|%s%spx\|link=\|alt=]]", shield[1], ~~landscape~~, ~~size~~)		local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], size, shield[1])
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end

Fredddie: not nil

2021-07-22T09:28:50Z

not nil

← Previous revision		Revision as of 09:28, 22 July 2021
Line 152:		Line 152:
	local function landscape(shieldEntry)		local function landscape(shieldEntry)
	if orientation == "upright" then		if orientation == "upright" then
	return ~~nil~~		return ""
	else return "x"		else return "x"
	end		end

Fredddie: fix

2021-07-22T09:28:04Z

fix

← Previous revision		Revision as of 09:28, 22 July 2021
Line 163:		Line 163:
	size = format("%s%d", landscape, sizeModule * scale)		size = format("%s%d", landscape, sizeModule * scale)
	end		end
	local shieldCode = format("[[File:%s\|%spx\|link=\|alt=]]", shield[1], ~~size~~, ~~shield[1]~~)		local shieldCode = format("[[File:%s\|%s%spx\|link=\|alt=]]", shield[1], landscape, size)
	if not banners[1] then return shieldCode end		if not banners[1] then return shieldCode end