Module:Coordinates - Revision history

Pppery: Switch to template gadget category per request

2024-05-31T00:22:22Z

Switch to template gadget category per request

← Previous revision		Revision as of 00:22, 31 May 2024
Line 156:		Line 156:
	return mw.getCurrentFrame():extensionTag{		return mw.getCurrentFrame():extensionTag{
	name = 'templatestyles', args = { src = stylesheetLink }		name = 'templatestyles', args = { src = stylesheetLink }
	} .. '<span class="plainlinks nourlexpansion ~~load-gadget" data-gadget="WikiMiniAtlas~~">[' .. coord_link .. uriComponents ..		} .. '<span class="plainlinks nourlexpansion">[' .. coord_link .. uriComponents ..
	' ' .. inner .. ']</span>'		' ' .. inner .. ']</span>' .. '[[Category:Pages using gadget WikiMiniAtlas]]'
	end		end

Pppery: Add class and data per request

2023-12-27T16:54:38Z

Add class and data per request

← Previous revision		Revision as of 16:54, 27 December 2023
Line 156:		Line 156:
	return mw.getCurrentFrame():extensionTag{		return mw.getCurrentFrame():extensionTag{
	name = 'templatestyles', args = { src = stylesheetLink }		name = 'templatestyles', args = { src = stylesheetLink }
	} .. '<span class="plainlinks nourlexpansion">[' .. coord_link .. uriComponents ..		} .. '<span class="plainlinks nourlexpansion load-gadget" data-gadget="WikiMiniAtlas">[' .. coord_link .. uriComponents ..
	' ' .. inner .. ']</span>'		' ' .. inner .. ']</span>'
	end		end

Ladsgroup: Switch from proto-relative urls (//foo.bar.com) to HTTPS (https://foo.bar.com). Since we are only serving https in Wikimedia now, it always outputs https links. At the same time, proto-relative add two duplicate rows to externallinks table meaning this is adding tens of millions of extra and useless rows bloating the table

2023-06-21T17:33:40Z

Switch from proto-relative urls (//foo.bar.com) to HTTPS (https://foo.bar.com). Since we are only serving https in Wikimedia now, it always outputs https links. At the same time, proto-relative add two duplicate rows to externallinks table meaning this is adding tens of millions of extra and useless rows bloating the table

← Previous revision		Revision as of 17:33, 21 June 2023
Line 24:		Line 24:
	local current_page = mw.title.getCurrentTitle()		local current_page = mw.title.getCurrentTitle()
	local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );		local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );
	local coord_link = '//geohack.toolforge.org/geohack.php?pagename=' .. page_name .. '&params='		local coord_link = 'https://geohack.toolforge.org/geohack.php?pagename=' .. page_name .. '&params='

	--[[ Helper function, replacement for {{coord/display/title}} ]]		--[[ Helper function, replacement for {{coord/display/title}} ]]

Izno: add noexcerpt to see if that hack works

2023-06-06T16:50:52Z

add noexcerpt to see if that hack works

← Previous revision		Revision as of 16:50, 6 June 2023
Line 652:		Line 652:
	-- Add to output since indicator content is invisible to Lua later on		-- Add to output since indicator content is invisible to Lua later on
	if not isInline(Display) then		if not isInline(Display) then
	text = text .. '<span class="geo-inline-hidden">' .. contents .. Notes .. '</span>'		text = text .. '<span class="geo-inline-hidden noexcerpt">' .. contents .. Notes .. '</span>'
	end		end
	text = text .. displaytitle(contents .. Notes) .. makeWikidataCategories(args.qid)		text = text .. displaytitle(contents .. Notes) .. makeWikidataCategories(args.qid)

MSGJ: make coordinsert work properly with the indicator in the title, coord2text callable from other modules

2023-06-05T14:59:31Z

make coordinsert work properly with the indicator in the title, coord2text callable from other modules

← Previous revision		Revision as of 14:59, 5 June 2023
Line 647:		Line 647:
	local text = ''		local text = ''
	if isInline(Display) then		if isInline(Display) then
	text = text .. contents .. Notes		text = text .. '<span class="geo-inline">' .. contents .. Notes .. '</span>'
	end		end
	if isInTitle(Display) then		if isInTitle(Display) then
⚫	text = text .. displaytitle(contents .. Notes)

	-- Add to output since indicator content is invisible to Lua later on		-- Add to output since indicator content is invisible to Lua later on
	if not isInline(Display) then		if not isInline(Display) then
	text = text .. '<~~div~~ class="geo-inline-hidden">' .. contents .. Notes .. '</~~div~~>'		text = text .. '<span class="geo-inline-hidden">' .. contents .. Notes .. '</span>'
	end		end
		⚫	text = text .. displaytitle(contents .. Notes) .. makeWikidataCategories(args.qid)

	text = text .. makeWikidataCategories(args.qid)
	end		end
	if not args.nosave then		if not args.nosave then
Line 690:		Line 687:

	]]		]]
	function coordinates.~~coord2text~~(~~frame~~)		function coordinates._coord2text(coord,type)
	if ~~frame.args[1]~~ == '' or ~~frame.args[2]~~ == '' or not ~~frame.args[2]~~ then return nil end		if coord == '' or type == '' or not type then return nil end
	~~frame.args[2]~~ = mw.text.trim(~~frame.args[2]~~)		type = mw.text.trim(type)
	if ~~frame.args[2]~~ == 'lat' or ~~frame.args[2]~~ == 'long' then		if type == 'lat' or type == 'long' then
	local result, negative = mw.text.split((mw.ustring.match(~~frame.args[1]~~,'[%.%d]+°[NS] [%.%d]+°[EW]') or ''), ' ')		local result, negative = mw.text.split((mw.ustring.match(coord,'[%.%d]+°[NS] [%.%d]+°[EW]') or ''), ' ')
	if ~~frame.args[2]~~ == 'lat' then		if type == 'lat' then
	result, negative = result[1], 'S'		result, negative = result[1], 'S'
	else		else
Line 704:		Line 701:
	return result[1]		return result[1]
	else		else
	return mw.ustring.match(~~frame.args[1]~~, 'params=.-_'..~~frame.args[2]~~..':(.-)[ _]')		return mw.ustring.match(coord, 'params=.-_' .. type .. ':(.-)[ _]')
	end		end
			end

			function coordinates.coord2text(frame)
			return coordinates._coord2text(frame.args[1],frame.args[2])
	end		end

Line 753:		Line 754:
	end		end

			-- replace the existing indicator with a new indicator using the modified content
	-- find the in-source 'indicators' and then call displaytitle
	mw.ustring.gsub(		frame.args[1] = mw.ustring.gsub(
	frame.args[1],		frame.args[1],
	'<~~div~~ class="geo-inline~~-hidden~~">(.+)</~~div~~>',		'(<span class="geo%-inline[^"]">(.+)</span>)\127[^\127]UNIQ%-%-indicator%-%x+%-%-?QINU[^\127]*\127',
	displaytitle		function (inline, coord) return inline .. displaytitle(coord) end
	)		)

Izno: per talk page

2023-05-24T22:28:34Z

per talk page

← Previous revision		Revision as of 22:28, 24 May 2023
Line 27:		Line 27:

	--[[ Helper function, replacement for {{coord/display/title}} ]]		--[[ Helper function, replacement for {{coord/display/title}} ]]
	local function displaytitle(~~s, notes~~)		local function displaytitle(coords)
	local coords = s .. notes;

	return mw.getCurrentFrame():extensionTag{		return mw.getCurrentFrame():extensionTag{
	name = 'indicator',		name = 'indicator',
Line 652:		Line 650:
	end		end
	if isInTitle(Display) then		if isInTitle(Display) then
	text = text .. displaytitle(contents~~, Notes)~~ .. ~~makeWikidataCategories(args.qid~~)		text = text .. displaytitle(contents .. Notes)

	-- Add to output since indicator content is invisible to Lua later on		-- Add to output since indicator content is invisible to Lua later on
	if not isInline(Display) then		if not isInline(Display) then
	~~return~~ '<div class="geo-inline-hidden">' .. contents .. Notes .. '</div>'		text = text .. '<div class="geo-inline-hidden">' .. contents .. Notes .. '</div>'
	end		end

			text = text .. makeWikidataCategories(args.qid)
	end		end
	if not args.nosave then		if not args.nosave then
Line 756:		Line 756:
	mw.ustring.gsub(		mw.ustring.gsub(
	frame.args[1],		frame.args[1],
	'<div class="geo-inline-hidden">~~(.+</span>)~~(.+)</div>',		'<div class="geo-inline-hidden">(.+)</div>',
	displaytitle		displaytitle
	)		)

Izno: per tper

2023-05-24T21:19:02Z

per tper

← Previous revision		Revision as of 21:19, 24 May 2023
Line 30:		Line 30:
	local coords = s .. notes;		local coords = s .. notes;

		⚫	return mw.getCurrentFrame():extensionTag{
	return '<!-- COORD INDICATOR START ' .. coords .. ' -->'
			name = 'indicator',
⚫	.. mw.getCurrentFrame():extensionTag{
	name = '~~indicator~~',		args = { name = 'coordinates' },
		⚫	content = '<span id="coordinates">[[Geographic coordinate system\|Coordinates]]: ' .. coords .. '</span>'
	args = { name = 'coordinates' },
			}
⚫	content = '<span id="coordinates">[[Geographic coordinate system\|Coordinates]]: ' .. coords .. '</span>'
⚫	}
	.. '<!-- COORD INDICATOR END -->'
	end		end

Line 655:		Line 653:
	if isInTitle(Display) then		if isInTitle(Display) then
	text = text .. displaytitle(contents, Notes) .. makeWikidataCategories(args.qid)		text = text .. displaytitle(contents, Notes) .. makeWikidataCategories(args.qid)
		⚫
			-- Add to output since indicator content is invisible to Lua later on
			if not isInline(Display) then
			return '<div class="geo-inline-hidden">' .. contents .. Notes .. '</div>'
			end
	end		end
	if not args.nosave then		if not args.nosave then
Line 753:		Line 756:
	mw.ustring.gsub(		mw.ustring.gsub(
	frame.args[1],		frame.args[1],
			'<div class="geo-inline-hidden">(.+</span>)(.+)</div>',
	'<!%-%- COORD INDICATOR START (.-) %-%->.-<!%-%- COORD INDICATOR END %-%->',
	~~function (coords) return~~ displaytitle~~(coords, '') end~~		displaytitle
	)		)

Dreamy Jazz: Use indicator for KML data - requested by TheDJ and Jon

2023-05-21T09:44:31Z

Use indicator for KML data - requested by TheDJ and Jon

← Previous revision		Revision as of 09:44, 21 May 2023
Line 20:		Line 20:
	local math_mod = require("Module:Math")		local math_mod = require("Module:Math")
	local coordinates = {};		local coordinates = {};
			local isSandbox = mw.getCurrentFrame():getTitle():find('sandbox', 1, true);

	local current_page = mw.title.getCurrentTitle()		local current_page = mw.title.getCurrentTitle()
	local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );		local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );
	local coord_link = '//geohack.toolforge.org/geohack.php?pagename=' .. page_name .. '&params='		local coord_link = '//geohack.toolforge.org/geohack.php?pagename=' .. page_name .. '&params='
	local templatestyles = 'Module:Coordinates/styles.css'

	--[[ Helper function, replacement for {{coord/display/title}} ]]		--[[ Helper function, replacement for {{coord/display/title}} ]]
	local function displaytitle(s, notes)		local function displaytitle(s, notes)
		⚫	local coords = s .. notes;
⚫	~~local l~~ = "[[Geographic coordinate system\|Coordinates]]: " .. s
	local co = '<span id="coordinates">' .. l .. notes .. '</span>';
	return '<span style="font-size: small;">' .. co .. '</span>';
	end

			return '<!-- COORD INDICATOR START ' .. coords .. ' -->'
	--[[ Helper function, Replacement for {{coord/display/inline}} ]]
			.. mw.getCurrentFrame():extensionTag{
	local function displayinline(s, notes)
			name = 'indicator',
⚫	~~return~~ s .. notes
			args = { name = 'coordinates' },
		⚫	content = '<span id="coordinates">[[Geographic coordinate system\|Coordinates]]: ' .. coords .. '</span>'
			}
			.. '<!-- COORD INDICATOR END -->'
	end		end

Line 69:		Line 70:
	local result = ""		local result = ""
	for i,v in ipairs(errors) do		for i,v in ipairs(errors) do
	~~local errorHTML~~ = '<strong class="error">Coordinates: ' .. v[2] .. '</strong>'		result = result .. '<strong class="error">Coordinates: ' .. v[2] .. '</strong><br />'
	result = result .. errorHTML .. "<br />"
	end		end
	return result		return result
Line 157:		Line 157:
	end		end

			local stylesheetLink = 'Module:Coordinates' .. ( isSandbox and '/sandbox' or '' ) .. '/styles.css'
	return mw.getCurrentFrame():extensionTag{ ~~name = 'templatestyles', args = { src = templatestyles} }~~		return mw.getCurrentFrame():extensionTag{
⚫	.. '<span class="plainlinks nourlexpansion">'
			name = 'templatestyles', args = { src = stylesheetLink }
	.. '[' .. coord_link .. uriComponents .. ' ' .. inner .. ']'
		⚫	} .. '<span class="plainlinks nourlexpansion">[' .. coord_link .. uriComponents ..
	.. '</span>'		' ' .. inner .. ']</span>'
	end		end

Line 633:		Line 634:
	local Display = args.display and args.display:lower() or 'inline'		local Display = args.display and args.display:lower() or 'inline'

			-- it and ti are short for inline,title and title,inline
	local function isInline(s)		local function isInline(s)
	-- Finds whether coordinates are displayed inline.		-- Finds whether coordinates are displayed inline.
Line 649:		Line 651:
	local text = ''		local text = ''
	if isInline(Display) then		if isInline(Display) then
	text = text .. ~~displayinline(~~contents, Notes)		text = text .. contents .. Notes
	end		end
	if isInTitle(Display) then		if isInTitle(Display) then
		⚫	text = text .. displaytitle(contents, Notes) .. makeWikidataCategories(args.qid)
	text = text
	.. displaytitle(contents, Notes)
⚫	.. makeWikidataCategories(args.qid)
	end		end
	if not args.nosave then		if not args.nosave then
Line 719:		Line 719:
	]]		]]
	function coordinates.coordinsert(frame)		function coordinates.coordinsert(frame)
			-- for the 2nd or later integer parameter (the first is the coord template, as above)
	for i, v in ipairs(frame.args) do		for i, v in ipairs(frame.args) do
	if i ~= 1 then		if i ~= 1 then
			-- if we cannot find in the coord_template the i_th coordinsert parameter e.g. region
	if not mw.ustring.find(frame.args[1], (mw.ustring.match(frame.args[i], '^(.-:)') or '')) then		if not mw.ustring.find(frame.args[1], (mw.ustring.match(frame.args[i], '^(.-:)') or '')) then
			-- find from the params= up to the first possibly-present underscore
			-- and append the i_th coordinsert parameter and a space
			-- IDK why we're adding a space but it does seem somewhat convenient
	frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ')		frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ')
	end		end
Line 727:		Line 732:
	end		end
	if frame.args.name then		if frame.args.name then
			-- if we can't find the vcard class
	if not mw.ustring.find(frame.args[1], '<span class="vcard">') then		if not mw.ustring.find(frame.args[1], '<span class="vcard">') then
			-- take something that looks like a coord template and add the vcard span with class and fn org class
	local namestr = frame.args.name		local namestr = frame.args.name
	frame.args[1] = mw.ustring.gsub(frame.args[1],		frame.args[1] = mw.ustring.gsub(
			frame.args[1],
	'(<span class="geo%-default">)(<span[^<>]>[^<>]</span><span[^<>]>[^<>]<span[^<>]>[^<>]</span></span>)(</span>)',		'(<span class="geo%-default">)(<span[^<>]>[^<>]</span><span[^<>]>[^<>]<span[^<>]>[^<>]</span></span>)(</span>)',
	'%1<span class="vcard">%2<span style="display:none"> (<span class="fn org">' .. namestr .. '</span>)</span></span>%3')		'%1<span class="vcard">%2<span style="display:none"> (<span class="fn org">' .. namestr .. '</span>)</span></span>%3'
			)
	frame.args[1] = mw.ustring.gsub(frame.args[1], '(&params=[^&"<>%[%] ]*) ', '%1&title=' .. mw.uri.encode(namestr) .. ' ')
			-- then find anything from coordinates parameters to the 'end' and attach the title parameter
			frame.args[1] = mw.ustring.gsub(
			frame.args[1],
			'(&params=[^&"<>%[%] ]*) ',
			'%1&title=' .. mw.uri.encode(namestr) .. ' '
			)
	end		end
	end		end

			-- find the in-source 'indicators' and then call displaytitle
			mw.ustring.gsub(
			frame.args[1],
			'<!%-%- COORD INDICATOR START (.-) %-%->.-<!%-%- COORD INDICATOR END %-%->',
			function (coords) return displaytitle(coords, '') end
			)

	return frame.args[1]		return frame.args[1]
	end		end

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

2022-10-22T12:01:04Z

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

← Previous revision		Revision as of 12:01, 22 October 2022
Line 16:		Line 16:
	]]		]]

	require('~~Module:No globals~~')		require('strict')

	local math_mod = require("Module:Math")		local math_mod = require("Module:Math")

Xaosflux: Changed protection settings for "Module:Coordinates": 1MM+ uses ([Edit=Require administrator access] (indefinite) [Move=Require administrator access] (indefinite))

2022-02-25T14:10:23Z

Changed protection settings for "Module:Coordinates": 1MM+ uses ([Edit=Require administrator access] (indefinite) [Move=Require administrator access] (indefinite))

← Previous revision	Revision as of 14:10, 25 February 2022
(No difference)