Module:OSM - Revision history

Polyglot: Add possibility to run query independent of wikidata Q-number

2015-09-27T22:48:01Z

Add possibility to run query independent of wikidata Q-number

← Previous revision		Revision as of 22:48, 27 September 2015
Line 29:		Line 29:
	runQueryRightAway = '&R'		runQueryRightAway = '&R'
	end		end
	if args.id then		if frame.args.overpass then
		⚫	itemID = ""
⚫	-- build query for specific Q-item(s)
	~~itemID~~ = ~~args.id~~		itemObject = nil
⚫	pcall(function () itemObject = mw.wikibase.getEntityObject(mw.text.split(itemID,";")[1]) end)
	else		else
			if args.id then
⚫	itemObject = mw.wikibase.getEntityObject()
		⚫	-- build query for specific Q-item(s)
⚫	if itemObject == nil then
			itemID = args.id
⚫	return "This page doesn't have a wikidata entry"
		⚫	pcall(function () itemObject = mw.wikibase.getEntityObject(mw.text.split(itemID,";")[1]) end)
			else
		⚫	itemObject = mw.wikibase.getEntityObject()
		⚫	if itemObject == nil then
		⚫	return "This page doesn't have a wikidata entry"
			end
		⚫	-- build query for current page
			itemID = itemObject.id
	end		end
⚫	-- build query for current page
⚫	itemID = ~~itemObject.id~~
	end		end
	-- Always perform a regular expression based search		-- Always perform a regular expression based search
	-- It ~~happens~~ ~~that~~ multiple values ~~are in the data~~		-- The data may contain multiple values
			if frame.args.overpass == nil then
	itemID = '"~"(^\|;)(' .. itemID:gsub(";", "\\|") .. ')(;\|$)'		itemID = '"~"(^\|;)(' .. itemID:gsub(";", "\\|") .. ')(;\|$)'
			leftbracket = '["'
			rightbracket = '"]'
			else
			leftbracket = ''
			rightbracket = ''
			end

	if args.query then		if args.query then
Line 49:		Line 61:
	query = args.query		query = args.query
	else		else
			if frame.args.overpass then
			return "If you invoke with overpass, you have to include a query="
			end
	query = ''		query = ''
	end		end
Line 76:		Line 91:
	if primitives:find("n") then		if primitives:find("n") then
	-- Include nodes		-- Include nodes
	overpassUrl = overpassUrl .. 'node["' .. target .. itemID ..~~'"]'~~ .. query .. bbox .. ';' .. remark .. '\n'		overpassUrl = overpassUrl .. 'node' .. leftbracket .. target .. itemID .. rightbracket .. query .. bbox .. ';' .. remark .. '\n'
	end		end
	if primitives:find("w") then		if primitives:find("w") then
	-- Include ways		-- Include ways
	overpassUrl = overpassUrl .. 'way["' .. target .. itemID .. ~~'"]'~~ .. query .. bbox .. ';\n'		overpassUrl = overpassUrl .. 'way' .. leftbracket .. target .. itemID .. rightbracket .. query .. bbox .. ';\n'
	end		end
	if primitives:find("r") then		if primitives:find("r") then
	-- Include relations		-- Include relations
	overpassUrl = overpassUrl .. 'relation["' .. target .. itemID .. ~~'"]'~~ .. query .. bbox .. ';\n>>;\n'		overpassUrl = overpassUrl .. 'relation' .. leftbracket .. target .. itemID .. rightbracket .. query .. bbox .. ';\n>>;\n'
	end		end
	overpassUrl = overpassUrl .. ');\n'		overpassUrl = overpassUrl .. ');\n'
Line 102:		Line 117:
	end		end
	if logo then		if logo then
	style = "node [".. target .."]{\n text: name;\n".. logo .. " icon-width: 32;}"		style = "node [".. target .."]{\n text: name;\n".. logo .. " icon-width: 32;}"
	end		end
	end		end
	if style then		if style then
Line 115:		Line 130:

	function p.overpass( frame )		function p.overpass( frame )
			frame.args.overpass = true
	return buildquery(frame, '')		return buildquery(frame, '')
	end		end

Polyglot: support multiple semicolon separated values in the data

2015-09-12T05:19:20Z

support multiple semicolon separated values in the data

← Previous revision		Revision as of 05:19, 12 September 2015
Line 12:		Line 12:
	timeout = '[timeout:' .. args.timeout .. '][out:json];\n'		timeout = '[timeout:' .. args.timeout .. '][out:json];\n'
	else		else
	timeout = '[timeout:15][out:json];\n'		timeout = '[timeout:20][out:json];\n'
	end		end
	if args.link and args.link == 'no' then		if args.link and args.link == 'no' then
Line 41:		Line 41:
	itemID = itemObject.id		itemID = itemObject.id
	end		end
		⚫	-- Always perform a regular expression based search
	if itemID:find(";") == nil then
			-- It happens that multiple values are in the data
	-- If there are no ; in the itemID, we only need to search for 1 value
	itemID = '"="' .. itemID		itemID = '"~"(^\|;)(' .. itemID:gsub(";", "\\|") .. ')(;\|$)'

	else
⚫	-- ~~If more than 1 Q-number is provided,~~ perform a regular expression based search ~~instead~~
	itemID = '"~"^(' .. itemID:gsub(";", "\\|") .. ')$'
	end
	if args.query then		if args.query then
	-- user can add their own tags to filter on		-- user can add their own tags to filter on

Polyglot: We only get the object reference of the first id, if more than 1 Q number is passed, fixed bug when no logo is found on wikidata

2015-08-19T05:26:53Z

We only get the object reference of the first id, if more than 1 Q number is passed, fixed bug when no logo is found on wikidata

← Previous revision		Revision as of 05:26, 19 August 2015
Line 32:		Line 32:
	-- build query for specific Q-item(s)		-- build query for specific Q-item(s)
	itemID = args.id		itemID = args.id
	pcall(function () itemObject = mw.wikibase.getEntityObject(mw.text.split(itemID,";")) end)		pcall(function () itemObject = mw.wikibase.getEntityObject(mw.text.split(itemID,";")[1]) end)
	else		else
	itemObject = mw.wikibase.getEntityObject()		itemObject = mw.wikibase.getEntityObject()
Line 100:		Line 100:
	logo = tostring(itemObject:formatPropertyValues('P154')['value']):gsub("'", "'")		logo = tostring(itemObject:formatPropertyValues('P154')['value']):gsub("'", "'")
	end		end
	if logo then		if logo and not(logo == '') then
	logo = ' icon-image: url("https://commons.wikimedia.org/wiki/Special:Redirect/file/'.. logo .. '");\n'		logo = ' icon-image: url("https://commons.wikimedia.org/wiki/Special:Redirect/file/'.. logo .. '");\n'
	end		end

Polyglot: only mark up the targeted objects

2015-08-16T07:16:56Z

only mark up the targeted objects

← Previous revision		Revision as of 07:16, 16 August 2015
Line 105:		Line 105:
	end		end
	if logo then		if logo then
	style = "node {\n text: name;\n".. logo .. " icon-width: 32;}"		style = "node [".. target .."]{\n text: name;\n".. logo .. " icon-width: 32;}"
	end		end
	end		end

Polyglot: The logo can now be fetched from Wikidata

2015-08-16T07:01:39Z

The logo can now be fetched from Wikidata

← Previous revision		Revision as of 07:01, 16 August 2015
Line 32:		Line 32:
	-- build query for specific Q-item(s)		-- build query for specific Q-item(s)
	itemID = args.id		itemID = args.id
	-- itemObject = mw.wikibase.getEntityObject(itemID)		pcall(function () itemObject = mw.wikibase.getEntityObject(mw.text.split(itemID,";")) end)
	else		else
	itemObject = mw.wikibase.getEntityObject()		itemObject = mw.wikibase.getEntityObject()
Line 98:		Line 98:
	else		else
	if itemObject then		if itemObject then
	logo = itemObject:~~getBestStatements~~('P154')		logo = tostring(itemObject:formatPropertyValues('P154')['value']):gsub("'", "'")
	end		end
	if logo then		if logo then
	logo = " icon-image: url(https://commons.wikimedia.org/wiki/Special:Redirect/file/".. logo .. ');\n'		logo = ' icon-image: url("https://commons.wikimedia.org/wiki/Special:Redirect/file/'.. logo .. '");\n'
	end		end
	end		end
	if logo then		if logo then
	style = "node {\n text: name\n".. logo .. " icon-width: 32;}"		style = "node {\n text: name;\n".. logo .. " icon-width: 32;}"
	end		end
	end		end

Polyglot: enable to fetch logo from wikidata

2015-08-15T23:30:02Z

enable to fetch logo from wikidata

← Previous revision		Revision as of 23:30, 15 August 2015
Line 1:		Line 1:
	local function buildquery(frame, target)		local function buildquery(frame, target)
	local textToDisplay, leftLink, rightLink, runQueryRightAway, itemID, query, coord, bbox, remark, overpassUrl, primitives, timeout		local textToDisplay, leftLink, rightLink, runQueryRightAway, itemObject, itemID, query, coord, bbox, remark, overpassUrl, primitives, timeout, style, logo
	local args = frame.args		local args = frame.args

Line 32:		Line 32:
	-- build query for specific Q-item(s)		-- build query for specific Q-item(s)
	itemID = args.id		itemID = args.id
			-- itemObject = mw.wikibase.getEntityObject(itemID)
	else		else
	~~itemID~~ = mw.wikibase.getEntityObject()		itemObject = mw.wikibase.getEntityObject()
	if ~~itemID~~ == nil then		if itemObject == nil then
	return "This page doesn't have a wikidata entry"		return "This page doesn't have a wikidata entry"
	end		end
	-- build query for current page		-- build query for current page
	itemID = ~~itemID~~.id		itemID = itemObject.id
	end		end
	if itemID:find(";") == nil then		if itemID:find(";") == nil then
Line 91:		Line 92:
	overpassUrl = overpassUrl .. 'out geom;\n'		overpassUrl = overpassUrl .. 'out geom;\n'
	if args.style then		if args.style then
	~~overpassUrl~~ = ~~overpassUrl .. '{{style:\n' ..~~ args.style ~~.. '\n}}\n'~~		style = args.style
			else
			if args.logo then
			logo = " icon-image: url(" .. args.logo .. ');\n'
			else
			if itemObject then
			logo = itemObject:getBestStatements('P154')
			end
			if logo then
			logo = " icon-image: url(https://commons.wikimedia.org/wiki/Special:Redirect/file/".. logo .. ');\n'
			end
			end
			if logo then
			style = "node {\n text: name\n".. logo .. " icon-width: 32;}"
			end
	end		end
			if style then
			overpassUrl = overpassUrl .. '{{style:\n' .. style .. '\n}}\n'
			end

	return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink		return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink
	end		end

Polyglot: make sure style is processed correctly when passed as a parameter

2015-08-15T16:03:43Z

make sure style is processed correctly when passed as a parameter

← Previous revision		Revision as of 16:03, 15 August 2015
Line 14:		Line 14:
	timeout = '[timeout:15][out:json];\n'		timeout = '[timeout:15][out:json];\n'
	end		end
	if args.link == 'no' then		if args.link and args.link == 'no' then
	-- just return the url		-- just return the url
	leftLink = ''		leftLink = ''
Line 23:		Line 23:
	rightLink = ']'		rightLink = ']'
	end		end
	if args.run == 'no' then		if args.run and args.run == 'no' then
	-- don't run immediately		-- don't run immediately
	runQueryRightAway = ''		runQueryRightAway = ''
Line 40:		Line 40:
	itemID = itemID.id		itemID = itemID.id
	end		end
	if ~~not~~ itemID:find(";") then		if itemID:find(";") == nil then
	-- If there are no ; in the itemID, we only need to search for 1 value		-- If there are no ; in the itemID, we only need to search for 1 value
	itemID = '"="' .. itemID		itemID = '"="' .. itemID
Line 53:		Line 53:
	query = ''		query = ''
	end		end
	if args.coord and args.limitToBBOX ~= 'no' then		if args.coord and not(args.limitToBBOX=='no') then
	-- The user can provide coordinates and a zoom factor		-- The user can provide coordinates and a zoom factor
	coord = '&C=' .. args.coord		coord = '&C=' .. args.coord
Line 91:		Line 91:
	overpassUrl = overpassUrl .. 'out geom;\n'		overpassUrl = overpassUrl .. 'out geom;\n'
	if args.style then		if args.style then
	overpassUrl = overpassUrl .. '{{style:\n' .. args.style .. '}}\n'		overpassUrl = overpassUrl .. '{{style:\n' .. args.style .. '\n}}\n'
	end		end
	return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink		return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink
Line 107:		Line 107:

	function p.pt( frame )		function p.pt( frame )
	frame.args.style = "node {\n opacity: 0;\n fill-opacity: 0;}\nnode[highway=bus_stop], way[highway=bus_stop]{\n text: name;\n icon-image: url('icons/maki/bus-18.png');\n icon-width: 18;}\n"		frame.args.style = "node {\n opacity: 0;\n fill-opacity: 0;}\nnode[highway=bus_stop], way[highway=bus_stop]{\n text: name;\n icon-image: url('icons/maki/bus-18.png');\n icon-width: 18;}"
	frame.args.prim = "r"		frame.args.prim = "r"
	frame.args.timeout = 50		frame.args.timeout = 50

Mr. Stradivarius: more logic simplification

2015-08-15T04:43:20Z

more logic simplification

← Previous revision		Revision as of 04:43, 15 August 2015
Line 40:		Line 40:
	itemID = itemID.id		itemID = itemID.id
	end		end
	if itemID:find(";") ~~== nil~~ then		if not itemID:find(";") then
	-- If there are no ; in the itemID, we only need to search for 1 value		-- If there are no ; in the itemID, we only need to search for 1 value
	itemID = '"="' .. itemID		itemID = '"="' .. itemID
Line 53:		Line 53:
	query = ''		query = ''
	end		end
	if args.coord and ~~not(~~args.limitToBBOX=='no') then		if args.coord and args.limitToBBOX ~= 'no' then
	-- The user can provide coordinates and a zoom factor		-- The user can provide coordinates and a zoom factor
	coord = '&C=' .. args.coord		coord = '&C=' .. args.coord

Mr. Stradivarius: simplify 'args.foo == "no"' logic

2015-08-15T04:22:10Z

simplify 'args.foo == "no"' logic

← Previous revision		Revision as of 04:22, 15 August 2015
Line 14:		Line 14:
	timeout = '[timeout:15][out:json];\n'		timeout = '[timeout:15][out:json];\n'
	end		end
	if ~~args.link and~~ args.link == 'no' then		if args.link == 'no' then
	-- just return the url		-- just return the url
	leftLink = ''		leftLink = ''
Line 23:		Line 23:
	rightLink = ']'		rightLink = ']'
	end		end
	if ~~args.run and~~ args.run == 'no' then		if args.run == 'no' then
	-- don't run immediately		-- don't run immediately
	runQueryRightAway = ''		runQueryRightAway = ''

Polyglot: Add support for styling the output, make it convenient to show public transport itineraries on the map

2015-08-14T22:21:37Z

Add support for styling the output, make it convenient to show public transport itineraries on the map

← Previous revision		Revision as of 22:21, 14 August 2015
Line 91:		Line 91:
	overpassUrl = overpassUrl .. 'out geom;\n'		overpassUrl = overpassUrl .. 'out geom;\n'
	if args.style then		if args.style then
	overpassUrl = overpassUrl .. args.style		overpassUrl = overpassUrl .. '{{style:\n' .. args.style .. '}}\n'
	end		end
	return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink		return leftLink .. 'http://overpass-turbo.eu/?Q=' .. mw.uri.encode(overpassUrl, "PATH" ) .. coord .. runQueryRightAway .. textToDisplay .. rightLink
Line 107:		Line 107:

	function p.pt( frame )		function p.pt( frame )
	frame.style = "node {\n opacity: 0;\n fill-opacity: 0;}\nnode[highway=bus_stop], way[highway=bus_stop]{\n text: name;\n icon-image: url('icons/maki/bus-18.png');\n icon-width: 18;}"		frame.args.style = "node {\n opacity: 0;\n fill-opacity: 0;}\nnode[highway=bus_stop], way[highway=bus_stop]{\n text: name;\n icon-image: url('icons/maki/bus-18.png');\n icon-width: 18;}\n"
			frame.args.prim = "r"
			frame.args.timeout = 50
	return buildquery(frame, 'wikidata')		return buildquery(frame, 'wikidata')
	end		end