fix

index.js

@@ -2,11 +2,9 @@ import { createSelector } from 'reselect';
 import Global from './Common';
 import { latLngDegreesToDecimal } from './Utils'
 
-export default class AmapShapesManager {
 
 
-
-    _getCircles(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getCircles(airspaceInfos, setStyle, currentAirspaceIndex) {
         let circles = [];
         if (!Array.isArray(airspaceInfos)) {
             return { circles };
@@ -34,7 +32,7 @@ export default class AmapShapesManager {
         return { circles }
     }
 
-    _getCircleSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getCircleSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
         return createSelector(
             airspaceInfos,
             () => setStyle,
@@ -43,33 +41,33 @@ export default class AmapShapesManager {
         );
     }
 
-    _isObject(arg) {
+    function _isObject(arg) {
         return typeof arg === 'object' && arg !== null;
     }
 
 
-    _hasLine(obj) {
+    function _hasLine(obj) {
         return (isObject(obj)
             && isSafeString(obj.addr)
             && isSafeString(obj.lat)
             && isSafeString(obj.lng));
     }
 
-    _hasPoint(obj) {
+    function _hasPoint(obj) {
         return (isObject(obj)
             && isSafeString(obj.lat)
             && isSafeString(obj.lng));
     }
 
 
-    _drawLineConfig(lat, lng) {
+    function _drawLineConfig(lat, lng) {
         let coordinate = {};
         coordinate.latitude = latLngDegreesToDecimal(lat);
         coordinate.longitude = latLngDegreesToDecimal(lng);
         return coordinate;
     }
 
-    _addOvalPointConfig(lat, lng, imageName) {
+    function _addOvalPointConfig(lat, lng, imageName) {
         let coordinate = {};
         coordinate.latitude = latLngDegreesToDecimal(lat);
         coordinate.longitude = latLngDegreesToDecimal(lng);
@@ -82,7 +80,7 @@ export default class AmapShapesManager {
     }
 
 
-    _getAirwayLine(airway, pointBefore, pointAfter, lineAndMarkerStyle) {
+    function _getAirwayLine(airway, pointBefore, pointAfter, lineAndMarkerStyle) {
         let found = 0
         let points = []
 
@@ -113,7 +111,7 @@ export default class AmapShapesManager {
 
 
 
-    _getLinesRouter(lineProps, lineAndMarkerStyle) {
+    function _getLinesRouter(lineProps, lineAndMarkerStyle) {
         let coordinates = new Array();
         let markers = new Array();
         let lines = []
@@ -171,7 +169,7 @@ export default class AmapShapesManager {
 
     }
 
-    _getLinesAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getLinesAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
         let retLines = [];
         let retMarkers = [];
         if (!Array.isArray(airspaceInfos)) {
@@ -191,7 +189,7 @@ export default class AmapShapesManager {
     }
 
 
-    _getLineAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getLineAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
         return createSelector(
             airspaceInfos,
             () => setStyle,
@@ -200,7 +198,7 @@ export default class AmapShapesManager {
         );
     }
 
-    _getPolygon = (polygonProps, polygonAndMarkerStyle) => {
+    function _getPolygon(polygonProps, polygonAndMarkerStyle) {
         let coordinates = new Array();
         let markers = new Array();
 
@@ -227,7 +225,7 @@ export default class AmapShapesManager {
     }
 
 
-    _getPolygonsAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getPolygonsAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
         let markers = [];
         let polygons = [];
         if (!Array.isArray(airspaceInfos)) {
@@ -246,7 +244,7 @@ export default class AmapShapesManager {
 
     }
 
-    _getPolygonAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
+    function _getPolygonAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex) {
         return createSelector(
             airspaceInfos,
             () => setStyle,
@@ -255,7 +253,7 @@ export default class AmapShapesManager {
         );
     }
 
-    _getMarkers(polygonAndMarkers,lineAndMarkers){
+    function _getMarkers(polygonAndMarkers,lineAndMarkers){
         let markers = [];
         if (polygonAndMarkers) {
             markers = [...polygonAndMarkers.markers]
@@ -266,7 +264,7 @@ export default class AmapShapesManager {
         return markers
     }
 
-    _getMarkerSelector(polygonAndMarkers,lineAndMarkers) {
+    function _getMarkerSelector(polygonAndMarkers,lineAndMarkers) {
         return createSelector(
             polygonAndMarkers,
             lineAndMarkers,
@@ -275,7 +273,7 @@ export default class AmapShapesManager {
     }
 
 
-    static getShapesSelect(airspaceInfos, setStyle, currentAirspaceIndex) {
+    export function getShapesSelect(airspaceInfos, setStyle, currentAirspaceIndex) {
         currentAirspaceIndex = currentAirspaceIndex ? currentAirspaceIndex : () => -1;
         let circles = this._getCircleSelector(airspaceInfos, setStyle, currentAirspaceIndex);
         let lineAndMarkers = this._getLineAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceIndex);
@@ -289,7 +287,7 @@ export default class AmapShapesManager {
         }
     }
 
-    static getShapes(airspaceInfos, setStyle, currentAirspaceIndex) {
+    export function getShapes(airspaceInfos, setStyle, currentAirspaceIndex) {
         currentAirspaceIndex = currentAirspaceIndex ? currentAirspaceIndex : () => -1;
         let circles = this._getCircles(airspaceInfos, setStyle, currentAirspaceIndex);
         let lineAndMarkers = this._getLinesAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex);
@@ -302,4 +300,3 @@ export default class AmapShapesManager {
             polygonAndMarkers
         }
     }
-}