Module:Mapframe - Revision history

>QuebbingtonBear: 87 revisions imported from :wikipedia:Module:Mapframe

2022-10-28T06:18:24Z

87 revisions imported from wikipedia:Module:Mapframe

← Older revision	Revision as of 06:18, 28 October 2022
(No difference)

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

2021-11-11T08:05:32Z

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

← Older 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

wikipedia>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)

← Older 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
	~~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

wikipedia>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

← Older 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
	~~-- 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

wikipedia>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)

← Older 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
	~~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

>GloGrear: 1 revision imported

2021-03-28T08:25:48Z

1 revision imported

← Older revision	Revision as of 08:25, 28 March 2021
(No difference)

nss>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

wikipedia>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 = {
-	Coord		= "coord" -- lowercase template name
+	coord     = { -- The coord template, as well as templates with output that contains {{coord}}
+}
@@ 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 mw.ustring.lower(mw.text.trim(name)) == L10n.template.Coord then
+		if util.isCoordTemplateOrWrapper(templateName) then
 			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 name = mw.ustring.match(expandedTemplate, "<span class=\"fn org\">(.-)</span>") or coord
+			local name = (
 			local description = name ~= coord and coord
 			local coord = mw.ustring.gsub(coord, "[° ]", "_")

wikipedia>Evad37: allow blank marker symbols to be explicitly specified, for overriding templates that define a default value

2020-12-04T00:05:46Z

allow blank marker symbols to be explicitly specified, for overriding templates that define a default value

← Older revision		Revision as of 00:05, 4 December 2020
Line 629:		Line 629:
	end		end
	else -- is a point		else -- is a point
	~~data.properties["marker-symbol"]~~ = util.getParameterValue(contentArgs, 'marker') or L10n.defaults.marker		local markerSymbol = util.getParameterValue(contentArgs, 'marker') or L10n.defaults.marker
			-- allow blank to be explicitly specified, for overriding infoboxes or other templates with a default value
			if markerSymbol ~= "blank" then
			data.properties["marker-symbol"] = markerSymbol
			end
	data.properties["marker-color"] = util.getParameterValue(contentArgs, 'markerColor') or L10n.defaults.markerColor		data.properties["marker-color"] = util.getParameterValue(contentArgs, 'markerColor') or L10n.defaults.markerColor
	data.properties["marker-size"] = util.getParameterValue(contentArgs, 'markerSize') or L10n.defaults.markerSize		data.properties["marker-size"] = util.getParameterValue(contentArgs, 'markerSize') or L10n.defaults.markerSize

wikipedia>Evad37: Update from sandbox: Improve parsing of coordinates from geohack urls to prevent script errors; New overlay functionality for overlaying another map or image above the mapframe

2020-11-05T03:40:16Z

Update from sandbox: Improve parsing of coordinates from geohack urls to prevent script errors; New overlay functionality for overlaying another map or image above the mapframe

Show changes