From 6626a26f7baca10773f4066de47a811a8a89d236 Mon Sep 17 00:00:00 2001
From: Ri Xu <xuri.me@gmail.com>
Date: Tue, 1 Aug 2017 16:35:18 +0800
Subject: [PATCH] Simplify code and update unit tests.

---
 excelize_test.go |  3 +++
 sheet.go         |  3 +--
 templates.go     |  4 ++--
 xmlChart.go      | 52 +++++++++++++++++++-----------------------------
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/excelize_test.go b/excelize_test.go
index c01e277..89c8ce9 100644
--- a/excelize_test.go
+++ b/excelize_test.go
@@ -598,6 +598,9 @@ func TestGetPicture(t *testing.T) {
 	// Try to get picture from a cell that doesn't contain an image.
 	file, raw = xlsx.GetPicture("Sheet2", "A2")
 	t.Log(file, len(raw))
+	xlsx.getDrawingRelationships("xl/worksheets/_rels/sheet1.xml.rels", "rId8")
+	xlsx.getDrawingRelationships("", "")
+	xlsx.getSheetRelationshipsTargetByID("", "")
 }
 
 func TestSheetVisibility(t *testing.T) {
diff --git a/sheet.go b/sheet.go
index 2f99adf..f7fcece 100644
--- a/sheet.go
+++ b/sheet.go
@@ -629,11 +629,10 @@ func (f *File) SetPanes(sheet, panes string) {
 //    xlsx.GetSheetVisible("Sheet1")
 //
 func (f *File) GetSheetVisible(name string) bool {
-	name = trimSheetName(name)
 	content := f.workbookReader()
 	visible := false
 	for k, v := range content.Sheets.Sheet {
-		if v.Name == name {
+		if v.Name == trimSheetName(name) {
 			if content.Sheets.Sheet[k].State == "" || content.Sheets.Sheet[k].State == "visible" {
 				visible = true
 			}
diff --git a/templates.go b/templates.go
index 0c6d3b3..b5f4f8c 100644
--- a/templates.go
+++ b/templates.go
@@ -1,5 +1,5 @@
-// This file contains default templates for XML files we don't yet
-// populated based on content.
+// This file contains default templates for XML files we don't yet populated
+// based on content.
 
 package excelize
 
diff --git a/xmlChart.go b/xmlChart.go
index 57bc334..3352e08 100644
--- a/xmlChart.go
+++ b/xmlChart.go
@@ -491,10 +491,7 @@ type formatChartAxis struct {
 		Italic    bool   `json:"italic"`
 		Underline bool   `json:"underline"`
 	} `json:"num_font"`
-	NameLayout struct {
-		X float64 `json:"x"`
-		Y float64 `json:"y"`
-	} `json:"name_layout"`
+	NameLayout formatLayout `json:"name_layout"`
 }
 
 // formatChart directly maps the format settings of the chart.
@@ -537,12 +534,7 @@ type formatChart struct {
 		Fill struct {
 			Color string `json:"color"`
 		} `json:"fill"`
-		Layout struct {
-			X      float64 `json:"x"`
-			Y      float64 `json:"y"`
-			Width  float64 `json:"width"`
-			Height float64 `json:"height"`
-		} `json:"layout"`
+		Layout formatLayout `json:"layout"`
 	} `json:"plotarea"`
 	ShowBlanksAs   string `json:"show_blanks_as"`
 	ShowHiddenData bool   `json:"show_hidden_data"`
@@ -552,18 +544,13 @@ type formatChart struct {
 
 // formatChartLegend directly maps the format settings of the chart legend.
 type formatChartLegend struct {
-	None         bool       `json:"none"`
-	DeleteSeries []int      `json:"delete_series"`
-	Font         formatFont `json:"font"`
-	Layout       struct {
-		X      float64 `json:"x"`
-		Y      float64 `json:"y"`
-		Width  float64 `json:"width"`
-		Height float64 `json:"height"`
-	} `json:"layout"`
-	Position        string `json:"position"`
-	ShowLegendEntry bool   `json:"show_legend_entry"`
-	ShowLegendKey   bool   `json:"show_legend_key"`
+	None            bool         `json:"none"`
+	DeleteSeries    []int        `json:"delete_series"`
+	Font            formatFont   `json:"font"`
+	Layout          formatLayout `json:"layout"`
+	Position        string       `json:"position"`
+	ShowLegendEntry bool         `json:"show_legend_entry"`
+	ShowLegendKey   bool         `json:"show_legend_key"`
 }
 
 // formatChartSeries directly maps the format settings of the chart series.
@@ -592,13 +579,16 @@ type formatChartSeries struct {
 
 // formatChartTitle directly maps the format settings of the chart title.
 type formatChartTitle struct {
-	None    bool   `json:"none"`
-	Name    string `json:"name"`
-	Overlay bool   `json:"overlay"`
-	Layout  struct {
-		X      float64 `json:"x"`
-		Y      float64 `json:"y"`
-		Width  float64 `json:"width"`
-		Height float64 `json:"height"`
-	} `json:"layout"`
+	None    bool         `json:"none"`
+	Name    string       `json:"name"`
+	Overlay bool         `json:"overlay"`
+	Layout  formatLayout `json:"layout"`
+}
+
+// formatLayout directly maps the format settings of the element layout.
+type formatLayout struct {
+	X      float64 `json:"x"`
+	Y      float64 `json:"y"`
+	Width  float64 `json:"width"`
+	Height float64 `json:"height"`
 }