Module Name: src
Committed By: dholland
Date: Mon Oct 24 05:04:51 UTC 2022
Modified Files:
src/usr.bin/units: units.lib
Log Message:
units.lib: fix "surveyfoot" and kill off "british".
The US survey foot is defined as 1200/3937 of a meter, whereas the
ordinary international foot is 0.3048 meter. These are almost, but
not quite the same.
Define the survey foot this way instead of defining an adjective unit
for the conversion, which is much less confusing even if the adjective
unit had a reasonable name. For the time being the fact that it was
called "british" remains thoroughly obscure.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/units/units.lib
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/units/units.lib
diff -u src/usr.bin/units/units.lib:1.27 src/usr.bin/units/units.lib:1.28
--- src/usr.bin/units/units.lib:1.27 Mon Oct 24 04:55:19 2022
+++ src/usr.bin/units/units.lib Mon Oct 24 05:04:50 2022
@@ -1,4 +1,4 @@
-/ $NetBSD: units.lib,v 1.27 2022/10/24 04:55:19 dholland Exp $
+/ $NetBSD: units.lib,v 1.28 2022/10/24 05:04:50 dholland Exp $
/ primitive units
@@ -290,8 +290,6 @@ mi mile
league 3 mi
mil 1e-3 in
-british 1200|3937 m/ft
-
/ nautical
/ Historically, the nautical mile was 6080 feet (6080.2 in England)
/ but was changed to 1852 meters (6076 feet and change) in the 20th
@@ -304,6 +302,11 @@ marineleague 3 nmile
cable 720 ft
/ surveying
+/
+/ The US survey foot is defined as 1200/3937 meters, as opposed to the
+/ ordinary international foot, which is 0.3048 meter (that's exactly
+/ 2.54 cm to the inch as defined above.)
+/ https://en.wikipedia.org/wiki/Foot_(unit)
rod 5.5 yd
rd rod
perch rd
@@ -311,7 +314,7 @@ pole rd
chain 66 ft
link 66|100 ft
furlong 220 yd
-surveyfoot british-ft
+surveyfoot 1200|3937 meter
surveyyard 3 surveyfoot
surveyorschain 66 ft
surveyorslink 66|100 ft
@@ -356,7 +359,7 @@ englishell 45 inch
rood 1.21e+3 yd
/ other
-geodeticfoot british-ft
+geodeticfoot surveyfoot
geographicalmile 1852 m
engineerschain 100 ft
engineerslink 100|100 ft