「モジュール:Coordinates」の版間の差分

引数の形式が認識できない場合にもエラーカテゴリをつける
(1版 をインポートしました)
北海道 トンネルwiki>ネイ
(引数の形式が認識できない場合にもエラーカテゴリをつける)
18行目: 18行目:
require('Module:No globals')
require('Module:No globals')


local math_mod = require("Module:Math");
local math_mod = require("Module:Math")
local coordinates = {};
local coordinates = {};


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?language=ja&pagename=' .. page_name .. '&params='
local coord_link = 'https://geohack.toolforge.org/geohack.php?language=ja&pagename=' .. page_name .. '&params='
local templatestyles = 'Module:Coordinates/styles.css'


--[[ Helper function, replacement for {{coord/display/title}} ]]
--[[ Helper function, replacement for {{coord/display/title}} ]]
34行目: 35行目:
--[[ Helper function, Replacement for {{coord/display/inline}} ]]
--[[ Helper function, Replacement for {{coord/display/inline}} ]]
local function displayinline(s, notes)
local function displayinline(s, notes)
return s .. notes
return s .. notes
end
end


79行目: 80行目:
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)
85行目: 86行目:
default = "dec"
default = "dec"
end
end
 
if default == mode then
if default == mode then
return "geo-default"
return "geo-default"
103行目: 104行目:
if uriComponents == "" then
if uriComponents == "" then
-- RETURN error, should never be empty or nil
-- RETURN error, should never be empty or nil
return "エラー: param が空です"
return "エラー: paramが空です"
end
end
if args["name"] then
if args["name"] then
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="この位置の地図や航空写真などにリンクするページを表示します">'
local geodmshtml = '<span class="geo-dms" title="この位置の地図や航空写真などにリンクするページを表示します">'
.. '<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
131行目: 132行目:
geodeclong = "東経" .. (coordinateSpec["dec-long"] or 0) .. "度"
geodeclong = "東経" .. (coordinateSpec["dec-long"] or 0) .. "度"
end
end
 
local geodechtml = '<span class="geo-dec" title="この位置の地図や航空写真などにリンクするページを表示します">'
local geodechtml = '<span class="geo-dec" title="この位置の地図や航空写真などにリンクするページを表示します">'
.. 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>'
147行目: 148行目:


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">'
156行目: 157行目:
end
end


return '<span class="plainlinks nourlexpansion">' ..  
return mw.getCurrentFrame():extensionTag{ name = 'templatestyles', args = { src = templatestyles} }
'[' .. coord_link .. uriComponents .. ' ' .. inner .. ']' .. '</span>'
      .. '<span class="plainlinks nourlexpansion">'
      .. '[' .. coord_link .. uriComponents .. ' ' .. inner .. ']'
      .. '</span>'
end
end


167行目: 170行目:


--[[ 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
188行目: 191行目:
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, firstPrefix, secondPrefix, precision)
local function convert_dec2dms(coordinate, firstPrefix, secondPrefix, precision)
218行目: 221行目:
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
direction = direction:gsub('^ *(.-) *$', '%1');
direction = direction:gsub('^ *(.-) *$', '%1');
224行目: 227行目:
factor = -1
factor = -1
end
end
 
local precision = 0
local precision = 0
if seconds_str then
if seconds_str then
233行目: 236行目:
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.
]]
]]
257行目: 260行目:
table.insert(errors, {source, "経度が0度を下回っていますが東西が指定されています"})
table.insert(errors, {source, "経度が0度を下回っていますが東西が指定されています"})
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, "経度が180度を上回っていますが東西が指定されています"})
table.insert(errors, {source, "経度が180度を上回っていますが東西が指定されています"})
end
end
]]
]]
end
end
 
if lat_d > 90 then
if lat_d > 90 then
table.insert(errors, {source, "緯度の度が90を上回っています"})
table.insert(errors, {source, "緯度の度が90を上回っています"})
305行目: 308行目:
table.insert(errors, {source, "経度の秒が0を下回っています"})
table.insert(errors, {source, "経度の秒が0を下回っています"})
end
end
 
return errors;
return errors;
end
end
312行目: 315行目:
parseDec
parseDec


Transforms decimal format latitude and longitude into the a
Transforms decimal format latitude and longitude into the
structure to be used in displaying coordinates
structure to be used in displaying coordinates
]]
]]
318行目: 321行目:
local coordinateSpec = {}
local coordinateSpec = {}
local errors = {}
local errors = {}
 
if not long then
if not long then
return nil, {{"parseDec", "経度が指定されていません"}}
return nil, {{"parseDec", "経度が指定されていません"}}
324行目: 327行目:
return nil, {{"parseDec", "経度が数値として認識できません: " .. long}}
return nil, {{"parseDec", "経度が数値として認識できません: " .. 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;
331行目: 334行目:
local mode = coordinates.determineMode( lat, long );
local mode = coordinates.determineMode( lat, long );
coordinateSpec["dms-lat"]  = convert_dec2dms( lat, "北緯", "南緯", mode)  -- {{coord/dec2dms|{{{1}}}|N|S|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-lat"]  = convert_dec2dms( lat, "北緯", "南緯", mode)  -- {{coord/dec2dms|{{{1}}}|N|S|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-long"] = convert_dec2dms( long, "東経", "西経", mode)  -- {{coord/dec2dms|{{{2}}}|E|W|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
coordinateSpec["dms-long"] = convert_dec2dms( long, "東経", "西経", mode)  -- {{coord/dec2dms|{{{2}}}|E|W|{{coord/prec dec|{{{1}}}|{{{2}}}}}}}
 
if format then
if format then
coordinateSpec.default = format
coordinateSpec.default = format
345行目: 348行目:
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 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 = {}, {}
local errors = {}
 
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
366行目: 368行目:
return nil, {{"parseDMS", "経度が数値として認識できません:" .. long_d }}
return nil, {{"parseDMS", "経度が数値として認識できません:" .. 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_f=="N" and "北緯" or "南緯") .. lat_d.."度"..optionalArg(lat_m,"分") .. optionalArg(lat_s,"秒")
coordinateSpec["dms-lat"]  = (lat_f=="N" and "北緯" or "南緯") .. lat_d.."度"..optionalArg(lat_m,"分") .. optionalArg(lat_s,"秒")
coordinateSpec["dms-long"] = (long_f=="E" and "東経" or "西経") .. long_d.."度"..optionalArg(long_m,"分") .. optionalArg(long_s,"秒")
coordinateSpec["dms-long"] = (long_f=="E" and "東経" or "西経") .. long_d.."度"..optionalArg(long_m,"分") .. optionalArg(long_s,"秒")
389行目: 391行目:
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.
409行目: 411行目:
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
421行目: 423行目:
if not result then
if not result then
return errorPrinter(errors);
return errorPrinter(errors);
end  
end
result.param = table.concat({args[1], 'N', args[2] or '', 'E', args[3] or ''}, '_')
-- formatting for geohack: geohack expects D_N_D_E notation or D;D notation
-- wikiminiatlas doesn't support D;D notation
-- #coordinates parserfunction doesn't support negative decimals with NSWE
result.param = table.concat({
math.abs(tonumber(args[1])),
((tonumber(args[1]) or 0) < 0) and 'S' or 'N',
math.abs(tonumber(args[2])),
((tonumber(args[2]) or 0) < 0) and 'W' or 'E',
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
table.insert( errors, { 'formatTest', '座標オプションが認識できません' } );
table.insert(errors, {'formatTest', '座標オプションが認識できません'})
end
end
if not result then
if not result then
436行目: 446行目:
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
table.insert(errors, {'formatTest', '座標オプションが認識できません'});
table.insert(errors, {'formatTest', '座標オプションが認識できません'})
end
end
if not result then
if not result then
447行目: 457行目:
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', '座標オプションが認識できません' } );
table.insert(errors, {'formatTest', '座標オプションが認識できません'})
end
end
if not result then
if not result then
return errorPrinter(errors)
return errorPrinter(errors)
458行目: 468行目:
else
else
-- Error
-- Error
return errorPrinter( {{"formatTest", "引数の形式が認識できません"}} )
return errorPrinter({{"formatTest", "引数の形式が認識できません"}}) .. '[[Category:座標タグに誤りがあるページ]]'
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', '引数: "' .. v .. '=" は "' .. v .. ':" という形式でなければいけません' } );
table.insert(errors, {'formatTest', '引数: "' .. v .. '=" は "' .. v .. ':" という形式でなければいけません'})
end
end
end
end
 
local ret = specPrinter(args, result)
local ret = specPrinter(args, result)
if #errors > 0 then
if #errors > 0 then
479行目: 489行目:
Generate Wikidata tracking categories.
Generate Wikidata tracking categories.
]]
]]
local function makeWikidataCategories()
local function makeWikidataCategories(qid)
local ret
local ret
if mw.wikibase and current_page.namespace == 0 then
if mw.wikibase and current_page.namespace == 0 then
local entity = mw.wikibase.getEntityObject()
local entity = qid and mw.wikibase.getEntityObject(qid) or mw.wikibase.getEntityObject()
if entity and entity.claims and entity.claims.P625 and entity.claims.P625[1] then
if entity and entity.claims and entity.claims.P625 and entity.claims.P625[1] then
local snaktype = entity.claims.P625[1].mainsnak.snaktype
local snaktype = entity.claims.P625[1].mainsnak.snaktype
491行目: 501行目:
ret = 'ウィキデータで不明な値となっている座標'
ret = 'ウィキデータで不明な値となっている座標'
elseif snaktype == 'novalue' then
elseif snaktype == 'novalue' then
ret = 'ウィキデータで値なしとなっている座標‎'
ret = 'ウィキデータで値なしとなっている座標'
end
end
else
else
511行目: 521行目:


Usage:
Usage:
{{ Invoke:Coordinates | link }}
{{#invoke:Coordinates | link }}
 
]]
]]
function coordinates.link(frame)
function coordinates.link(frame)
524行目: 534行目:


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
555行目: 565行目:
return 'dms';
return 'dms';
end
end
end
end


--[[
--[[
563行目: 573行目:


Usage:
Usage:
{{ 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).
]]
]]
586行目: 596行目:


Usage:
Usage:
{{ Invoke:Coordinates | coord }}
{{#invoke:Coordinates | coord }}
{{ Invoke:Coordinates | coord | lat | long }}
{{#invoke:Coordinates | coord | lat | long }}
{{ 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}}.
601行目: 611行目:
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 = 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
610行目: 620行目:
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 ''
632行目: 642行目:
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
645行目: 655行目:
text = text
text = text
.. displaytitle(contents, Notes)
.. displaytitle(contents, Notes)
.. makeWikidataCategories()
.. makeWikidataCategories(args.qid)
end
end
if not args.nosave then
if not args.nosave then
682行目: 692行目:
frame.args[2] = mw.text.trim(frame.args[2])
frame.args[2] = mw.text.trim(frame.args[2])
if frame.args[2] == 'lat' or frame.args[2] == 'long' then
if frame.args[2] == 'lat' or frame.args[2] == 'long' then
local result, negative = mw.text.split((mw.ustring.match(frame.args[1],'%d+.?%d*°[NS] %d+.?%d*°[EW]') or ''), ' ')
local result, negative = mw.text.split((mw.ustring.match(frame.args[1],'[%.%d]+°[NS] [%.%d]+°[EW]') or ''), ' ')
if frame.args[2] == 'lat' then
if table.maxn(result) ~= 1 then -- input format: '57.30611°N 4.45889°E'
result, negative = result[1], 'S'
if frame.args[2] == 'lat' then
else
result, negative = result[1], 'S'
result, negative = result[2], 'W'
else
result, negative = result[2], 'W'
end
result = mw.text.split(result, '°')
if result[2] == negative then result[1] = '-'..result[1] end
return result[1]
else -- input format: '北緯57.30611度 東経4.45889度'
result = mw.text.split(mw.ustring.match(frame.args[1],'[南北]緯%-?[%.%d]+度 [東西]経%-?[%.%d]+度') or '', ' ')
if frame.args[2] == 'lat' then
result, negative = result[1], '南'
else
result, negative = result[2], '西'
end
result = mw.text.split(result, '[経緯度]')
if result[1] == negative then result[2] = '-'..result[2] end
return result[2]
end
end
result = mw.text.split(result, '°')
if result[2] == negative then result[1] = '-'..result[1] end
return result[1]
else
else
return mw.ustring.match(frame.args[1], 'params=.-_'..frame.args[2]..':(.-)[ _]')
return mw.ustring.match(frame.args[1], 'params=.-_'..frame.args[2]..':(.-)[ _]')
712行目: 734行目:
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 frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ') end
if not mw.ustring.find(frame.args[1], (mw.ustring.match(frame.args[i], '^(.-:)') or '')) then
frame.args[1] = mw.ustring.gsub(frame.args[1], '(params=.-)_? ', '%1_'..frame.args[i]..' ')
end
end
end
if frame.args.name then
if not mw.ustring.find(frame.args[1], '<span class="vcard">') then
local namestr = frame.args.name
frame.args[1] = mw.ustring.gsub(frame.args[1],
'(<span class="geo%-default">)(<span[^<>]*>[^<>]*</span><span[^<>]*>[^<>]*<span[^<>]*>[^<>]*</span></span>)(</span>)',
'%1<span class="vcard">%2<span style="display:none">&#xfeff; (<span class="fn org">' .. namestr .. '</span>)</span></span>%3')
frame.args[1] = mw.ustring.gsub(frame.args[1], '(&params=[^&"<>%[%] ]*) ', '%1&title=' .. mw.uri.encode(namestr) .. ' ')
end
end
end
end