Module:Location map/sandbox2 - Revision history

Mr. Stradivarius: remove a couple of new lines that weren't in the original

2014-04-08T13:13:55Z

remove a couple of new lines that weren't in the original

← Previous revision		Revision as of 13:13, 8 April 2014
Line 81:		Line 81:
	retval = retval .. '<div class="center">'		retval = retval .. '<div class="center">'
	end		end

	if args.caption then		if args.caption then
	retval = retval .. '<div class="thumb '		retval = retval .. '<div class="thumb '
Line 253:		Line 252:
	mark = 'Red pog.svg'		mark = 'Red pog.svg'
	end		end

	local divContent = markImageDiv(mark, tonumber(args.marksize) or tonumber(map('marksize')) or 8, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])		local divContent = markImageDiv(mark, tonumber(args.marksize) or tonumber(map('marksize')) or 8, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])
	if args.label and args.position ~= 'none' then		if args.label and args.position ~= 'none' then

Mr. Stradivarius: remove all the hyphens to make diffs easier to view

2014-04-08T13:12:14Z

remove all the hyphens to make diffs easier to view

← Previous revision		Revision as of 13:12, 8 April 2014
Line 10:		Line 10:

	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs

	---------------------------------------------------------------
	local function round(n, digits)		local function round(n, digits)
	local mult = math.pow(10, digits)		local mult = math.pow(10, digits)
	return math.floor(n * mult + 0.5) / mult		return math.floor(n * mult + 0.5) / mult
	end		end

	---------------------------------------------------------------
	local function getMapParams(map, frame)		local function getMapParams(map, frame)
	if mw.title.new('Module:Location map/data/' .. map).exists then		if mw.title.new('Module:Location map/data/' .. map).exists then
Line 42:		Line 42:
	end		end
	end		end

	---------------------------------------------------------------
	local function decdeg(degrees, minutes, seconds, hemisphere, digits, decimal)		local function decdeg(degrees, minutes, seconds, hemisphere, digits, decimal)
	if degrees == nil then		if degrees == nil then
Line 63:		Line 63:
	return round(decimal, digits)		return round(decimal, digits)
	end		end

	---------------------------------------------------------------
	function p.top(frame, args, map)		function p.top(frame, args, map)
	if not args then		if not args then
Line 81:		Line 81:
	retval = retval .. '<div class="center">'		retval = retval .. '<div class="center">'
	end		end

	---------------------------------------------------
	if args.caption then		if args.caption then
	retval = retval .. '<div class="thumb '		retval = retval .. '<div class="thumb '
Line 129:		Line 129:
	return retval		return retval
	end		end

	---------------------------------------------------------------
	function p.bottom(frame, args, map)		function p.bottom(frame, args, map)
	if not args then		if not args then
Line 140:		Line 140:
	retval = retval .. '</div><div ' .. (args.caption and 'class="thumbcaption"' or 'style="font-size: 90%; padding-top:3px"') .. '>'		retval = retval .. '</div><div ' .. (args.caption and 'class="thumbcaption"' or 'style="font-size: 90%; padding-top:3px"') .. '>'
	local caption = frame.args.caption or frame:getParent().args.caption		local caption = frame.args.caption or frame:getParent().args.caption

	---------------------------------------------------
	if args.lon_deg == nil then		if args.lon_deg == nil then
	local n = tonumber(args.long);		local n = tonumber(args.long);
Line 166:		Line 166:
	return retval		return retval
	end		end

	---------------------------------------------------------------
	function p.container(frame, args, map)		function p.container(frame, args, map)
	if not args then		if not args then
Line 176:		Line 176:
	return p.top(frame, args, map) .. (args.places or '') .. p.bottom(frame, args, map)		return p.top(frame, args, map) .. (args.places or '') .. p.bottom(frame, args, map)
	end		end

	---------------------------------------------------------------
	local function markOuterDiv(x, y, content)		local function markOuterDiv(x, y, content)
	return '<div style="position:absolute; z-index:2; top:' .. y .. '%;left:' .. x .. '%;height:0;width:0;margin:0;padding:0">' .. content .. '</div>'		return '<div style="position:absolute; z-index:2; top:' .. y .. '%;left:' .. x .. '%;height:0;width:0;margin:0;padding:0">' .. content .. '</div>'
	end		end

	---------------------------------------------------------------
	local function markImageDiv(mark, marksize, label, link, alt, title)		local function markImageDiv(mark, marksize, label, link, alt, title)
	local retval = '<div style="position:relative;text-align:center;left:-' .. round(marksize / 2, 0) .. 'px;top:-' .. round(marksize / 2, 0) .. 'px;width:' .. marksize .. 'px;font-size:' .. 9 .. 'px;line-height:0"'		local retval = '<div style="position:relative;text-align:center;left:-' .. round(marksize / 2, 0) .. 'px;top:-' .. round(marksize / 2, 0) .. 'px;width:' .. marksize .. 'px;font-size:' .. 9 .. 'px;line-height:0"'
Line 196:		Line 196:
	return retval .. '</div>'		return retval .. '</div>'
	end		end

	---------------------------------------------------------------
	local function markLabelDiv(label, label_size, label_width, position, background, x)		local function markLabelDiv(label, label_size, label_width, position, background, x)
	local retval = '<div style="font-size:' .. label_size .. '%;line-height:110%;position:relative;top:-1.5em;width:' .. label_width .. 'em;'		local retval = '<div style="font-size:' .. label_size .. '%;line-height:110%;position:relative;top:-1.5em;width:' .. label_width .. 'em;'
Line 214:		Line 214:
	return retval .. '">' .. label .. '</span></div>'		return retval .. '">' .. label .. '</span></div>'
	end		end

	---------------------------------------------------------------
	local function getX(longitude, latitude, lon_dir, left, right, top, bottom, crosses180, skew, lon_shift)		local function getX(longitude, latitude, lon_dir, left, right, top, bottom, crosses180, skew, lon_shift)
	local crosses180_correction = crosses180 and lon_dir == 'W' and (-36000/(left - right)) or 0		local crosses180_correction = crosses180 and lon_dir == 'W' and (-36000/(left - right)) or 0
Line 224:		Line 224:
	return round(crosses180_correction + 100 * (longitude - left) / (right - left), 1)		return round(crosses180_correction + 100 * (longitude - left) / (right - left), 1)
	end		end

	---------------------------------------------------------------
	local function getY(latitude, top, bottom)		local function getY(latitude, top, bottom)
	return round(100 * (top - latitude) / (top - bottom), 1)		return round(100 * (top - latitude) / (top - bottom), 1)
	end		end

	---------------------------------------------------------------
	function p.mark(frame, args, map)		function p.mark(frame, args, map)
	if not args then		if not args then
Line 253:		Line 253:
	mark = 'Red pog.svg'		mark = 'Red pog.svg'
	end		end

	---------------------------------------------------
	local divContent = markImageDiv(mark, tonumber(args.marksize) or tonumber(map('marksize')) or 8, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])		local divContent = markImageDiv(mark, tonumber(args.marksize) or tonumber(map('marksize')) or 8, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])
	if args.label and args.position ~= 'none' then		if args.label and args.position ~= 'none' then
Line 260:		Line 260:
	return markOuterDiv(x, y, divContent)		return markOuterDiv(x, y, divContent)
	end		end

	---------------------------------------------------------------
	function p.main(frame, args, map)		function p.main(frame, args, map)
	if not args then		if not args then

Wikid77: created, as a 2nd sandbox version of Module:Location_map, to test major changes

2014-04-08T04:19:52Z

created, as a 2nd sandbox version of Module:Location_map, to test major changes

New page

--=============================================================
-- Module:Location_map/sandbox2 - Map marker with autofixing
--=============================================================
--
-- This version of Module:Location_map will autofix the
-- parameters, to attempt to display a map marker even
-- though the parameters might be invalid.
--
local p = {}

local getArgs = require('Module:Arguments').getArgs
---------------------------------------------------------------
local function round(n, digits)
local mult = math.pow(10, digits)
return math.floor(n * mult + 0.5) / mult
end
---------------------------------------------------------------
local function getMapParams(map, frame)
if mw.title.new('Module:Location map/data/' .. map).exists then
local mapData = mw.loadData('Module:Location map/data/' .. map)
return function(name, params)
if mapData[name] == nil then
return ''
elseif params then
return mw.message.newRawMessage(mapData[name], unpack(params)):plain()
else
return mapData[name]
end
end
else
local cache = {}
return function(name, params)
if params then
return frame:expandTemplate{title = 'Location map ' .. map, args = { name, unpack(params) }}
else
if cache[name] == nil then
cache[name] = frame:expandTemplate{title = 'Location map ' .. map, args = { name }}
end
return cache[name]
end
end
end
end
---------------------------------------------------------------
local function decdeg(degrees, minutes, seconds, hemisphere, digits, decimal)
if degrees == nil then
local n = tonumber(decimal);
if n == nil then
n = tonumber( string.sub(decimal,1,-2) );
end
if n == nil then
n = tonumber( string.sub(decimal,1,-3) );
end
return n
end
decimal = (degrees or 0) + (minutes or 0)/60 + (seconds or 0)/3600
if hemisphere == 'W' or hemisphere == 'w' or hemisphere == 'S' or hemisphere == 's' then
decimal = -decimal
end
if digits == nil then
digits = 7
end
return round(decimal, digits)
end
---------------------------------------------------------------
function p.top(frame, args, map)
if not args then
args = getArgs(frame)
end
if not map then
map = getMapParams(args[1], frame)
end
local width
if args.width then
width = mw.ustring.gsub(args.width, 'px', '')
else
width = round((args.default_width or 240) * (tonumber(map('defaultscale')) or 1), 0)
end
local retval = ''
if args.float == 'center' then
retval = retval .. '<div class="center">'
end
---------------------------------------------------
if args.caption then
retval = retval .. '<div class="thumb '
if args.float == '"left"' or args.float == 'left' then
retval = retval .. 'tleft'
elseif args.float == '"center"' or args.float == 'center' or args.float == '"none"' or args.float == 'none' then
retval = retval .. 'tnone'
else
retval = retval .. 'tright'
end
retval = retval .. '"><div  style="width:' .. (width + 2) .. 'px; '
if args.border == 'none' then
retval = retval .. 'border: none;'
elseif args.border then
retval = retval .. 'border-color:' .. args.border .. ';'
end
retval = retval .. '"><div style="position: relative; '
if args.border ~= 'none' then
retval = retval .. 'border: 1px solid lightgray'
end
retval = retval .. '">'
else
retval = retval .. '<div style="width:' .. width .. 'px; '
if args.float == '"left"' or args.float == 'left' then
retval = retval .. 'float: left; clear: left'
elseif args.float == '"center"' or args.float == 'center' then
retval = retval .. 'float: none; clear: both; margin-left: auto; margin-right: auto'
elseif args.float == '"none"' or args.float == 'none' then
retval = retval .. 'float: none; clear: none'
else
retval = retval .. 'float: right; clear: right'
end
retval = retval .. '"><div style="width:' .. width .. 'px; padding:0"><div style="position: relative; ">'
end
local image
if args.AlternativeMap then
image = args.AlternativeMap
elseif args.relief and map('image1') ~= '' then
image = map('image1')
else
image = map('image')
end
retval = retval .. '[[File:' .. image .. '|' .. width .. 'px|' .. (args.alt or ((args.label or mw.title.getCurrentTitle().text) .. ' is located in ' .. map('name'))) .. ']]'
if args.overlay_image then
retval = retval .. '<div style="position:absolute; top: 0; left: 0">[[File:' .. args.overlay_image .. '|' .. width .. 'px|link=File:' .. image .. ']]</div>'
end
return retval
end
---------------------------------------------------------------
function p.bottom(frame, args, map)
if not args then
args = getArgs(frame)
end
if not map then
map = getMapParams(args[1], frame)
end
local retval = ''
retval = retval .. '</div><div ' .. (args.caption and 'class="thumbcaption"' or 'style="font-size: 90%; padding-top:3px"') .. '>'
local caption = frame.args.caption or frame:getParent().args.caption
---------------------------------------------------
if args.lon_deg == nil then
local n = tonumber(args.long);
if n == nil then
if caption==nil then caption='' end
caption = caption .. " <sup>[fix long=" ..args.long.. "]</sup>"
end
end
if args.lat_deg == nil then
local n = tonumber(args.lat);
if n == nil then
if caption==nil then caption='' end
caption = caption .. " <sup>[fix lat=" ..args.lat.. "]</sup>"
end
end
if caption and not args.caption_undefined then
retval = retval .. mw.text.trim(caption)
else
retval = retval .. (args.label or mw.title.getCurrentTitle().text) .. ' (' .. map('name') .. ')'
end
retval = retval .. '</div></div></div>'
if args.float == 'center' then
retval = retval .. '</div>'
end
return retval
end
---------------------------------------------------------------
function p.container(frame, args, map)
if not args then
args = getArgs(frame)
end
if not map then
map = getMapParams(args[1], frame)
end
return p.top(frame, args, map) .. (args.places or '') .. p.bottom(frame, args, map)
end
---------------------------------------------------------------
local function markOuterDiv(x, y, content)
return '<div style="position:absolute; z-index:2; top:' .. y .. '%;left:' .. x .. '%;height:0;width:0;margin:0;padding:0">' .. content .. '</div>'
end
---------------------------------------------------------------
local function markImageDiv(mark, marksize, label, link, alt, title)
local retval = '<div style="position:relative;text-align:center;left:-' .. round(marksize / 2, 0) .. 'px;top:-' .. round(marksize / 2, 0) .. 'px;width:' .. marksize .. 'px;font-size:' .. 9 .. 'px;line-height:0"'
if title then
retval = retval .. ' title="' .. title .. '"'
end
retval = retval .. '>'
if marksize ~= 0 then
retval = retval .. '[[File:' .. mark .. '|' .. marksize .. 'x' .. marksize .. 'px|' .. label .. '|link=' .. link
if alt then
retval = retval .. '|alt=' .. alt
end
retval = retval .. ']]'
end
return retval .. '</div>'
end
---------------------------------------------------------------
local function markLabelDiv(label, label_size, label_width, position, background, x)
local retval = '<div style="font-size:' .. label_size .. '%;line-height:110%;position:relative;top:-1.5em;width:' .. label_width .. 'em;'
if position == 'top' then -- specified top
retval = retval .. 'top:-2.65em;left:-3em;text-align:center'
elseif position == 'bottom' then -- specified bottom
retval = retval .. 'top:-0.15em;left:-3em;text-align:center'
elseif position == 'left' or (tonumber(x) > 70 and position ~= 'right') then -- specified left or autodetected to left
retval = retval .. 'left:-6.5em;text-align:right'
else -- specified right or autodetected to right
retval = retval .. 'left:0.5em;text-align:left'
end
retval = retval .. '"><span style="padding:1px'
if background then
retval = retval .. ';background-color:' .. background
end
return retval .. '">' .. label .. '</span></div>'
end
---------------------------------------------------------------
local function getX(longitude, latitude, lon_dir, left, right, top, bottom, crosses180, skew, lon_shift)
local crosses180_correction = crosses180 and lon_dir == 'W' and (-36000/(left - right)) or 0
if skew then
local lat_ratio = (top - latitude)/(top - bottom)
local skew_factor = (1 - skew) * lat_ratio + skew
longitude = (longitude - 0.5 * (right + left) + lon_shift) * skew_factor + 0.5 * (right + left) - lon_shift
end
return round(crosses180_correction + 100 * (longitude - left) / (right - left), 1)
end
---------------------------------------------------------------
local function getY(latitude, top, bottom)
return round(100 * (top - latitude) / (top - bottom), 1)
end
---------------------------------------------------------------
function p.mark(frame, args, map)
if not args then
args = getArgs(frame)
end
if not map then
map = getMapParams(args[1], frame)
end
local x, y, longitude, latitide
longitude = decdeg(args.lon_deg, args.lon_min, args.lon_sec, args.lon_dir, nil, args.long)
latitude = decdeg(args.lat_deg, args.lat_min, args.lat_sec, args.lat_dir, nil, args.lat)
if map('x') ~= '' then
x = frame:callParserFunction('#expr', map('x', { latitude, longitude }))
else
x = getX(longitude, latitude, args.lon_dir, map('left'), map('right'), map('top'), map('bottom'), map('crosses180') ~= '', tonumber(args.skew or map('skew')), args.lon_shift or 0)
end
if map('y') ~= '' then
y = frame:callParserFunction('#expr', map('y', { latitude, longitude }))
else
y = getY(latitude, map('top'), map('bottom'))
end
local mark = args.mark or map('mark')
if mark == '' then
mark = 'Red pog.svg'
end
---------------------------------------------------
local divContent = markImageDiv(mark, tonumber(args.marksize) or tonumber(map('marksize')) or 8, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])
if args.label and args.position ~= 'none' then
divContent = divContent .. markLabelDiv(args.label, args.label_size or 90, args.label_width or 6, args.position, args.background, x)
end
return markOuterDiv(x, y, divContent)
end
---------------------------------------------------------------
function p.main(frame, args, map)
if not args then
args = getArgs(frame)
end
if not args[1] then
args[1] = 'World'
end
if not map then
map = getMapParams(args[1], frame)
end
return p.top(frame, args, map) .. p.mark(frame, args, map) .. p.bottom(frame, args, map)
end

return p