Module:Location map/multi - Revision history

>Zwangzug: 1 revision imported from :wikipedia:Module:Location_map/multi

2023-06-02T22:53:27Z

1 revision imported from wikipedia:Module:Location_map/multi

← Older revision	Revision as of 22:53, 2 June 2023
(No difference)

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

2022-10-21T21:08:54Z

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

@@ Line 1: / Line 1: @@
-require('Module:No globals')
+require('strict')
 local p = {}
@@ Line 5: / Line 5: @@
 local getArgs = require('Module:Arguments').getArgs
 local locmap = require('Module:Location map')
 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 21: / Line 86: @@
 			lat = fullArgs.lat1 or fullArgs.lat,
 			long = fullArgs.long1 or fullArgs.long,
 			lat_deg = fullArgs.lat1_deg or fullArgs.lat_deg,
 			lat_min = fullArgs.lat1_min or fullArgs.lat_min,
@@ Line 29: / 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 34: / Line 101: @@
 			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 41: / Line 109: @@
 			lat = fullArgs['lat' .. n],
 			long = fullArgs['long' .. n],
 			lat_deg = fullArgs['lat' .. n .. '_deg'],
 			lat_min = fullArgs['lat' .. n .. '_min'],
@@ Line 55: / Line 124: @@
 			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 103: / Line 173: @@
 				if k then
 					table.insert(marks, k)
 				end
 			end
@@ Line 108: / Line 183: @@
 	end
 	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)
 	end

>Astograth: 1 revision imported from :wikipedia:Module:Location_map/multi

2022-02-16T19:23:04Z

1 revision imported from wikipedia:Module:Location_map/multi

← Older revision	Revision as of 19:23, 16 February 2022
(No difference)

>Osarius: 1 revision imported: location map stuff

2020-09-30T10:58:17Z

1 revision imported: location map stuff

@@ Line 5: / Line 5: @@
 local getArgs = require('Module:Arguments').getArgs
 local locmap = require('Module:Location map')
 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
-		if args[1] then
+		map = locmap.getMapParams(args[1], frame)
 	end
 end
@@ Line 86: / Line 21: @@
 			lat = fullArgs.lat1 or fullArgs.lat,
 			long = fullArgs.long1 or fullArgs.long,
 			lat_deg = fullArgs.lat1_deg or fullArgs.lat_deg,
 			lat_min = fullArgs.lat1_min or fullArgs.lat_min,
@@ Line 95: / Line 29: @@
 			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 101: / Line 34: @@
 			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 109: / Line 41: @@
 			lat = fullArgs['lat' .. n],
 			long = fullArgs['long' .. n],
 			lat_deg = fullArgs['lat' .. n .. '_deg'],
 			lat_min = fullArgs['lat' .. n .. '_min'],
@@ Line 124: / Line 55: @@
 			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 173: / Line 103: @@
 				if k then
 					table.insert(marks, k)
 				end
 			end
@@ Line 183: / Line 108: @@
 	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

wikipedia>Frietjes: not sure why this was removed

2018-02-23T19:39:02Z

not sure why this was removed

@@ Line 5: / Line 5: @@
 local getArgs = require('Module:Arguments').getArgs
 local locmap = require('Module:Location map')
 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 21: / Line 86: @@
 			lat = fullArgs.lat1 or fullArgs.lat,
 			long = fullArgs.long1 or fullArgs.long,
 			lat_deg = fullArgs.lat1_deg or fullArgs.lat_deg,
 			lat_min = fullArgs.lat1_min or fullArgs.lat_min,
@@ Line 29: / 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 34: / Line 101: @@
 			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 41: / Line 109: @@
 			lat = fullArgs['lat' .. n],
 			long = fullArgs['long' .. n],
 			lat_deg = fullArgs['lat' .. n .. '_deg'],
 			lat_min = fullArgs['lat' .. n .. '_min'],
@@ Line 55: / Line 124: @@
 			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 103: / Line 173: @@
 				if k then
 					table.insert(marks, k)
 				end
 			end
@@ Line 108: / Line 183: @@
 	end
 	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)
 	end

wikipedia>Admin: 1 revision imported

2015-07-02T09:24:47Z

1 revision imported

New page

require('Module:No globals')

local p = {}

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

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)
end
return locmap.top(frame, args, map) .. (args.places or '') .. locmap.bottom(frame, args, map)
end

local function manyMakeArgs(fullArgs, n)
if n == 1 then
return {
lat = fullArgs.lat1 or fullArgs.lat,
long = fullArgs.long1 or fullArgs.long,
lat_deg = fullArgs.lat1_deg or fullArgs.lat_deg,
lat_min = fullArgs.lat1_min or fullArgs.lat_min,
lat_sec = fullArgs.lat1_sec or fullArgs.lat_sec,
lat_dir = fullArgs.lat1_dir or fullArgs.lat_dir,
lon_deg = fullArgs.lon1_deg or fullArgs.lon_deg,
lon_min = fullArgs.lon1_min or fullArgs.lon_min,
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,
link = fullArgs.link1 or fullArgs.link,
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
}
else
return {
lat = fullArgs['lat' .. n],
long = fullArgs['long' .. n],
lat_deg = fullArgs['lat' .. n .. '_deg'],
lat_min = fullArgs['lat' .. n .. '_min'],
lat_sec = fullArgs['lat' .. n .. '_sec'],
lat_dir = fullArgs['lat' .. n .. '_dir'],
lon_deg = fullArgs['lon' .. n .. '_deg'],
lon_min = fullArgs['lon' .. n .. '_min'],
lon_sec = fullArgs['lon' .. n .. '_sec'],
lon_dir = fullArgs['lon' .. n .. '_dir'],
outside = fullArgs['outside' .. n],
mark = fullArgs['mark' .. n],
marksize = fullArgs['mark' .. n .. 'size'],
link = fullArgs['link' .. n],
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]
}
end
end

function p.many(frame, args, map)
if not args then
args = getArgs(frame, {wrappers = 'Template:Location map many', valueFunc = locmap.valueFunc})
end
if not args[1] then
args[1] = 'World'
end
if not map then
map = {}
for mapname in string.gmatch(args[1], '[^#]+') do
map[#map + 1] = locmap.getMapParams(mapname, frame)
end
if #map ~= 1 then
local outputs = {}
args.autoSwitcherLabel = true
for k,v in ipairs(map) do
outputs[k] = p.many(frame, args, v)
end
return '<div class="switcher-container">' .. table.concat(outputs) .. '</div>'
end
map = map[1]
end
local marks = {}
local markhigh
if args.markhigh then
mw.log('Removed parameter markhigh used.')
local parent = frame:getParent()
if parent then
mw.log('Parent is ' .. parent:getTitle())
end
mw.logObject(args, 'args')
markhigh = true
end
for k, v in pairs(args) do -- @todo change to uargs once we have that
if v then
if string.sub(k, -4) == '_deg' then
k = string.sub(k, 1, -5)
end
if string.sub(k, 1, 3) == 'lat' then
k = tonumber(string.sub(k, 4))
if k then
table.insert(marks, k)
end
end
end
end
table.sort(marks)
if marks[1] ~= 1 and (args.lat or args.lat_deg) then
table.insert(marks, 1, 1)
end
local body = ''
for _, v in ipairs(marks) do
-- don't try to consolidate this into the above loop. ordering of elements from pairs() is unspecified
body = body .. tostring( locmap.mark(frame, manyMakeArgs(args, v), map) )
if args['mark' .. v .. 'high'] then
mw.log('Removed parameter mark' .. v .. 'high used.')
local parent = frame:getParent()
if parent then
mw.log('Parent is ' .. parent:getTitle())
end
mw.logObject(args, 'args')
markhigh = true
end
end
args.label = nil -- there is no global label
return locmap.top(frame, args, map) .. body .. locmap.bottom(frame, args, map) .. (markhigh and '[[Category:Location maps with possible errors|Page using removed parameter]]' or '')
end

function p.load(frame, args, map)
if not args then
args = getArgs(frame, {frameOnly = true})
end
local dataModule = mw.loadData(frame.args[1])
if not map then
map = {}
for mapname in string.gmatch(dataModule.containerArgs[1], '[^#]+') do
map[#map + 1] = locmap.getMapParams(mapname, frame)
end
if #map ~= 1 then
local outputs = {}
args.autoSwitcherLabel = true
for k,v in ipairs(map) do
outputs[k] = p.load(frame, args, v)
end
return '<div class="switcher-container">' .. table.concat(outputs) .. '</div>'
end
map = map[1]
end
local marks = {}
if dataModule.marks then
for k,markArgs in ipairs(dataModule.marks) do
marks[k] = tostring(locmap.mark(frame, markArgs, map))
end
end
if dataModule.secondaryModules then
for _,modname in ipairs(dataModule.secondaryModules) do
for _,markArgs in ipairs(mw.loadData(modname).marks) do
marks[#marks + 1] = tostring(locmap.mark(frame, markArgs, map))
end
end
end
return locmap.top(frame, dataModule.containerArgs, map) .. table.concat(marks) .. locmap.bottom(frame, dataModule.containerArgs, map)
end

return p