Module:Coordinates: Difference between revisions

m
1 revision imported
(Limit error checking to main (article) space)
m (1 revision imported)
 
(2 intermediate revisions by 2 users not shown)
Line 16: Line 16:
]]
]]


require('Module:No globals')
require('strict')


local math_mod = require("Module:Math")
local math_mod = require("Module:Math")
local coordinates = {};
local coordinates = {};
local isSandbox = mw.getCurrentFrame():getTitle():find('sandbox', 1, true);


local current_page = mw.title.getCurrentTitle()
local current_page = mw.title.getCurrentTitle()
local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );
local page_name = mw.uri.encode( current_page.prefixedText, 'WIKI' );
local coord_link = '//tools.wmflabs.org/geohack/geohack.php?pagename=' .. page_name .. '&params='
local coord_link = 'https://geohack.toolforge.org/geohack.php?pagename=' .. page_name .. '&params='


--[[ Helper function, replacement for {{coord/display/title}} ]]
--[[ Helper function, replacement for {{coord/display/title}} ]]
local function displaytitle(s, notes)
local function displaytitle(coords)
local l = "[[Geographic coordinate system|Coordinates]]: " .. s
return mw.getCurrentFrame():extensionTag{
local co = '<span id="coordinates">' .. l .. notes .. '</span>';
name = 'indicator',
return '<span style="font-size: small;">' .. co .. '</span>';
args = { name = 'coordinates' },
end
content = '<span id="coordinates">[[Geographic coordinate system|Coordinates]]: ' .. coords .. '</span>'
 
}
--[[ Helper function, Replacement for {{coord/display/inline}} ]]
local function displayinline(s, notes)
return s .. notes
end
end


Line 68: Line 66:
local result = ""
local result = ""
for i,v in ipairs(errors) do
for i,v in ipairs(errors) do
local errorHTML = '<strong class="error">Coordinates: ' .. v[2] .. '</strong>'
result = result .. '<strong class="error">Coordinates: ' .. v[2] .. '</strong><br />'
result = result .. errorHTML .. "<br />"
end
end
return result
return result
Line 79: Line 76:
Usually geo-nondefault is hidden by CSS, unless a user has overridden this for himself
Usually geo-nondefault is hidden by CSS, unless a user has overridden this for himself
default is the mode as specificied by the user when calling the {{coord}} template
default is the mode as specificied by the user when calling the {{coord}} template
mode is the display mode (dec or dms) that we will need to determine the css class for  
mode is the display mode (dec or dms) that we will need to determine the css class for
]]
]]
local function displayDefault(default, mode)
local function displayDefault(default, mode)
Line 85: Line 82:
default = "dec"
default = "dec"
end
end
 
if default == mode then
if default == mode then
return "geo-default"
return "geo-default"
Line 108: Line 105:
uriComponents = uriComponents .. "&title=" .. mw.uri.encode(coordinateSpec["name"])
uriComponents = uriComponents .. "&title=" .. mw.uri.encode(coordinateSpec["name"])
end
end
 
local geodmshtml = '<span class="geo-dms" title="Maps, aerial photos, and other data for this location">'
local geodmshtml = '<span class="geo-dms" title="Maps, aerial photos, and other data for this location">'
.. '<span class="latitude">' .. coordinateSpec["dms-lat"] .. '</span> '
.. '<span class="latitude">' .. coordinateSpec["dms-lat"] .. '</span> '
.. '<span class="longitude">' ..coordinateSpec["dms-long"] .. '</span>'
.. '<span class="longitude">' ..coordinateSpec["dms-long"] .. '</span>'
.. '</span>'
.. '</span>'


local lat = tonumber( coordinateSpec["dec-lat"] ) or 0
local lat = tonumber( coordinateSpec["dec-lat"] ) or 0
Line 127: Line 124:
if long < 0 then
if long < 0 then
-- FIXME does not handle unicode minus
-- FIXME does not handle unicode minus
geodeclong = tostring(coordinateSpec["dec-long"]):sub(2) .. "°W"  
geodeclong = tostring(coordinateSpec["dec-long"]):sub(2) .. "°W"
else
else
geodeclong = (coordinateSpec["dec-long"] or 0) .. "°E"
geodeclong = (coordinateSpec["dec-long"] or 0) .. "°E"
end
end
 
local geodechtml = '<span class="geo-dec" title="Maps, aerial photos, and other data for this location">'
local geodechtml = '<span class="geo-dec" title="Maps, aerial photos, and other data for this location">'
.. geodeclat .. ' '
.. geodeclat .. ' '
.. geodeclong
.. geodeclong
.. '</span>'
.. '</span>'


local geonumhtml = '<span class="geo">'
local geonumhtml = '<span class="geo">'
.. coordinateSpec["dec-lat"] .. '; '
.. coordinateSpec["dec-lat"] .. '; '
.. coordinateSpec["dec-long"]
.. coordinateSpec["dec-long"]
.. '</span>'
.. '</span>'


local inner = '<span class="' .. displayDefault(coordinateSpec["default"], "dms" ) .. '">' .. geodmshtml .. '</span>'
local inner = '<span class="' .. displayDefault(coordinateSpec["default"], "dms" ) .. '">' .. geodmshtml .. '</span>'
Line 147: Line 144:


if not args["name"] then
if not args["name"] then
inner = inner .. geodechtml  
inner = inner .. geodechtml
.. '<span style="display:none">&#xfeff; / ' .. geonumhtml .. '</span></span>'
.. '<span style="display:none">&#xfeff; / ' .. geonumhtml .. '</span></span>'
else
else
inner = inner .. '<span class="vcard">' .. geodechtml  
inner = inner .. '<span class="vcard">' .. geodechtml
.. '<span style="display:none">&#xfeff; / ' .. geonumhtml .. '</span>'
.. '<span style="display:none">&#xfeff; / ' .. geonumhtml .. '</span>'
.. '<span style="display:none">&#xfeff; (<span class="fn org">'
.. '<span style="display:none">&#xfeff; (<span class="fn org">'
Line 156: Line 153:
end
end


return '<span class="plainlinks nourlexpansion">' ..
    local stylesheetLink = 'Module:Coordinates' .. ( isSandbox and '/sandbox' or '' ) .. '/styles.css'
'[' .. coord_link .. uriComponents .. ' ' .. inner .. ']' .. '</span>'
return mw.getCurrentFrame():extensionTag{
name = 'templatestyles', args = { src = stylesheetLink }
} .. '<span class="plainlinks nourlexpansion">[' .. coord_link .. uriComponents ..
' ' .. inner .. ']</span>'
end
end


Line 167: Line 167:


--[[ Helper function, convert decimal to degrees and minutes ]]
--[[ Helper function, convert decimal to degrees and minutes ]]
local function convert_dec2dms_dm(coordinate)
local function convert_dec2dms_dm(coordinate)
coordinate = math_mod._round( coordinate * 60, 0 );
coordinate = math_mod._round( coordinate * 60, 0 );
local m = coordinate % 60;
local m = coordinate % 60;
coordinate = math.floor( (coordinate - m) / 60 );
coordinate = math.floor( (coordinate - m) / 60 );
local d = coordinate % 360 .."°"
local d = coordinate % 360 .."°"
 
return d .. string.format( "%02d′", m )
return d .. string.format( "%02d′", m )
end
end
Line 188: Line 188:
end
end


--[[  
--[[
Helper function, convert decimal latitude or longitude to  
Helper function, convert decimal latitude or longitude to
degrees, minutes, and seconds format based on the specified precision.
degrees, minutes, and seconds format based on the specified precision.
]]
]]
local function convert_dec2dms(coordinate, firstPostfix, secondPostfix, precision)
local function convert_dec2dms(coordinate, firstPostfix, secondPostfix, precision)
Line 218: Line 218:
local minutes = tonumber(minutes_str) or 0
local minutes = tonumber(minutes_str) or 0
local seconds = tonumber(seconds_str) or 0
local seconds = tonumber(seconds_str) or 0
 
local factor = 1
local factor = 1
if direction == "S" or direction == "W" then
if direction == "S" or direction == "W" then
factor = -1
factor = -1
end
end
 
local precision = 0
local precision = 0
if seconds_str then
if seconds_str then
Line 232: Line 232:
precision = math.max( math_mod._precision(degrees_str), 0 );
precision = math.max( math_mod._precision(degrees_str), 0 );
end
end
 
local decimal = factor * (degrees+(minutes+seconds/60)/60)  
local decimal = factor * (degrees+(minutes+seconds/60)/60)
return string.format( "%." .. precision .. "f", decimal ) -- not tonumber since this whole thing is string based.
return string.format( "%." .. precision .. "f", decimal ) -- not tonumber since this whole thing is string based.
end
end


--[[  
--[[
Checks input values to for out of range errors.
Checks input values to for out of range errors.
]]
]]
Line 256: Line 256:
table.insert(errors, {source, "longitude degrees < 0 with hemisphere flag"})
table.insert(errors, {source, "longitude degrees < 0 with hemisphere flag"})
end
end
--[[  
--[[
#coordinates is inconsistent about whether this is an error.  If globe: is
#coordinates is inconsistent about whether this is an error.  If globe: is
specified, it won't error on this condition, but otherwise it will.
specified, it won't error on this condition, but otherwise it will.
 
For not simply disable this check.
For not simply disable this check.
 
if long_d > 180 then
if long_d > 180 then
table.insert(errors, {source, "longitude degrees > 180 with hemisphere flag"})
table.insert(errors, {source, "longitude degrees > 180 with hemisphere flag"})
end
end
]]
]]
end
end
 
if lat_d > 90 then
if lat_d > 90 then
table.insert(errors, {source, "latitude degrees > 90"})
table.insert(errors, {source, "latitude degrees > 90"})
Line 304: Line 304:
table.insert(errors, {source, "longitude seconds < 0"})
table.insert(errors, {source, "longitude seconds < 0"})
end
end
 
return errors;
return errors;
end
end
Line 317: Line 317:
local coordinateSpec = {}
local coordinateSpec = {}
local errors = {}
local errors = {}
 
if not long then
if not long then
return nil, {{"parseDec", "Missing longitude"}}
return nil, {{"parseDec", "Missing longitude"}}
Line 323: Line 323:
return nil, {{"parseDec", "Longitude could not be parsed as a number: " .. long}}
return nil, {{"parseDec", "Longitude could not be parsed as a number: " .. long}}
end
end
 
errors = validate( lat, nil, nil, long, nil, nil, 'parseDec', false );
errors = validate( lat, nil, nil, long, nil, nil, 'parseDec', false );
coordinateSpec["dec-lat"]  = lat;
coordinateSpec["dec-lat"]  = lat;
coordinateSpec["dec-long"] = long;
coordinateSpec["dec-long"] = long;
Line 330: Line 330:
local mode = coordinates.determineMode( lat, long );
local mode = coordinates.determineMode( lat, long );
coordinateSpec["dms-lat"]  = convert_dec2dms( lat, "N", "S", mode)  -- {{coord/dec2dms|{{{1}}}|N|S|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-lat"]  = convert_dec2dms( lat, "N", "S", mode)  -- {{coord/dec2dms|{{{1}}}|N|S|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-long"] = convert_dec2dms( long, "E", "W", mode)  -- {{coord/dec2dms|{{{2}}}|E|W|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-long"] = convert_dec2dms( long, "E", "W", mode)  -- {{coord/dec2dms|{{{2}}}|E|W|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
 
if format then
if format then
coordinateSpec.default = format
coordinateSpec.default = format
Line 344: Line 344:
parseDMS
parseDMS


Transforms degrees, minutes, seconds format latitude and longitude  
Transforms degrees, minutes, seconds format latitude and longitude
into the a structure to be used in displaying coordinates
into the a structure to be used in displaying coordinates
]]
]]
local function parseDMS( lat_d, lat_m, lat_s, lat_f, long_d, long_m, long_s, long_f, format )
local function parseDMS( lat_d, lat_m, lat_s, lat_f, long_d, long_m, long_s, long_f, format )
local coordinateSpec, errors, backward = {}, {}
local coordinateSpec, errors, backward = {}, {}
 
lat_f = lat_f:upper();
lat_f = lat_f:upper();
long_f = long_f:upper();
long_f = long_f:upper();
 
-- Check if specified backward
-- Check if specified backward
if lat_f == 'E' or lat_f == 'W' then
if lat_f == 'E' or lat_f == 'W' then
lat_d, long_d, lat_m, long_m, lat_s, long_s, lat_f, long_f, backward = long_d, lat_d, long_m, lat_m, long_s, lat_s, long_f, lat_f, true;
lat_d, long_d, lat_m, long_m, lat_s, long_s, lat_f, long_f, backward = long_d, lat_d, long_m, lat_m, long_s, lat_s, long_f, lat_f, true;
end
end
 
errors = validate( lat_d, lat_m, lat_s, long_d, long_m, long_s, 'parseDMS', true );
errors = validate( lat_d, lat_m, lat_s, long_d, long_m, long_s, 'parseDMS', true );
if not long_d then
if not long_d then
Line 364: Line 364:
return nil, {{"parseDMS", "Longitude could not be parsed as a number:" .. long_d }}
return nil, {{"parseDMS", "Longitude could not be parsed as a number:" .. long_d }}
end
end
 
if not lat_m and not lat_s and not long_m and not long_s and #errors == 0 then  
if not lat_m and not lat_s and not long_m and not long_s and #errors == 0 then
if math_mod._precision( lat_d ) > 0 or math_mod._precision( long_d ) > 0 then
if math_mod._precision( lat_d ) > 0 or math_mod._precision( long_d ) > 0 then
if lat_f:upper() == 'S' then  
if lat_f:upper() == 'S' then
lat_d = '-' .. lat_d;
lat_d = '-' .. lat_d;
end
end
if long_f:upper() == 'W' then  
if long_f:upper() == 'W' then
long_d = '-' .. long_d;
long_d = '-' .. long_d;
end
end
 
return parseDec( lat_d, long_d, format );
return parseDec( lat_d, long_d, format );
end
end
end  
end
 
coordinateSpec["dms-lat"]  = lat_d.."°"..optionalArg(lat_m,"′") .. optionalArg(lat_s,"″") .. lat_f
coordinateSpec["dms-lat"]  = lat_d.."°"..optionalArg(lat_m,"′") .. optionalArg(lat_s,"″") .. lat_f
coordinateSpec["dms-long"] = long_d.."°"..optionalArg(long_m,"′") .. optionalArg(long_s,"″") .. long_f
coordinateSpec["dms-long"] = long_d.."°"..optionalArg(long_m,"′") .. optionalArg(long_s,"″") .. long_f
Line 387: Line 387:
else
else
coordinateSpec.default = "dms"
coordinateSpec.default = "dms"
end  
end


return coordinateSpec, errors, backward
return coordinateSpec, errors, backward
end
end


--[[  
--[[
Check the input arguments for coord to determine the kind of data being provided
Check the input arguments for coord to determine the kind of data being provided
and then make the necessary processing.
and then make the necessary processing.
Line 407: Line 407:
return table.concat(ret, '_')
return table.concat(ret, '_')
end
end
 
if not args[1] then
if not args[1] then
-- no lat logic
-- no lat logic
Line 424: Line 424:
-- #coordinates parserfunction doesn't support negative decimals with NSWE
-- #coordinates parserfunction doesn't support negative decimals with NSWE
result.param = table.concat({
result.param = table.concat({
math.abs(tonumber(args[1])),  
math.abs(tonumber(args[1])),
((tonumber(args[1]) or 0) < 0) and 'S' or 'N',  
((tonumber(args[1]) or 0) < 0) and 'S' or 'N',
math.abs(tonumber(args[2])),  
math.abs(tonumber(args[2])),
((tonumber(args[2]) or 0) < 0) and 'W' or 'E',  
((tonumber(args[2]) or 0) < 0) and 'W' or 'E',
args[3] or ''}, '_')
args[3] or ''}, '_')
elseif dmsTest(args[4], args[8]) then
elseif dmsTest(args[4], args[8]) then
-- dms logic
-- dms logic
result, errors, backward = parseDMS(args[1], args[2], args[3], args[4],  
result, errors, backward = parseDMS(args[1], args[2], args[3], args[4],
args[5], args[6], args[7], args[8], args.format)
args[5], args[6], args[7], args[8], args.format)
if args[10] then
if args[10] then
Line 442: Line 442:
elseif dmsTest(args[3], args[6]) then
elseif dmsTest(args[3], args[6]) then
-- dm logic
-- dm logic
result, errors, backward = parseDMS(args[1], args[2], nil, args[3],  
result, errors, backward = parseDMS(args[1], args[2], nil, args[3],
args[4], args[5], nil, args[6], args['format'])
args[4], args[5], nil, args[6], args['format'])
if args[8] then
if args[8] then
Line 453: Line 453:
elseif dmsTest(args[2], args[4]) then
elseif dmsTest(args[2], args[4]) then
-- d logic
-- d logic
result, errors, backward = parseDMS(args[1], nil, nil, args[2],  
result, errors, backward = parseDMS(args[1], nil, nil, args[2],
args[3], nil, nil, args[4], args.format)
args[3], nil, nil, args[4], args.format)
if args[6] then
if args[6] then
table.insert(errors, {'formatTest', 'Extra unexpected parameters'})
table.insert(errors, {'formatTest', 'Extra unexpected parameters'})
end
end
if not result then
if not result then
return errorPrinter(errors)
return errorPrinter(errors)
Line 464: Line 464:
else
else
-- Error
-- Error
return errorPrinter({{"formatTest", "Unknown argument format"}})
return errorPrinter({{"formatTest", "Unknown argument format"}}) .. '[[Category:Pages with malformed coordinate tags]]'
end
end
result.name = args.name
result.name = args.name
 
local extra_param = {'dim', 'globe', 'scale', 'region', 'source', 'type'}
local extra_param = {'dim', 'globe', 'scale', 'region', 'source', 'type'}
for _, v in ipairs(extra_param) do
for _, v in ipairs(extra_param) do
if args[v] then  
if args[v] then
table.insert(errors, {'formatTest', 'Parameter: "' .. v .. '=" should be "' .. v .. ':"' })
table.insert(errors, {'formatTest', 'Parameter: "' .. v .. '=" should be "' .. v .. ':"' })
end
end
end
end
 
local ret = specPrinter(args, result)
local ret = specPrinter(args, result)
if #errors > 0 then
if #errors > 0 then
if mw.title.getCurrentTitle().namespace == 0 then
ret = ret .. ' ' .. errorPrinter(errors) .. '[[Category:Pages with malformed coordinate tags]]'
ret = ret .. ' ' .. errorPrinter(errors) .. '[[Category:Pages with malformed coordinate tags]]'
end
end
end
return ret, backward
return ret, backward
Line 489: Line 487:
local function makeWikidataCategories(qid)
local function makeWikidataCategories(qid)
local ret
local ret
local qid = qid or mw.wikibase.getEntityIdForCurrentPage()
if mw.wikibase and current_page.namespace == 0 then
if mw.wikibase and current_page.namespace == 0 then
local entity = qid and mw.wikibase.getEntityObject(qid) or mw.wikibase.getEntityObject()
if qid and mw.wikibase.entityExists(qid) and mw.wikibase.getBestStatements(qid, "P625") and mw.wikibase.getBestStatements(qid, "P625")[1] then
if entity and entity.claims and entity.claims.P625 and entity.claims.P625[1] then
local snaktype = mw.wikibase.getBestStatements(qid, "P625")[1].mainsnak.snaktype
local snaktype = entity.claims.P625[1].mainsnak.snaktype
if snaktype == 'value' then
if snaktype == 'value' then
-- coordinates exist both here and on Wikidata, and can be compared.
-- coordinates exist both here and on Wikidata, and can be compared.
Line 520: Line 518:
Usage:
Usage:
{{#invoke:Coordinates | link }}
{{#invoke:Coordinates | link }}
 
]]
]]
function coordinates.link(frame)
function coordinates.link(frame)
Line 532: Line 530:


Usage:
Usage:
{{#invoke:Coordinates | dec2dms | decimal_coordinate | positive_suffix |  
{{#invoke:Coordinates | dec2dms | decimal_coordinate | positive_suffix |
negative_suffix | precision }}
negative_suffix | precision }}
 
decimal_coordinate is converted to DMS format.  If positive, the positive_suffix
decimal_coordinate is converted to DMS format.  If positive, the positive_suffix
is appended (typical N or E), if negative, the negative suffix is appended.  The
is appended (typical N or E), if negative, the negative suffix is appended.  The
Line 563: Line 561:
return 'dms';
return 'dms';
end
end
end
end


--[[
--[[
Line 573: Line 571:
{{#invoke:Coordinates | dms2dec | direction_flag | degrees |
{{#invoke:Coordinates | dms2dec | direction_flag | degrees |
minutes | seconds }}
minutes | seconds }}
 
Converts DMS values specified as degrees, minutes, seconds too decimal format.
Converts DMS values specified as degrees, minutes, seconds too decimal format.
direction_flag is one of N, S, E, W, and determines whether the output is  
direction_flag is one of N, S, E, W, and determines whether the output is
positive (i.e. N and E) or negative (i.e. S and W).
positive (i.e. N and E) or negative (i.e. S and W).
]]
]]
Line 598: Line 596:
{{#invoke:Coordinates | coord | lat | lat_flag | long | long_flag }}
{{#invoke:Coordinates | coord | lat | lat_flag | long | long_flag }}
...
...
 
Refer to {{coord}} documentation page for many additional parameters and  
Refer to {{coord}} documentation page for many additional parameters and
configuration options.
configuration options.
 
Note: This function provides the visual display elements of {{coord}}.  In
Note: This function provides the visual display elements of {{coord}}.  In
order to load coordinates into the database, the {{#coordinates:}} parser  
order to load coordinates into the database, the {{#coordinates:}} parser
function must also be called, this is done automatically in the Lua
function must also be called, this is done automatically in the Lua
version of {{coord}}.
version of {{coord}}.
Line 609: Line 607:
coordinates.coord = makeInvokeFunc('_coord')
coordinates.coord = makeInvokeFunc('_coord')
function coordinates._coord(args)
function coordinates._coord(args)
if (not args[1] or not tonumber(args[1])) and not args[2] and mw.wikibase.getEntityObject() then
if not tonumber(args[1]) and not args[2] then
args[3] = args[1]; args[1] = nil
args[3] = args[1]; args[1] = nil
local entity = args.qid and mw.wikibase.getEntityObject(args.qid) or mw.wikibase.getEntityObject()
local entity = mw.wikibase.getEntityObject(args.qid)
if entity  
if entity
and entity.claims
and entity.claims
and entity.claims.P625
and entity.claims.P625
Line 618: Line 616:
then
then
local precision = entity.claims.P625[1].mainsnak.datavalue.value.precision
local precision = entity.claims.P625[1].mainsnak.datavalue.value.precision
args[1]=entity.claims.P625[1].mainsnak.datavalue.value.latitude
args[1] = entity.claims.P625[1].mainsnak.datavalue.value.latitude
args[2]=entity.claims.P625[1].mainsnak.datavalue.value.longitude
args[2] = entity.claims.P625[1].mainsnak.datavalue.value.longitude
if precision then
if precision then
precision=-math_mod._round(math.log(precision)/math.log(10),0)
precision = -math_mod._round(math.log(precision)/math.log(10),0)
args[1]=math_mod._round(args[1],precision)
args[1] = math_mod._round(args[1],precision)
args[2]=math_mod._round(args[2],precision)
args[2] = math_mod._round(args[2],precision)
end
end
end
end
end
end
 
local contents, backward = formatTest(args)
local contents, backward = formatTest(args)
local Notes = args.notes or ''
local Notes = args.notes or ''
local Display = args.display and args.display:lower() or 'inline'
local Display = args.display and args.display:lower() or 'inline'


-- it and ti are short for inline,title and title,inline
local function isInline(s)
local function isInline(s)
-- Finds whether coordinates are displayed inline.
-- Finds whether coordinates are displayed inline.
Line 640: Line 639:
return s:find('title') ~= nil or s == 't' or s == 'it' or s == 'ti'
return s:find('title') ~= nil or s == 't' or s == 'it' or s == 'ti'
end
end
 
local function coord_wrapper(in_args)
local function coord_wrapper(in_args)
-- Calls the parser function {{#coordinates:}}.
-- Calls the parser function {{#coordinates:}}.
return mw.getCurrentFrame():callParserFunction('#coordinates', in_args) or ''
return mw.getCurrentFrame():callParserFunction('#coordinates', in_args) or ''
end
end
 
local text = ''
local text = ''
if isInline(Display) then
if isInline(Display) then
text = text .. displayinline(contents, Notes)
text = text .. '<span class="geo-inline">' .. contents .. Notes .. '</span>'
end
end
if isInTitle(Display) then
if isInTitle(Display) then
text = text
-- Add to output since indicator content is invisible to Lua later on
.. displaytitle(contents, Notes)
if not isInline(Display) then
.. makeWikidataCategories(args.qid)
text = text .. '<span class="geo-inline-hidden noexcerpt">' .. contents .. Notes .. '</span>'
end
text = text .. displaytitle(contents .. Notes) .. makeWikidataCategories(args.qid)
end
end
if not args.nosave then
if not args.nosave then
Line 686: Line 687:


]]
]]
function coordinates.coord2text(frame)
function coordinates._coord2text(coord,type)
if frame.args[1] == '' or frame.args[2] == '' or not frame.args[2] then return nil end
if coord == '' or type == '' or not type then return nil end
frame.args[2] = mw.text.trim(frame.args[2])
type = mw.text.trim(type)
if frame.args[2] == 'lat' or frame.args[2] == 'long' then
if type == 'lat' or type == 'long' then
local result, negative = mw.text.split((mw.ustring.match(frame.args[1],'[%.%d]+°[NS] [%.%d]+°[EW]') or ''), ' ')
local result, negative = mw.text.split((mw.ustring.match(coord,'[%.%d]+°[NS] [%.%d]+°[EW]') or ''), ' ')
if frame.args[2] == 'lat' then
if type == 'lat' then
result, negative = result[1], 'S'
result, negative = result[1], 'S'
else
else
Line 700: Line 701:
return result[1]
return result[1]
else
else
return mw.ustring.match(frame.args[1], 'params=.-_'..frame.args[2]..':(.-)[ _]')
return mw.ustring.match(coord, 'params=.-_' .. type .. ':(.-)[ _]')
end
end
end
function coordinates.coord2text(frame)
return coordinates._coord2text(frame.args[1],frame.args[2])
end
end


Line 718: Line 723:
]]
]]
function coordinates.coordinsert(frame)
function coordinates.coordinsert(frame)
-- for the 2nd or later integer parameter (the first is the coord template, as above)
for i, v in ipairs(frame.args) do
for i, v in ipairs(frame.args) do
if i ~= 1 then
if i ~= 1 then
if not mw.ustring.find(frame.args[1], (mw.ustring.match(frame.args[i], '^(.-:)') or '')) then  
-- if we cannot find in the coord_template the i_th coordinsert parameter e.g. region
if not mw.ustring.find(frame.args[1], (mw.ustring.match(frame.args[i], '^(.-:)') or '')) then
-- find from the params= up to the first possibly-present underscore
-- and append the i_th coordinsert parameter and a space
-- IDK why we're adding a space but it does seem somewhat convenient
frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ')
frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ')
end
end
Line 726: Line 736:
end
end
if frame.args.name then
if frame.args.name then
-- if we can't find the vcard class
if not mw.ustring.find(frame.args[1], '<span class="vcard">') then
if not mw.ustring.find(frame.args[1], '<span class="vcard">') then
-- take something that looks like a coord template and add the vcard span with class and fn org class
local namestr = frame.args.name
local namestr = frame.args.name
frame.args[1] = mw.ustring.gsub(frame.args[1],  
frame.args[1] = mw.ustring.gsub(
'(<span class="geo%-default">)(<span[^<>]*>[^<>]*</span><span[^<>]*>[^<>]*<span[^<>]*>[^<>]*</span></span>)(</span>)',  
frame.args[1],
'%1<span class="vcard">%2<span style="display:none">&#xfeff; (<span class="fn org">' .. namestr .. '</span>)</span></span>%3')
'(<span class="geo%-default">)(<span[^<>]*>[^<>]*</span><span[^<>]*>[^<>]*<span[^<>]*>[^<>]*</span></span>)(</span>)',
frame.args[1] = mw.ustring.gsub(frame.args[1], '(&params=[^&"<>%[%] ]*) ', '%1&title=' .. mw.uri.encode(namestr) .. ' ')
'%1<span class="vcard">%2<span style="display:none">&#xfeff; (<span class="fn org">' .. namestr .. '</span>)</span></span>%3'
)
-- then find anything from coordinates parameters to the 'end' and attach the title parameter
frame.args[1] = mw.ustring.gsub(
frame.args[1],
'(&params=[^&"<>%[%] ]*) ',
'%1&title=' .. mw.uri.encode(namestr) .. ' '
)
end
end
end
end
-- replace the existing indicator with a new indicator using the modified content
frame.args[1] = mw.ustring.gsub(
frame.args[1],
'(<span class="geo%-inline[^"]*">(.+)</span>)\127[^\127]*UNIQ%-%-indicator%-%x+%-%-?QINU[^\127]*\127',
function (inline, coord) return inline .. displaytitle(coord) end
)
return frame.args[1]
return frame.args[1]
end
end


return coordinates
return coordinates