Module:Location map/multi - Revision history

Pppery: Desandbox

2024-04-30T01:22:33Z

Desandbox

← Previous revision		Revision as of 01:22, 30 April 2024
Line 4:		Line 4:

	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local locmap = require('Module:Location map~~/sandbox~~')		local locmap = require('Module:Location map')

	local function switcherSeparate(s)		local function switcherSeparate(s)

Pppery: Per request on talk

2024-04-30T00:14:56Z

Per request on talk

← Previous revision		Revision as of 00:14, 30 April 2024
Line 4:		Line 4:

	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local locmap = require('Module:Location map')		local locmap = require('Module:Location map/sandbox')

	local function switcherSeparate(s)		local function switcherSeparate(s)
Line 208:		Line 208:
	args = getArgs(frame, {frameOnly = true})		args = getArgs(frame, {frameOnly = true})
	end		end
	local dataModule = mw.loadData(~~frame.~~args[1])		local dataModule = mw.loadData(args[1])
			local containerArgs = dataModule.containerArgs
	if not map then		if not map then
	map = {}		map = {}
	for mapname in string.gmatch(~~dataModule.~~containerArgs[1], '[^#]+') do		for mapname in string.gmatch(containerArgs[1], '[^#]+') do
	map[#map + 1] = locmap.getMapParams(mapname, frame)		map[#map + 1] = locmap.getMapParams(mapname, frame)
	end		end
Line 237:		Line 238:
	end		end
	end		end
			if args.autoSwitcherLabel then
⚫	return locmap.top(frame, ~~dataModule.~~containerArgs, map) .. table.concat(marks) .. locmap.bottom(frame, ~~dataModule.~~containerArgs, map)
			local TableTools = require('Module:TableTools')
			containerArgs = TableTools.shallowClone(containerArgs)
			containerArgs.autoSwitcherLabel = true
			end
		⚫	return locmap.top(frame, containerArgs, map) .. table.concat(marks) .. locmap.bottom(frame, containerArgs, map)
	end		end

Legoktm: Replace Module:No globals with require( "strict" )

2022-10-21T21:08:54Z

Replace Module:No globals with require( "strict" )

← Previous revision		Revision as of 21:08, 21 October 2022
Line 1:		Line 1:
	require('~~Module:No globals~~')		require('strict')

	local p = {}		local p = {}

Frietjes: not sure why this was removed

2018-02-23T19:39:02Z

not sure why this was removed

← Previous revision		Revision as of 19:39, 23 February 2018
Line 173:		Line 173:
	if k then		if k then
	table.insert(marks, k)		table.insert(marks, k)
			end
			elseif string.sub(k, 1, 11) == 'coordinates' then
			k = tonumber(string.sub(k, 12))
			if k then
			table.insert(marks,k)
	end		end
	end		end

Frietjes: not sure why this was removed

2018-02-23T19:35:09Z

not sure why this was removed

← Previous revision		Revision as of 19:35, 23 February 2018
Line 178:		Line 178:
	end		end
	table.sort(marks)		table.sort(marks)
	if marks[1] ~= 1 and (args.lat or args.lat_deg) then		if marks[1] ~= 1 and (args.lat or args.lat_deg or args.coordinates) then
	table.insert(marks, 1, 1)		table.insert(marks, 1, 1)
	end		end

Frietjes: consistent ordering

2018-02-23T19:34:08Z

consistent ordering

← Previous revision		Revision as of 19:34, 23 February 2018
Line 124:		Line 124:
	label = fullArgs['label' .. n],		label = fullArgs['label' .. n],
	label_size = fullArgs['label' .. n .. '_size'],		label_size = fullArgs['label' .. n .. '_size'],
⚫	position = fullArgs['position' .. n] or fullArgs['pos' .. n],
	label_width = fullArgs['label' .. n .. '_width'],		label_width = fullArgs['label' .. n .. '_width'],
		⚫	position = fullArgs['position' .. n] or fullArgs['pos' .. n],
	background = fullArgs['background' .. n] or fullArgs['bg' .. n]		background = fullArgs['background' .. n] or fullArgs['bg' .. n]
	}		}

Frietjes: not sure why these were removed

2018-02-23T19:32:51Z

not sure why these were removed

Galobtter: remove /sandbox

2018-02-23T16:43:37Z

remove /sandbox

← Previous revision		Revision as of 16:43, 23 February 2018
Line 4:		Line 4:

	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local locmap = require('Module:Location map~~/sandbox~~')		local locmap = require('Module:Location map')

	local function switcherSeparate(s)		local function switcherSeparate(s)

MSGJ: changes requested by User:Bellezzasolo, support for multiple maps

2018-02-23T13:14:43Z

changes requested by User:Bellezzasolo, support for multiple maps

@@ Line 4: / Line 4: @@
 local getArgs = require('Module:Arguments').getArgs
-local locmap = require('Module:Location map')
+local locmap = require('Module:Location map/sandbox')
 function p.container(frame, args, map)
 	if not args then
 		args = getArgs(frame, {wrappers = 'Template:Location map+', valueFunc = locmap.valueFunc})
 	end
 	if not map then
-		map = locmap.getMapParams(args[1], frame)
+		if args[1] then
 	end
 end
@@ Line 30: / Line 95: @@
 			lon_sec = fullArgs.lon1_sec or fullArgs.lon_sec,
 			lon_dir = fullArgs.lon1_dir or fullArgs.lon_dir,
 			mark = fullArgs.mark1 or fullArgs.mark,
 			marksize = fullArgs.mark1size or fullArgs.marksize,
@@ Line 36: / Line 100: @@
 			label = fullArgs.label1 or fullArgs.label,
 			label_size = fullArgs.label1_size or fullArgs.label_size,
 			position = fullArgs.position1 or fullArgs.pos1 or fullArgs.position or fullArgs.pos,
 			background = fullArgs.background1 or fullArgs.bg1 or fullArgs.background or fullArgs.bg
@@ Line 59: / Line 122: @@
 			label = fullArgs['label' .. n],
 			label_size = fullArgs['label' .. n .. '_size'],
 			position = fullArgs['position' .. n] or fullArgs['pos' .. n],
 			background = fullArgs['background' .. n] or fullArgs['bg' .. n]
@@ Line 108: / Line 170: @@
 				if k then
 					table.insert(marks, k)
 				end
 			end
@@ Line 118: / Line 175: @@
 	end
 	table.sort(marks)
-	if marks[1] ~= 1 and (args.lat or args.lat_deg or args.coordinates) then
+	if marks[1] ~= 1 and (args.lat or args.lat_deg) then
 		table.insert(marks, 1, 1)
 	end

Courcelles: Changed protection level for "Module:Location map/multi": High-risk Lua module ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2018-01-15T04:59:35Z

Changed protection level for "Module:Location map/multi": High-risk Lua module ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 04:59, 15 January 2018
(No difference)

← Previous revision		Revision as of 19:32, 23 February 2018
Line 95:		Line 95:
	lon_sec = fullArgs.lon1_sec or fullArgs.lon_sec,		lon_sec = fullArgs.lon1_sec or fullArgs.lon_sec,
	lon_dir = fullArgs.lon1_dir or fullArgs.lon_dir,		lon_dir = fullArgs.lon1_dir or fullArgs.lon_dir,
			outside = fullArgs.outside1 or fullArgs.outside,
	mark = fullArgs.mark1 or fullArgs.mark,		mark = fullArgs.mark1 or fullArgs.mark,
	marksize = fullArgs.mark1size or fullArgs.marksize,		marksize = fullArgs.mark1size or fullArgs.marksize,
Line 100:		Line 101:
	label = fullArgs.label1 or fullArgs.label,		label = fullArgs.label1 or fullArgs.label,
	label_size = fullArgs.label1_size or fullArgs.label_size,		label_size = fullArgs.label1_size or fullArgs.label_size,
			label_width = fullArgs.label1_width or fullArgs.label_width,
	position = fullArgs.position1 or fullArgs.pos1 or fullArgs.position or fullArgs.pos,		position = fullArgs.position1 or fullArgs.pos1 or fullArgs.position or fullArgs.pos,
	background = fullArgs.background1 or fullArgs.bg1 or fullArgs.background or fullArgs.bg		background = fullArgs.background1 or fullArgs.bg1 or fullArgs.background or fullArgs.bg
Line 123:		Line 125:
	label_size = fullArgs['label' .. n .. '_size'],		label_size = fullArgs['label' .. n .. '_size'],
	position = fullArgs['position' .. n] or fullArgs['pos' .. n],		position = fullArgs['position' .. n] or fullArgs['pos' .. n],
			label_width = fullArgs['label' .. n .. '_width'],
	background = fullArgs['background' .. n] or fullArgs['bg' .. n]		background = fullArgs['background' .. n] or fullArgs['bg' .. n]
	}		}