|
@@ -272,17 +272,26 @@ function getMarkerSelector(polygonAndMarkers, lineAndMarkers) {
|
|
|
|
|
|
|
|
function getRegionPoints(circles, lineAndMarkers, polygonAndMarkers) {
|
|
function getRegionPoints(circles, lineAndMarkers, polygonAndMarkers) {
|
|
|
let regionPoints = new Array();
|
|
let regionPoints = new Array();
|
|
|
- for (let i = 0; i < circles.length; i++) {
|
|
|
|
|
- regionPoints.push(getCircleRegions(circles[i]));
|
|
|
|
|
|
|
+ if(Array.isArray(circles)) {
|
|
|
|
|
+ for (let i = 0; i < circles.length; i++) {
|
|
|
|
|
+ regionPoints.push(getCircleRegions(circles[i]));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- let lines = lineAndMarkers.lines;
|
|
|
|
|
- for (let i = 0; i < lines.length; i++) {
|
|
|
|
|
- regionPoints.push(lines[i].coordinates);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if(Array.isArray(lineAndMarkers.lines)) {
|
|
|
|
|
+ let lines = lineAndMarkers.lines;
|
|
|
|
|
+ for (let i = 0; i < lines.length; i++) {
|
|
|
|
|
+ regionPoints.push(lines[i].coordinates);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- let polygons = getPolygonsAndMarkers.polygons;
|
|
|
|
|
- for (let i = 0; i < polygons.length; i++) {
|
|
|
|
|
- regionPoints.push(polygons.coordinates);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if(Array.isArray(lineAndMarkers.polygons)) {
|
|
|
|
|
+ let polygons = getPolygonsAndMarkers.polygons;
|
|
|
|
|
+ for (let i = 0; i < polygons.length; i++) {
|
|
|
|
|
+ regionPoints.push(polygons.coordinates);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
return regionPoints;
|
|
return regionPoints;
|
|
|
}
|
|
}
|
|
|
|
|
|