# HG changeset patch
# User Fadi Abbud <fadi.abbud@intevation.de>
# Date 1583754107 -3600
# Node ID c4f90dcd7c156ef8d981840ca19bec2f76aeead0
# Parent  e916651d3f93ff7c8a30a072bcb94d05a0730de6# Parent  9e210879bd884d56c7857d0ec966033a4aabb999
merge default into time-slinding branch

diff -r e916651d3f93 -r c4f90dcd7c15 schema/default_sysconfig.sql
--- a/schema/default_sysconfig.sql	Fri Mar 06 17:21:20 2020 +0100
+++ b/schema/default_sysconfig.sql	Mon Mar 09 12:41:47 2020 +0100
@@ -96,12 +96,15 @@
     ('waterway', 'waterway_area', NULL, NULL, NULL),
     ('waterway', 'waterway_profiles', NULL, NULL, NULL),
     ('waterway', 'fairway_dimensions', NULL, NULL, NULL),
-    ('waterway', 'fairway_marks_bcnlat', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_bcnlat_hydro', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_bcnlat_ienc', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_boycar', NULL, NULL, NULL),
-    ('waterway', 'fairway_marks_boylat', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_boylat_hydro', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_boylat_ienc', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_boysaw', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_boyspp', NULL, NULL, NULL),
-    ('waterway', 'fairway_marks_daymar', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_daymar_hydro', NULL, NULL, NULL),
+    ('waterway', 'fairway_marks_daymar_ienc', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_lights', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_rtpbcn', NULL, NULL, NULL),
     ('waterway', 'fairway_marks_topmar', NULL, NULL, NULL),
@@ -291,12 +294,15 @@
 INSERT INTO sys_admin.layer_groups VALUES ('fairway_marks');
 
 INSERT INTO sys_admin.grouped_layers VALUES
-  ('fairway_marks', 'waterway', 'fairway_marks_boylat', 0),
+  ('fairway_marks', 'waterway', 'fairway_marks_boylat_hydro', 0),
+  ('fairway_marks', 'waterway', 'fairway_marks_boylat_ienc', 0),
   ('fairway_marks', 'waterway', 'fairway_marks_boycar', 1),
-  ('fairway_marks', 'waterway', 'fairway_marks_bcnlat', 2),
+  ('fairway_marks', 'waterway', 'fairway_marks_bcnlat_hydro', 2),
+  ('fairway_marks', 'waterway', 'fairway_marks_bcnlat_ienc', 2),
   ('fairway_marks', 'waterway', 'fairway_marks_boysaw', 3),
   ('fairway_marks', 'waterway', 'fairway_marks_boyspp', 4),
-  ('fairway_marks', 'waterway', 'fairway_marks_daymar', 5),
+  ('fairway_marks', 'waterway', 'fairway_marks_daymar_hydro', 5),
+  ('fairway_marks', 'waterway', 'fairway_marks_daymar_ienc', 5),
   ('fairway_marks', 'waterway', 'fairway_marks_lights', 6),
   ('fairway_marks', 'waterway', 'fairway_marks_rtpbcn', 7),
   ('fairway_marks', 'waterway', 'fairway_marks_topmar', 8),
diff -r e916651d3f93 -r c4f90dcd7c15 schema/updates/1410/01.distinct_hydro_ienc_layers.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/updates/1410/01.distinct_hydro_ienc_layers.sql	Mon Mar 09 12:41:47 2020 +0100
@@ -0,0 +1,31 @@
+INSERT INTO sys_admin.published_services (
+    schema, name, style
+) VALUES
+    ('waterway', 'fairway_marks_bcnlat_ienc', (
+        SELECT style FROM sys_admin.published_services
+        WHERE schema = 'waterway' AND name = 'fairway_marks_bcnlat')),
+    ('waterway', 'fairway_marks_boylat_ienc', (
+        SELECT style FROM sys_admin.published_services
+        WHERE schema = 'waterway' AND name = 'fairway_marks_boylat')),
+    ('waterway', 'fairway_marks_daymar_ienc', (
+        SELECT style FROM sys_admin.published_services
+        WHERE schema = 'waterway' AND name = 'fairway_marks_daymar'));
+
+INSERT INTO sys_admin.grouped_layers VALUES
+  ('fairway_marks', 'waterway', 'fairway_marks_boylat_ienc', 0),
+  ('fairway_marks', 'waterway', 'fairway_marks_bcnlat_ienc', 2),
+  ('fairway_marks', 'waterway', 'fairway_marks_daymar_ienc', 5);
+
+WITH upd AS (
+    UPDATE sys_admin.grouped_layers
+        SET name = name || '_hydro'
+        WHERE schema = 'waterway' AND name IN(
+            'fairway_marks_bcnlat',
+            'fairway_marks_boylat',
+            'fairway_marks_daymar'))
+UPDATE sys_admin.published_services
+    SET name = name || '_hydro'
+    WHERE schema = 'waterway' AND name IN(
+        'fairway_marks_bcnlat',
+        'fairway_marks_boylat',
+        'fairway_marks_daymar');
diff -r e916651d3f93 -r c4f90dcd7c15 schema/version.sql
--- a/schema/version.sql	Fri Mar 06 17:21:20 2020 +0100
+++ b/schema/version.sql	Mon Mar 09 12:41:47 2020 +0100
@@ -1,1 +1,1 @@
-INSERT INTO gemma_schema_version(version) VALUES (1409);
+INSERT INTO gemma_schema_version(version) VALUES (1410);