Merge pull request #5442 from camptocamp/fix-permalink

Fix permalink when no color is provided
camptocamp · Jan 21, 2020 · dfc7f76 · dfc7f76
2 parents 9d6de01 + b2a078b
commit dfc7f76
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/misc/FeatureHelper.js b/src/misc/FeatureHelper.js
@@ -974,21 +974,23 @@ FeatureHelper.prototype.getAngleProperty = function(feature) {
 
 /**
  * @param {olFeature<import("ol/geom/Geometry.js").default>} feature Feature.
- * @return {string} Color.
+ * @return {?string} Color.
  */
 FeatureHelper.prototype.getColorProperty = function(feature) {
   const color = feature.get(ngeoFormatFeatureProperties.COLOR);
-  console.assert(typeof color == 'string');
   return color;
 };
 
 
 /**
  * @param {olFeature<import("ol/geom/Geometry.js").default>} feature Feature.
- * @return {import('ol/color.js').Color} Color.
+ * @return {?import('ol/color.js').Color} Color.
  */
 FeatureHelper.prototype.getRGBAColorProperty = function(feature) {
   const color = this.getColorProperty(feature);
+  if (typeof color != 'string') {
+    return null;
+  }
   return colorFromString(color);
 };