Browse Source

fix add marker

wd 7 years ago
parent
commit
2463dfca44
1 changed files with 7 additions and 3 deletions
  1. 7 3
      index.js

+ 7 - 3
index.js

@@ -436,8 +436,11 @@ function getPolygonAndMarkerSelector(airspaceInfos, setStyle, currentAirspaceInd
     );
 }
 
-function getMarkers(polygonAndMarkers, lineAndMarkers) {
+function getMarkers(circlesAndMarkers, polygonAndMarkers, lineAndMarkers) {
     let markers = [];
+    if (circlesAndMarkers) {
+        markers = [...circlesAndMarkers.markers]
+    }
     if (polygonAndMarkers) {
         markers = [...polygonAndMarkers.markers]
     }
@@ -447,8 +450,9 @@ function getMarkers(polygonAndMarkers, lineAndMarkers) {
     return markers
 }
 
-function getMarkerSelector(polygonAndMarkers, lineAndMarkers) {
+function getMarkerSelector(circlesAndMarkers, polygonAndMarkers, lineAndMarkers) {
     return createSelector(
+        circlesAndMarkers,
         polygonAndMarkers,
         lineAndMarkers,
         getMarkers
@@ -534,7 +538,7 @@ export function getShapesSelector(airspaceInfos, style, currentAirspaceIndex) {
     let lines = getLineSelector(linePolygonsAndMarkers);
     let polygonAndMarkers = getPolygonAndMarkerSelector(airspaceInfos, setStyle(style), currentAirspaceIndex);
     let polygons = getPolygonSelector(polygonAndMarkers, linePolygonsAndMarkers);
-    let markers = getMarkerSelector(polygonAndMarkers, linePolygonsAndMarkers);
+    let markers = getMarkerSelector(circlesAndMarkers, polygonAndMarkers, linePolygonsAndMarkers);
     let regionPoints = getRegionPointsSelector(circles, linePolygonsAndMarkers, polygonAndMarkers);
     return {
         markers,