Merge remote-tracking branch 'origin/master' into add-date-to-fragment

ElectronicBabylonianLiterature · Oct 11, 2023 · 9c95b43 · 9c95b43
2 parents 306a4d3 + 521885b
commit 9c95b43
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git a/src/chronology/domain/DateConverter.test.ts b/src/chronology/domain/DateConverter.test.ts
@@ -64,9 +64,9 @@ describe('DateConverter', () => {
       gregorianMonth: 12,
       gregorianDay: 28,
       julianYear: -580,
+      bcJulianYear: 581,
       julianMonth: 1,
       julianDay: 3,
-      bcJulianYear: 581,
       cjdn: 1509215,
       weekDay: 3,
       mesopotamianDay: 14,

diff --git a/src/chronology/domain/dateConverterData.json b/src/chronology/domain/dateConverterData.json
@@ -1,22 +1,5 @@
 {
   "rulerName": [
-    "Nabonassar",
-    "Nabu-nadin-zeri",
-    "Nabu-mukin-zeri",
-    "Tiglath-Pileser III [Pulu]",
-    "Salmanassar V [Ululayu]",
-    "Marduk-apal-iddina",
-    "Sargon II",
-    "Sennacherib (first conquest of Babylonia)",
-    "Bel-ibni",
-    "Aššur-nadim-šum",
-    "Nergal-ušezib",
-    "Mušezib-Marduk",
-    "Sennacherib (second conquest of Babylonia)",
-    "Asarhaddon",
-    "Šamaš-šum-ukin",
-    "Kandalānu",
-    "Interregnum",
     "Nabopolassar",
     "Nebuchadnezzar II",
     "Amēl-Marduk",
@@ -49,23 +32,6 @@
   ],
 
   "rulerToBrinkmanKings": {
-    "Nabonassar": 140,
-    "Nabu-nadin-zeri": 141,
-    "Nabu-mukin-zeri": 143,
-    "Tiglath-Pileser III [Pulu]": 144,
-    "Salmanassar V [Ululayu]": 145,
-    "Marduk-apal-iddina": 146,
-    "Sargon II": 147,
-    "Sennacherib (first conquest of Babylonia)": 148,
-    "Bel-ibni": 151,
-    "Aššur-nadim-šum": 152,
-    "Nergal-ušezib": 153,
-    "Mušezib-Marduk": 154,
-    "Sennacherib (second conquest of Babylonia)": 155,
-    "Asarhaddon": 156,
-    "Šamaš-šum-ukin": 158,
-    "Kandalānu": 159,
-    "Interregnum": 160,
     "Nabopolassar": 161,
     "Nebuchadnezzar II": 162,
     "Amēl-Marduk": 163,