Skip to content

Commit ff000d4

Browse files
committed
UnitSystem in UnitDefinition schema (for Volume)
- added an association (1:0..1) between UnitSystem and Unit (kept the name 'BaseUnit' instead of the previously considered 'DefaultUnit') - added an association (1:0..n) between Unit and UnitSystem- this would be used to generate list of units for a quantity in a particular unit system (not an exhaustive list, needs a review)
1 parent 0b69e3b commit ff000d4

File tree

1 file changed

+41
-2
lines changed

1 file changed

+41
-2
lines changed

Common/UnitDefinitions/Volume.json

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"FromUnitToBaseFunc": "x",
3030
"FromBaseToUnitFunc": "x",
3131
"Prefixes": [ "Hecto", "Kilo" ],
32+
"UnitSystems": [ "SI", "CGS" ],
3233
"Localization": [
3334
{
3435
"Culture": "en-US",
@@ -45,6 +46,7 @@
4546
"PluralName": "CubicKilometers",
4647
"FromUnitToBaseFunc": "x*1e9",
4748
"FromBaseToUnitFunc": "x/1e9",
49+
"UnitSystems": [ "SI", "CGS" ],
4850
"Localization": [
4951
{
5052
"Culture": "en-US",
@@ -64,6 +66,7 @@
6466
},
6567
"FromUnitToBaseFunc": "x*1e6",
6668
"FromBaseToUnitFunc": "x/1e6",
69+
"UnitSystems": [ "SI", "CGS" ],
6770
"Localization": [
6871
{
6972
"Culture": "en-US",
@@ -75,11 +78,12 @@
7578
}
7679
]
7780
},
78-
{
81+
{
7982
"SingularName": "CubicDecimeter",
8083
"PluralName": "CubicDecimeters",
8184
"FromUnitToBaseFunc": "x/1e3",
8285
"FromBaseToUnitFunc": "x*1e3",
86+
"UnitSystems": [ "SI", "CGS" ],
8387
"Localization": [
8488
{
8589
"Culture": "en-US",
@@ -96,6 +100,7 @@
96100
"PluralName": "CubicCentimeters",
97101
"FromUnitToBaseFunc": "x/1e6",
98102
"FromBaseToUnitFunc": "x*1e6",
103+
"UnitSystems": [ "SI", "CGS" ],
99104
"Localization": [
100105
{
101106
"Culture": "en-US",
@@ -112,6 +117,7 @@
112117
"PluralName": "CubicMillimeters",
113118
"FromUnitToBaseFunc": "x/1e9",
114119
"FromBaseToUnitFunc": "x*1e9",
120+
"UnitSystems": [ "SI", "CGS" ],
115121
"Localization": [
116122
{
117123
"Culture": "en-US",
@@ -128,6 +134,7 @@
128134
"PluralName": "CubicMicrometers",
129135
"FromUnitToBaseFunc": "x/1e18",
130136
"FromBaseToUnitFunc": "x*1e18",
137+
"UnitSystems": [ "SI", "CGS" ],
131138
"Localization": [
132139
{
133140
"Culture": "en-US",
@@ -142,6 +149,7 @@
142149
{
143150
"SingularName": "CubicMile",
144151
"PluralName": "CubicMiles",
152+
"UnitSystems": [ "BI", "USC" ],
145153
"FromUnitToBaseFunc": "x*4.16818182544058e9",
146154
"FromBaseToUnitFunc": "x/4.16818182544058e9",
147155
"Localization": [
@@ -160,6 +168,7 @@
160168
"PluralName": "CubicYards",
161169
"FromUnitToBaseFunc": "x*0.764554858",
162170
"FromBaseToUnitFunc": "x/0.764554858",
171+
"UnitSystems": [ "EE", "BI", "USC" ],
163172
"Localization": [
164173
{
165174
"Culture": "en-US",
@@ -177,6 +186,7 @@
177186
"FromUnitToBaseFunc": "x*0.0283168",
178187
"FromBaseToUnitFunc": "x/0.0283168",
179188
"Prefixes": [ "Hecto", "Kilo", "Mega" ],
189+
"UnitSystems": [ "EE", "BI", "USC" ],
180190
"Localization": [
181191
{
182192
"Culture": "en-US",
@@ -193,6 +203,7 @@
193203
"PluralName": "CubicInches",
194204
"FromUnitToBaseFunc": "x*1.6387*1e-5",
195205
"FromBaseToUnitFunc": "x/(1.6387*1e-5)",
206+
"UnitSystems": [ "EE", "BI", "USC" ],
196207
"Localization": [
197208
{
198209
"Culture": "en-US",
@@ -210,6 +221,7 @@
210221
"FromUnitToBaseFunc": "x*0.00454609000000181429905810072407",
211222
"FromBaseToUnitFunc": "x/0.00454609000000181429905810072407",
212223
"Prefixes": [ "Kilo", "Mega" ],
224+
"UnitSystems": [ "BI" ],
213225
"Localization": [
214226
{
215227
"Culture": "en-US",
@@ -226,6 +238,7 @@
226238
"PluralName": "ImperialOunces",
227239
"FromUnitToBaseFunc": "x*2.8413062499962901241875439064617e-5",
228240
"FromBaseToUnitFunc": "x/2.8413062499962901241875439064617e-5",
241+
"UnitSystems": [ "BI" ],
229242
"Localization": [
230243
{
231244
"Culture": "en-US",
@@ -243,6 +256,7 @@
243256
"FromUnitToBaseFunc": "x*0.00378541",
244257
"FromBaseToUnitFunc": "x/0.00378541",
245258
"Prefixes": [ "Kilo", "Mega" ],
259+
"UnitSystems": [ "USC" ],
246260
"Localization": [
247261
{
248262
"Culture": "en-US",
@@ -259,6 +273,7 @@
259273
"PluralName": "UsOunces",
260274
"FromUnitToBaseFunc": "x*2.957352956253760505068307980135e-5",
261275
"FromBaseToUnitFunc": "x/2.957352956253760505068307980135e-5",
276+
"UnitSystems": [ "USC" ],
262277
"Localization": [
263278
{
264279
"Culture": "en-US",
@@ -275,6 +290,7 @@
275290
"PluralName": "UsTablespoons",
276291
"FromUnitToBaseFunc": "x*1.478676478125e-5",
277292
"FromBaseToUnitFunc": "x/1.478676478125e-5",
293+
"UnitSystems": [ "USC" ],
278294
"Localization": [
279295
{
280296
"Culture": "en-US",
@@ -315,6 +331,7 @@
315331
"PluralName": "UkTablespoons",
316332
"FromUnitToBaseFunc": "x*1.5e-5",
317333
"FromBaseToUnitFunc": "x/1.5e-5",
334+
"UnitSystems": [ "BI" ],
318335
"Localization": [
319336
{
320337
"Culture": "en-US",
@@ -355,6 +372,7 @@
355372
"PluralName": "UsTeaspoons",
356373
"FromUnitToBaseFunc": "x*4.92892159375e-6",
357374
"FromBaseToUnitFunc": "x/4.92892159375e-6",
375+
"UnitSystems": [ "USC" ],
358376
"Localization": [
359377
{
360378
"Culture": "en-US",
@@ -387,6 +405,7 @@
387405
"PluralName": "UsCustomaryCups",
388406
"FromUnitToBaseFunc": "x*0.0002365882365",
389407
"FromBaseToUnitFunc": "x/0.0002365882365",
408+
"UnitSystems": [ "USC" ],
390409
"Localization": [
391410
{
392411
"Culture": "en-US",
@@ -399,6 +418,7 @@
399418
"PluralName": "UsLegalCups",
400419
"FromUnitToBaseFunc": "x*0.00024",
401420
"FromBaseToUnitFunc": "x/0.00024",
421+
"UnitSystems": [ "USC" ],
402422
"Localization": [
403423
{
404424
"Culture": "en-US",
@@ -423,6 +443,7 @@
423443
"PluralName": "UsBeerBarrels",
424444
"FromUnitToBaseFunc": "x*0.1173477658",
425445
"FromBaseToUnitFunc": "x/0.1173477658",
446+
"UnitSystems": [ "USC" ],
426447
"Localization": [
427448
{
428449
"Culture": "en-US",
@@ -435,6 +456,7 @@
435456
"PluralName": "ImperialBeerBarrels",
436457
"FromUnitToBaseFunc": "x*0.16365924",
437458
"FromBaseToUnitFunc": "x/0.16365924",
459+
"UnitSystems": [ "BI" ],
438460
"Localization": [
439461
{
440462
"Culture": "en-US",
@@ -447,6 +469,7 @@
447469
"PluralName": "UsQuarts",
448470
"FromUnitToBaseFunc": "x*9.46352946e-4",
449471
"FromBaseToUnitFunc": "x/9.46352946e-4",
472+
"UnitSystems": [ "USC" ],
450473
"Localization": [
451474
{
452475
"Culture": "en-US",
@@ -459,6 +482,7 @@
459482
"PluralName": "UsPints",
460483
"FromUnitToBaseFunc": "x*4.73176473e-4",
461484
"FromBaseToUnitFunc": "x/4.73176473e-4",
485+
"UnitSystems": [ "USC" ],
462486
"Localization": [
463487
{
464488
"Culture": "en-US",
@@ -486,12 +510,27 @@
486510
},
487511
"FromUnitToBaseFunc": "x * 5.6826125e-4",
488512
"FromBaseToUnitFunc": "x / 5.6826125e-4",
513+
"UnitSystems": [ "BI" ],
489514
"Localization": [
490515
{
491516
"Culture": "en-US",
492517
"Abbreviations": [ "pt (imp.)", "UK pt", "pt", "p" ]
493518
}
494519
]
495520
}
496-
]
521+
],
522+
"UnitSystems": [
523+
{
524+
"UnitSystem": "SI",
525+
"BaseUnit": "CubicMeter"
526+
},
527+
{
528+
"UnitSystem": "CGS ",
529+
"BaseUnit": "CubicCentimeter"
530+
},
531+
{
532+
"UnitSystem": "EE",
533+
"BaseUnit": "CubicFoot"
534+
}
535+
]
497536
}

0 commit comments

Comments
 (0)