Module:Storm categories - Revision history

Paine Ellsworth: per edit request on talk page - implement three significant changes per Module talk:Storm categories#Template-protected edit request on 23 April 2022

2023-04-24T15:35:45Z

per edit request on talk page - implement three significant changes per Module talk:Storm categories#Template-protected edit request on 23 April 2022

← Previous revision		Revision as of 15:35, 24 April 2023
Line 26:		Line 26:
	end		end

	function p.~~_color~~(~~colorCode, nullIfMissing~~)		function p.isEqual(frame)
			return p._isEqual(
			frame.args[1] or frame:getParent().args[1],
			frame.args[2] or frame:getParent().args[2]
			) and "yes" or ""
			end

			function p._normalizeId(category, fallback)
			-- Normalize if normalizable, fall back to default if not.
		⚫	return (category ~= nil and string.len(category) ~= 0) and
		⚫	string.gsub(string.lower(category), "[^%w]", "") or fallback
			end

			function p._color(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local color = ~~(colorCode ~= nil and string~~.~~len~~(~~colorCode)~~ ~~~= 0~~) ~~and~~		local color = p._normalizeId(category, defaultCategory)
	string.gsub(string.lower(colorCode), "[^%w]", "")
⚫	or defaultCategory

	return colors[color] or ((cats[color] or (		return colors[color] or ((cats[color] or (
			nilIfMissing
	nullIfMissing
	and { color = nil }		and { color = nil }
	or cats[defaultCategory]		or cats[defaultCategory]
Line 39:		Line 50:
	end		end

	function p._name(category, basin, ~~nullIfMissing~~)		function p._name(category, basin, nilIfMissing)
	local name_def = (cats[		local name_def = (cats[
		⚫	p._normalizeId(category, defaultCategory)
⚫	(category ~= nil and string.len(category) ~= 0) and
		⚫	] or (nilIfMissing and { name = nil } or cats[defaultCategory])).name
⚫	string.gsub(string.lower(category), "[^%w]", "")
⚫	or defaultCategory
	] or cats[defaultCategory]).name
	return type(name_def) == "table" and		return type(name_def) == "table" and
	(		(
	name_def[string.lower(basin or "default")]		name_def[string.lower(basin or "default")]
	or name_def["default"]		or name_def["default"]
	or (not ~~nullIfMissing~~ and error("No default name for basin-based category name.") or nil)		or (not nilIfMissing and error("No default name for basin-based category name.") or nil)
	)		)
	or name_def		or name_def
	end		end

	function p._sortkey(category, ~~nullIfMissing~~)		function p._sortkey(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	return (cats[		return (cats[
		⚫	p._normalizeId(category, defaultCategory)
	(category ~= nil and string.len(category) ~= 0) and
			] or (nilIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey
	string.gsub(string.lower(category), "[^%w]", "")
	or defaultCategory
⚫	] or (~~nullIfMissing~~ and { ~~sortkey~~ = nil } or cats[defaultCategory])).~~sortkey~~
	end		end

	function p._icon(~~iconCode~~, ~~nullIfMissing~~)		function p._icon(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local icon = ~~(iconCode ~= nil and string~~.~~len~~(~~iconCode)~~ ~~~= 0~~) ~~and~~		local icon = p._normalizeId(category, defaultCategory)
	string.gsub(string.lower(iconCode), "[^%w]", "")
	or defaultCategory

	return icons[icon] or (cats[icon] ~= nil and (		return icons[icon] or (cats[icon] ~= nil and (
	cats[icon].icon or cats["tropicalcyclone"].icon		cats[icon].icon or cats["tropicalcyclone"].icon
	) or (not ~~nullIfMissing~~ and cats[defaultCategory].icon) or nil)		) or (not nilIfMissing and cats[defaultCategory].icon) or nil)
			end

			function p._isEqual(category1, category2)
			-- Checks if two IDs are equal.
			-- An {{#ifeq}} check does not consider aliases. This function compares two
			-- IDs in a way that considers category aliases. This works because alias
			-- assignments are references to the actual table containing the category
			-- info found in the main category table.
			--
			-- `false` will be returned if at least one of the categories are nil or
			-- if the category is not defined.
			local _category1 = p._normalizeId(category1)
			local _category2 = p._normalizeId(category2)
			return (_category1 == _category2 and _category1 ~= nil) or
			cats[ _category1 ] == cats[ _category2 ] and
			-- `false` if categories are undefined and not equal.
			cats[ _category1 ] ~= nil
	end		end

Paine Ellsworth: per edit request on talk page - fixes

2023-04-13T09:32:13Z

per edit request on talk page - fixes

← Previous revision		Revision as of 09:32, 13 April 2023
Line 49:		Line 49:
	name_def[string.lower(basin or "default")]		name_def[string.lower(basin or "default")]
	or name_def["default"]		or name_def["default"]
	or (nullIfMissing and ~~nil or~~ error("No default name for basin-based category name."))		or (not nullIfMissing and error("No default name for basin-based category name.") or nil)
	)		)
	or name_def		or name_def
Line 71:		Line 71:
	return icons[icon] or (cats[icon] ~= nil and (		return icons[icon] or (cats[icon] ~= nil and (
	cats[icon].icon or cats["tropicalcyclone"].icon		cats[icon].icon or cats["tropicalcyclone"].icon
	) or (nullIfMissing and ~~nil or~~ cats[defaultCategory].icon))		) or (not nullIfMissing and cats[defaultCategory].icon) or nil)
	end		end

BusterD: Changed protection settings for "Module:Storm categories": Highly visible template; requested at WP:RfPP ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

2022-04-12T17:39:24Z

Changed protection settings for "Module:Storm categories": Highly visible template; requested at WP:RfPP ([Edit=Require template editor access] (indefinite) [Move=Require template editor access] (indefinite))

← Previous revision	Revision as of 17:39, 12 April 2022
(No difference)

Chlod: /* top */Post-move cleanup, replaced: Tropical cyclone categories → Storm categories (4)

2022-02-03T03:04:20Z

top: Post-move cleanup, replaced: Tropical cyclone categories → Storm categories (4)

← Previous revision		Revision as of 03:04, 3 February 2022
Line 1:		Line 1:
	local categoryData = require("Module:~~Tropical cyclone~~ categories/categories")		local categoryData = require("Module:Storm categories/categories")
	local colors = require("Module:~~Tropical cyclone~~ categories/colors").colors		local colors = require("Module:Storm categories/colors").colors
	local icons = require("Module:~~Tropical cyclone~~ categories/icons").icons		local icons = require("Module:Storm categories/icons").icons
	local cats = categoryData.cats		local cats = categoryData.cats
	local defaultCategory = categoryData.defaultCategory		local defaultCategory = categoryData.defaultCategory
Line 75:		Line 75:

	function p.demo(frame)		function p.demo(frame)
	return require("Module:~~Tropical cyclone~~ categories/demo").demo(frame)		return require("Module:Storm categories/demo").demo(frame)
	end		end

Anthony Appleyard: Anthony Appleyard moved page Module:Tropical cyclone categories to Module:Storm categories without leaving a redirect: Requested by Chlod at WP:RM/TR: Module's scope has now expanded to include other non-tropical storms (such as tornadoes). As such, the name "Tropical cyclone categories" is unfitting. This module includes many subpages (some are submodules, others are documentation pages) which require the page mover right to move (or at least, it'...

2022-02-03T00:33:59Z

Anthony Appleyard moved page Module:Tropical cyclone categories to Module:Storm categories without leaving a redirect: Requested by Chlod at WP:RM/TR: Module's scope has now expanded to include other non-tropical storms (such as tornadoes). As such, the name "Tropical cyclone categories" is unfitting. This module includes many subpages (some are submodules, others are documentation pages) which require the page mover right to move (or at least, it'...

← Previous revision	Revision as of 00:33, 3 February 2022
(No difference)

Chlod: moving to submodules

2022-01-23T21:21:12Z

moving to submodules

Show changes

Chlod: change icon

2022-01-23T06:47:05Z

change icon

← Previous revision		Revision as of 06:47, 23 January 2022
Line 69:		Line 69:
	name = "Overland depression",		name = "Overland depression",
	sortkey = 60,		sortkey = 60,
	icon = "[[File:~~Disturbance~~ icon.png\|25px]]"		icon = "[[File:Depression icon.png\|25px]]"
	},		},
	subdisturbance = {		subdisturbance = {

Chlod: add overland depression

2022-01-23T06:45:24Z

add overland depression

← Previous revision		Revision as of 06:45, 23 January 2022
Line 62:		Line 62:
	color = "5ebaff",		color = "5ebaff",
	name = "Subtropical depression",		name = "Subtropical depression",
	sortkey = 60,		sortkey = 62,
	icon = "[[File:Subtropical Depression icon.png\|25px]]"		icon = "[[File:Subtropical Depression icon.png\|25px]]"
			},
			overland = {
			color = "5ebaff",
			name = "Overland depression",
			sortkey = 60,
			icon = "[[File:Disturbance icon.png\|25px]]"
	},		},
	subdisturbance = {		subdisturbance = {
Line 360:		Line 366:
	cats["nwpstorm"] = cats["storm"]		cats["nwpstorm"] = cats["storm"]
	cats["d"] = cats["depression"]		cats["d"] = cats["depression"]
			cats["overlanddepression"] = cats["overland"]
			cats["od"] = cats["overland"]
	cats["spdepression"] = cats["depression"]		cats["spdepression"] = cats["depression"]
	cats["shdepression"] = cats["depression"]		cats["shdepression"] = cats["depression"]

Chlod: better demo

2022-01-23T06:42:30Z

better demo

Show changes

Chlod: adjust aliases

2022-01-23T06:03:32Z

adjust aliases

← Previous revision		Revision as of 06:03, 23 January 2022
Line 40:		Line 40:
	name = "Tropical depression",		name = "Tropical depression",
	sortkey = 90,		sortkey = 90,
	icon = "[[File:~~Tropical_Depression~~.png\|25px]]"		icon = "[[File:Tropical Depression.png\|25px]]"
	},		},
	disturbance = {		disturbance = {
Line 68:		Line 68:
	color = "80ccff",		color = "80ccff",
	name = "Subtropical disturbance",		name = "Subtropical disturbance",
	sortkey = 55		sortkey = 55,
			icon = "[[File:Disturbance icon.png\|25px]]"
	},		},
	extratropical = {		extratropical = {
Line 302:		Line 303:
	color = "00faf4",		color = "00faf4",
	name = "Moderate tropical storm",		name = "Moderate tropical storm",
	sortkey = 30004		sortkey = 30004,
			icon = "[[File:Moderate tropical storm icon.png\|18px]]"
	},		},
	zodw = {		zodw = {
Line 368:		Line 370:
	cats["ss"] = cats["subtropical"]		cats["ss"] = cats["subtropical"]
	cats["et"] = cats["extratropical"]		cats["et"] = cats["extratropical"]
			cats["ex"] = cats["extratropical"]
	cats["md"] = cats["monsoondepression"]		cats["md"] = cats["monsoondepression"]
	cats["pt"] = cats["potential"]		cats["pt"] = cats["potential"]
	cats["potentialtropicalcyclone"] = cats["potential"]		cats["potentialtropicalcyclone"] = cats["potential"]
	cats["potentialtropicalcyclone"] = cats["potential"]		cats["potentialtropicalcyclone"] = cats["potential"]
	cats["post"] = cats["~~remnant~~"]		cats["post"] = cats["posttropical"]
			cats["post-tropical"] = cats["posttropical"]
	cats["remnantlow"] = cats["remnant"]		cats["remnantlow"] = cats["remnant"]
	cats["rl"] = cats["remnant"]		cats["rl"] = cats["remnant"]
Line 431:		Line 435:
	-- viable category.		-- viable category.
	local icons = {		local icons = {
			-- Ambiguious 5-tier scale
			["1"] = cats["cat1"].icon,
			["2"] = cats["cat2"].icon,
			["3"] = cats["cat3"].icon,
			["4"] = cats["cat4"].icon,
			["5"] = cats["cat5"].icon,
			-- FMS scale
			["a5"] = cats["aus5"].icon,
			["a4"] = cats["aus4"].icon,
			["a3"] = cats["aus3"].icon,
			["a2"] = cats["aus2"].icon,
			["a1"] = cats["aus1"].icon,
			-- Misc
	["extratropical2"] = "[[File:Extratropical storm icon.png\|18px]]",		["extratropical2"] = "[[File:Extratropical storm icon.png\|18px]]",
	["typhoon"] = "[[File:Typhoon icon.png\|18px]]",		["typhoon"] = "[[File:Typhoon icon.png\|18px]]",
Line 440:		Line 457:
	icons["ex2"] = icons["extratropical2"]		icons["ex2"] = icons["extratropical2"]
	icons["ty"] = icons["typhoon"]		icons["ty"] = icons["typhoon"]
	icons["~~sts-s~~"] = icons["swiosts"]		icons["stss"] = icons["swiosts"]
		⚫	icons["tc"] = icons["swiotc"]
	-- Disabled due to improper ambiguity.
⚫	-- icons["tc"] = icons["~~swiosts~~"]

	function p.color(frame)		function p.color(frame)
Line 502:		Line 518:
	or defaultCategory		or defaultCategory

	return icons[~~iconCode~~] or ((cats[~~iconCode~~] or ~~cats[defaultCategory]).icon)~~ or ~~cats["tropicalcyclone"].icon~~		return icons[icon] or (cats[icon] ~= nil and (
			cats[icon].icon or cats["tropicalcyclone"].icon
			) or cats[defaultCategory].icon)
	end		end