Module:Jcon/sandbox - Revision history

BrandonXLF: Use 36px

2024-08-26T09:01:14Z

Use 36px

← Previous revision		Revision as of 09:01, 26 August 2024
Line 268:		Line 268:

	-- Generate route shield		-- Generate route shield
	local routeShield = roadData.shield(parserArgs, 'list', '~~list~~')		local routeShield = roadData.shield(parserArgs, 'list', '36px')

	if routeShield ~= '' then		if routeShield ~= '' then

BrandonXLF: Use new custom size format

2024-08-26T08:47:55Z

Use new custom size format

← Previous revision		Revision as of 08:47, 26 August 2024
Line 7:		Line 7:
	local parser = require('Module:Road data/parser').parser		local parser = require('Module:Road data/parser').parser
	local roadData = require('Module:Road data/sandbox') -- REMOVE SANDBOX		local roadData = require('Module:Road data/sandbox') -- REMOVE SANDBOX
⚫	~~local sizeModule =~~ require('Module:Road data/size~~/sandbox~~') -- ~~REMOVE~~ ~~SANDBOX~~

	local data = mw.loadData('Module:Jcon/data/sandbox') -- REMOVE SANDBOX		local data = mw.loadData('Module:Jcon/data/sandbox') -- REMOVE SANDBOX
Line 28:		Line 27:
	-- Generate wikitext to show a MTO sign		-- Generate wikitext to show a MTO sign
	local function showSign(fileName, size, args)		local function showSign(fileName, size, args)
		⚫	local size = size:match('^%d+px$')
	local sizeDef = type(size) == 'table' and size or sizeModule.getDef(size)
			and size
	local signSize = sizeModule.getType(sizeDef, 'upright')
		⚫	or require('Module:Road data/size')._size{ style = size }
	fileName = data.signs[fileName] -- Get the file name from the sign definition		fileName = data.signs[fileName] -- Get the file name from the sign definition
	return '[[File:' .. fileName .. '\|alt=\|link=\|' .. ~~signSize~~ .. ']]' -- Return the file wikitext		return '[[File:' .. fileName .. '\|alt=\|link=\|' .. size .. ']]' -- Return the file wikitext
	end		end

Line 156:		Line 156:
	local showText = not yesno(args.notext)		local showText = not yesno(args.notext)
	local shieldAfter = yesno(args.picaft or args['pic aft'])		local shieldAfter = yesno(args.picaft or args['pic aft'])
			local size = args.size or 'jct'

	-- Use custom size definition when provided
⚫	local size = ~~args.~~size
	and { banner = args.size, upright = args.size, default = 'x' .. args.size }
	or 'jct'

	local shield = nil -- Generated shield wikitext		local shield = nil -- Generated shield wikitext

BrandonXLF: Use sizes from sizeModule

2024-08-25T19:53:30Z

Use sizes from sizeModule

← Previous revision		Revision as of 19:53, 25 August 2024
Line 7:		Line 7:
	local parser = require('Module:Road data/parser').parser		local parser = require('Module:Road data/parser').parser
	local roadData = require('Module:Road data/sandbox') -- REMOVE SANDBOX		local roadData = require('Module:Road data/sandbox') -- REMOVE SANDBOX
			local sizeModule = require('Module:Road data/size/sandbox') -- REMOVE SANDBOX

	local data = mw.loadData('Module:Jcon/data/sandbox') -- REMOVE SANDBOX		local data = mw.loadData('Module:Jcon/data/sandbox') -- REMOVE SANDBOX
Line 26:		Line 27:

	-- Generate wikitext to show a MTO sign		-- Generate wikitext to show a MTO sign
	local function showSign(fileName, ~~args~~, ~~sign~~)		local function showSign(fileName, size, args)
	local ~~size~~ = ~~args.~~size or '~~20px~~' -- ~~Image~~ size		local sizeDef = type(size) == 'table' and size or sizeModule.getDef(size)
			local signSize = sizeModule.getType(sizeDef, 'upright')
	fileName = data.signs[fileName] -- Get the file name from the sign definition		fileName = data.signs[fileName] -- Get the file name from the sign definition
	return '[[File:' .. fileName .. '\|alt=\|link=\|' .. ~~size~~ .. ']]' -- Return the file wikitext		return '[[File:' .. fileName .. '\|alt=\|link=\|' .. signSize .. ']]' -- Return the file wikitext
	end		end

Line 51:		Line 53:
	-- Generate the text part of the output		-- Generate the text part of the output
	local function getText(parserArgs, args, noSelfRedirect)		local function getText(parserArgs, args, noSelfRedirect)
			local linkParserArgs = {}
⚫	local link = parser(~~parserArgs~~, 'link', nil)
			for k, v in pairs(parserArgs) do linkParserArgs[k] = v end
		⚫	linkParserArgs.ignoreifexists = true

		⚫	local link = parser(linkParserArgs, 'link', nil)

	local display = ''		local display = ''
Line 70:		Line 76:

	-- Process routes present in the provided arguments		-- Process routes present in the provided arguments
	local function processRoutes(roadType, showShield, showText, args, prefix, name)		local function processRoutes(roadType, size, showShield, showText, args, prefix, name)
	local shield = '' -- Generated shield wikitext		local shield = '' -- Generated shield wikitext
	local text = '' -- Generated text/link wikitext		local text = '' -- Generated text/link wikitext
Line 97:		Line 103:

	if showShield then		if showShield then
⚫	-- Use custom size definition when provided
⚫	local size = args.size
⚫	and { banner = args.size, upright = args.size, default = 'x' .. args.size }
⚫	or 'jct'

	local routeShield = roadData.shield(parserArgs, yesno(args.shield) and 'list', size) -- Generate route shield		local routeShield = roadData.shield(parserArgs, yesno(args.shield) and 'list', size) -- Generate route shield

Line 109:		Line 110:
	end		end
	end		end

⚫	~~parserArgs~~.ignoreifexists = true

	if showText then		if showText then
Line 157:		Line 156:
	local showText = not yesno(args.notext)		local showText = not yesno(args.notext)
	local shieldAfter = yesno(args.picaft or args['pic aft'])		local shieldAfter = yesno(args.picaft or args['pic aft'])

		⚫	-- Use custom size definition when provided
		⚫	local size = args.size
		⚫	and { banner = args.size, upright = args.size, default = 'x' .. args.size }
		⚫	or 'jct'

	local shield = nil -- Generated shield wikitext		local shield = nil -- Generated shield wikitext
Line 163:		Line 167:
	if data.signs[roadType] then		if data.signs[roadType] then
	-- Handle MTO signs		-- Handle MTO signs
	shield = showSign(roadType, args)		shield = showSign(roadType, size, args)
	text = args[2] or ''		text = args[2] or ''
	elseif ON[roadType] then		elseif ON[roadType] then
	-- Handle numbered roads		-- Handle numbered roads
	shield, text = processRoutes(roadType, showShield, showText, args, 'con', args[3])		shield, text = processRoutes(roadType, size, showShield, showText, args, 'con', args[3])

	-- Handle to and via parameters		-- Handle to and via parameters
	local toShield, toText = processRoutes(roadType, showShield, showText, args, 'to', args.toname)		local toShield, toText = processRoutes(roadType, size, showShield, showText, args, 'to', args.toname)
	local viaShield, viaText = processRoutes(roadType, showShield, showText, args, 'via', args.vianame)		local viaShield, viaText = processRoutes(roadType, size, showShield, showText, args, 'via', args.vianame)

	if toShield ~= '' then		if toShield ~= '' then
Line 197:		Line 201:
	if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields		if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields
	-- Add the MTO sign if provided		-- Add the MTO sign if provided
	shield = shield .. showSign(args.sign, args)		shield = shield .. showSign(args.sign, size, args)
	end		end

Line 203:		Line 207:
	if showShield then		if showShield then
	if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields		if shield ~= '' then shield = shield .. ' ' end -- Add space after existing shields
	shield = shield .. showSign('tch', args) -- Add the TCH shield		shield = shield .. showSign('tch', size, args) -- Add the TCH shield
	end		end

Line 250:		Line 254:
	local type = normalizeType(args[1])		local type = normalizeType(args[1])
	local route = args[2]		local route = args[2]
	local size = args.size or '36px'

	if not ON[type] then return '' end		if not ON[type] then return '' end
Line 262:		Line 265:
	-- Arguments for the road data parser		-- Arguments for the road data parser
	local parserArgs = {		local parserArgs = {
	ignoreifexists = true,
	country = 'CAN',		country = 'CAN',
	province = 'ON',		province = 'ON',
Line 276:		Line 278:
	end		end

	-- Generate route text		-- Generate route text
	local routeText = getText(parserArgs, { fulltext = true }, true)		local routeText = getText(parserArgs, { fulltext = true }, true)

BrandonXLF: Support custom size

2024-08-25T18:59:09Z

Support custom size

← Previous revision		Revision as of 18:59, 25 August 2024
Line 97:		Line 97:

	if showShield then		if showShield then
			-- Use custom size definition when provided
⚫	local routeShield = roadData.shield(parserArgs, yesno(args.shield) and 'list', ~~'jct'~~) -- Generate route shield
			local size = args.size
			and { banner = args.size, upright = args.size, default = 'x' .. args.size }
			or 'jct'

		⚫	local routeShield = roadData.shield(parserArgs, yesno(args.shield) and 'list', size) -- Generate route shield

	if routeShield ~= '' then		if routeShield ~= '' then

BrandonXLF: Use Module:Road data/sandbox, TODO: Support size parameter

2024-08-24T18:07:16Z

Use Module:Road data/sandbox, TODO: Support size parameter

Show changes

BrandonXLF: Support multiple shields per route

2024-08-24T10:36:45Z

Support multiple shields per route

← Previous revision		Revision as of 10:36, 24 August 2024
Line 46:		Line 46:
	if to and shield then		if to and shield then
	local res = parser(parserArgs, 'shieldtomain', nil, dataModuleName)		local res = parser(parserArgs, 'shieldtomain', nil, dataModuleName)
⚫	if type(~~res~~) == 'table' then ~~return res[1] end~~
	if res then return res end		if res then return res end
	end		end
Line 53:		Line 52:
	if to then		if to then
	local res = parser(parserArgs, 'shieldto', nil, dataModuleName)		local res = parser(parserArgs, 'shieldto', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end
	end		end
Line 59:		Line 57:
	-- Shield format (used as reassurance marker)		-- Shield format (used as reassurance marker)
	if shield then		if shield then
	local res = parser(parserArgs, '~~shieldmain~~', nil, dataModuleName)		local res = parser(parserArgs, 'shieldlist', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end
	end		end
Line 66:		Line 63:
	-- Guide format (used on guide signs)		-- Guide format (used on guide signs)
	local res = parser(parserArgs, 'shield', nil, dataModuleName)		local res = parser(parserArgs, 'shield', nil, dataModuleName)
	if type(res) == 'table' then return res[1] end
	if res then return res end		if res then return res end

Line 74:		Line 70:
	-- Generate the wikitext for the shield		-- Generate the wikitext for the shield
	local function shieldWikitext(parserArgs, args, prefix)		local function shieldWikitext(parserArgs, args, prefix)
		⚫	local shield = getShield(parserArgs, yesno(args.shield), prefix == 'to')
⚫	return showFile(
		⚫
⚫	getShield(parserArgs, yesno(args.shield), prefix == 'to'),
		⚫	if type(shield) == 'table' then
	args
			local out = {}
⚫	)

			for i, single in ipairs(shield) do
			table.insert(out, showFile(single, args))
			end

			return table.concat(out, ' ') -- Add a space between multiple shields
			end

		⚫	return showFile(shield, args)
	end		end

BrandonXLF: Syncing sandbox code with main template (sync-template-sandbox.js)

2024-08-24T10:29:18Z

Syncing sandbox code with main template (sync-template-sandbox.js)

← Previous revision		Revision as of 10:29, 24 August 2024
Line 7:		Line 7:
	local parser = require('Module:Road data/parser').parser		local parser = require('Module:Road data/parser').parser

	local dataModuleName = 'Module:Jcon/data~~/sandbox~~'		local dataModuleName = 'Module:Jcon/data'
	local data = mw.loadData(dataModuleName)		local data = mw.loadData(dataModuleName)

Line 292:		Line 292:
	local route = args[2]		local route = args[2]
	local size = args.size or '36px'		local size = args.size or '36px'

			if not data[type] then return '' end

	-- Add table		-- Add table

BrandonXLF: Fix shieldlist

2024-08-24T09:49:15Z

Fix shieldlist

← Previous revision		Revision as of 09:49, 24 August 2024
Line 135:		Line 135:
	end		end

			-- Arguments for the road data parser
	local parserArgs = {		local parserArgs = {
	ignoreifexists = true,		ignoreifexists = true,
Line 288:		Line 289:
	function p.shieldlist(frame)		function p.shieldlist(frame)
	local args = getArgs(frame)		local args = getArgs(frame)
	local ~~roadInfo~~ = ~~data[~~normalizeType(args[1])]		local type = normalizeType(args[1])
	local route = args[2]		local route = args[2]
	local size = args.size or '36px'		local size = args.size or '36px'
⚫
	if not roadInfo then
	return ''
	end

	-- Add table		-- Add table
Line 301:		Line 298:
	-- Add a table row		-- Add a table row
	out = out .. '<tr>'		out = out .. '<tr>'
		⚫
			-- Arguments for the road data parser
			local parserArgs = {
			ignoreifexists = true,
			country = 'CAN',
			province = 'ON',
			type = type,
			route = route
			}

	-- Generate route shield		-- Generate route shield
	local routeShield = shieldWikitext(~~route, roadInfo~~, { size = size, shield = true })		local routeShield = shieldWikitext(parserArgs, { size = size, shield = true })

	if routeShield ~= '' then		if routeShield ~= '' then
Line 310:		Line 316:

	-- Generate route text		-- Generate route text
	local routeText = getText(~~route, roadInfo~~, { fulltext = true }, true)		local routeText = getText(parserArgs, { fulltext = true }, true)

	if routeText ~= '' then		if routeText ~= '' then

BrandonXLF: Use new Module:Jcon/data format

2024-08-24T09:42:30Z

Use new Module:Jcon/data format

Show changes

BrandonXLF: Syncing sandbox code with main template (sync-template-sandbox.js)

2024-08-24T08:07:41Z

Syncing sandbox code with main template (sync-template-sandbox.js)

← Previous revision		Revision as of 08:07, 24 August 2024
Line 292:		Line 292:
	end		end

			-- Entry function for {{shieldlist}}
	function p.shieldlist(frame)		function p.shieldlist(frame)
	local args = getArgs(frame)		local args = getArgs(frame)
Line 309:		Line 310:

	-- Generate route shield		-- Generate route shield
	local routeShield = shieldWikitext(route, roadInfo, {		local routeShield = shieldWikitext(route, roadInfo, { size = size, shield = true })

	size = size,
	shield = true
	})
	if routeShield ~= '' then		if routeShield ~= '' then
	out = out .. '<td style="background: transparent; border: 0px; margin: 0px; padding: 0px;">' .. routeShield .. '</td>'		out = out .. '<td style="background: transparent; border: 0px; margin: 0px; padding: 0px;">' .. routeShield .. '</td>'
Line 318:		Line 317:

	-- Generate route text		-- Generate route text
	local routeText = getText(route, roadInfo, {		local routeText = getText(route, roadInfo, { fulltext = true }, true)

	fulltext = true
	}, true)
	if routeText ~= '' then		if routeText ~= '' then
	out = out .. '<td style="background: transparent; border: 0px; margin: 0px; padding: 0px; text-align: center;">' .. routeText .. '</td>'		out = out .. '<td style="background: transparent; border: 0px; margin: 0px; padding: 0px; text-align: center;">' .. routeText .. '</td>'