adapt glrender

Author: deyihu

src/geometry/Ellipse.js

@@ -88,12 +88,18 @@ class Ellipse extends CenterMixin(Polygon) {
         this.onShapeChanged();
         return this;
     }
-
     /**
      * Gets the shell of the ellipse as a polygon, number of the shell points is decided by [options.numberOfShellPoints]{@link Circle#options}
      * @return {Coordinate[]} - shell coordinates
      */
     getShell() {
+        if (this.isRotated()) {
+            return this.getRotatedShell();
+        }
+        return this._getShell();
+    }
+
+    _getShell() {
         const measurer = this._getMeasurer(),
             center = this.getCoordinates(),
             numberOfPoints = this.options['numberOfShellPoints'],
@@ -153,6 +159,9 @@ class Ellipse extends CenterMixin(Polygon) {
     }
 
     _computePrjExtent() {
+        if (this.isRotated()) {
+            return this._computeRotatedPrjExtent();
+        }
         return Circle.prototype._computePrjExtent.apply(this, arguments);
     }
 

src/geometry/Geometry.js

@@ -1132,11 +1132,7 @@ class Geometry extends JSONAble(Eventable(Handlerable(Class))) {
         const p = this._getProjection();
         this._verifyProjection();
         if (!this._extent && p) {
-            if (this.isRotated() && this._computePrjExtentForRotated) {
-                this._extent = this._computePrjExtentForRotated(p);
-            } else {
-                this._extent = this._computePrjExtent(p);
-            }
+            this._extent = this._computePrjExtent(p);
         }
         return this._extent;
     }

src/geometry/Polygon.js

@@ -223,7 +223,7 @@ class Polygon extends Path {
         //r.g. for Rectangle
         this._verifyProjection();
         if (this._getProjection() && !this._prjShell) {
-            this._prjShell = this._projectCoords(this.getShell());
+            this._prjShell = this._projectCoords(this._getShell ? this._getShell() : this.getShell());
         }
         return this._prjShell;
     }

src/geometry/Rectangle.js

@@ -107,6 +107,13 @@ class Rectangle extends Polygon {
      * @return {Coordinate[]} - shell coordinates
      */
     getShell() {
+        if (this.isRotated()) {
+            return this.getRotatedShell();
+        }
+        return this._getShell();
+    }
+
+    _getShell() {
         const measurer = this._getMeasurer();
         const nw = this._coordinates;
         const map = this.getMap();
@@ -223,6 +230,9 @@ class Rectangle extends Polygon {
     }
 
     _computePrjExtent(projection) {
+        if (this.isRotated()) {
+            return this._computeRotatedPrjExtent();
+        }
         const se = this._getSouthEast(projection);
         if (!se) {
             return null;

src/geometry/Sector.js

@@ -88,6 +88,13 @@ class Sector extends Circle {
      * @return {Coordinate[]} - shell coordinates
      */
     getShell() {
+        if (this.isRotated()) {
+            return this.getRotatedShell();
+        }
+        return this._getShell();
+    }
+
+    _getShell() {
         const measurer = this._getMeasurer(),
             center = this.getCoordinates(),
             numberOfPoints = this.options['numberOfShellPoints'] - 2,
@@ -117,6 +124,13 @@ class Sector extends Circle {
         return this._rotatePrjCoordinates(shell);
     }
 
+    _computePrjExtent() {
+        if (this.isRotated()) {
+            return this._computeRotatedPrjExtent();
+        }
+        return super._computePrjExtent();
+    }
+
     _containsPoint(point, tolerance) {
         const map = this.getMap();
         if (map.isTransforming()) {

src/renderer/geometry/VectorRenderer.js

@@ -50,7 +50,7 @@ Geometry.include({
     }
 });
 
-function _computePrjExtentForRotated() {
+function _computeRotatedPrjExtent() {
     const coord = this._getPrjShell();
     const bbox = getDefaultBBOX();
     //cal all points center
@@ -59,13 +59,25 @@ function _computePrjExtentForRotated() {
     return new Extent(minx, miny, maxx, maxy);
 }
 
+function getRotatedShell() {
+    const prjs = this._getPrjShell();
+    if (!prjs || !Array.isArray(prjs)) {
+        return [];
+    }
+    const projection = this._getProjection();
+    return prjs.map(prj => {
+        return projection.unproject(prj);
+    });
+}
+
 const el = {
     _redrawWhenPitch: () => true,
 
     _redrawWhenRotate: function () {
         return (this instanceof Ellipse) || (this instanceof Sector);
     },
-    _computePrjExtentForRotated,
+    _computeRotatedPrjExtent,
+    getRotatedShell,
 
     _paintAsPath: function () {
         //why? when rotate need draw by path
@@ -120,7 +132,8 @@ Rectangle.include({
     },
 
     _paintOn: Canvas.polygon,
-    _computePrjExtentForRotated
+    _computeRotatedPrjExtent,
+    getRotatedShell
 });
 //----------------------------------------------------
 Sector.include(el, {