Module:Location map/multi/sandbox - Revision history

Alexiscoutinho: Fixed CompactLabels forwarding

2024-05-06T00:29:32Z

Fixed CompactLabels forwarding

← Previous revision		Revision as of 00:29, 6 May 2024
Line 228:		Line 228:
	if dataModule.marks then		if dataModule.marks then
	for k,markArgs in ipairs(dataModule.marks) do		for k,markArgs in ipairs(dataModule.marks) do
	marks[k] = tostring(locmap.mark(frame, markArgs, map))		marks[k] = tostring(locmap.mark(frame, markArgs, map, containerArgs))
	end		end
	end		end
Line 234:		Line 234:
	for _,modname in ipairs(dataModule.secondaryModules) do		for _,modname in ipairs(dataModule.secondaryModules) do
	for _,markArgs in ipairs(mw.loadData(modname).marks) do		for _,markArgs in ipairs(mw.loadData(modname).marks) do
	marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))		marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map, containerArgs))
	end		end
	end		end

Alexiscoutinho: Undid revision 1222441728 by Alexiscoutinho (talk) Not like this

2024-05-05T23:57:34Z

Undid revision 1222441728 by Alexiscoutinho (talk) Not like this

← Previous revision		Revision as of 23:57, 5 May 2024
Line 228:		Line 228:
	if dataModule.marks then		if dataModule.marks then
	for k,markArgs in ipairs(dataModule.marks) do		for k,markArgs in ipairs(dataModule.marks) do
	markArgs.compact = containerArgs.CompactLabels
	marks[k] = tostring(locmap.mark(frame, markArgs, map))		marks[k] = tostring(locmap.mark(frame, markArgs, map))
	end		end
Line 235:		Line 234:
	for _,modname in ipairs(dataModule.secondaryModules) do		for _,modname in ipairs(dataModule.secondaryModules) do
	for _,markArgs in ipairs(mw.loadData(modname).marks) do		for _,markArgs in ipairs(mw.loadData(modname).marks) do
	markArgs.compact = containerArgs.CompactLabels
	marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))		marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))
	end		end

Alexiscoutinho: Forwarded container CompactLabels to each mark

2024-05-05T23:37:17Z

Forwarded container CompactLabels to each mark

← Previous revision		Revision as of 23:37, 5 May 2024
Line 228:		Line 228:
	if dataModule.marks then		if dataModule.marks then
	for k,markArgs in ipairs(dataModule.marks) do		for k,markArgs in ipairs(dataModule.marks) do
			markArgs.compact = containerArgs.CompactLabels
	marks[k] = tostring(locmap.mark(frame, markArgs, map))		marks[k] = tostring(locmap.mark(frame, markArgs, map))
	end		end
Line 234:		Line 235:
	for _,modname in ipairs(dataModule.secondaryModules) do		for _,modname in ipairs(dataModule.secondaryModules) do
	for _,markArgs in ipairs(mw.loadData(modname).marks) do		for _,markArgs in ipairs(mw.loadData(modname).marks) do
			markArgs.compact = containerArgs.CompactLabels
	marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))		marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))
	end		end

Alexiscoutinho: Another bugfix

2024-04-27T22:28:58Z

Another bugfix

← Previous revision		Revision as of 22:28, 27 April 2024
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

Great Brightstar at 07:03, 25 May 2023

2023-05-25T07:03:18Z

← Previous revision		Revision as of 07:03, 25 May 2023
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)

Great Brightstar at 07:02, 25 May 2023

2023-05-25T07:02:03Z

← Previous revision		Revision as of 07:02, 25 May 2023
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 removeDuplicates = require('Module:TableTools').removeDuplicates

	local function switcherSeparate(s)		local function switcherSeparate(s)
Line 104:		Line 103:
	label_width = fullArgs.label1_width or fullArgs.label_width,		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
	useWikidata = true
	}		}
	else		else
Line 128:		Line 126:
	label_width = fullArgs['label' .. n .. '_width'],		label_width = fullArgs['label' .. n .. '_width'],
	position = fullArgs['position' .. n] or fullArgs['pos' .. n],		position = fullArgs['position' .. n] or fullArgs['pos' .. n],
	background = fullArgs['background' .. n] or fullArgs['bg' .. n],		background = fullArgs['background' .. n] or fullArgs['bg' .. n]
	useWikidata = true
	}		}
	end		end
Line 172:		Line 169:
	k = string.sub(k, 1, -5)		k = string.sub(k, 1, -5)
	end		end
	local idx
	if string.sub(k, 1, 3) == 'lat' then		if string.sub(k, 1, 3) == 'lat' then
	~~idx~~ = tonumber(string.sub(k, 4))		k = tonumber(string.sub(k, 4))
		⚫	if k then
		⚫	table.insert(marks, k)
			end
	elseif string.sub(k, 1, 11) == 'coordinates' then		elseif string.sub(k, 1, 11) == 'coordinates' then
	~~idx~~ = tonumber(string.sub(k, 12))		k = tonumber(string.sub(k, 12))
	~~elseif~~ ~~string.sub(~~k~~, 1, 4) == 'link'~~ then		if k then
			table.insert(marks,k)
	idx = tonumber(string.sub(k, 5))
	end		end
⚫	if ~~idx~~ then
⚫	table.insert(marks, ~~idx~~)
	end		end
	end		end
	end		end
	table.sort(marks)		table.sort(marks)
		⚫	if marks[1] ~= 1 and (args.lat or args.lat_deg or args.coordinates) then
	removeDuplicates(marks)
⚫	if marks[1] ~= 1 and (args.lat or args.lat_deg or args.coordinates ~~or args.link~~) then
	table.insert(marks, 1, 1)		table.insert(marks, 1, 1)
	end		end

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T10:03:30Z

use require('strict') instead of require('Module:No globals')

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

	local p = {}		local p = {}

Toohool: set useWikidata to true in marker params

2019-03-31T02:33:47Z

set useWikidata to true in marker params

← Previous revision		Revision as of 02:33, 31 March 2019
Line 104:		Line 104:
	label_width = fullArgs.label1_width or fullArgs.label_width,		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,
			useWikidata = true
	}		}
	else		else
Line 127:		Line 128:
	label_width = fullArgs['label' .. n .. '_width'],		label_width = fullArgs['label' .. n .. '_width'],
	position = fullArgs['position' .. n] or fullArgs['pos' .. n],		position = fullArgs['position' .. n] or fullArgs['pos' .. n],
	background = fullArgs['background' .. n] or fullArgs['bg' .. n]		background = fullArgs['background' .. n] or fullArgs['bg' .. n],
			useWikidata = true
	}		}
	end		end

Toohool: show markers that have a link parameter even if they don't have coordinates, to allow the coords to be fetched from the linked article's wikidata item

2019-03-31T02:18:08Z

show markers that have a link parameter even if they don't have coordinates, to allow the coords to be fetched from the linked article's wikidata item

← Previous revision		Revision as of 02:18, 31 March 2019
Line 5:		Line 5:
	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/sandbox')
			local removeDuplicates = require('Module:TableTools').removeDuplicates

	local function switcherSeparate(s)		local function switcherSeparate(s)
Line 169:		Line 170:
	k = string.sub(k, 1, -5)		k = string.sub(k, 1, -5)
	end		end
			local idx
	if string.sub(k, 1, 3) == 'lat' then		if string.sub(k, 1, 3) == 'lat' then
	k = tonumber(string.sub(k, 4))		idx = tonumber(string.sub(k, 4))
⚫	if k then
⚫	table.insert(marks, k)
	end
	elseif string.sub(k, 1, 11) == 'coordinates' then		elseif string.sub(k, 1, 11) == 'coordinates' then
	k = tonumber(string.sub(k, 12))		idx = tonumber(string.sub(k, 12))
	if k then		elseif string.sub(k, 1, 4) == 'link' then
			idx = tonumber(string.sub(k, 5))
	table.insert(marks,k)
	end		end
		⚫	if idx then
		⚫	table.insert(marks, idx)
	end		end
	end		end
	end		end
	table.sort(marks)		table.sort(marks)
			removeDuplicates(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 or args.coordinates or args.link) then
	table.insert(marks, 1, 1)		table.insert(marks, 1, 1)
	end		end

Frietjes at 19:40, 23 February 2018

2018-02-23T19:40:00Z

← Previous revision		Revision as of 19:40, 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 122:		Line 124:
	label = fullArgs['label' .. n],		label = fullArgs['label' .. n],
	label_size = fullArgs['label' .. n .. '_size'],		label_size = fullArgs['label' .. n .. '_size'],
			label_width = fullArgs['label' .. n .. '_width'],
	position = fullArgs['position' .. n] or fullArgs['pos' .. n],		position = fullArgs['position' .. n] or fullArgs['pos' .. n],
	background = fullArgs['background' .. n] or fullArgs['bg' .. n]		background = fullArgs['background' .. n] or fullArgs['bg' .. n]
Line 170:		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
Line 175:		Line 183:
	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