Merge pull request #4260 from camptocamp/merge23b

Merge remote-tracking branch 'origin/2.3'
camptocamp · Sep 24, 2018 · a2b768d · a2b768d
2 parents 85ddfe9 + ee85ae9
commit a2b768d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
@@ -532,7 +532,7 @@ const exports = class {
         };
 
         if (ngeoFile.isKml(content)) {
-          features = new olFormatKML().readFeatures(content, readOptions);
+          features = new olFormatKML({extractStyles: false}).readFeatures(content, readOptions);
         } else if (ngeoFile.isGpx(content)) {
           features = new olFormatGPX().readFeatures(content, readOptions);
         }

diff --git a/contribs/gmf/src/profile/component.js b/contribs/gmf/src/profile/component.js
@@ -608,7 +608,7 @@ exports.Controller_.prototype.getZFactory_ = function(layerName) {
     if ('values' in item && layerName in item['values']) {
       return parseFloat(item['values'][layerName]);
     }
-    return 0;
+    return null;
   };
   return getZFn;
 };

diff --git a/examples/importfeatures.js b/examples/importfeatures.js
@@ -39,7 +39,9 @@ exports.MainController = function($scope) {
    * @private
    * @type {ol.format.KML}
    */
-  this.kmlFormat_ = new olFormatKML();
+  this.kmlFormat_ = new olFormatKML({
+    extractStyles: false
+  });
 
   /**
    * @private

diff --git a/src/profile/d3Elevation.js b/src/profile/d3Elevation.js
@@ -407,7 +407,9 @@ const exports = function(options) {
         // Configure the d3 line.
         line = d3.line()
           .x(d => x(distanceExtractor(d)))
-          .y(d => y(linesConfiguration[name].zExtractor(d)));
+          .y(d => y(linesConfiguration[name].zExtractor(d)))
+          .defined(d => d.value !== null);
+
 
         // Update path for the line.
         g.select(`.line.${name}`)