Module:Mapframe - Revision history

Paine Ellsworth: per edit request on talk page - paramter → parameter

2025-05-28T20:20:06Z

per edit request on talk page - paramter → parameter

← Previous revision		Revision as of 20:20, 28 May 2025
Line 92:		Line 92:
	dsep = ",", -- separator between inline and title (comma in the example above)		dsep = ",", -- separator between inline and title (comma in the example above)

	-- valid values for type ~~paramter~~		-- valid values for type parameter
	line = "line", -- geoline feature (e.g. a road)		line = "line", -- geoline feature (e.g. a road)
	shape = "shape", -- geoshape feature (e.g. a state or province)		shape = "shape", -- geoshape feature (e.g. a state or province)

Ahecht: Better error

2025-01-23T15:50:40Z

Better error

← Previous revision		Revision as of 15:50, 23 January 2025
Line 59:		Line 59:
	L10n.template = {		L10n.template = {
	coord = { -- The coord template, as well as templates with output that contains {{coord}}		coord = { -- The coord template, as well as templates with output that contains {{coord}}
	"Coord", "Coord/sandbox~~", "Coordinates", "Module:Coordinates~~",		"Coord", "Coord/sandbox",
	"NRHP row", "NRHP row/sandbox",		"NRHP row", "NRHP row/sandbox",
	"WikidataCoord", "WikidataCoord/sandbox", "Wikidatacoord", "Wikidata coord~~", "Module:WikidataCoord~~"		"WikidataCoord", "WikidataCoord/sandbox", "Wikidatacoord", "Wikidata coord"
	}		}
	}		}
Line 258:		Line 258:
	]]--		]]--
	function util.isCoordTemplateOrWrapper(name)		function util.isCoordTemplateOrWrapper(name)
	name = ~~mw.text.split(~~mw.text.trim(name~~),":",true~~)		name = mw.text.trim(name)
	local inputTitle		local inputTitle = mw.title.new(name, 'Template')
	if not name[2] then
	inputTitle = mw.title.new(name[1], 'Template')
	elseif mw.ustring.lower(name[1]) == "#invoke" then
	inputTitle = mw.title.new(name[2], 'Module')
	end
	if not inputTitle then		if not inputTitle then
	return false		return false
Line 385:		Line 380:

	local lat_d = tonumber(parts[1])		local lat_d = tonumber(parts[1])
			assert(lat_d, "Unable to get latitude from input '"..coords.."'.")
	local lat_m = tonumber(parts[2]) -- nil if coords are in decimal format		local lat_m = tonumber(parts[2]) -- nil if coords are in decimal format
	local lat_s = lat_m and tonumber(parts[3]) -- nil if coords are either in decimal format or degrees and minutes only		local lat_s = lat_m and tonumber(parts[3]) -- nil if coords are either in decimal format or degrees and minutes only
Line 393:		Line 389:

	local long_d = tonumber(parts[1+#parts/2])		local long_d = tonumber(parts[1+#parts/2])
			assert(long_d, "Unable to get longitude from input '"..coords.."'.")
	local long_m = tonumber(parts[2+#parts/2]) -- nil if coords are in decimal format		local long_m = tonumber(parts[2+#parts/2]) -- nil if coords are in decimal format
	local long_s = long_m and tonumber(parts[3+#parts/2]) -- nil if coords are either in decimal format or degrees and minutes only		local long_s = long_m and tonumber(parts[3+#parts/2]) -- nil if coords are either in decimal format or degrees and minutes only

Ahecht: Support Module:Coordinates and Module:WikidataCoord

2024-12-04T17:38:47Z

Support Module:Coordinates and Module:WikidataCoord

← Previous revision		Revision as of 17:38, 4 December 2024
Line 59:		Line 59:
	L10n.template = {		L10n.template = {
	coord = { -- The coord template, as well as templates with output that contains {{coord}}		coord = { -- The coord template, as well as templates with output that contains {{coord}}
	"Coord", "Coord/sandbox",		"Coord", "Coord/sandbox", "Coordinates", "Module:Coordinates",
	"NRHP row", "NRHP row/sandbox",		"NRHP row", "NRHP row/sandbox",
	"WikidataCoord", "WikidataCoord/sandbox", "Wikidatacoord", "Wikidata coord"		"WikidataCoord", "WikidataCoord/sandbox", "Wikidatacoord", "Wikidata coord", "Module:WikidataCoord"
	}		}
	}		}
Line 258:		Line 258:
	]]--		]]--
	function util.isCoordTemplateOrWrapper(name)		function util.isCoordTemplateOrWrapper(name)
	name = mw.text.trim(name)		name = mw.text.split(mw.text.trim(name),":",true)
	local inputTitle ~~= mw.title.new(name, 'Template')~~		local inputTitle
			if not name[2] then
			inputTitle = mw.title.new(name[1], 'Template')
			elseif mw.ustring.lower(name[1]) == "#invoke" then
			inputTitle = mw.title.new(name[2], 'Module')
			end
	if not inputTitle then		if not inputTitle then
	return false		return false

Uzume: strict

2023-03-21T11:20:30Z

strict

← Previous revision		Revision as of 11:20, 21 March 2023
Line 9:		Line 9:
	-- Modue dependencies		-- Modue dependencies
	local transcluder -- local copy of https://www.mediawiki.org/wiki/Module:Transcluder loaded lazily		local transcluder -- local copy of https://www.mediawiki.org/wiki/Module:Transcluder loaded lazily
	-- "~~Module:No globals~~" should not be used, at least until all other modules which require this module are not using globals.		-- "strict" should not be used, at least until all other modules which require this module are not using globals.

	-- Template parameter names (unnumbered versions only)		-- Template parameter names (unnumbered versions only)

Jts1882: better regex to match description key (handles N>9)

2021-11-11T08:05:32Z

better regex to match description key (handles N>9)

← Previous revision		Revision as of 08:05, 11 November 2021
Line 198:		Line 198:
	-- However, don't strip control characters from wikitext (text or description parameters) or you'll break strip markers		-- However, don't strip control characters from wikitext (text or description parameters) or you'll break strip markers
	-- Alternatively it might be better to only strip control char from raw parameter content		-- Alternatively it might be better to only strip control char from raw parameter content
	if util.matchesParam('text', key) or util.matchesParam('description', key, key:gsub('^.+(%d+)$', '%1') ) then		if util.matchesParam('text', key) or util.matchesParam('description', key, key:gsub('^%D+(%d+)$', '%1') ) then
	cleanArgs[key] = val		cleanArgs[key] = val
	else		else

Jts1882: restore last version with check for parameter key type (no positional parameters are used, although some templates have them)

2021-11-08T08:54:11Z

restore last version with check for parameter key type (no positional parameters are used, although some templates have them)

← Previous revision		Revision as of 08:54, 8 November 2021
Line 191:		Line 191:
	local cleanArgs = {}		local cleanArgs = {}
	for key, val in pairs(argsTable) do		for key, val in pairs(argsTable) do
	if type(val) == 'string' then		if type(key) == 'string' and type(val) == 'string' then
	val = val:match('^%s(.-)%s$')		val = val:match('^%s(.-)%s$')
	if val ~= '' then		if val ~= '' then
	-- control characters inside json need to be escaped, but stripping them is simpler		-- control characters inside json need to be escaped, but stripping them is simpler
	-- See also T214984		-- See also T214984
	-- However, don't strip control characters from wikitext or you'll break strip markers		-- However, don't strip control characters from wikitext (text or description parameters) or you'll break strip markers
			-- Alternatively it might be better to only strip control char from raw parameter content
⚫	cleanArgs[key] = ~~(not util.matchesParam('text', key)) and~~ val:gsub('%c',' ') ~~or val~~
			if util.matchesParam('text', key) or util.matchesParam('description', key, key:gsub('^.+(%d+)$', '%1') ) then
			cleanArgs[key] = val
			else
		⚫	cleanArgs[key] = val:gsub('%c',' ')
			end
	end		end
	else		else

Jts1882: Undid revision 1054004455 by Jts1882 (talk) undo while investigating error

2021-11-07T17:46:14Z

Undid revision 1054004455 by Jts1882 (talk) undo while investigating error

← Previous revision		Revision as of 17:46, 7 November 2021
Line 196:		Line 196:
	-- control characters inside json need to be escaped, but stripping them is simpler		-- control characters inside json need to be escaped, but stripping them is simpler
	-- See also T214984		-- See also T214984
	-- However, don't strip control characters from wikitext ~~(text or description parameters)~~ or you'll break strip markers		-- However, don't strip control characters from wikitext or you'll break strip markers
		⚫	cleanArgs[key] = (not util.matchesParam('text', key)) and val:gsub('%c',' ') or val
	-- Alternatively it might be better to only strip control char from raw parameter content
	if util.matchesParam('text', key) or util.matchesParam('description', key, key:gsub('^.+(%d+)$', '%1') ) then
	cleanArgs[key] = val
	else
⚫	cleanArgs[key] = val:gsub('%c',' ')
	end
	end		end
	else		else

Jts1882: don't remove control characters from description parameters (in addition to text parameters)

2021-11-07T13:31:19Z

don't remove control characters from description parameters (in addition to text parameters)

← Previous revision		Revision as of 13:31, 7 November 2021
Line 196:		Line 196:
	-- control characters inside json need to be escaped, but stripping them is simpler		-- control characters inside json need to be escaped, but stripping them is simpler
	-- See also T214984		-- See also T214984
	-- However, don't strip control characters from wikitext or you'll break strip markers		-- However, don't strip control characters from wikitext (text or description parameters) or you'll break strip markers
			-- Alternatively it might be better to only strip control char from raw parameter content
⚫	cleanArgs[key] = ~~(not util.matchesParam('text', key)) and~~ val:gsub('%c',' ') ~~or val~~
			if util.matchesParam('text', key) or util.matchesParam('description', key, key:gsub('^.+(%d+)$', '%1') ) then
			cleanArgs[key] = val
			else
		⚫	cleanArgs[key] = val:gsub('%c',' ')
			end
	end		end
	else		else

Johnuniq: update from sandbox mainly to fix unhelpful error at Railway Museum (Western Australia)

2021-01-23T06:23:35Z

update from sandbox mainly to fix unhelpful error at Railway Museum (Western Australia)

Show changes

Evad37: Look for named coords specified through other templates

2020-12-07T23:48:23Z

Look for named coords specified through other templates

@@ Line 56: / Line 56: @@
+}
--- Names of other templates this module depends on
+-- Names of other templates this module can extract coordinates from
 L10n.template = {
+}
@@ Line 239: / Line 243: @@
 	if not(val) then return false end
 	return string.find(L10n.str.declinedWords , ' '..val..' ', 1, true ) and true or false
 end
@@ Line 251: / Line 288: @@
 	local subtemplates = {}
 	for template in templates do
-		local name = mw.ustring.match(template, '{{([^}|]+)') -- get the template name
+		local templateName = mw.ustring.match(template, '{{([^}|]+)')
 		local nameParam = mw.ustring.match(template, "|%s*name%s*=%s*[^}|]+")
 			if nameParam then table.insert(output, template) end
-		elseif mw.ustring.find(template, L10n.template.Coord) then
+		elseif mw.ustring.find(mw.ustring.sub(template, 2), "{{") then
 			local subOutput = util.extractCoordTemplates(mw.ustring.sub(template, 2))
 			for _, t in pairs(subOutput) do
@@ Line 301: / Line 338: @@
 		local coord = mw.ustring.match(expandedTemplate, "<span class=\"geo%-dec\".->(.-)</span>")
 		if coord then
 			local description = name ~= coord and coord
 			local coord = mw.ustring.gsub(coord, "[° ]", "_")