Fix layer with no data

camptocamp · Nov 26, 2018 · f024bd1 · f024bd1
1 parent ff614aa
commit f024bd1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/contribs/gmf/apps/desktop/Controller.js b/contribs/gmf/apps/desktop/Controller.js
@@ -58,7 +58,7 @@ const exports = function($scope, $injector) {
    * @type {Array.<string>}
    * @export
    */
-  this.elevationLayers = ['aster', 'srtm'];
+  this.elevationLayers = ['aster', 'srtm', 'srtm-partial'];
 
   /**
    * @type {Object.<string, gmf.raster.component.LayerConfig>}
@@ -78,7 +78,8 @@ const exports = function($scope, $injector) {
    */
   this.profileLinesconfiguration = {
     'aster': {color: '#0000A0'},
-    'srtm': {color: '#00A000'}
+    'srtm': {color: '#00A000'},
+    'srtm-partial': {color: '#FF66FF'},
   };
 
   /**

diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
@@ -310,7 +310,7 @@
     <% } %>
     <script>
     document.write(
-      '<script src="https://geomapfish-demo.camptocamp.com/2.3/wsgi/dynamic.js?' +
+      '<script src="https://geomapfish-demo.camptocamp.com/sbrunner23/wsgi/dynamic.js?' +
       'interface=desktop&' +
       'query=' + encodeURIComponent(document.location.search) +
       '"><' + '/script>');

diff --git a/contribs/gmf/src/profile/component.js b/contribs/gmf/src/profile/component.js
@@ -661,6 +661,11 @@ exports.Controller_.prototype.getJsonProfile_ = function() {
 exports.Controller_.prototype.getProfileDataSuccess_ = function(resp) {
   const profileData = resp.data['profile'];
   if (profileData instanceof Array) {
+    if (profileData.length == 0) {
+      this.profileData = profileData;
+      return
+    }
+
     const nonempty_layers = [];
     for (const d of profileData) {
       for (const v in d['values']) {
@@ -670,6 +675,19 @@ exports.Controller_.prototype.getProfileDataSuccess_ = function(resp) {
       }
     }
 
+    const empty_layers = [];
+    for (const v in profileData[0]['values']) {
+      if (!nonempty_layers.includes(v)) {
+        empty_layers.push(v);
+      }
+    }
+
+    for (const d of profileData) {
+      for (const l of empty_layers) {
+        delete d['values'][l];
+      }
+    }
+
     this.profileOptions.linesConfiguration = {};
     for (const layer of nonempty_layers) {
       this.profileOptions.linesConfiguration[layer] = this.linesConfiguration_[layer];