Module:Location map/sandbox - Revision history

Marat Turaev at 04:11, 1 November 2024

2024-11-01T04:11:52Z

← Previous revision		Revision as of 04:11, 1 November 2024
Line 326:		Line 326:
	:cssText('font-size:' .. label_size .. '%;width:' .. label_width .. 'em')		:cssText('font-size:' .. label_size .. '%;width:' .. label_width .. 'em')
	local distance = round(marksize / 2 + 1)		local distance = round(marksize / 2 + 1)
	if position == '~~top~~' then -- specified ~~top~~		if position == 'center' then -- specified center
			builder:addClass('pc'):cssText('left:' .. (-label_width / 2) .. 'em')
			elseif position == 'top' then -- specified top
	builder:addClass(compact and 'pvc' or 'pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')		builder:addClass(compact and 'pvc' or 'pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')
	elseif position == 'bottom' then -- specified bottom		elseif position == 'bottom' then -- specified bottom

Alexiscoutinho: Added parameter to opt-out of noresize

2024-06-22T16:44:10Z

Added parameter to opt-out of noresize

← Previous revision		Revision as of 16:44, 22 June 2024
Line 178:		Line 178:
	end		end
	if args.caption and args.caption ~= '' and args.border ~= 'infobox' then		if args.caption and args.caption ~= '' and args.border ~= 'infobox' then
	retval = retval .. '<div class="locmap noviewer noresize thumb '		retval = retval .. '<div class="locmap noviewer' .. (args.noresize ~= false and ' noresize' or '') .. ' thumb '
	if args.float == '"left"' or args.float == 'left' then		if args.float == '"left"' or args.float == 'left' then
	retval = retval .. 'tleft'		retval = retval .. 'tleft'

Alexiscoutinho: Added explanation

2024-05-20T20:52:41Z

Added explanation

← Previous revision		Revision as of 20:52, 20 May 2024
Line 340:		Line 340:
	end		end
	end		end
	builder = builder:tag('div')		builder = builder:tag('div') -- not 'span' to avoid Linter errors if the label contains block content
	:wikitext(label)		:wikitext(label)
	if background then		if background then

Jonesey95: Undid revision 1224643418 by Alexiscoutinho (talk). This will cause Linter errors when label contains block content. See https://en.wikipedia.org/w/index.php?title=Module%3ALocation_map&diff=856357854&oldid=833142668

2024-05-20T13:04:11Z

Undid revision 1224643418 by Alexiscoutinho (talk). This will cause Linter errors when label contains block content. See https://en.wikipedia.org/w/index.php?title=Module%3ALocation_map&diff=856357854&oldid=833142668

← Previous revision		Revision as of 13:04, 20 May 2024
Line 340:		Line 340:
	end		end
	end		end
	builder = builder:tag('~~span~~')		builder = builder:tag('div')
	:wikitext(label)		:wikitext(label)
	if background then		if background then

Alexiscoutinho: Shorter distance no longer needed due to compact padding

2024-05-19T16:17:54Z

Shorter distance no longer needed due to compact padding

← Previous revision		Revision as of 16:17, 19 May 2024
Line 325:		Line 325:
	local builder = mw.html.create('div')		local builder = mw.html.create('div')
	:cssText('font-size:' .. label_size .. '%;width:' .. label_width .. 'em')		:cssText('font-size:' .. label_size .. '%;width:' .. label_width .. 'em')
	local distance = round(marksize / 2) + ~~(compact and 0 or~~ 1)		local distance = round(marksize / 2 + 1)
	if position == 'top' then -- specified top		if position == 'top' then -- specified top
	builder:addClass(compact and 'pvc' or 'pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')		builder:addClass(compact and 'pvc' or 'pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')

Alexiscoutinho: More intuitive and at minimal cost

2024-05-19T15:57:12Z

More intuitive and at minimal cost

← Previous revision		Revision as of 15:57, 19 May 2024
Line 340:		Line 340:
	end		end
	end		end
	builder = builder:tag('~~div~~')		builder = builder:tag('span')
	:wikitext(label)		:wikitext(label)
	if background then		if background then

Alexiscoutinho: Old label_size method no longer needed

2024-05-13T08:57:16Z

Old label_size method no longer needed

← Previous revision		Revision as of 08:57, 13 May 2024
Line 291:		Line 291:
	end		end

	local function markOuterDiv(x, y, imageDiv, labelDiv~~, label_size~~)		local function markOuterDiv(x, y, imageDiv, labelDiv)
	return mw.html.create('div')		return mw.html.create('div')
	:addClass('od')		:addClass('od')
	:addClass('notheme') -- T236137		:addClass('notheme') -- T236137
	:cssText('top:' .. round(y, 3) .. '%;left:' .. round(x, 3) ~~.. '%;font-size:' .. label_size~~ .. '%')		:cssText('top:' .. round(y, 3) .. '%;left:' .. round(x, 3) .. '%')
	:node(imageDiv)		:node(imageDiv)
	:node(labelDiv)		:node(labelDiv)
Line 324:		Line 324:
	end		end
	local builder = mw.html.create('div')		local builder = mw.html.create('div')
	:cssText('width:' .. label_width .. 'em')		:cssText('font-size:' .. label_size .. '%;width:' .. label_width .. 'em')
	local distance = round(marksize / 2) + (compact and 0 or 1)		local distance = round(marksize / 2) + (compact and 0 or 1)
	if position == 'top' then -- specified top		if position == 'top' then -- specified top
Line 500:		Line 500:
	local marksize = tonumber(args.marksize) or tonumber(map('marksize')) or 8		local marksize = tonumber(args.marksize) or tonumber(map('marksize')) or 8
	local imageDiv = markImageDiv(mark, marksize, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])		local imageDiv = markImageDiv(mark, marksize, args.label or mw.title.getCurrentTitle().text, args.link or '', args.alt, args[2])
	local label_size = args.label_size or 91
	local labelDiv		local labelDiv
	if args.label and args.position ~= 'none' then		if args.label and args.position ~= 'none' then
	labelDiv = markLabelDiv(args.label, label_size, args.label_width or 6, args.position, args.background, x, marksize, args.label_top, containerArgs and containerArgs.CompactLabels)		labelDiv = markLabelDiv(args.label, args.label_size or 91, args.label_width or 6, args.position, args.background, x, marksize, args.label_top, containerArgs and containerArgs.CompactLabels)
	end		end
	return builder:node(markOuterDiv(x, y, imageDiv, labelDiv~~, label_size~~))		return builder:node(markOuterDiv(x, y, imageDiv, labelDiv))
	end		end

Alexiscoutinho: Improved label class compacting

2024-05-08T05:35:30Z

Improved label class compacting

Alexiscoutinho: Compacted a bit more

2024-05-06T21:53:18Z

Compacted a bit more

← Previous revision		Revision as of 21:53, 6 May 2024
Line 339:		Line 339:
	builder:cssText('top:' .. top .. 'em')		builder:cssText('top:' .. top .. 'em')
	end		end
			end
			if compact then
			builder:cssText('line-height:100%')
	end		end
	builder = builder:tag('div')		builder = builder:tag('div')

Alexiscoutinho: Improved compact labels interface

2024-05-06T00:25:43Z

Improved compact labels interface

← Previous revision		Revision as of 00:25, 6 May 2024
Line 319:		Line 319:
	end		end

	local function markLabelDiv(label, label_size, label_width, position, background, x, marksize, ~~compact~~, ~~top~~)		local function markLabelDiv(label, label_size, label_width, position, background, x, marksize, top, compact)
	if tonumber(label_size) == 0 then		if tonumber(label_size) == 0 then
	return mw.html.create('div'):addClass('l0'):wikitext(label)		return mw.html.create('div'):addClass('l0'):wikitext(label)
Line 365:		Line 365:
	end		end

	function p.mark(frame, args, map)		function p.mark(frame, args, map, ...)
	if not args then		if not args then
	args = getArgs(frame, {wrappers = 'Template:Location map~'})		args = getArgs(frame, {wrappers = 'Template:Location map~'})
Line 393:		Line 393:
	return table.concat(outputs, '#PlaceList#') .. '#PlaceList#'		return table.concat(outputs, '#PlaceList#') .. '#PlaceList#'
	end		end
			local containerArgs = ...
	local x, y, longitude, latitude		local x, y, longitude, latitude
	longitude = decdeg(args.lon_deg, args.lon_min, args.lon_sec, args.lon_dir, args.long, 'longitude')		longitude = decdeg(args.lon_deg, args.lon_min, args.lon_sec, args.lon_dir, args.long, 'longitude')
Line 502:		Line 503:
	local labelDiv		local labelDiv
	if args.label and args.position ~= 'none' then		if args.label and args.position ~= 'none' then
	labelDiv = markLabelDiv(args.label, label_size, args.label_width or 6, args.position, args.background, x, marksize, args.~~compact~~, ~~args~~.~~label_top~~)		labelDiv = markLabelDiv(args.label, label_size, args.label_width or 6, args.position, args.background, x, marksize, args.label_top, containerArgs and containerArgs.CompactLabels)
	end		end
	return builder:node(markOuterDiv(x, y, imageDiv, labelDiv, label_size))		return builder:node(markOuterDiv(x, y, imageDiv, labelDiv, label_size))

← Previous revision		Revision as of 05:35, 8 May 2024
Line 173:		Line 173:
	end		end
	end		end
	local retval = frame:extensionTag{name = 'templatestyles', args = {src = 'Module:Location map/styles.css'}}		local retval = frame:extensionTag{name = 'templatestyles', args = {src = 'Module:Location map/sandbox/styles.css'}}
	if args.float == 'center' then		if args.float == 'center' then
	retval = retval .. '<div class="center">'		retval = retval .. '<div class="center">'
Line 327:		Line 327:
	local distance = round(marksize / 2) + (compact and 0 or 1)		local distance = round(marksize / 2) + (compact and 0 or 1)
	if position == 'top' then -- specified top		if position == 'top' then -- specified top
	builder:addClass('pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')		builder:addClass(compact and 'pvc' or 'pv'):cssText('bottom:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')
	elseif position == 'bottom' then -- specified bottom		elseif position == 'bottom' then -- specified bottom
	builder:addClass('pv'):cssText('top:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')		builder:addClass(compact and 'pvc' or 'pv'):cssText('top:' .. distance .. 'px;left:' .. (-label_width / 2) .. 'em')
	else		else
	if position == 'left' or (tonumber(x) > 70 and position ~= 'right') then -- specified left or autodetected to left		if position == 'left' or (tonumber(x) > 70 and position ~= 'right') then -- specified left or autodetected to left
	builder:addClass('pl'):cssText('right:' .. distance .. 'px')		builder:addClass(compact and 'plc' or 'pl'):cssText('right:' .. distance .. 'px')
	else -- specified right or autodetected to right		else -- specified right or autodetected to right
	builder:addClass('pr'):cssText('left:' .. distance .. 'px')		builder:addClass(compact and 'prc' or 'pr'):cssText('left:' .. distance .. 'px')
	end		end
	if top then		if top then
	builder:cssText('top:' .. top .. 'em')		builder:cssText('top:' .. top .. 'em')
	end		end
	end
	if compact then
	builder:cssText('line-height:100%')
	end		end
	builder = builder:tag('div')		builder = builder:tag('div')