Module:Cyclone map - Revision history

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

2022-10-21T22:04:38Z

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

← Previous revision		Revision as of 22:04, 21 October 2022
Line 1:		Line 1:
	require('~~Module:No globals~~')		require('strict')
	local fn = require('Module:Formatnum')		local fn = require('Module:Formatnum')
	--local mm = require('Module:Math')		--local mm = require('Module:Math')

Jts1882: tidy up, remove some legacy code

2020-06-28T08:33:58Z

tidy up, remove some legacy code

← Previous revision		Revision as of 08:33, 28 June 2020
Line 14:		Line 14:
	return frame:preprocess(str) -- the mapframe needs to be preprocessed!!!!!		return frame:preprocess(str) -- the mapframe needs to be preprocessed!!!!!
	end -- End the function.		end -- End the function.



	--[[ function to construct mapframe string		--[[ function to construct mapframe string
Line 311:		Line 309:
	for i, v in pairs(feature.path) do		for i, v in pairs(feature.path) do

	local ~~markerColor~~ = ~~featureProperties['marker-color'] or~~ p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )		local autoColor = p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )
	local ~~strokeColor~~ = featureProperties['~~stroke~~'] or ~~p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )~~		local markerColor = featureProperties['marker-color'] or autoColor
			local strokeColor = featureProperties['stroke'] or autoColor


	local longitude = feature.path[i]['longitude']		local longitude = feature.path[i]['longitude']
Line 404:		Line 404:

	local size = featureProperties['symbol-size']		local size = featureProperties['symbol-size']
	local shape = featureProperties['symbol-shape']		local shape = featureProperties['symbol-shape'] -- symbol for tropical cyclone
	if feature.path[i]['cycloneType2'] == 'extratropical cyclone' then ~~--extratropical cyclone (Q1063457) subtropical cyclone (Q2331851)~~		if feature.path[i]['cycloneType2'] == 'extratropical cyclone' then
			shape = 'triangle' -- symbol for extratropical cyclone (Q1063457)
	shape = 'triangle'
	elseif feature.path[i]['cycloneType2'] == 'subtropical cyclone' then		elseif feature.path[i]['cycloneType2'] == 'subtropical cyclone' then
			shape = 'square' -- symbol for subtropical cyclone (Q2331851)
	shape = 'square'
	end		end
	~~--local~~ ~~markerColor~~ = ~~featureProperties['symbol-color']~~ or p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )		local autoColor = p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )
	local ~~strokeColor~~ = featureProperties['symbol-~~stroke~~'] or ~~'#000088' p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )~~		--local markerColor = featureProperties['symbol-color'] or autoColor
	local ~~fillColor~~ = featureProperties['symbol-~~fill~~'] or ~~p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )~~		local strokeColor = featureProperties['symbol-stroke'] or autoColor
			local fillColor = featureProperties['symbol-fill'] or autoColor


	local longitude = feature.path[i]['longitude']		local longitude = feature.path[i]['longitude']
	local latitude = feature.path[i]['latitude']		local latitude = feature.path[i]['latitude']


	local description = '<div style=\\"text-align:left;\\"> '		local description = '<div style=\\"text-align:left;\\"> '

Line 442:		Line 441:
	.. ' } '		.. ' } '
	-- if shape==cyclone, a circle shape will have been drawn; now add the tails		-- if shape==cyclone, a circle shape will have been drawn; now add the tails
	if shape=="cyclone" ~~and mw.getCurrentFrame():getParent().args['mode'] == "test2"~~ then -- superimpose a second shape		if shape=="cyclone" then -- superimpose a second shape
	~~shape~~="cyclone_tails"		local shape2="cyclone_tails"
	shapeFeature = shapeFeature .. ', '		shapeFeature = shapeFeature .. ', '
	.. '{ "type": "Feature", '		.. '{ "type": "Feature", '
	.. ' "geometry": { "type": "Polygon", '		.. ' "geometry": { "type": "Polygon", '
	.. ' "coordinates": [ ' .. p.getPolygonCoordinates(~~shape~~, size, latitude, longitude) ..' ] '		.. ' "coordinates": [ ' .. p.getPolygonCoordinates(shape2, size, latitude, longitude) ..' ] '
	.. ' }, '		.. ' }, '
	.. ' "properties": { "stroke": "' .. strokeColor .. '" , '		.. ' "properties": { "stroke": "' .. strokeColor .. '" , '

Jts1882: reorganise functions with some notes on what they do

2020-06-27T12:54:31Z

reorganise functions with some notes on what they do

@@ Line 283: / Line 283: @@
 --[[ functions adding path to cyclone item
-		function p.getCycloneColor() - sets color of symbols/lines based on storm type (from wikidata)
+		p.addPathFeatureCollection()    -- adds markers/symbols and lines for path of storm (cordinates from wikidata)
 --]]
 p.addPathFeatureCollection=function(feature, featureProperties)
@@ Line 683: / Line 641: @@
 end
 --[[-------------------------------Retrieve information from wikidata-------------------------

Jts1882: clean up and consolidate path loops

2020-06-27T12:25:20Z

clean up and consolidate path loops

@@ Line 107: / Line 107: @@
     if strokeColor == "auto" then strokeColor = nil end  -- if using auto color
     local defaultProperties = {
     	                    ['marker-color']   = parent.args['marker-color'], -- default to nil --or  "#0050d0",
@@ Line 203: / Line 204: @@
             if strokeColor == "auto" then strokeColor = nil end  -- if using auto color
 	       local featureProperties = {
 		    	['marker-color']   = parent.args['marker-color'..tostring(index)]   or defaultProperties['marker-color'],
@@ Line 349: / Line 351: @@
 		                      end)
 	for i, v in pairs(feature.path) do
 		local markerColor = featureProperties['marker-color'] or p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )
 		local strokeColor = featureProperties['stroke'] or p.getCycloneColor( feature.path[i]['cycloneType'], featureProperties )
@@ Line 377: / Line 379: @@
 		end
-		-- place marker symbol on each point
+		--[[ place mapframe markers and custom symbols on each object
-		if mode == "marker" or (mode == "test" and i==1) then
+		       mode="marker": use mapframe markers for mark storm objects
@@ Line 391: / Line 397: @@
 			featureCollection = featureCollection .. sep .. pointFeature
 			sep = ","
 			local dateString = " 2020-06"
@@ Line 418: / Line 422: @@
 			featureCollection = featureCollection .. sep .. circleFeature
 			sep = ","
 			featureCollection = featureCollection .. sep .. p.addShapeFeature(i, feature, featureProperties)
 			sep = ","

Jts1882: some tidy up and rounding of width and height

2020-06-27T12:03:21Z

some tidy up and rounding of width and height

← Previous revision		Revision as of 12:03, 27 June 2020
Line 5:		Line 5:
	local p = {}		local p = {}

			-- N/A but possible option: keep cyclone data in subpage data files
	local ~~stadiumDatabase~~ = require( "Module:~~Football~~ map/data" ) -- configuration module		--local stormDatabase = require( "Module:Cyclone map/data" ) -- configuration module

	-- main function callable in Wikipedia via the #invoke command.		-- main function callable in Wikipedia via the #invoke command.
Line 27:		Line 28:
	local parent = mw.getCurrentFrame():getParent()		local parent = mw.getCurrentFrame():getParent()


	-- get JSON data for features to display		-- get JSON data for features to display
	local mapData = p.getGeoJSON()		local mapData = p.getGeoJSON()
Line 44:		Line 44:

	-- set width and height using noth parameters, one parameter assuming 4:3 aspect ratio, or defaults		-- set width and height using noth parameters, one parameter assuming 4:3 aspect ratio, or defaults
		⚫	local aspect = 4/3
⚫	local ~~width~~ = parent.args['~~width~~'] --or "~~220~~"
	local ~~height~~ = parent.args['~~height~~'] or ~~(width~~ or ~~"220")*3/4~~ --or "~~165~~"		local width = parent.args['width'] --or "220"
		⚫	local height = parent.args['height'] or (width or 220)/aspect --or "165"
⚫	~~width~~ = width or height*4/3 -- if ~~width~~ ~~null,~~ ~~use~~ ~~height~~
			width = width or height*aspect -- if width null, use height

	local align = parent.args['align'] or "right"		local align = parent.args['align'] or "right"

⚫	local zoom = parent.args['zoom'] --or "0"
			mapString = mapString .. ' width=' .. math.floor(width) .. ' height=' .. math.floor(height) .. ' align=' .. align

		⚫	local zoom = parent.args['zoom'] --or "0" -- no longer set defaults (mapframe does automatically)
	local latitude = parent.args['latitude'] --or "0"		local latitude = parent.args['latitude'] --or "0"
	local longitude = parent.args['longitude'] --or "0"		local longitude = parent.args['longitude'] --or "0"
	mapString = mapString
	.. ' width=' .. width
	.. ' height=' .. height
	.. ' align=' .. align

	--set if values, otherwise allow mapframe to set automatically (TODO check if longitude and latitude are independent)		--set if values, otherwise allow mapframe to set automatically (TODO check if longitude and latitude are independent)
	if zoom then mapString = mapString .. ' zoom=' .. zoom end		if zoom then mapString = mapString .. ' zoom=' .. zoom end
	if latitude then mapString = mapString .. ' latitude=' .. latitude end		if latitude then mapString = mapString .. ' latitude=' .. latitude end
	if longitude then mapString = mapString .. ' longitude=' .. longitude end		if longitude then mapString = mapString .. ' longitude=' .. longitude end

	mapString = mapString .. ' >' .. mapData .. '</mapframe>'		mapString = mapString .. ' >' .. mapData .. '</mapframe>' -- add data and close tag
	else		else
	mapString = "No data for map"		mapString = "No data for map"

Jts1882: handle stroke=auto

2020-06-27T09:47:36Z

handle stroke=auto

Jts1882: change default stroke and shape

2020-06-27T09:30:00Z

change default stroke and shape

Jts1882: change test2 to default

2020-06-27T09:08:36Z

change test2 to default

@@ Line 342: / Line 342: @@
 		                          end
 		                      end)
 	for i, v in pairs(feature.path) do
 	--while feature.path[i] do
@@ Line 371: / Line 372: @@
 		-- place marker symbol on each point
-		if mode == "default" or (mode == "test" and i==1) then
+		if mode == "marker" or (mode == "test" and i==1) then
@@ Line 387: / Line 388: @@
 		-- use short lines or polygons to mark with circle
-		if mode == "test2"  then
+		if mode == "test"  then
 			--[[
 			local size = 0.3
@@ Line 412: / Line 437: @@
 			featureCollection = featureCollection .. sep .. p.addShapeFeature(i, feature, featureProperties)
 			sep = ","
 		end

Jts1882: change handling on mapframe attributes to allow automatic setting of zoom, longitude and latitude

2020-06-27T08:56:39Z

change handling on mapframe attributes to allow automatic setting of zoom, longitude and latitude

← Previous revision		Revision as of 08:56, 27 June 2020
Line 43:		Line 43:
	end		end

			-- set width and height using noth parameters, one parameter assuming 4:3 aspect ratio, or defaults
			local width = parent.args['width'] --or "220"
			local height = parent.args['height'] or (width or "220")*3/4 --or "165"
			width = width or height*4/3 -- if width null, use height

			local align = parent.args['align'] or "right"
		⚫	local zoom = parent.args['zoom'] --or "0"
			local latitude = parent.args['latitude'] --or "0"
			local longitude = parent.args['longitude'] --or "0"
	mapString = mapString		mapString = mapString
	.. ' width=' .. ~~(parent.args['~~width~~'] or "220" )~~		.. ' width=' .. width
	.. ' height=' .. ~~(parent.args['~~height~~'] or "165")~~		.. ' height=' .. height
	-- .. ' align=' .. ~~(parent.args['~~align'] or ~~"right")~~		.. ' align=' .. align

			--set if values, otherwise allow mapframe to set automatically (TODO check if longitude and latitude are independent)
⚫	-- ~~.. ' zoom~~=~~' ..~~ (parent.args['zoom'] or "0" )
	-- .. ' ~~latitude~~=' .. ~~(parent.args['latitude'] or~~ ~~"0")~~		if zoom then mapString = mapString .. ' zoom=' .. zoom end
	-- .. ' ~~longitude~~=' .. ~~(parent.args['longitude'] or~~ ~~"0")~~		if latitude then mapString = mapString .. ' latitude=' .. latitude end
	.. ' >'		if longitude then mapString = mapString .. ' longitude=' .. longitude end

	.. mapData
	.. '</mapframe>'		mapString = mapString .. ' >' .. mapData .. '</mapframe>'
	else		else
	mapString = "No data for map"		mapString = "No data for map"

Jts1882: remove defaults for zoom, lat and long

2020-06-25T14:41:13Z

remove defaults for zoom, lat and long

← Previous revision		Revision as of 14:41, 25 June 2020
Line 44:		Line 44:

	mapString = mapString		mapString = mapString
	.. ' width=' .. (parent.args['width'] or "~~400~~" )		.. ' width=' .. (parent.args['width'] or "220" )
	.. ' height=' .. (parent.args['height'] or "~~300~~")		.. ' height=' .. (parent.args['height'] or "165")
	.. ' align=' .. (parent.args['align'] or "right")		-- .. ' align=' .. (parent.args['align'] or "right")
	.. ' zoom=' .. (parent.args['zoom'] or "9" )		-- .. ' zoom=' .. (parent.args['zoom'] or "0" )
	.. ' latitude=' .. (parent.args['latitude'] or "~~51.5~~")		-- .. ' latitude=' .. (parent.args['latitude'] or "0")
	.. ' longitude=' .. (parent.args['longitude'] or "-0~~.15~~")		-- .. ' longitude=' .. (parent.args['longitude'] or "0")
	.. ' >'		.. ' >'
	.. mapData		.. mapData

← Previous revision		Revision as of 09:47, 27 June 2020
Line 104:		Line 104:

	-- default parameters for marker color, size and symbol, etc (i.e. those without index suffix)		-- default parameters for marker color, size and symbol, etc (i.e. those without index suffix)
			local strokeColor = parent.args['stroke'] or "#000000"
			if strokeColor == "auto" then strokeColor = nil end -- if using auto color

	local defaultProperties = {		local defaultProperties = {
	['marker-color'] = parent.args['marker-color'], -- default to nil --or "#0050d0",		['marker-color'] = parent.args['marker-color'], -- default to nil --or "#0050d0",
	['marker-size'] = parent.args['marker-size'] or "small",		['marker-size'] = parent.args['marker-size'] or "small",
	['marker-symbol'] = parent.args['marker-symbol'] or "circle",		['marker-symbol'] = parent.args['marker-symbol'] or "circle",
	['stroke'] = parent.args['stroke'] or "#000000", -- nil default causes autocolor path; a value overrides autocolor		['stroke'] = strokeColor, --parent.args['stroke'] or "#000000", -- nil default causes autocolor path; a value overrides autocolor
	['stroke-width'] = parent.args['stroke-width'] or 1,		['stroke-width'] = parent.args['stroke-width'] or 1,
	['stroke-opacity'] = parent.args['stroke-opacity'] or 1.0,		['stroke-opacity'] = parent.args['stroke-opacity'] or 1.0,
Line 197:		Line 200:

	--check if current feature marker has specified color, size or symbol		--check if current feature marker has specified color, size or symbol
			local strokeColor = parent.args['stroke'..tostring(index)] or defaultProperties['stroke']
			if strokeColor == "auto" then strokeColor = nil end -- if using auto color

	local featureProperties = {		local featureProperties = {
	['marker-color'] = parent.args['marker-color'..tostring(index)] or defaultProperties['marker-color'],		['marker-color'] = parent.args['marker-color'..tostring(index)] or defaultProperties['marker-color'],
	['marker-symbol'] = parent.args['marker-symbol'..tostring(index)] or defaultProperties['marker-symbol'],		['marker-symbol'] = parent.args['marker-symbol'..tostring(index)] or defaultProperties['marker-symbol'],
	['marker-size'] = parent.args['marker-size'..tostring(index)] or defaultProperties['marker-size'],		['marker-size'] = parent.args['marker-size'..tostring(index)] or defaultProperties['marker-size'],
	['stroke'] = parent.args['stroke'..tostring(index)] or defaultProperties['stroke'],		['stroke'] = strokeColor, --parent.args['stroke'..tostring(index)] or defaultProperties['stroke'],
	['stroke-width'] = parent.args['stroke-width'..tostring(index)] or defaultProperties['stroke-width'],		['stroke-width'] = parent.args['stroke-width'..tostring(index)] or defaultProperties['stroke-width'],
	['stroke-opacity'] = parent.args['stroke-opacity'..tostring(index)] or defaultProperties['stroke-opacity'],		['stroke-opacity'] = parent.args['stroke-opacity'..tostring(index)] or defaultProperties['stroke-opacity'],

← Previous revision		Revision as of 09:30, 27 June 2020
Line 108:		Line 108:
	['marker-size'] = parent.args['marker-size'] or "small",		['marker-size'] = parent.args['marker-size'] or "small",
	['marker-symbol'] = parent.args['marker-symbol'] or "circle",		['marker-symbol'] = parent.args['marker-symbol'] or "circle",
	['stroke'] = parent.args['stroke'], -- nil default causes autocolor path; a value overrides autocolor		['stroke'] = parent.args['stroke'] or "#000000", -- nil default causes autocolor path; a value overrides autocolor
	['stroke-width'] = parent.args['stroke-width'] or 3,		['stroke-width'] = parent.args['stroke-width'] or 1,
	['stroke-opacity'] = parent.args['stroke-opacity'] or 1.0,		['stroke-opacity'] = parent.args['stroke-opacity'] or 1.0,

Line 115:		Line 115:
	['symbol-stroke'] = parent.args['symbol-stroke'], -- nil default causes autocolor path; a value overrides autocolor		['symbol-stroke'] = parent.args['symbol-stroke'], -- nil default causes autocolor path; a value overrides autocolor
	['symbol-fill'] = parent.args['symbol-fill'], -- nil default causes autocolor path;		['symbol-fill'] = parent.args['symbol-fill'], -- nil default causes autocolor path;
	['symbol-shape'] = parent.args['symbol-shape'] or "~~star~~",		['symbol-shape'] = parent.args['symbol-shape'] or "circle",
	['symbol-size'] = parent.args['symbol-size'] or 0.4,		['symbol-size'] = parent.args['symbol-size'] or 0.4,
	['symbol-stroke-width'] = parent.args['symbol-stroke-width'] or 1,		['symbol-stroke-width'] = parent.args['symbol-stroke-width'] or 0,
	['symbol-stroke-opacity'] = parent.args['symbol-stroke-opacity'] or 1.0,		['symbol-stroke-opacity'] = parent.args['symbol-stroke-opacity'] or 1.0,
	['symbol-fill-opacity'] = parent.args['symbol-fill-opacity'] or 1.0		['symbol-fill-opacity'] = parent.args['symbol-fill-opacity'] or 1.0