update ganzhi name

tommitoan · Aug 11, 2024 · 5242a3b · 5242a3b
1 parent 56dca87
commit 5242a3b
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 65 deletions.
diff --git a/internal/fourpillars/get_four_pillars_test.go b/internal/fourpillars/get_four_pillars_test.go
@@ -25,7 +25,7 @@ func TestGetFourPillarChart(t *testing.T) {
 					EarthlyBranch: model.EarthlyBranch{Name: model.Snake, Value: model.SnakeValue},
 					Year:          1977,
 					GanZhi: model.GanZhi{
-						Name:         "Earth in the Sand",
+						Name:         "Desert earth",
 						ElementName:  "Earth",
 						ElementValue: 5,
 					},
@@ -35,7 +35,7 @@ func TestGetFourPillarChart(t *testing.T) {
 					EarthlyBranch: model.EarthlyBranch{Name: model.Goat, Value: model.GoatValue},
 					Month:         7,
 					GanZhi: model.GanZhi{
-						Name:         "Milky Way Water",
+						Name:         "Sky water",
 						ElementName:  "Water",
 						ElementValue: 1,
 					},
@@ -45,7 +45,7 @@ func TestGetFourPillarChart(t *testing.T) {
 					EarthlyBranch: model.EarthlyBranch{Name: model.Goat, Value: model.GoatValue},
 					Day:           12,
 					GanZhi: model.GanZhi{
-						Name:         "Earth on the Roadside",
+						Name:         "Road earth",
 						ElementName:  "Earth",
 						ElementValue: 5,
 					},
@@ -55,7 +55,7 @@ func TestGetFourPillarChart(t *testing.T) {
 					EarthlyBranch: model.EarthlyBranch{Name: model.Rat, Value: model.RatValue},
 					Hour:          model.TimeOfDay{Hour: 23, Minute: 30},
 					GanZhi: model.GanZhi{
-						Name:         "Thunder Fire",
+						Name:         "Lightning fire",
 						ElementName:  "Fire",
 						ElementValue: 2,
 					},
@@ -70,7 +70,7 @@ func TestGetFourPillarChart(t *testing.T) {
 					EarthlyBranch: model.EarthlyBranch{Name: model.Pig, Value: model.PigValue},
 					Year:          1995,
 					GanZhi: model.GanZhi{
-						Name:         "Fire on the Mountain",
+						Name:         "Volcanic fire",
 						ElementName:  "Fire",
 						ElementValue: 2,
 					},

diff --git a/internal/ultis/get_ganzhi.go b/internal/ultis/get_ganzhi.go
@@ -3,66 +3,66 @@ package ultis
 import "strings"
 
 var baziMap = map[string]string{
-	"Yang Wood Rat":     "Gold in the Sea",
-	"Yin Wood Ox":       "Gold in the Sea",
-	"Yang Fire Tiger":   "Fire in the Furnace",
-	"Yin Fire Rabbit":   "Fire in the Furnace",
-	"Yang Earth Dragon": "Wood in the Great Forest",
-	"Yin Earth Snake":   "Wood in the Great Forest",
-	"Yang Metal Horse":  "Earth on the Roadside",
-	"Yin Metal Goat":    "Earth on the Roadside",
-	"Yang Water Monkey": "Gold on the Point of the Sword",
-	"Yin Water Rooster": "Gold on the Point of the Sword",
-	"Yang Wood Dog":     "Fire on the Mountain",
-	"Yin Wood Pig":      "Fire on the Mountain",
-	"Yang Fire Rat":     "Stream Water",
-	"Yin Fire Ox":       "Stream Water",
-	"Yang Earth Tiger":  "City Wall Earth",
-	"Yin Earth Rabbit":  "City Wall Earth",
-	"Yang Metal Dragon": "Waxing Gold",
-	"Yin Metal Snake":   "Waxing Gold",
-	"Yang Water Horse":  "Willow Tree Wood",
-	"Yin Water Goat":    "Willow Tree Wood",
-	"Yang Wood Monkey":  "Well Spring Water",
-	"Yin Wood Rooster":  "Well Spring Water",
-	"Yang Fire Dog":     "Earth on the Roof",
-	"Yin Fire Pig":      "Earth on the Roof",
-	"Yang Earth Rat":    "Thunder Fire",
-	"Yin Earth Ox":      "Thunder Fire",
-	"Yang Metal Tiger":  "Pine and Cypress Wood",
-	"Yin Metal Rabbit":  "Pine and Cypress Wood",
-	"Yang Water Dragon": "Flowing River Water",
-	"Yin Water Snake":   "Flowing River Water",
-	"Yang Wood Horse":   "Gold in the Sand",
-	"Yin Wood Goat":     "Gold in the Sand",
-	"Yang Fire Monkey":  "Fire at the Foot of the Mountain",
-	"Yin Fire Rooster":  "Fire at the Foot of the Mountain",
-	"Yang Earth Dog":    "Wood in the Flatland",
-	"Yin Earth Pig":     "Wood in the Flatland",
-	"Yang Metal Rat":    "Earth on the Wall",
-	"Yin Metal Ox":      "Earth on the Wall",
-	"Yang Water Tiger":  "Gold Foil",
-	"Yin Water Rabbit":  "Gold Foil",
-	"Yang Wood Dragon":  "Lamp Fire",
-	"Yin Wood Snake":    "Lamp Fire",
-	"Yang Fire Horse":   "Milky Way Water",
-	"Yin Fire Goat":     "Milky Way Water",
-	"Yang Earth Monkey": "Posthouse Earth",
-	"Yin Earth Rooster": "Posthouse Earth",
-	"Yang Metal Dog":    "Ornamental Gold",
-	"Yin Metal Pig":     "Ornamental Gold",
-	"Yang Water Rat":    "Mulberry Wood",
-	"Yin Water Ox":      "Mulberry Wood",
-	"Yang Wood Tiger":   "Big Stream Water",
-	"Yin Wood Rabbit":   "Big Stream Water",
-	"Yang Fire Dragon":  "Earth in the Sand",
-	"Yin Fire Snake":    "Earth in the Sand",
-	"Yang Earth Horse":  "Heavenly Fire",
-	"Yin Earth Goat":    "Heavenly Fire",
-	"Yang Metal Monkey": "Pomegranate Wood",
-	"Yin Metal Rooster": "Pomegranate Wood",
-	"Yang Water Dog":    "Ocean Water",
-	"Yin Water Pig":     "Ocean Water",
+	"Yang Wood Rat":     "Sea metal",
+	"Yin Wood Ox":       "Sea metal",
+	"Yang Fire Tiger":   "Furnace fire",
+	"Yin Fire Rabbit":   "Furnace fire",
+	"Yang Earth Dragon": "Forest wood",
+	"Yin Earth Snake":   "Forest wood",
+	"Yang Metal Horse":  "Road earth",
+	"Yin Metal Goat":    "Road earth",
+	"Yang Water Monkey": "Sword metal",
+	"Yin Water Rooster": "Sword metal",
+	"Yang Wood Dog":     "Volcanic fire",
+	"Yin Wood Pig":      "Volcanic fire",
+	"Yang Fire Rat":     "Cave water",
+	"Yin Fire Ox":       "Cave water",
+	"Yang Earth Tiger":  "Fortress earth",
+	"Yin Earth Rabbit":  "Fortress earth",
+	"Yang Metal Dragon": "Wax metal",
+	"Yin Metal Snake":   "Wax metal",
+	"Yang Water Horse":  "Willow wood",
+	"Yin Water Goat":    "Willow wood",
+	"Yang Wood Monkey":  "Stream water",
+	"Yin Wood Rooster":  "Stream water",
+	"Yang Fire Dog":     "Roof tiles earth",
+	"Yin Fire Pig":      "Roof tiles earth",
+	"Yang Earth Rat":    "Lightning fire",
+	"Yin Earth Ox":      "Lightning fire",
+	"Yang Metal Tiger":  "Conifer wood",
+	"Yin Metal Rabbit":  "Conifer wood",
+	"Yang Water Dragon": "River water",
+	"Yin Water Snake":   "River water",
+	"Yang Wood Horse":   "Sand metal",
+	"Yin Wood Goat":     "Sand metal",
+	"Yang Fire Monkey":  "Forest fire",
+	"Yin Fire Rooster":  "Forest fire",
+	"Yang Earth Dog":    "Meadow wood",
+	"Yin Earth Pig":     "Meadow wood",
+	"Yang Metal Rat":    "Adobe earth",
+	"Yin Metal Ox":      "Adobe earth",
+	"Yang Water Tiger":  "Precious metal",
+	"Yin Water Rabbit":  "Precious metal",
+	"Yang Wood Dragon":  "Lamp fire",
+	"Yin Wood Snake":    "Lamp fire",
+	"Yang Fire Horse":   "Sky water",
+	"Yin Fire Goat":     "Sky water",
+	"Yang Earth Monkey": "Highway earth",
+	"Yin Earth Rooster": "Highway earth",
+	"Yang Metal Dog":    "Jewellery metal",
+	"Yin Metal Pig":     "Jewellery metal",
+	"Yang Water Rat":    "Mulberry wood",
+	"Yin Water Ox":      "Mulberry wood",
+	"Yang Wood Tiger":   "Rapids water",
+	"Yin Wood Rabbit":   "Rapids water",
+	"Yang Fire Dragon":  "Desert earth",
+	"Yin Fire Snake":    "Desert earth",
+	"Yang Earth Horse":  "Sun fire",
+	"Yin Earth Goat":    "Sun fire",
+	"Yang Metal Monkey": "Pomegranate wood",
+	"Yin Metal Rooster": "Pomegranate wood",
+	"Yang Water Dog":    "Ocean water",
+	"Yin Water Pig":     "Ocean water",
 }
 
 // Function to get the corresponding element