Mercurial > gemma

changeset 4992:ac846e085553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Distinguish between HYDRO and IENC features in layer names This will enable correct display of pretty names in the client.
author Tom Gottfried <tom@intevation.de>
date Fri, 06 Mar 2020 18:28:42 +0100
parents 6a48e5c6fe2f
children 9e210879bd88
files schema/default_sysconfig.sql schema/updates/1410/01.distinct_hydro_ienc_layers.sql
diffstat 2 files changed, 43 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/schema/default_sysconfig.sql	Fri Mar 06 11:06:27 2020 +0100
+++ b/schema/default_sysconfig.sql	Fri Mar 06 18:28:42 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),
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/updates/1410/01.distinct_hydro_ienc_layers.sql	Fri Mar 06 18:28:42 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');