haoxinlei 7 年 前
コミット
425c6ccedb
1 ファイル変更18 行追加3 行削除
  1. 18 3
      index.js

+ 18 - 3
index.js

@@ -29,7 +29,12 @@ function getCircles(airspaceInfos, setStyle, currentAirspaceIndex) {
     let circleStyle = setStyle('circle');
     for (let i = 0; i < airspaceInfos.length; i++) {
         let tmpCircle = airspaceInfos[i]
-        if (tmpCircle.airspaceType == Global.airspaceType.circle && currentAirspaceIndex != i) {
+        let airspaceTypeFix;
+        if (tmpCircle.airspaceType)
+            airspaceTypeFix = 'airspaceType';
+        else
+            airspaceTypeFix = 'airspace_type';
+        if (tmpCircle[airspaceTypeFix] == Global.airspaceType.circle && currentAirspaceIndex != i) {
             let coordinate = {};
             coordinate.latitude = latLngDegreesToDecimal(tmpCircle.lat);
             coordinate.longitude = latLngDegreesToDecimal(tmpCircle.lng);
@@ -176,7 +181,12 @@ function getLinesAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
     let lineStyle = setStyle('line');
     for (let i = 0; i < airspaceInfos.length; i++) {
         let tmpLine = airspaceInfos[i]
-        if (tmpLine.airspaceType == Global.airspaceType.line && currentAirspaceIndex != i) {
+        let airspaceTypeFix;
+        if (tmpCircle.airspaceType)
+            airspaceTypeFix = 'airspaceType';
+        else
+            airspaceTypeFix = 'airspace_type';
+        if (tmpLine[airspaceTypeFix] == Global.airspaceType.line && currentAirspaceIndex != i) {
             let { lines, markers } = getLinesRouter(tmpLine, lineStyle);
             retMarkers.push(...markers);
             retLines.push(...lines);
@@ -232,7 +242,12 @@ function getPolygonsAndMarkers(airspaceInfos, setStyle, currentAirspaceIndex) {
     let polygonAndMarkerStyle = setStyle('polygon');
     for (let i = 0; i < airspaceInfos.length; i++) {
         let polygon = airspaceInfos[i]
-        if (polygon.airspaceType == Global.airspaceType.polygon && currentAirspaceIndex != i) {
+        let airspaceTypeFix;
+        if (tmpCircle.airspaceType)
+            airspaceTypeFix = 'airspaceType';
+        else
+            airspaceTypeFix = 'airspace_type';
+        if (polygon[airspaceTypeFix] == Global.airspaceType.polygon && currentAirspaceIndex != i) {
             let retObj = getPolygon(polygon, polygonAndMarkerStyle);
             markers.push(...retObj.markers);
             polygons.push(retObj.polygon);