Module:Jct/sandbox - Revision history

BrandonXLF: Use non-sandbox size module

2024-08-26T08:50:12Z

Use non-sandbox size module

← Previous revision		Revision as of 08:50, 26 August 2024
Line 2:		Line 2:

	local cityModuleName = "Module:Jct/city"		local cityModuleName = "Module:Jct/city"
	local sizeModuleName = "Module:Road data/size/sandbox" -- REMOVE SANDBOX

	local concat = table.concat		local concat = table.concat
Line 44:		Line 43:
	local function extra(args, sizeStyle)		local function extra(args, sizeStyle)
	local extraTypes = mw.loadData('Module:Road data/extra')		local extraTypes = mw.loadData('Module:Road data/extra')
	local sizeModule = require(sizeModuleName)
	local size = sizeModule.getType(sizeModule.getDef('jct'))
	local extraIcon = extraTypes[string.lower(args.extra or '')]		local extraIcon = extraTypes[string.lower(args.extra or '')]
	if not extraIcon then return '' end		if not extraIcon then return '' end
			local size = require('Module:Road data/size')._size{ style = sizeStyle }
	local countryIcon = extraIcon[args.country] or extraIcon.default		local countryIcon = extraIcon[args.country] or extraIcon.default
	if type(countryIcon) == 'table' then		if type(countryIcon) == 'table' then

BrandonXLF: Use new sizeModule functions

2024-08-25T19:54:24Z

Use new sizeModule functions

← Previous revision		Revision as of 19:54, 25 August 2024
Line 1:		Line 1:
	local p = {}		local p = {}
	-- Change to "" upon deployment.
	local moduleSuffix = ""

	local ~~parserModuleName~~ = "Module:~~Road data~~/~~parser~~" ~~.. moduleSuffix~~		local cityModuleName = "Module:Jct/city"
	local ~~cityModuleName~~ = "Module:~~Jct~~/~~city~~" .. ~~moduleSuffix~~		local sizeModuleName = "Module:Road data/size/sandbox" -- REMOVE SANDBOX

	local concat = table.concat		local concat = table.concat
Line 11:		Line 9:
	local trim = mw.text.trim		local trim = mw.text.trim

	local parserModule = require(~~parserModuleName~~)		local parserModule = require("Module:Road data/parser")
	local parser = parserModule.parser		local parser = parserModule.parser
	local util = require("Module:Road data/util")		local util = require("Module:Road data/util")
Line 46:		Line 44:
	local function extra(args, sizeStyle)		local function extra(args, sizeStyle)
	local extraTypes = mw.loadData('Module:Road data/extra')		local extraTypes = mw.loadData('Module:Road data/extra')
	local ~~size~~ = require(~~'Module:Road data/size/sandbox')._size({style=sizeStyle}~~)		local sizeModule = require(sizeModuleName)
			local size = sizeModule.getType(sizeModule.getDef('jct'))
	local extraIcon = extraTypes[string.lower(args.extra or '')]		local extraIcon = extraTypes[string.lower(args.extra or '')]
	if not extraIcon then return '' end		if not extraIcon then return '' end

BrandonXLF: Takes way fewer (and different) parameters, so use a separate module

2024-08-24T06:28:24Z

Takes way fewer (and different) parameters, so use a separate module

@@ Line 294: / Line 294: @@
 	local args = getArgs(frame, {removeBlanks = false})
 	return p._jctrdt(args, frame)
 end

BrandonXLF at 05:49, 24 August 2024

2024-08-24T05:49:53Z

← Previous revision		Revision as of 05:49, 24 August 2024
Line 302:		Line 302:

	for num, route in ipairs(routes) do		for num, route in ipairs(routes) do
	~~insert(shields,~~ roadDataModule.shield(route, ~~nil~~, '~~main~~', true))		local shield = roadDataModule.shield(route, 'main', 'infobox', true)
			table.insert(shields, shield)
	end		end

BrandonXLF: Add shieldmain to be used as the main image for infoboxes

2024-08-24T05:43:35Z

Add shieldmain to be used as the main image for infoboxes

@@ Line 294: / Line 294: @@
 	local args = getArgs(frame, {removeBlanks = false})
 	return p._jctrdt(args, frame)
 end

BrandonXLF: Add thinsp

2024-08-24T03:12:48Z

Add thinsp

← Previous revision		Revision as of 03:12, 24 August 2024
Line 142:		Line 142:
	toErr = toErr or route.toerror or false		toErr = toErr or route.toerror or false
	end		end
	local ~~graphics~~ = ~~concat(shields) ..~~ extra(args, 'jct') ~~.. ' '~~		local extraOutput = extra(args, 'jct')
			local graphics = concat(shields, ' ') .. (extraOutput ~= '' and ' ' or '') .. extraOutput .. ' '
	local linkText = concat(links)		local linkText = concat(links)
	local cities = ''		local cities = ''
Line 271:		Line 272:
	insert(links, routeText(route, args.jctname, frame, true))		insert(links, routeText(route, args.jctname, frame, true))
	end		end
	local graphics = concat(shields) .. ' '		local graphics = concat(shields, ' ') .. ' '
	local linkText = concat(links)		local linkText = concat(links)
	local cities = ''		local cities = ''

BrandonXLF at 04:39, 23 August 2024

2024-08-23T04:39:04Z

← Previous revision		Revision as of 04:39, 23 August 2024
Line 14:		Line 14:
	local parser = parserModule.parser		local parser = parserModule.parser
	local util = require("Module:Road data/util")		local util = require("Module:Road data/util")
	local roadDataModule = require("Module:~~Sandbox/BrandonXLF~~/4") -- ~~Module:Road~~ ~~data~~		local roadDataModule = require("Module:Road data/sandbox") -- REMOVE SANDBOX

	-- Links/abbreviations		-- Links/abbreviations

BrandonXLF: Will be Module:Road data

2024-08-23T04:30:44Z

Will be Module:Road data

← Previous revision		Revision as of 04:30, 23 August 2024
Line 14:		Line 14:
	local parser = parserModule.parser		local parser = parserModule.parser
	local util = require("Module:Road data/util")		local util = require("Module:Road data/util")
	local ~~displayModule~~ = require("Module:Sandbox/BrandonXLF/4")		local roadDataModule = require("Module:Sandbox/BrandonXLF/4") -- Module:Road data

	-- Links/abbreviations		-- Links/abbreviations
Line 23:		Line 23:
	link = route.route		link = route.route
	else		else
	link = ~~displayModule~~.link(route)		link = roadDataModule.link(route)
	end		end

Line 130:		Line 130:
	for num,route in ipairs(routes) do		for num,route in ipairs(routes) do
	if not (args.noshield or route.noshield) then		if not (args.noshield or route.noshield) then
	local shield, missingShields = ~~displayModule~~.shield(route, nil, 'jct')		local shield, missingShields = roadDataModule.shield(route, nil, 'jct')
	insert(shields, shield)		insert(shields, shield)
	if missingShields[1] then		if missingShields[1] then
Line 264:		Line 264:
	for num,route in ipairs(routes) do		for num,route in ipairs(routes) do
	if not (args.noshield or route.noshield) then		if not (args.noshield or route.noshield) then
	local shield = ~~displayModule~~.shield(route, nil, 'rdt')		local shield = roadDataModule.shield(route, nil, 'rdt')
	insert(shields, shield)		insert(shields, shield)
	end		end

BrandonXLF: require

2024-08-23T04:24:32Z

require

← Previous revision		Revision as of 04:24, 23 August 2024
Line 46:		Line 46:
	local function extra(args, sizeStyle)		local function extra(args, sizeStyle)
	local extraTypes = mw.loadData('Module:Road data/extra')		local extraTypes = mw.loadData('Module:Road data/extra')
	local size = ~~mw.loadData~~('Module:Road data/size/sandbox')._size({style=sizeStyle})		local size = require('Module:Road data/size/sandbox')._size({style=sizeStyle})
	local extraIcon = extraTypes[string.lower(args.extra or '')]		local extraIcon = extraTypes[string.lower(args.extra or '')]
	if not extraIcon then return '' end		if not extraIcon then return '' end

BrandonXLF: Merge Module:Jctrdt/sandbox

2024-08-23T04:19:04Z

Merge Module:Jctrdt/sandbox

@@ Line 15: / Line 15: @@
 local util = require("Module:Road data/util")
 local displayModule = require("Module:Sandbox/BrandonXLF/4")
 -- Links/abbreviations
-local function routeText(route, jctname, frame)
+local function routeText(route, jctname, frame, routeMap)
 	local link
 	local type = route.type
@@ Line 36: / Line 33: @@
 		local mainText = jctname and name or routeText
 		local parenText = jctname and routeText or name
 		return format('%s (%s)', mainText, parenText)
@@ Line 43: / Line 44: @@
 end
-local function extra(args)
+local function extra(args, sizeStyle)
 	local extraTypes = mw.loadData('Module:Road data/extra')
 	local extraIcon = extraTypes[string.lower(args.extra or '')]
 	if not extraIcon then return '' end
 	local countryIcon = extraIcon[args.country] or extraIcon.default
 	if type(countryIcon) == 'table' then
@@ Line 141: / Line 142: @@
 		toErr = toErr or route.toerror or false
 	end
-	local graphics = concat(shields) .. extra(args) .. ' '
+	local graphics = concat(shields) .. extra(args, 'jct') .. ' '
 	local linkText = concat(links)
 	local cities = ''
@@ Line 254: / Line 255: @@
 	local args = getArgs(frame, {removeBlanks = true})
 	return p._roadlink(args, frame)
 end