# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1567779456 -7200
# Node ID 6a1fef54d49fc377335d7b5ee5f398f9cfdc9cc9
# Parent  e58affd956c535c414da2633cc17ee29e22e83cb
Always associate style with layer

Even if the uploaded style existed before, the layer might not be
associated with it (e.g. because the layer was re-created without
style). Thus always (re-)create the association.

diff -r e58affd956c5 -r 6a1fef54d49f pkg/geoserver/boot.go
--- a/pkg/geoserver/boot.go	Fri Sep 06 14:39:21 2019 +0200
+++ b/pkg/geoserver/boot.go	Fri Sep 06 16:17:36 2019 +0200
@@ -507,28 +507,26 @@
 
 	// Third associate with layer
 
-	if create {
-		req, err := http.NewRequest(
-			http.MethodPost,
-			geoURL+"/rest/layers/"+
-				url.PathEscape(workspaceName+":"+entry.Name)+
-				"/styles?default=true",
-			toStream(&styleFilename))
-		if err != nil {
-			return err
-		}
-		auth(req)
-		asJSON(req)
+	req, err = http.NewRequest(
+		http.MethodPost,
+		geoURL+"/rest/layers/"+
+			url.PathEscape(workspaceName+":"+entry.Name)+
+			"/styles?default=true",
+		toStream(&styleFilename))
+	if err != nil {
+		return err
+	}
+	auth(req)
+	asJSON(req)
 
-		resp, err = http.DefaultClient.Do(req)
-		if err != nil {
-			return err
-		}
+	resp, err = http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
 
-		if resp.StatusCode != http.StatusCreated {
-			return fmt.Errorf("cannot connect style %s with layer (%s)",
-				entry.Name, http.StatusText(resp.StatusCode))
-		}
+	if resp.StatusCode != http.StatusCreated {
+		return fmt.Errorf("cannot connect style %s with layer (%s)",
+			entry.Name, http.StatusText(resp.StatusCode))
 	}
 
 	return nil