changeset 2303:e7546e318f66

merge
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 18 Feb 2019 12:16:42 +0100
parents 14ab0872a57b (current diff) 3dd2de314b1b (diff)
children ff947964c4ff
files
diffstat 3 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Maplayer.vue	Mon Feb 18 12:16:10 2019 +0100
+++ b/client/src/components/Maplayer.vue	Mon Feb 18 12:16:42 2019 +0100
@@ -303,13 +303,12 @@
     layer.data.getSource().setLoader(
       this.buildVectorLoader(
         {
-          featurePrefix: "ws-wamos",
-          featureTypes: ["ienc_dismar"],
-          geometryName: "geom" //,
-          /* restrict loading approximately to extend of danube in Austria */
-          // filter: bboxFilter("geom", [13.3, 48.0, 17.1, 48.6], "EPSG:4326")
+          featureNS: "gemma",
+          featurePrefix: "gemma",
+          featureTypes: ["distance_marks_ashore_geoserver"],
+          geometryName: "geom"
         },
-        "/external/d4d",
+        "/internal/wfs",
         layer.data.getSource()
       )
     );
--- a/schema/demo-data/published_services.sql	Mon Feb 18 12:16:10 2019 +0100
+++ b/schema/demo-data/published_services.sql	Mon Feb 18 12:16:42 2019 +0100
@@ -14,6 +14,7 @@
 INSERT INTO sys_admin.published_services (name) VALUES
     ('waterway.stretches_geoserver'),
     ('waterway.fairway_dimensions'),
+    ('waterway.distance_marks_ashore_geoserver'),
     ('waterway.distance_marks_geoserver'),
     ('waterway.sounding_results_contour_lines_geoserver'),
     ('waterway.bottlenecks_geoserver'),
--- a/schema/gemma.sql	Mon Feb 18 12:16:10 2019 +0100
+++ b/schema/gemma.sql	Mon Feb 18 12:16:42 2019 +0100
@@ -327,6 +327,16 @@
                (location_code).hectometre
             FROM distance_marks_virtual
 
+    CREATE VIEW distance_marks_ashore_geoserver AS
+        SELECT id,
+               country,
+               geom::Geometry(POINT, 4326),
+               related_enc,
+               hectom,
+               catdis,
+               position_code
+            FROM distance_marks
+
     -- We need to configure primary keys for the views used by
     -- geoserver for wfs, otherwise it will generate ids on the fly,
     -- which will change for the same feature...
@@ -625,6 +635,7 @@
 -- Configure primary keys for geoserver views
 INSERT INTO waterway.gt_pk_metadata VALUES
   ('waterway', 'distance_marks_geoserver', 'location_code'),
+  ('waterway', 'distance_marks_ashore_geoserver', 'id'),
   ('waterway', 'bottlenecks_geoserver', 'id');
 
 --