Merge pull request openlayers#14962 from mike-000/fromExtent

Cannot create polygon from empty extent
skytangleisky · Aug 1, 2023 · 0b90e81 · 0b90e81
2 parents e532713 + 78aa961
commit 0b90e81
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js
@@ -5,7 +5,7 @@ import LinearRing from './LinearRing.js';
 import Point from './Point.js';
 import SimpleGeometry from './SimpleGeometry.js';
 import {arrayMaxSquaredDelta, assignClosestArrayPoint} from './flat/closest.js';
-import {closestSquaredDistanceXY, getCenter} from '../extent.js';
+import {closestSquaredDistanceXY, getCenter, isEmpty} from '../extent.js';
 import {deflateCoordinatesArray} from './flat/deflate.js';
 import {extend} from '../array.js';
 import {getInteriorPointOfArray} from './flat/interiorpoint.js';
@@ -438,6 +438,9 @@ export function circular(center, radius, n, sphereRadius) {
  * @api
  */
 export function fromExtent(extent) {
+  if (isEmpty(extent)) {
+    throw new Error('Cannot create polygon from empty extent');
+  }
   const minX = extent[0];
   const minY = extent[1];
   const maxX = extent[2];

diff --git a/test/node/ol/geom/Polygon.test.js b/test/node/ol/geom/Polygon.test.js
@@ -5,7 +5,11 @@ import Polygon, {
   fromExtent,
 } from '../../../../src/ol/geom/Polygon.js';
 import expect from '../../expect.js';
-import {boundingExtent, isEmpty} from '../../../../src/ol/extent.js';
+import {
+  boundingExtent,
+  createEmpty,
+  isEmpty,
+} from '../../../../src/ol/extent.js';
 
 describe('ol/geom/Polygon.js', function () {
   it('cannot be constructed with a null geometry', function () {
@@ -693,6 +697,12 @@ describe('ol/geom/Polygon.js', function () {
       const orientedFlatCoordinates = polygon.getOrientedFlatCoordinates();
       expect(orientedFlatCoordinates).to.eql([1, 2, 1, 5, 3, 5, 3, 2, 1, 2]);
     });
+
+    it('throws on empty extent', function () {
+      expect(function () {
+        fromExtent(createEmpty());
+      }).to.throwException();
+    });
   });
 
   describe('fromCircle()', function () {