Skip to content

Commit a1c5dc2

Browse files
TrevorVonSeggernangularsen
TrevorVonSeggern
authored and
angularsen
committed
Feature/more units (#580)
Many units added.
1 parent 38e034b commit a1c5dc2

File tree

50 files changed

+2848
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2848
-49
lines changed

‎Common/UnitDefinitions/Capacitance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"PluralName": "Farads",
1616
"FromUnitToBaseFunc": "x",
1717
"FromBaseToUnitFunc": "x",
18-
"Prefixes": [ "Pico", "Nano", "Micro", "Milli" ],
18+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1919
"Localization": [
2020
{
2121
"Culture": "en-US",

‎Common/UnitDefinitions/Density.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"PluralName": "GramsPerCubicMeter",
4040
"FromUnitToBaseFunc": "x/1e3",
4141
"FromBaseToUnitFunc": "x*1e3",
42-
"Prefixes": [ "Milli", "Kilo" ],
42+
"Prefixes": [ "Kilo", "Milli", "Micro" ],
4343
"Localization": [
4444
{
4545
"Culture": "en-US",

‎Common/UnitDefinitions/ElectricResistivity.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,26 @@
1515
"PluralName": "OhmMeters",
1616
"FromUnitToBaseFunc": "x",
1717
"FromBaseToUnitFunc": "x",
18-
"Prefixes": [ "Nano", "Micro", "Milli" ],
18+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1919
"Localization": [
2020
{
2121
"Culture": "en-US",
2222
"Abbreviations": [ "Ω·m" ]
2323
}
2424
]
25+
},
26+
{
27+
"SingularName": "OhmCentimeter",
28+
"PluralName": "OhmsCentimeter",
29+
"FromUnitToBaseFunc": "x/100",
30+
"FromBaseToUnitFunc": "x*100",
31+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
32+
"Localization": [
33+
{
34+
"Culture": "en-US",
35+
"Abbreviations": [ "Ω·cm" ]
36+
}
37+
]
2538
}
2639
]
2740
}

‎Common/UnitDefinitions/Irradiance.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,26 @@
1212
"PluralName": "WattsPerSquareMeter",
1313
"FromUnitToBaseFunc": "x",
1414
"FromBaseToUnitFunc": "x",
15-
"Prefixes": [ "Kilo" ],
15+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
1616
"Localization": [
1717
{
1818
"Culture": "en-US",
1919
"Abbreviations": [ "W/m²" ]
2020
}
2121
]
22+
},
23+
{
24+
"SingularName": "WattPerSquareCentimeter",
25+
"PluralName": "WattsPerSquareCentimeter",
26+
"FromUnitToBaseFunc": "x*10000",
27+
"FromBaseToUnitFunc": "x*0.0001",
28+
"Prefixes": [ "Pico", "Nano", "Micro", "Milli", "Kilo", "Mega" ],
29+
"Localization": [
30+
{
31+
"Culture": "en-US",
32+
"Abbreviations": [ "W/cm²" ]
33+
}
34+
]
2235
}
2336
]
2437
}

‎Common/UnitDefinitions/MassFlow.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,19 @@
2020
}
2121
]
2222
},
23+
{
24+
"SingularName": "GramPerDay",
25+
"PluralName": "GramsPerDay",
26+
"FromUnitToBaseFunc": "x/86400",
27+
"FromBaseToUnitFunc": "x*86400",
28+
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Deca", "Hecto", "Kilo", "Mega" ],
29+
"Localization": [
30+
{
31+
"Culture": "en-US",
32+
"Abbreviations": [ "g/d" ]
33+
}
34+
]
35+
},
2336
{
2437
"SingularName": "KilogramPerHour",
2538
"PluralName": "KilogramsPerHour",
@@ -64,6 +77,20 @@
6477
}
6578
]
6679
},
80+
{
81+
"SingularName": "PoundPerDay",
82+
"PluralName": "PoundsPerDay",
83+
"FromUnitToBaseFunc": "x/190.47936",
84+
"FromBaseToUnitFunc": "x*190.47936",
85+
"Prefixes": [ "Mega" ],
86+
"Localization": [
87+
{
88+
"Culture": "en-US",
89+
"Abbreviations": [ "lb/d" ],
90+
"AbbreviationsWithPrefixes": [ "Mlb/d" ]
91+
}
92+
]
93+
},
6794
{
6895
"SingularName": "PoundPerHour",
6996
"PluralName": "PoundsPerHour",

‎Common/UnitDefinitions/Pressure.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,18 @@
328328
"Abbreviations": [ "lbm/(in·s²)", "lb/(in·s²)" ]
329329
}
330330
]
331+
},
332+
{
333+
"SingularName": "InchOfWaterColumn",
334+
"PluralName": "InchesOfWaterColumn",
335+
"FromUnitToBaseFunc": "x*249.08890833333",
336+
"FromBaseToUnitFunc": "x/249.08890833333",
337+
"Localization": [
338+
{
339+
"Culture": "en-US",
340+
"Abbreviations": [ "wc" ]
341+
}
342+
]
331343
}
332344
]
333345
}

‎Common/UnitDefinitions/SpecificVolume.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"PluralName": "CubicMetersPerKilogram",
1313
"FromUnitToBaseFunc": "x",
1414
"FromBaseToUnitFunc": "x",
15-
"Prefixes": [],
15+
"Prefixes": [ "Milli" ],
1616
"Localization": [
1717
{
1818
"Culture": "en-US",

‎Common/UnitDefinitions/Volume.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"PluralName": "Liters",
1212
"FromUnitToBaseFunc": "x/1e3",
1313
"FromBaseToUnitFunc": "x*1e3",
14-
"Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Hecto", "Kilo" ],
14+
"Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Hecto", "Kilo", "Mega" ],
1515
"Localization": [
1616
{
1717
"Culture": "en-US",
@@ -20,7 +20,7 @@
2020
{
2121
"Culture": "ru-RU",
2222
"Abbreviations": [ "л" ],
23-
"AbbreviationsWithPrefixes": [ "мкл", "мл", "сл", "дл", "гл", "кл" ]
23+
"AbbreviationsWithPrefixes": [ "мкл", "мл", "сл", "дл", "гл", "кл", "Mкл" ]
2424
}
2525
]
2626
},
@@ -447,6 +447,18 @@
447447
"Abbreviations": [ "pt (U.S.)" ]
448448
}
449449
]
450+
},
451+
{
452+
"SingularName": "AcreFoot",
453+
"PluralName": "AcreFeet",
454+
"FromUnitToBaseFunc": "x/0.000810714",
455+
"FromBaseToUnitFunc": "x*0.000810714",
456+
"Localization": [
457+
{
458+
"Culture": "en-US",
459+
"Abbreviations": [ "ac-ft", "acre-foot", "acre-feet" ]
460+
}
461+
]
450462
}
451463
]
452464
}

‎Common/UnitDefinitions/VolumeFlow.json‎

Lines changed: 148 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@
5151
}
5252
]
5353
},
54+
{
55+
"SingularName": "CubicMeterPerDay",
56+
"PluralName": "CubicMetersPerDay",
57+
"FromUnitToBaseFunc": "x/86400",
58+
"FromBaseToUnitFunc": "x*86400",
59+
"Localization": [
60+
{
61+
"Culture": "en-US",
62+
"Abbreviations": [ "m³/d" ]
63+
}
64+
]
65+
},
5466
{
5567
"SingularName": "CubicFootPerSecond",
5668
"PluralName": "CubicFeetPerSecond",
@@ -123,6 +135,18 @@
123135
}
124136
]
125137
},
138+
{
139+
"SingularName": "CubicYardPerDay",
140+
"PluralName": "CubicYardsPerDay",
141+
"FromUnitToBaseFunc": "x/113007",
142+
"FromBaseToUnitFunc": "x*113007",
143+
"Localization": [
144+
{
145+
"Culture": "en-US",
146+
"Abbreviations": [ "cy/day" ]
147+
}
148+
]
149+
},
126150
{
127151
"SingularName": "MillionUsGallonsPerDay",
128152
"PluralName": "MillionUsGallonsPerDay",
@@ -135,6 +159,18 @@
135159
}
136160
]
137161
},
162+
{
163+
"SingularName": "UsGallonPerDay",
164+
"PluralName": "UsGallonsPerDay",
165+
"FromUnitToBaseFunc": "x/22824465.227",
166+
"FromBaseToUnitFunc": "x*22824465.227",
167+
"Localization": [
168+
{
169+
"Culture": "en-US",
170+
"Abbreviations": [ "gpd", "gal/d" ]
171+
}
172+
]
173+
},
138174
{
139175
"SingularName": "LiterPerSecond",
140176
"PluralName": "LitersPerSecond",
@@ -176,6 +212,19 @@
176212
}
177213
]
178214
},
215+
{
216+
"SingularName": "LiterPerDay",
217+
"PluralName": "LitersPerDay",
218+
"FromUnitToBaseFunc": "x/86400000",
219+
"FromBaseToUnitFunc": "x*86400000",
220+
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega" ],
221+
"Localization": [
222+
{
223+
"Culture": "en-US",
224+
"Abbreviations": [ "l/day", "L/d", "LPD" ]
225+
}
226+
]
227+
},
179228
{
180229
"SingularName": "UsGallonPerSecond",
181230
"PluralName": "UsGallonsPerSecond",
@@ -201,7 +250,44 @@
201250
]
202251
},
203252
{
204-
"SingularName": "KilousGallonsPerMinute",
253+
"SingularName": "UkGallonPerDay",
254+
"PluralName": "UkGallonsPerDay",
255+
"FromUnitToBaseFunc": "x/19005304",
256+
"FromBaseToUnitFunc": "x*19005304",
257+
"Localization": [
258+
{
259+
"Culture": "en-US",
260+
"Abbreviations": [ "gal (U. K.)/d" ]
261+
}
262+
]
263+
},
264+
{
265+
"SingularName": "UkGallonPerMinute",
266+
"PluralName": "UkGallonsPerMinute",
267+
"FromUnitToBaseFunc": "x/13198.2",
268+
"FromBaseToUnitFunc": "x*13198.2",
269+
"Localization": [
270+
{
271+
"Culture": "en-US",
272+
"Abbreviations": [ "gal (imp.)/min" ]
273+
}
274+
]
275+
},
276+
{
277+
"SingularName": "UkGallonPerSecond",
278+
"PluralName": "UkGallonsPerSecond",
279+
"FromUnitToBaseFunc": "x/219.969",
280+
"FromBaseToUnitFunc": "x*219.969",
281+
"Prefixes": [ "Mega" ],
282+
"Localization": [
283+
{
284+
"Culture": "en-US",
285+
"Abbreviations": [ "gal (imp.)/s" ]
286+
}
287+
]
288+
},
289+
{
290+
"SingularName": "KilousGallonPerMinute",
205291
"PluralName": "KilousGallonsPerMinute",
206292
"FromUnitToBaseFunc": "x/15.850323141489",
207293
"FromBaseToUnitFunc": "x*15.850323141489",
@@ -276,7 +362,19 @@
276362
}
277363
]
278364
},
279-
{
365+
{
366+
"SingularName": "OilBarrelPerSecond",
367+
"PluralName": "OilBarrelsPerSecond",
368+
"FromUnitToBaseFunc": "x/6.28981",
369+
"FromBaseToUnitFunc": "x*6.28981",
370+
"Localization": [
371+
{
372+
"Culture": "en-US",
373+
"Abbreviations": [ "bbl/s" ]
374+
}
375+
]
376+
},
377+
{
280378
"SingularName": "CubicMillimeterPerSecond",
281379
"PluralName": "CubicMillimetersPerSecond",
282380
"FromUnitToBaseFunc": "x*1e-9",
@@ -291,6 +389,54 @@
291389
"Abbreviations": [ "мм³/с" ]
292390
}
293391
]
392+
},
393+
{
394+
"SingularName": "AcreFootPerSecond",
395+
"PluralName": "AcreFeetPerSecond",
396+
"FromUnitToBaseFunc": "x/0.000810713194",
397+
"FromBaseToUnitFunc": "x*0.000810713194",
398+
"Localization": [
399+
{
400+
"Culture": "en-US",
401+
"Abbreviations": [ "af/s" ]
402+
}
403+
]
404+
},
405+
{
406+
"SingularName": "AcreFootPerMinute",
407+
"PluralName": "AcreFeetPerMinute",
408+
"FromUnitToBaseFunc": "x/0.0486427916",
409+
"FromBaseToUnitFunc": "x*0.0486427916",
410+
"Localization": [
411+
{
412+
"Culture": "en-US",
413+
"Abbreviations": [ "af/m" ]
414+
}
415+
]
416+
},
417+
{
418+
"SingularName": "AcreFootPerHour",
419+
"PluralName": "AcreFeetPerHour",
420+
"FromUnitToBaseFunc": "x/2.91857",
421+
"FromBaseToUnitFunc": "x*2.91857",
422+
"Localization": [
423+
{
424+
"Culture": "en-US",
425+
"Abbreviations": [ "af/h" ]
426+
}
427+
]
428+
},
429+
{
430+
"SingularName": "AcreFootPerDay",
431+
"PluralName": "AcreFeetPerDay",
432+
"FromUnitToBaseFunc": "x/70.0457",
433+
"FromBaseToUnitFunc": "x*70.0457",
434+
"Localization": [
435+
{
436+
"Culture": "en-US",
437+
"Abbreviations": [ "af/d" ]
438+
}
439+
]
294440
}
295441
]
296442
}

‎UnitsNet.Serialization.JsonNet.CompatibilityTests/UnitsNet.Serialization.JsonNet.CompatibilityTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>

0 commit comments

Comments
 (0)