Module:Infobox mapframe - Revision history

>QuebbingtonBear: 39 revisions imported from :wikipedia:Module:Infobox_mapframe

2022-10-28T06:18:15Z

39 revisions imported from wikipedia:Module:Infobox_mapframe

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

>GloGrear: 1 revision imported

2021-03-28T08:25:47Z

1 revision imported

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

nss>Evad37: only allow shapes/lines based on wikidata id if there is an id

2020-10-28T02:54:00Z

only allow shapes/lines based on wikidata id if there is an id

← Older revision		Revision as of 02:54, 28 October 2020
Line 241:		Line 241:
	local shouldShowLine = config.line ~= 'none'		local shouldShowLine = config.line ~= 'none'
	local maskItem		local maskItem
	local useWikidata = true -- Use shapes/lines based on wikidata id		local useWikidata = wikidataId and true or false -- Use shapes/lines based on wikidata id, if there is one
	-- Do not use wikidata when coords are specified (and not turned off), unless explicitly set		-- But do not use wikidata when local coords are specified (and not turned off), unless explicitly set
	if config.coord and shouldShowPointMarker then		if useWikidata and config.coord and shouldShowPointMarker then
	useWikidata = config.wikidata and true or false		useWikidata = config.wikidata and true or false
	end		end

wikipedia>Evad37: allow width and height to be specified without the "frame-" prefix

2020-07-03T01:22:05Z

allow width and height to be specified without the "frame-" prefix

← Older revision		Revision as of 01:22, 3 July 2020
Line 202:		Line 202:
	args.frame = "yes"		args.frame = "yes"
	args.plain = "yes"		args.plain = "yes"
	args["frame-width"] = config["frame-width"] or DEFAULT_FRAME_WIDTH		args["frame-width"] = config["frame-width"] or config.width or DEFAULT_FRAME_WIDTH
	args["frame-height"] = config["frame-height"] or DEFAULT_FRAME_HEIGHT		args["frame-height"] = config["frame-height"] or config.height or DEFAULT_FRAME_HEIGHT
	args["frame-align"] = "center"		args["frame-align"] = "center"

wikipedia>Evad37: show shapes/lines from wikidata id when local coords are specified, but turned off

2020-07-03T01:12:59Z

show shapes/lines from wikidata id when local coords are specified, but turned off

← Older revision		Revision as of 01:12, 3 July 2020
Line 181:		Line 181:
	-- `config` is the args passed to this module		-- `config` is the args passed to this module
	local config = trimArgs(_config)		local config = trimArgs(_config)

	~~-- Use wikidata by default~~
	~~local useWikidata = true~~
	~~-- Do not use wikidata when coords are specified, unless explicitly set~~
	~~if config.coord then~~
	~~useWikidata = config.wikidata and true or false~~
	~~end~~

	-- Require wikidata item, or specified coords		-- Require wikidata item, or specified coords
Line 248:		Line 241:
	local shouldShowLine = config.line ~= 'none'		local shouldShowLine = config.line ~= 'none'
	local maskItem		local maskItem
			local useWikidata = true -- Use shapes/lines based on wikidata id
			-- Do not use wikidata when coords are specified (and not turned off), unless explicitly set
			if config.coord and shouldShowPointMarker then
			useWikidata = config.wikidata and true or false
			end

	-- Switcher		-- Switcher

wikipedia>Evad37: update from sandbox: added switcher functionality; Let kartographer determine zoom and position, unless zoom is explicitly set

2020-06-21T13:28:52Z

update from sandbox: added switcher functionality; Let kartographer determine zoom and position, unless zoom is explicitly set

@@ Line 135: / Line 135: @@
 	if not shouldAutoRun(frame) then return "" end
 	local args = argsFromAuto(frame)
-	if args.caption then return args.caption end
+	if args.caption then
 	local maskItem
 	local maskType = idType(args.geomask)
@@ Line 229: / Line 233: @@
 		args.zoom = config.zoom or DEFAULT_ZOOM
 	end
 	-- Conditionals: whether point, geomask should be shown
 	local hasOsmRelationId = hasWikidataProperty(wikidataId, 'P402') -- P402 is OSM relation ID
@@ Line 244: / Line 248: @@
 	local shouldShowLine = config.line ~= 'none'
 	local maskItem
 	local maskType = idType(config.geomask)
-	if maskType == 'item' then
+	-- Switcher
-		maskItem = config.geomask
+	if config.switcher == "zooms" then
-	elseif maskType == "property" then
+		-- switching between zoom levels
-		maskItem = relatedEntity(wikidataId, config.geomask)
+		local maxZoom = math.max(tonumber(args.zoom), 3) -- what zoom would have otherwise been (if 3 or more, otherwise 3)
 	end
@@ Line 269: / Line 322: @@
 		args["fill"..argNumber] = config["geomask-fill"] or DEFAULT_GEOMASK_FILL
 		args["fill-opacity"..argNumber] = config["geomask-fill-opacity"] or DEFAULT_SHAPE_FILL_OPACITY
-		-- Recalculate zoom based on mask area, if available, and not set in config
+		-- Let kartographer determine zoom and position, unless it is explicitly set in config
-		if not config.zoom then
+		if not config.zoom and not config.switcher then
 			local maskArea = getStatementValue( getBestStatement(maskItem, 'P2046') )
 		end
 		incrementArgNumber()
 	end
@@ Line 313: / Line 370: @@
 	end
-	local mapframe = mf._main(args)
+	local mapframe = args.switch and mf.multi(args) or mf._main(args)
 	local tracking = hasOsmRelationId and '' or '[[Category:Infobox mapframe without OSM relation ID on Wikidata]]'
 	return mapframe .. tracking

wikipedia>Evad37: Update auto functionality: Allow custom maps (image or mapframe template); use dash instead of underscore in parameters prefix

2020-06-17T03:30:37Z

Update auto functionality: Allow custom maps (image or mapframe template); use dash instead of underscore in parameters prefix

← Older revision		Revision as of 03:30, 17 June 2020
Line 2:		Line 2:
	local getArgs = require('Module:Arguments').getArgs		local getArgs = require('Module:Arguments').getArgs
	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
			local infoboxImage = require('Module:InfoboxImage').InfoboxImage

	-- Defaults		-- Defaults
Line 112:		Line 113:
	local args = getArgs(frame, {parentFirst = true})		local args = getArgs(frame, {parentFirst = true})

	-- Discard args not prefixed with "~~mapframe_~~", remove that prefix from those that remain		-- Discard args not prefixed with "mapframe-", remove that prefix from those that remain
	local fixedArgs = {}		local fixedArgs = {}
	for name, val in pairs(args) do		for name, val in pairs(args) do
	local fixedName = string.match(name, "^~~mapframe_~~(.+)$" )		local fixedName = string.match(name, "^mapframe%-(.+)$" )
	if fixedName then		if fixedName then
	fixedArgs[fixedName] = val		fixedArgs[fixedName] = val
Line 144:		Line 145:
	local maskItemLabel = maskItem and mw.wikibase.getLabel( maskItem )		local maskItemLabel = maskItem and mw.wikibase.getLabel( maskItem )
	return maskItemLabel and "Location in "..maskItemLabel or ""		return maskItemLabel and "Location in "..maskItemLabel or ""
			end

			function parseCustomWikitext(customWikitext)
			-- infoboxImage will format an image if given wikitext containing an
			-- image, or else pass through the wikitext unmodified
			return infoboxImage({
			args = {
			image = customWikitext
			}
			})
	end		end

Line 149:		Line 160:
	if not shouldAutoRun(frame) then return "" end		if not shouldAutoRun(frame) then return "" end
	local args = argsFromAuto(frame)		local args = argsFromAuto(frame)
			if args.custom then
			return frame:preprocess(parseCustomWikitext(args.custom))
			end
	local mapframe = p._main(args)		local mapframe = p._main(args)
	return frame:preprocess(mapframe)		return frame:preprocess(mapframe)

wikipedia>Evad37: fix picking up unprefixed args

2020-06-16T05:49:24Z

fix picking up unprefixed args

← Older revision		Revision as of 05:49, 16 June 2020
Line 118:		Line 118:
	if fixedName then		if fixedName then
	fixedArgs[fixedName] = val		fixedArgs[fixedName] = val
	-- allow coord, coordinates, id to be unprefixed		-- allow coord, coordinates, etc to be unprefixed
	elseif name == "coordinates" or name == "coord" or name == "id" then		elseif name == "coordinates" or name == "coord" or name == "coordinate" and not fixedArgs.coord then
	fixedArgs~~[name]~~ = val		fixedArgs.coord = val
	-- allow qid to be unprefixed, map to id (if not already present)		-- allow id, qid to be unprefixed, map to id (if not already present)
	elseif name == "qid" and not fixedArgs.id then		elseif name == "id" or name == "qid" and not fixedArgs.id then
	fixedArgs.id = val		fixedArgs.id = val
	end		end

wikipedia>Evad37: New auto and autocaption functions to make this easier to use in infoboxes

2020-06-16T04:00:01Z

New auto and autocaption functions to make this easier to use in infoboxes

@@ Line 1: / Line 1: @@
 local mf = require('Module:Mapframe')
 -- Defaults
@@ Line 95: / Line 97: @@
 	-- minimum value is 1
 	return math.max(1, zoom)
 end
 local p = {}
 p.main = function(frame)

wikipedia>Evad37: Allow shape, point, or line to be turned off; allow point to be forced on; allow shape type to be changed to shape-inverse; allow shape and geomask fill opacity to be specified

2020-05-06T10:19:39Z

Allow shape, point, or line to be turned off; allow point to be forced on; allow shape type to be changed to shape-inverse; allow shape and geomask fill opacity to be specified

← Older revision		Revision as of 10:19, 6 May 2020
Line 8:		Line 8:
	local DEFAULT_GEOMASK_STROKE_COLOR = "#777777"		local DEFAULT_GEOMASK_STROKE_COLOR = "#777777"
	local DEFAULT_GEOMASK_FILL = "#888888"		local DEFAULT_GEOMASK_FILL = "#888888"
			local DEFAULT_GEOMASK_FILL_OPACITY = "0.5"
	local DEFAULT_SHAPE_STROKE_WIDTH = "3"		local DEFAULT_SHAPE_STROKE_WIDTH = "3"
	local DEFAULT_SHAPE_STROKE_COLOR = "#FF0000"		local DEFAULT_SHAPE_STROKE_COLOR = "#FF0000"
	local DEFAULT_SHAPE_FILL = "#606060"		local DEFAULT_SHAPE_FILL = "#606060"
			local DEFAULT_SHAPE_FILL_OPACITY = "0.5"
	local DEFAULT_LINE_STROKE_WIDTH = "5"		local DEFAULT_LINE_STROKE_WIDTH = "5"
	local DEFAULT_LINE_STROKE_COLOR = "#FF0000"		local DEFAULT_LINE_STROKE_COLOR = "#FF0000"
Line 162:		Line 164:
	-- Conditionals: whether point, geomask should be shown		-- Conditionals: whether point, geomask should be shown
	local hasOsmRelationId = hasWikidataProperty(wikidataId, 'P402') -- P402 is OSM relation ID		local hasOsmRelationId = hasWikidataProperty(wikidataId, 'P402') -- P402 is OSM relation ID
	local shouldShowPointMarker = not(hasOsmRelationId) or (config.marker and config.marker ~= 'none') or (config.coordinates or config.coord)		local shouldShowPointMarker;
			if config.point == "on" then
			shouldShowPointMarker = true
			elseif config.point == "none" then
			shouldShowPointMarker = false
			else
			shouldShowPointMarker = not(hasOsmRelationId) or (config.marker and config.marker ~= 'none') or (config.coordinates or config.coord)
			end
			local shouldShowShape = config.shape ~= 'none'
			local shapeType = config.shape == 'inverse' and 'shape-inverse' or 'shape'
			local shouldShowLine = config.line ~= 'none'
	local maskItem		local maskItem
	local maskType = idType(config.geomask)		local maskType = idType(config.geomask)
Line 188:		Line 200:
	args["stroke-color"..argNumber] = config["geomask-stroke-color"] or config["geomask-stroke-colour"] or DEFAULT_GEOMASK_STROKE_COLOR		args["stroke-color"..argNumber] = config["geomask-stroke-color"] or config["geomask-stroke-colour"] or DEFAULT_GEOMASK_STROKE_COLOR
	args["fill"..argNumber] = config["geomask-fill"] or DEFAULT_GEOMASK_FILL		args["fill"..argNumber] = config["geomask-fill"] or DEFAULT_GEOMASK_FILL
			args["fill-opacity"..argNumber] = config["geomask-fill-opacity"] or DEFAULT_SHAPE_FILL_OPACITY
	-- Recalculate zoom based on mask area, if available, and not set in config		-- Recalculate zoom based on mask area, if available, and not set in config
	if not config.zoom then		if not config.zoom then
Line 202:		Line 215:
	end		end

	-- Shape		-- Shape (or shape-inverse)
	if useWikidata then		if useWikidata and shouldShowShape then
	args["type"..argNumber] = ~~"shape"~~		args["type"..argNumber] = shapeType
	if config.id then args["id"..argNumber] = config.id end		if config.id then args["id"..argNumber] = config.id end
	args["stroke-width"..argNumber] = config["shape-stroke-width"] or config["stroke-width"] or DEFAULT_SHAPE_STROKE_WIDTH		args["stroke-width"..argNumber] = config["shape-stroke-width"] or config["stroke-width"] or DEFAULT_SHAPE_STROKE_WIDTH
	args["stroke-color"..argNumber] = config["shape-stroke-color"] or config["shape-stroke-colour"] or config["stroke-color"] or config["stroke-colour"] or DEFAULT_SHAPE_STROKE_COLOR		args["stroke-color"..argNumber] = config["shape-stroke-color"] or config["shape-stroke-colour"] or config["stroke-color"] or config["stroke-colour"] or DEFAULT_SHAPE_STROKE_COLOR
	args["fill"..argNumber] = config["shape-fill"] or DEFAULT_SHAPE_FILL		args["fill"..argNumber] = config["shape-fill"] or DEFAULT_SHAPE_FILL
			args["fill-opacity"..argNumber] = config["shape-fill-opacity"] or DEFAULT_SHAPE_FILL_OPACITY
	incrementArgNumber()		incrementArgNumber()
	end		end

	-- Line		-- Line
	if useWikidata then		if useWikidata and shouldShowLine then
	args["type"..argNumber] = "line"		args["type"..argNumber] = "line"
	if config.id then args["id"..argNumber] = config.id end		if config.id then args["id"..argNumber] = config.id end