Module:Ordnance Survey coordinates - Revision history

Hike395: factor data out into subpage, use loadData

2024-11-04T14:29:39Z

factor data out into subpage, use loadData

@@ Line 71: / Line 71: @@
 -- Datum parameters
-local IEglobe = {
+local OSGBglobe = data.OSGBglobe
 local function HelmertDatumShift ( latitude , longitude, param )

Hike395: correct dim override logic

2024-11-03T02:54:32Z

correct dim override logic

← Previous revision		Revision as of 02:54, 3 November 2024
Line 441:		Line 441:
	args[splitOut[1]] = splitOut[2]		args[splitOut[1]] = splitOut[2]
	end		end
	~~args.dim~~ = args.~~dim~~ or ~~(LL~~.~~prec~~ and ~~tostring(floor(50*LL.prec+0~~.~~5))..'m')~~		if not args.scale and not args.type and not args.dim then
			args.dim = LL.prec and tostring(floor(50*LL.prec+0.5))..'m'
			end
	args.viewport_cm = 10		args.viewport_cm = 10
	local zoom = require('Module:Infobox dim')._zoom		local zoom = require('Module:Infobox dim')._zoom

Hike395: implement direct link parameter

2024-11-02T23:46:33Z

implement direct link parameter

Show changes

Ahecht: local _ = 0 to reduce lua errors

2024-06-12T20:41:04Z

local _ = 0 to reduce lua errors

← Previous revision		Revision as of 20:41, 12 June 2024
Line 373:		Line 373:

	local function trim(s)		local function trim(s)
			local _ = 0
	s, _ = mw.ustring.gsub(s,"^%s+","")		s, _ = mw.ustring.gsub(s,"^%s+","")
	s, _ = mw.ustring.gsub(s,"%s+$","")		s, _ = mw.ustring.gsub(s,"%s+$","")

Ahecht: set _ = 0 to remove lua errors

2024-06-12T20:40:18Z

set _ = 0 to remove lua errors

← Previous revision		Revision as of 20:40, 12 June 2024
Line 349:		Line 349:

	local function NGR2LL(ngr)		local function NGR2LL(ngr)
	local result = {}~~, _~~		local result = {}
			local _ = 0
	ngr, _ = mw.ustring.gsub(mw.ustring.upper(ngr),"[%s%p]","")		ngr, _ = mw.ustring.gsub(mw.ustring.upper(ngr),"[%s%p]","")
	local first, last, lett, num = mw.ustring.find(ngr,"^([A-Z]+)(%d+)$")		local first, last, lett, num = mw.ustring.find(ngr,"^([A-Z]+)(%d+)$")

Ahecht: declare _

2024-06-12T20:38:52Z

declare _

← Previous revision		Revision as of 20:38, 12 June 2024
Line 349:		Line 349:

	local function NGR2LL(ngr)		local function NGR2LL(ngr)
	local result = {}		local result = {}, _
	ngr, _ = mw.ustring.gsub(mw.ustring.upper(ngr),"[%s%p]","")		ngr, _ = mw.ustring.gsub(mw.ustring.upper(ngr),"[%s%p]","")
	local first, last, lett, num = mw.ustring.find(ngr,"^([A-Z]+)(%d+)$")		local first, last, lett, num = mw.ustring.find(ngr,"^([A-Z]+)(%d+)$")

Hike395: handle OS grid truncation to SW correctly; produce 6 latlong sigfig results that should survive round trip through OS->LL->OS conversion

2023-12-17T13:13:22Z

handle OS grid truncation to SW correctly; produce 6 latlong sigfig results that should survive round trip through OS->LL->OS conversion

← Previous revision		Revision as of 13:13, 17 December 2023
Line 45:		Line 45:
	local abs = math.abs		local abs = math.abs
	local floor = math.floor		local floor = math.floor
			local ceil = math.ceil
	local sin = math.sin		local sin = math.sin
	local cos = math.cos		local cos = math.cos
Line 444:		Line 445:
	LL.lat = LL.lat or 0		LL.lat = LL.lat or 0
	LL.long = LL.long or 0		LL.long = LL.long or 0
	~~url~~ = ~~url..'params='..~~LL.lat~~..'_N_'~~		LL.lat = ceil(LL.lat*1000000)/1000000
			LL.long = ceil(LL.long*1000000)/1000000
			url = url..'params='..mw.ustring.format('%.6f',LL.lat)..'_N_'
	if LL.long < 0 then		if LL.long < 0 then
	url = url..(-LL.long)..'_W'		url = url..mw.ustring.format('%.6f',-LL.long)..'_W'
	else		else
	url = url..LL.long..'_E'		url = url..mw.ustring.format('%.6f',LL.long)..'_E'
	end		end
	for i = restargs,#args do		for i = restargs,#args do
Line 525:		Line 528:
	local function find_M ( lat_rad )		local function find_M ( lat_rad )
	local e = OSGBglobe.ecc		local e = OSGBglobe.ecc
			local e2 = e*e
			local e3 = eee

	return OSGBglobe.semimajor * ( ( 1 - e/4 - 3 * ~~e * e~~/64		return OSGBglobe.semimajor * ( ( 1 - e/4 - 3 * e2/64
	- 5 * ~~e * e * e~~/256		- 5 * e3/256
	) * lat_rad		) * lat_rad
	- ( 3 * e/8 + 3 * ~~e * e~~/32		- ( 3 * e/8 + 3 * e2/32
	+ 45 * ~~e * e * e~~/1024		+ 45 * e3/1024
	) * sin(2 * lat_rad)		) * sin(2 * lat_rad)
	+ ( 15 * ~~e * e~~/256 +		+ ( 15 * e2/256 +
	45 * ~~e * e * e~~/1024		45 * e3/1024
	) * sin(4 * lat_rad)		) * sin(4 * lat_rad)
	- ( 35 * ~~e * e * e~~/3072		- ( 35 * e3/3072
	) * sin(6 * lat_rad) )		) * sin(6 * lat_rad) )
	end		end
Line 558:		Line 563:

	local v = OSGBglobe.semimajor / sqrt(1 - e * sin(lat_rad)*sin(lat_rad))		local v = OSGBglobe.semimajor / sqrt(1 - e * sin(lat_rad)*sin(lat_rad))
	local T = ~~pow(~~ tan(lat_rad~~), 2~~)		local tank = tan(lat_rad)
			local T = tank*tank
			local T2 = T*T
	local C = e_prime_sq * pow( cos(lat_rad), 2)		local C = e_prime_sq * pow( cos(lat_rad), 2)
	local A = deg2rad( longitude2 -OSGBglobe.lon0 ) * cos(lat_rad)		local A = deg2rad( longitude2 -OSGBglobe.lon0 ) * cos(lat_rad)
			local A2 = A*A
			local A3 = A2*A
			local A4 = A2*A2
			local A5 = A3*A2
			local A6 = A3*A3
	local M = find_M( lat_rad )		local M = find_M( lat_rad )
	local M0 = 0.0		local M0 = 0.0
Line 569:		Line 581:
	local northing = OSGBglobe.n0 + OSGBglobe.scale *		local northing = OSGBglobe.n0 + OSGBglobe.scale *
	( (M - M0) + vtan(lat_rad)		( (M - M0) + vtan(lat_rad)
	( ~~A*A~~/2		( A2/2
	+ (5 - T + 9C + 4CC) ~~pow(A,4)~~/24		+ (5 - T + 9C + 4CC) A4/24
	+ (61 - 58T + ~~TT~~		+ (61 - 58*T + T2
	+ 600C - 330e_prime_sq) * ~~pow(A,6)~~/720 ))		+ 600C - 330e_prime_sq) * A6/720 ))

	local easting = OSGBglobe.e0 + OSGBglobe.scale * v *		local easting = OSGBglobe.e0 + OSGBglobe.scale * v *
	( A		( A
	+ (1-T+C)*~~pow(A,3)~~/6		+ (1-T+C)*A3/6
	+ (5 - 18T + ~~pow(T,2)~~ + 72C		+ (5 - 18T + T2 + 72C
	- 58 * e_prime_sq)*~~pow(A,5)~~/120 )		- 58 * e_prime_sq)*A5/120 )

	return {northing=northing,easting=easting}		return {northing=northing,easting=easting}
Line 611:		Line 623:
	local northing = tm.northing%100000		local northing = tm.northing%100000
	local grid = pow(10.0,5.0-prec)		local grid = pow(10.0,5.0-prec)
	easting = floor(easting/grid~~+0.5~~)		easting = floor(easting/grid)
	northing = floor(northing/grid~~+0.5~~)		northing = floor(northing/grid)
	local fmt = '%0'..prec..'d'		local fmt = '%0'..prec..'d'
	local e = mw.ustring.format(fmt, easting)		local e = mw.ustring.format(fmt, easting)

Hike395: change series expansion to use dimensionless quantity for numerical stability

2023-12-16T23:34:30Z

change series expansion to use dimensionless quantity for numerical stability

← Previous revision		Revision as of 23:34, 16 December 2023
Line 279:		Line 279:
	local tank6 = tank2*tank4		local tank6 = tank2*tank4
	local cosk = cos(k)		local cosk = cos(k)
	local v2 = v*v		local yv = y1/v -- dimensionless quantity in series expansion
	local v3 = v*v2		local yv2 = yv*yv
	local v5 = v3*v2		local yv3 = yv*yv2
	local v7 = v5*v2		local yv5 = yv3*yv2
	local ~~y12~~ = y1*y1		local yv7 = yv5*yv2
			j3=tank/(2.0*r)
	local y13 = y12*y1
		⚫	j4=tank/(24.0r)(5.0+3.0tank2+h2-9.0tank2*h2)
	local y14 = y12*y12
		⚫	j5=tank/(720.0r)(61.0+90.0tank2+45.0tank4)
	local y15 = y14*y1
	local ~~y16~~ = ~~y13~~*~~y13~~		local k9=k-y1(yvj3+yv3j4-yv5j5)
		⚫	j6=1.0/(cosk)
	local y17 = y16*y1
	j3=~~tank~~/(2.0rv)		local j7=1.0/(cosk6.0)(v/r+2.0*tank2)
	j4=~~tank~~/(24.0rv3)(5.0+3.0tank2+~~h2-9~~.0~~tank2h2~~)		local j8=1.0/(cosk120.0)(5.0+28.0tank2+24.0tank4)
		⚫	local j9=1.0/(cosk*5040.0)
⚫	j5=tank/(~~720~~.0rv5)(61.0+90.0tank2+45.0*~~tank4~~)
	local k9=k-y1y1j3+y14j4-y16j5
⚫	j6=1.0/(cosk*v)
	local j7=1.0/(cosk6.0v3)(v/r+2.0tank2)
⚫	~~local j8~~=~~1.0~~/(~~cosk120~~.0v5)(5.0+28.0tank2+24.0*tank4)
⚫	local j9=1.0/(~~cos(k)~~5040.0v7)
	j9=j9(61.0+662.0tank2+1320.0tank4+720.0tank6)		j9=j9(61.0+662.0tank2+1320.0tank4+720.0tank6)
	local long=datum.lon0+rad2deg(y1j6-~~y13~~j7+~~y15~~j8-~~y17~~j9)		local long=datum.lon0+rad2deg(yvj6-yv3j7+yv5j8-yv7j9)
	local lat=rad2deg(k9)		local lat=rad2deg(k9)
	return {lat=lat,lon=long}		return {lat=lat,lon=long}

Hike395: perform pre-computations to save time, hopefully reduce round-off error, and make code more readable

2023-12-16T22:49:44Z

perform pre-computations to save time, hopefully reduce round-off error, and make code more readable

← Previous revision		Revision as of 22:49, 16 December 2023
Line 252:		Line 252:
	local b = datum.semiminor*datum.scale		local b = datum.semiminor*datum.scale
	local lat0rad = deg2rad(datum.lat0)		local lat0rad = deg2rad(datum.lat0)
			local n1 = datum.n1
			local n12 = n1*n1
			local n13 = n12*n1
	local k=(n-datum.n0)/a+lat0rad		local k=(n-datum.n0)/a+lat0rad
	local nextcounter=0		local nextcounter=0
Line 259:		Line 262:
	local k3=k-lat0rad		local k3=k-lat0rad
	local k4=k+lat0rad		local k4=k+lat0rad
	j3=(1.0+~~datum.~~n1+1.25~~pow(datum.n1,2.0)~~+1.25~~pow(datum.n1,3.0)~~)*k3		j3=(1.0+n1+1.25n12+1.25n13)*k3
	j4=(3.0~~datum.~~n1+3.0~~pow(datum.n1,2.0)~~+2.625~~pow(datum.n1,3.0)~~)sin(k3)*cos(k4)		j4=(3.0n1+3.0n12+2.625n13)sin(k3)*cos(k4)
	j5=(1.875~~pow(datum.n1,2.0)~~+1.875~~pow(datum.n1,3.0)~~)sin(2.0k3)cos(2.0k4)		j5=(1.875n12+1.875n13)sin(2.0k3)cos(2.0k4)
	j6=35.0/24.0~~pow(datum.n1,3.0)~~sin(3.0k3)cos(3.0*k4)		j6=35.0/24.0n13sin(3.0k3)cos(3.0*k4)
	m=b*(j3-j4+j5-j6)		m=b*(j3-j4+j5-j6)
	k=k+(n-datum.n0-m)/a		k=k+(n-datum.n0-m)/a
	until abs(n-datum.n0-m)<=0.000000001 or nextcounter>=100		until abs(n-datum.n0-m)<=0.000000001 or nextcounter>=100
	local v=~~a/sqrt(~~1.0-datum.ecc*pow(sin(k),2.0))		local x = 1.0-datum.ecc*pow(sin(k),2.0)
	local r=~~v(1.0-datum.ecc)~~/(~~1.0-datum.eccpow(sin(k),2.0)~~)		local v=a/sqrt(x)
			local r=v*(1.0-datum.ecc)/x
	local h2=v/r-1.0		local h2=v/r-1.0
	local y1=e-datum.e0		local y1=e-datum.e0
	j3=tan(k~~)/(2.0rv~~)		local tank = tan(k)
			local tank2 = tank*tank
⚫	j4=~~tan(k)~~/(24.0r~~pow(v,3.0)~~)(5.0+3.0~~pow(tan(k),2.0)~~+h2-9.0~~pow(tan(k),2.0)~~h2)
			local tank4 = tank2*tank2
⚫	j5=~~tan(k)~~/(720.0r~~pow(v,5.0)~~)(61.0+90.0~~pow(tan(k),2.0)~~+45.0*~~pow(tan(k),4.0)~~)
			local tank6 = tank2*tank4
⚫	local k9=k-y1y1j3+~~pow(y1,4.0)~~j4-~~pow(y1,6.0)~~j5
	j6=~~1.0/(~~cos(k~~)*v~~)		local cosk = cos(k)
			local v2 = v*v
⚫	local j7=1.0/(~~cos(k)~~6.0~~pow(v,3.0)~~)(v/r+2.0~~pow(tan(k),2.0)~~)
			local v3 = v*v2
⚫	local j8=1.0/(~~cos(k)~~120.0~~pow(v,5.0)~~)(5.0+28.0~~pow(tan(k),2.0)~~+24.0*~~pow(tan(k),4.0)~~)
	local j9=~~1.0/(cos(k)~~~~5040.0pow(v,7.0))~~		local v5 = v3*v2
			local v7 = v5*v2
⚫	~~local~~ j9=j9(61.0+662.0~~pow(tan(k),2.0)~~+1320.0~~pow(tan(k),4.0)~~+720.0~~pow(tan(k),6.0)~~)
			local y12 = y1*y1
⚫	local long=datum.lon0+rad2deg(y1j6-~~y1y1y1~~j7+~~pow(y1,5.0)~~j8-~~pow(y1,7.0)~~j9)
			local y13 = y12*y1
			local y14 = y12*y12
			local y15 = y14*y1
			local y16 = y13*y13
			local y17 = y16*y1
			j3=tank/(2.0rv)
		⚫	j4=tank/(24.0rv3)(5.0+3.0tank2+h2-9.0tank2h2)
		⚫	j5=tank/(720.0rv5)(61.0+90.0tank2+45.0*tank4)
		⚫	local k9=k-y1y1j3+y14j4-y16j5
			j6=1.0/(cosk*v)
		⚫	local j7=1.0/(cosk6.0v3)(v/r+2.0tank2)
		⚫	local j8=1.0/(cosk120.0v5)(5.0+28.0tank2+24.0*tank4)
			local j9=1.0/(cos(k)5040.0v7)
		⚫	j9=j9(61.0+662.0tank2+1320.0tank4+720.0tank6)
		⚫	local long=datum.lon0+rad2deg(y1j6-y13j7+y15j8-y17j9)
	local lat=rad2deg(k9)		local lat=rad2deg(k9)
	return {lat=lat,lon=long}		return {lat=lat,lon=long}

Hike395: rm stray code

2023-12-16T21:49:24Z

rm stray code

← Previous revision		Revision as of 21:49, 16 December 2023
Line 51:		Line 51:
	local deg2rad = math.rad		local deg2rad = math.rad
	local rad2deg = math.deg		local rad2deg = math.deg
	local dr = math.deg(1.0)