changeset 4688:ad271887fd8d

Added FeatureInfo for sounding results including surtyp attribute.
author Raimund Renkert <raimund@renkert.org>
date Wed, 16 Oct 2019 13:43:30 +0200
parents f73868037365
children 1653b13e0db6
files client/src/components/identify/formatter.js client/src/store/map.js schema/default_sysconfig.sql schema/updates/1305/01.update_sr_geoserv.sql schema/version.sql
diffstat 5 files changed, 46 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/identify/formatter.js	Wed Oct 16 13:02:08 2019 +0200
+++ b/client/src/components/identify/formatter.js	Wed Oct 16 13:43:30 2019 +0200
@@ -113,6 +113,14 @@
 
       return p;
     }
+  },
+  sounding_results_areas_geoserver: {
+    props: p => {
+      let propsToRemove = ["height"];
+      if (propsToRemove.indexOf(p.key) !== -1) return null;
+
+      return p;
+    }
   }
 };
 
--- a/client/src/store/map.js	Wed Oct 16 13:02:08 2019 +0200
+++ b/client/src/store/map.js	Wed Oct 16 13:43:30 2019 +0200
@@ -523,6 +523,32 @@
             commit("addIdentifiedFeatures", features);
           });
         }
+        var srSource = map.getLayer("BOTTLENECKISOLINE").getSource();
+        var srUrl = srSource.getGetFeatureInfoUrl(
+          event.coordinate,
+          currentResolution /* resolution */,
+          "EPSG:3857",
+          // { INFO_FORMAT: "application/vnd.ogc.gml" } // not allowed by d4d
+          { INFO_FORMAT: "application/json" }
+        );
+
+        if (srUrl) {
+          HTTP.get(srUrl + "&BUFFER=5", {
+            headers: {
+              "X-Gemma-Auth": localStorage.getItem("token")
+            }
+          }).then(response => {
+            let features = response.data.features.map(f => {
+              let feat = new Feature({
+                geometry: new Point(f.geometry.coordinates)
+              });
+              feat.setId(f.id);
+              feat.setProperties(f.properties);
+              return feat;
+            });
+            commit("addIdentifiedFeatures", features);
+          });
+        }
       });
     },
     refreshLayers({ state }) {
--- a/schema/default_sysconfig.sql	Wed Oct 16 13:02:08 2019 +0200
+++ b/schema/default_sysconfig.sql	Wed Oct 16 13:43:30 2019 +0200
@@ -190,7 +190,8 @@
         SELECT bottleneck_id,
             date_info,
             height,
-            areas
+            areas,
+            surtyp
         FROM waterway.sounding_results_iso_areas ia
             JOIN waterway.sounding_results sr ON sr.id = ia.sounding_result_id
     $$),
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/updates/1305/01.update_sr_geoserv.sql	Wed Oct 16 13:43:30 2019 +0200
@@ -0,0 +1,9 @@
+UPDATE sys_admin.published_services SET view_def = $$
+        SELECT bottleneck_id,
+            date_info,
+            height,
+            areas,
+            surtyp
+        FROM waterway.sounding_results_iso_areas ia
+            JOIN waterway.sounding_results sr ON sr.id = ia.sounding_result_id
+    $$ WHERE name = 'sounding_results_areas_geoserver';
\ No newline at end of file
--- a/schema/version.sql	Wed Oct 16 13:02:08 2019 +0200
+++ b/schema/version.sql	Wed Oct 16 13:43:30 2019 +0200
@@ -1,1 +1,1 @@
-INSERT INTO gemma_schema_version(version) VALUES (1304);
+INSERT INTO gemma_schema_version(version) VALUES (1305);