fix: Guard converting an empty polygon.

OpenGeoscience · Jun 27, 2022 · fe970f7 · fe970f7
1 parent 3e924c6
commit fe970f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/examples/annotations/main.js b/examples/annotations/main.js
@@ -212,7 +212,7 @@ function setBrushMode(mode) {
   const annot = geo.registries.annotations[shape].func({layer: layer});
   brushLayer.addAnnotation(annot);
   annot._coordinates([{x: 0, y: 0}, {x: size, y: 0}, {x: size, y: size}, {y: size, x: 0}]);
-  brushLayer.mode('cursor', annot);
+  brushLayer.mode(brushLayer.modes.cursor, annot);
   map.draw();
 }
 

diff --git a/src/annotation/annotation.js b/src/annotation/annotation.js
@@ -754,6 +754,9 @@ var annotation = function (type, args) {
    */
   this.coordinates = function (gcs) {
     var coord = m_this._coordinates() || [];
+    if (!coord.length && (!coord.outer || !coord.outer.length)) {
+      coord = [];
+    }
     if (m_this.layer()) {
       var map = m_this.layer().map();
       gcs = (gcs === null ? map.gcs() : (

diff --git a/src/annotation/polygonAnnotation.js b/src/annotation/polygonAnnotation.js
@@ -134,7 +134,7 @@ var polygonAnnotation = function (args) {
       (coord.inner || []).forEach((h) => result[0].push(h.map((pt) => [pt.x, pt.y])));
       return result;
     }
-    if (coord.length < 3) {
+    if (coord.length < 3 || !coord.map) {
       return [];
     }
     return [[coord.map((pt) => [pt.x, pt.y])]];