Merge pull request #46 from PDOK/jd/marshallers

Added missing marshallers

Author: Shalucik

pkg/wfs200/crs_yaml.go

@@ -1,7 +1,5 @@
 package wfs200
 
-import "strconv"
-
 // UnmarshalYAML CRS
 func (c *CRS) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var s string
@@ -17,6 +15,6 @@ func (c *CRS) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	return nil
 }
 
-func (c *CRS) MarshalYAML() (interface{}, error) {
-	return codeSpace + ":" + strconv.Itoa(c.Code), nil
+func (c CRS) MarshalYAML() (interface{}, error) {
+	return c.String(), nil
 }

pkg/wms130/boundingbox_yaml.go

@@ -0,0 +1,24 @@
+package wms130
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// UnmarshalYAML Position
+func (p *Position) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var s string
+	if err := unmarshal(&s); err != nil {
+		return err
+	}
+
+	position := getPositionFromString(s)
+	*p = Position{position[0], position[1]}
+
+	return nil
+}
+
+// MarshalYAML Position
+func (p Position) MarshalYAML() (interface{}, error) {
+	return fmt.Sprintf("%s %s", strconv.FormatFloat(p[0], 'f', -1, 64), strconv.FormatFloat(p[1], 'f', -1, 64)), nil
+}

pkg/wms130/boundingbox_yaml_test.go

@@ -0,0 +1,52 @@
+package wms130
+
+import (
+	"testing"
+
+	"gopkg.in/yaml.v3"
+)
+
+func TestUnmarshalYAMLPosition(t *testing.T) {
+
+	var tests = []struct {
+		positionstring   []byte
+		expectedposition Position
+	}{
+		0: {positionstring: []byte(`2.52712538742158 50.2128625669452`), expectedposition: Position{2.52712538742158, 50.2128625669452}},
+		1: {positionstring: []byte(`7.37402550506231 55.7211602557705`), expectedposition: Position{7.37402550506231, 55.7211602557705}},
+		2: {positionstring: []byte(`7.37402550506231 55.7211602557705 0 1 2 3`), expectedposition: Position{7.37402550506231, 55.7211602557705}},
+	}
+
+	for k, test := range tests {
+		var pos Position
+		err := yaml.Unmarshal(test.positionstring, &pos)
+		if err != nil {
+			t.Errorf("test: %d, yaml.UnMarshal failed with '%s'\n", k, err)
+		} else {
+			if pos != test.expectedposition {
+				t.Errorf("test: %d, expected: %v+,\n got: %v+", k, test.expectedposition, pos)
+			}
+		}
+	}
+}
+
+func TestMarshalYAMLPosition(t *testing.T) {
+	var tests = []struct {
+		positionstring []byte
+		position       Position
+	}{
+		0: {positionstring: []byte("2.52712538742158 50.2128625669452\n"), position: Position{2.52712538742158, 50.2128625669452}},
+		1: {positionstring: []byte("7.37402550506231 55.7211602557705\n"), position: Position{7.37402550506231, 55.7211602557705}},
+	}
+
+	for k, test := range tests {
+		pos, err := yaml.Marshal(test.position)
+		if err != nil {
+			t.Errorf("test: %d, yaml.Marshal failed with '%s'\n", k, err)
+		} else {
+			if string(pos) != string(test.positionstring) {
+				t.Errorf("test: %d, expected: %s,\n got: %s", k, test.positionstring, pos)
+			}
+		}
+	}
+}

pkg/wsc110/boundingbox_yaml.go

@@ -1,5 +1,10 @@
 package wsc110
 
+import (
+	"fmt"
+	"strconv"
+)
+
 // UnmarshalYAML Position
 func (p *Position) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var s string
@@ -12,3 +17,8 @@ func (p *Position) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 	return nil
 }
+
+// MarshalYAML Position
+func (p Position) MarshalYAML() (interface{}, error) {
+	return fmt.Sprintf("%s %s", strconv.FormatFloat(p[0], 'f', -1, 64), strconv.FormatFloat(p[1], 'f', -1, 64)), nil
+}

pkg/wsc110/boundingbox_yaml_test.go

@@ -29,3 +29,24 @@ func TestUnmarshalYAMLPosition(t *testing.T) {
 		}
 	}
 }
+
+func TestMarshalYAMLPosition(t *testing.T) {
+	var tests = []struct {
+		positionstring []byte
+		position       Position
+	}{
+		0: {positionstring: []byte("2.52712538742158 50.2128625669452\n"), position: Position{2.52712538742158, 50.2128625669452}},
+		1: {positionstring: []byte("7.37402550506231 55.7211602557705\n"), position: Position{7.37402550506231, 55.7211602557705}},
+	}
+
+	for k, test := range tests {
+		pos, err := yaml.Marshal(test.position)
+		if err != nil {
+			t.Errorf("test: %d, yaml.Marshal failed with '%s'\n", k, err)
+		} else {
+			if string(pos) != string(test.positionstring) {
+				t.Errorf("test: %d, expected: %s,\n got: %s", k, test.positionstring, pos)
+			}
+		}
+	}
+}

pkg/wsc110/crs_yaml.go

@@ -14,3 +14,7 @@ func (c *CRS) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 	return nil
 }
+
+func (c CRS) MarshalYAML() (interface{}, error) {
+	return c.String(), nil
+}