|
@@ -23,7 +23,7 @@ function getCircleRegions(circle) {
|
|
|
function getCircles(airspaceInfos, setStyle, currentAirspaceIndex) {
|
|
function getCircles(airspaceInfos, setStyle, currentAirspaceIndex) {
|
|
|
let circles = [];
|
|
let circles = [];
|
|
|
if (!Array.isArray(airspaceInfos)) {
|
|
if (!Array.isArray(airspaceInfos)) {
|
|
|
- return { circles };
|
|
|
|
|
|
|
+ return circles;
|
|
|
}
|
|
}
|
|
|
//通过该方法获取样式
|
|
//通过该方法获取样式
|
|
|
let circleStyle = setStyle('circle');
|
|
let circleStyle = setStyle('circle');
|
|
@@ -272,10 +272,9 @@ function getMarkerSelector(polygonAndMarkers, lineAndMarkers) {
|
|
|
|
|
|
|
|
function getRegionPoints(circles, lineAndMarkers, polygonAndMarkers) {
|
|
function getRegionPoints(circles, lineAndMarkers, polygonAndMarkers) {
|
|
|
let regionPoints = new Array();
|
|
let regionPoints = new Array();
|
|
|
- if(Array.isArray(circles)) {
|
|
|
|
|
- for (let i = 0; i < circles.length; i++) {
|
|
|
|
|
- regionPoints.push(getCircleRegions(circles[i]));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
+ for (let i = 0; i < circles.length; i++) {
|
|
|
|
|
+ regionPoints.push(getCircleRegions(circles[i]));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(Array.isArray(lineAndMarkers.lines)) {
|
|
if(Array.isArray(lineAndMarkers.lines)) {
|