@kando-env/kando-ui 1.2.227 → 1.2.228-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/lib/Widgets/Map/Map.js +86 -17
  2. package/lib/Widgets/Map/Map.scss +65 -0
  3. package/lib/Widgets/Map/MapUtils.js +27 -15
  4. package/lib/Widgets/Map/areas/AreaPolygons.js +2 -2
  5. package/lib/Widgets/Map/edges/Edges.js +17 -2
  6. package/lib/Widgets/Map/events/EventUtils.js +13 -9
  7. package/lib/Widgets/Map/events/NetworkForSpecificEvent.js +9 -2
  8. package/lib/Widgets/Map/events/PointOfEvent.js +12 -9
  9. package/lib/Widgets/Map/points/PointIcon.js +60 -0
  10. package/lib/Widgets/Map/points/PointIcon.scss +244 -0
  11. package/lib/Widgets/Map/points/PointMarker.js +22 -20
  12. package/lib/Widgets/Map/points/PointMarkers.js +90 -22
  13. package/lib/Widgets/Map/points/PointUtils.js +95 -32
  14. package/lib/assets/icons/pin/pin-matash-white.svg +8 -42
  15. package/lib/assets/icons/plus_v.svg +13 -0
  16. package/lib/assets/icons/water_reuse.svg +27 -0
  17. package/lib/assets/map/pin-matash-clicked.svg +12 -0
  18. package/lib/assets/map/pin-matash-white.svg +8 -28
  19. package/lib/assets/map/pin-plant-clicked.svg +10 -0
  20. package/lib/assets/map/pin-plant-white.svg +6 -28
  21. package/lib/assets/map/pin-suction-clicked.svg +10 -0
  22. package/lib/assets/map/pin-water-clicked.svg +11 -0
  23. package/lib/assets/map/pin-water.svg +7 -17
  24. package/lib/assets/point_icons/WWTP-icon.svg +8 -21
  25. package/lib/assets/point_icons/factory-icon.svg +6 -21
  26. package/lib/assets/point_icons/pump-station-icon.svg +6 -16
  27. package/lib/hooks/useMap.js +4 -18
  28. package/lib/i18n/en.json +8 -7
  29. package/lib/i18n/he.json +3 -0
  30. package/lib/macros/getVersion.js +2 -2
  31. package/lib/pages/UtilityDashboardPage/UtilityDashboardMapContainer/UtilityDashboardMapContainer.js +2 -2
  32. package/lib/utilities/edgesMath.js +6 -3
  33. package/lib/utilities/map/icons.js +23 -7
  34. package/package.json +5 -3
@@ -11,11 +11,9 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _reactRedux = require("react-redux");
13
13
 
14
- var _useRemoveExistingLayers = _interopRequireWildcard(require("hooks/useRemoveExistingLayers"));
15
-
16
14
  var _PointUtils = require("./PointUtils");
17
15
 
18
- var _MapUtils = require("../MapUtils");
16
+ require("leaflet.featuregroup.subgroup");
19
17
 
20
18
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
21
19
 
@@ -31,29 +29,33 @@ function mapStateToProps(state) {
31
29
  var PointMarker = function PointMarker(props) {
32
30
  var map = props.map,
33
31
  point = props.point,
34
- rerender = props.rerender;
35
- (0, _useRemoveExistingLayers.default)(map, point, 'Point');
36
- (0, _useRemoveExistingLayers.default)(map, point, 'Observation');
37
- (0, _useRemoveExistingLayers.default)(map, point, 'Sampling');
38
- (0, _useRemoveExistingLayers.default)(map, point, 'IconNumber');
32
+ rerender = props.rerender,
33
+ layerGroup = props.layerGroup; // useRemoveExistingLayers(map, point, 'Point');
34
+ // useRemoveExistingLayers(map, point, 'Observation');
35
+ // useRemoveExistingLayers(map, point, 'Sampling');
36
+ // useRemoveExistingLayers(map, point, 'IconNumber');
39
37
 
40
38
  var renderLogic = function renderLogic() {
41
39
  var markerLocation = [point['latitude'], point['longitude']];
42
40
  if (markerLocation[0] === null) return;
43
- (0, _PointUtils.createManholePoint)(markerLocation, point, map);
44
- (0, _PointUtils.createBubblePoint)(markerLocation, point, map);
41
+ (0, _PointUtils.createBubblePoint)(markerLocation, point, map, null, layerGroup);
42
+
43
+ if (point.group.type === 'Groups::Factory') {
44
+ (0, _PointUtils.bindPopupToMarker)(point, layerGroup); //The following is being called for every point, we should do that on the layerGroup level which will happen once
45
+ //It is noticed when there are thousands of points
46
+
47
+ (0, _PointUtils.handleMarkerClick)(map, point, layerGroup);
48
+ }
45
49
  };
46
50
 
47
51
  (0, _react.useEffect)(function () {
48
- renderLogic();
49
- (0, _MapUtils.iconZoomControl)(map);
50
- return function cleanup() {
51
- // UNBIND POPUP
52
- (0, _useRemoveExistingLayers.removeFromMap)(map, point, 'Observation');
53
- (0, _useRemoveExistingLayers.removeFromMap)(map, point, 'Point');
54
- (0, _useRemoveExistingLayers.removeFromMap)(map, point, 'Sampling');
55
- (0, _useRemoveExistingLayers.removeFromMap)(map, point, 'IconNumber');
56
- };
52
+ renderLogic(); // return function cleanup() {
53
+ // // UNBIND POPUP
54
+ // removeFromMap(map, point, 'Observation');
55
+ // removeFromMap(map, point, 'Point');
56
+ // removeFromMap(map, point, 'Sampling');
57
+ // removeFromMap(map, point, 'IconNumber');
58
+ // };
57
59
  }, [rerender]);
58
60
  return /*#__PURE__*/_react.default.createElement("div", null);
59
61
  };
@@ -69,4 +71,4 @@ var _default = connector( /*#__PURE__*/_react.default.memo(PointMarker, function
69
71
  }));
70
72
 
71
73
  exports.default = _default;
72
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9XaWRnZXRzL01hcC9wb2ludHMvUG9pbnRNYXJrZXIudHN4Il0sIm5hbWVzIjpbIm1hcFN0YXRlVG9Qcm9wcyIsInN0YXRlIiwiZXZlbnRzX2RhdGEiLCJQb2ludE1hcmtlciIsInByb3BzIiwibWFwIiwicG9pbnQiLCJyZXJlbmRlciIsInJlbmRlckxvZ2ljIiwibWFya2VyTG9jYXRpb24iLCJjbGVhbnVwIiwiY29ubmVjdG9yIiwiUmVhY3QiLCJtZW1vIiwicHJldlByb3BzIiwibmV4dFByb3BzIiwiZm9jdXNlZEV2ZW50Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFLQTs7QUFFQTs7Ozs7O0FBRUEsU0FBU0EsZUFBVCxDQUF5QkMsS0FBekIsRUFBMkM7QUFDekMsTUFBUUMsV0FBUixHQUF3QkQsS0FBeEIsQ0FBUUMsV0FBUjtBQUVBLFNBQU87QUFDTEEsSUFBQUEsV0FBVyxFQUFYQTtBQURLLEdBQVA7QUFHRDs7QUFRRCxJQUFNQyxXQUE0QixHQUFHLFNBQS9CQSxXQUErQixDQUFDQyxLQUFELEVBQVc7QUFDOUMsTUFBUUMsR0FBUixHQUFpQ0QsS0FBakMsQ0FBUUMsR0FBUjtBQUFBLE1BQWFDLEtBQWIsR0FBaUNGLEtBQWpDLENBQWFFLEtBQWI7QUFBQSxNQUFvQkMsUUFBcEIsR0FBaUNILEtBQWpDLENBQW9CRyxRQUFwQjtBQUVBLHdDQUF3QkYsR0FBeEIsRUFBNkJDLEtBQTdCLEVBQW9DLE9BQXBDO0FBQ0Esd0NBQXdCRCxHQUF4QixFQUE2QkMsS0FBN0IsRUFBb0MsYUFBcEM7QUFDQSx3Q0FBd0JELEdBQXhCLEVBQTZCQyxLQUE3QixFQUFvQyxVQUFwQztBQUNBLHdDQUF3QkQsR0FBeEIsRUFBNkJDLEtBQTdCLEVBQW9DLFlBQXBDOztBQUVBLE1BQU1FLFdBQVcsR0FBRyxTQUFkQSxXQUFjLEdBQU07QUFDeEIsUUFBSUMsY0FBMkIsR0FBRyxDQUFDSCxLQUFLLENBQUMsVUFBRCxDQUFOLEVBQW9CQSxLQUFLLENBQUMsV0FBRCxDQUF6QixDQUFsQztBQUNBLFFBQUlHLGNBQWMsQ0FBQyxDQUFELENBQWQsS0FBc0IsSUFBMUIsRUFBZ0M7QUFFaEMsd0NBQW1CQSxjQUFuQixFQUFtQ0gsS0FBbkMsRUFBMENELEdBQTFDO0FBQ0EsdUNBQWtCSSxjQUFsQixFQUFrQ0gsS0FBbEMsRUFBeUNELEdBQXpDO0FBQ0QsR0FORDs7QUFRQSx3QkFBVSxZQUFNO0FBQ2RHLElBQUFBLFdBQVc7QUFDWCxtQ0FBZ0JILEdBQWhCO0FBRUEsV0FBTyxTQUFTSyxPQUFULEdBQW1CO0FBQ3hCO0FBQ0Esa0RBQWNMLEdBQWQsRUFBbUJDLEtBQW5CLEVBQTBCLGFBQTFCO0FBQ0Esa0RBQWNELEdBQWQsRUFBbUJDLEtBQW5CLEVBQTBCLE9BQTFCO0FBQ0Esa0RBQWNELEdBQWQsRUFBbUJDLEtBQW5CLEVBQTBCLFVBQTFCO0FBQ0Esa0RBQWNELEdBQWQsRUFBbUJDLEtBQW5CLEVBQTBCLFlBQTFCO0FBQ0QsS0FORDtBQU9ELEdBWEQsRUFXRyxDQUFDQyxRQUFELENBWEg7QUFhQSxzQkFBTyx5Q0FBUDtBQUNELENBOUJEOztBQWdDQSxJQUFNSSxTQUFTLEdBQUcseUJBQVFYLGVBQVIsQ0FBbEI7O2VBQ2VXLFNBQVMsZUFDdEJDLGVBQU1DLElBQU4sQ0FBV1YsV0FBWCxFQUF3QixVQUFDVyxTQUFELEVBQVlDLFNBQVosRUFBMEI7QUFDaEQsTUFDRUQsU0FBUyxDQUFDWixXQUFWLENBQXNCYyxZQUF0QixLQUF1Q0QsU0FBUyxDQUFDYixXQUFWLENBQXNCYyxZQUQvRCxFQUVFO0FBQ0EsV0FBTyxLQUFQO0FBQ0Q7O0FBRUQsU0FBTyxJQUFQO0FBQ0QsQ0FSRCxDQURzQixDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0LCB7IHVzZUVmZmVjdCB9IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IGNvbm5lY3QsIENvbm5lY3RlZFByb3BzIH0gZnJvbSAncmVhY3QtcmVkdXgnO1xuaW1wb3J0IHVzZVJlbW92ZUV4aXN0aW5nTGF5ZXJzLCB7XG4gIHJlbW92ZUZyb21NYXAsXG59IGZyb20gJ3NyYy9ob29rcy91c2VSZW1vdmVFeGlzdGluZ0xheWVycyc7XG5pbXBvcnQgeyBJQXBwU3RhdGUgfSBmcm9tICdzcmMvbW9kZWxzL0lBcHBTdGF0ZSc7XG5pbXBvcnQgeyBJUG9pbnQgfSBmcm9tICdzcmMvc3RvcmUvcG9pbnRzL21vZGVscy9JUG9pbnQnO1xuaW1wb3J0IHsgY3JlYXRlQnViYmxlUG9pbnQsIGNyZWF0ZU1hbmhvbGVQb2ludCB9IGZyb20gJy4vUG9pbnRVdGlscyc7XG5pbXBvcnQgeyBMYXRMbmdUdXBsZSB9IGZyb20gJ2xlYWZsZXQnO1xuaW1wb3J0IHsgaWNvblpvb21Db250cm9sIH0gZnJvbSAnLi4vTWFwVXRpbHMnO1xuXG5mdW5jdGlvbiBtYXBTdGF0ZVRvUHJvcHMoc3RhdGU6IElBcHBTdGF0ZSkge1xuICBjb25zdCB7IGV2ZW50c19kYXRhIH0gPSBzdGF0ZTtcblxuICByZXR1cm4ge1xuICAgIGV2ZW50c19kYXRhLFxuICB9O1xufVxuXG50eXBlIFByb3BzID0gQ29ubmVjdGVkUHJvcHM8dHlwZW9mIGNvbm5lY3Rvcj4gJiB7XG4gIG1hcDogYW55O1xuICBwb2ludDogSVBvaW50O1xuICByZXJlbmRlcjogYm9vbGVhbjtcbn07XG5cbmNvbnN0IFBvaW50TWFya2VyOiBSZWFjdC5GQzxQcm9wcz4gPSAocHJvcHMpID0+IHtcbiAgY29uc3QgeyBtYXAsIHBvaW50LCByZXJlbmRlciB9ID0gcHJvcHM7XG5cbiAgdXNlUmVtb3ZlRXhpc3RpbmdMYXllcnMobWFwLCBwb2ludCwgJ1BvaW50Jyk7XG4gIHVzZVJlbW92ZUV4aXN0aW5nTGF5ZXJzKG1hcCwgcG9pbnQsICdPYnNlcnZhdGlvbicpO1xuICB1c2VSZW1vdmVFeGlzdGluZ0xheWVycyhtYXAsIHBvaW50LCAnU2FtcGxpbmcnKTtcbiAgdXNlUmVtb3ZlRXhpc3RpbmdMYXllcnMobWFwLCBwb2ludCwgJ0ljb25OdW1iZXInKTtcblxuICBjb25zdCByZW5kZXJMb2dpYyA9ICgpID0+IHtcbiAgICBsZXQgbWFya2VyTG9jYXRpb246IExhdExuZ1R1cGxlID0gW3BvaW50WydsYXRpdHVkZSddLCBwb2ludFsnbG9uZ2l0dWRlJ11dO1xuICAgIGlmIChtYXJrZXJMb2NhdGlvblswXSA9PT0gbnVsbCkgcmV0dXJuO1xuXG4gICAgY3JlYXRlTWFuaG9sZVBvaW50KG1hcmtlckxvY2F0aW9uLCBwb2ludCwgbWFwKTtcbiAgICBjcmVhdGVCdWJibGVQb2ludChtYXJrZXJMb2NhdGlvbiwgcG9pbnQsIG1hcCk7XG4gIH07XG5cbiAgdXNlRWZmZWN0KCgpID0+IHtcbiAgICByZW5kZXJMb2dpYygpO1xuICAgIGljb25ab29tQ29udHJvbChtYXApO1xuXG4gICAgcmV0dXJuIGZ1bmN0aW9uIGNsZWFudXAoKSB7XG4gICAgICAvLyBVTkJJTkQgUE9QVVBcbiAgICAgIHJlbW92ZUZyb21NYXAobWFwLCBwb2ludCwgJ09ic2VydmF0aW9uJyk7XG4gICAgICByZW1vdmVGcm9tTWFwKG1hcCwgcG9pbnQsICdQb2ludCcpO1xuICAgICAgcmVtb3ZlRnJvbU1hcChtYXAsIHBvaW50LCAnU2FtcGxpbmcnKTtcbiAgICAgIHJlbW92ZUZyb21NYXAobWFwLCBwb2ludCwgJ0ljb25OdW1iZXInKTtcbiAgICB9O1xuICB9LCBbcmVyZW5kZXJdKTtcblxuICByZXR1cm4gPGRpdj48L2Rpdj47XG59O1xuXG5jb25zdCBjb25uZWN0b3IgPSBjb25uZWN0KG1hcFN0YXRlVG9Qcm9wcyk7XG5leHBvcnQgZGVmYXVsdCBjb25uZWN0b3IoXG4gIFJlYWN0Lm1lbW8oUG9pbnRNYXJrZXIsIChwcmV2UHJvcHMsIG5leHRQcm9wcykgPT4ge1xuICAgIGlmIChcbiAgICAgIHByZXZQcm9wcy5ldmVudHNfZGF0YS5mb2N1c2VkRXZlbnQgIT09IG5leHRQcm9wcy5ldmVudHNfZGF0YS5mb2N1c2VkRXZlbnRcbiAgICApIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICByZXR1cm4gdHJ1ZTtcbiAgfSksXG4pO1xuIl19
74
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9XaWRnZXRzL01hcC9wb2ludHMvUG9pbnRNYXJrZXIudHN4Il0sIm5hbWVzIjpbIm1hcFN0YXRlVG9Qcm9wcyIsInN0YXRlIiwiZXZlbnRzX2RhdGEiLCJQb2ludE1hcmtlciIsInByb3BzIiwibWFwIiwicG9pbnQiLCJyZXJlbmRlciIsImxheWVyR3JvdXAiLCJyZW5kZXJMb2dpYyIsIm1hcmtlckxvY2F0aW9uIiwiZ3JvdXAiLCJ0eXBlIiwiY29ubmVjdG9yIiwiUmVhY3QiLCJtZW1vIiwicHJldlByb3BzIiwibmV4dFByb3BzIiwiZm9jdXNlZEV2ZW50Il0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFNQTs7QUFNQTs7Ozs7O0FBRUEsU0FBU0EsZUFBVCxDQUF5QkMsS0FBekIsRUFBMkM7QUFDekMsTUFBUUMsV0FBUixHQUF3QkQsS0FBeEIsQ0FBUUMsV0FBUjtBQUVBLFNBQU87QUFDTEEsSUFBQUEsV0FBVyxFQUFYQTtBQURLLEdBQVA7QUFHRDs7QUFTRCxJQUFNQyxXQUE0QixHQUFHLFNBQS9CQSxXQUErQixDQUFDQyxLQUFELEVBQVc7QUFDOUMsTUFBUUMsR0FBUixHQUE2Q0QsS0FBN0MsQ0FBUUMsR0FBUjtBQUFBLE1BQWFDLEtBQWIsR0FBNkNGLEtBQTdDLENBQWFFLEtBQWI7QUFBQSxNQUFvQkMsUUFBcEIsR0FBNkNILEtBQTdDLENBQW9CRyxRQUFwQjtBQUFBLE1BQThCQyxVQUE5QixHQUE2Q0osS0FBN0MsQ0FBOEJJLFVBQTlCLENBRDhDLENBRzlDO0FBQ0E7QUFDQTtBQUNBOztBQUVBLE1BQU1DLFdBQVcsR0FBRyxTQUFkQSxXQUFjLEdBQU07QUFDeEIsUUFBSUMsY0FBMkIsR0FBRyxDQUFDSixLQUFLLENBQUMsVUFBRCxDQUFOLEVBQW9CQSxLQUFLLENBQUMsV0FBRCxDQUF6QixDQUFsQztBQUNBLFFBQUlJLGNBQWMsQ0FBQyxDQUFELENBQWQsS0FBc0IsSUFBMUIsRUFBZ0M7QUFFaEMsdUNBQWtCQSxjQUFsQixFQUFrQ0osS0FBbEMsRUFBeUNELEdBQXpDLEVBQThDLElBQTlDLEVBQW9ERyxVQUFwRDs7QUFFQSxRQUFJRixLQUFLLENBQUNLLEtBQU4sQ0FBWUMsSUFBWixLQUFxQixpQkFBekIsRUFBNEM7QUFDMUMseUNBQWtCTixLQUFsQixFQUF5QkUsVUFBekIsRUFEMEMsQ0FHMUM7QUFDQTs7QUFDQSx5Q0FBa0JILEdBQWxCLEVBQXVCQyxLQUF2QixFQUE4QkUsVUFBOUI7QUFDRDtBQUNGLEdBYkQ7O0FBZUEsd0JBQVUsWUFBTTtBQUNkQyxJQUFBQSxXQUFXLEdBREcsQ0FFZDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNELEdBVEQsRUFTRyxDQUFDRixRQUFELENBVEg7QUFXQSxzQkFBTyx5Q0FBUDtBQUNELENBbkNEOztBQXFDQSxJQUFNTSxTQUFTLEdBQUcseUJBQVFiLGVBQVIsQ0FBbEI7O2VBQ2VhLFNBQVMsZUFDdEJDLGVBQU1DLElBQU4sQ0FBV1osV0FBWCxFQUF3QixVQUFDYSxTQUFELEVBQVlDLFNBQVosRUFBMEI7QUFDaEQsTUFDRUQsU0FBUyxDQUFDZCxXQUFWLENBQXNCZ0IsWUFBdEIsS0FBdUNELFNBQVMsQ0FBQ2YsV0FBVixDQUFzQmdCLFlBRC9ELEVBRUU7QUFDQSxXQUFPLEtBQVA7QUFDRDs7QUFFRCxTQUFPLElBQVA7QUFDRCxDQVJELENBRHNCLEMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QsIHsgdXNlRWZmZWN0IH0gZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgY29ubmVjdCwgQ29ubmVjdGVkUHJvcHMgfSBmcm9tICdyZWFjdC1yZWR1eCc7XG4vLyBpbXBvcnQgdXNlUmVtb3ZlRXhpc3RpbmdMYXllcnMsIHtcbi8vICAgcmVtb3ZlRnJvbU1hcCxcbi8vIH0gZnJvbSAnc3JjL2hvb2tzL3VzZVJlbW92ZUV4aXN0aW5nTGF5ZXJzJztcbmltcG9ydCB7IElBcHBTdGF0ZSB9IGZyb20gJ3NyYy9tb2RlbHMvSUFwcFN0YXRlJztcbmltcG9ydCB7IElQb2ludCB9IGZyb20gJ3NyYy9zdG9yZS9wb2ludHMvbW9kZWxzL0lQb2ludCc7XG5pbXBvcnQge1xuICBiaW5kUG9wdXBUb01hcmtlcixcbiAgY3JlYXRlQnViYmxlUG9pbnQsXG4gIGhhbmRsZU1hcmtlckNsaWNrLFxufSBmcm9tICcuL1BvaW50VXRpbHMnO1xuaW1wb3J0IHsgTGF0TG5nVHVwbGUgfSBmcm9tICdsZWFmbGV0JztcbmltcG9ydCAnbGVhZmxldC5mZWF0dXJlZ3JvdXAuc3ViZ3JvdXAnO1xuXG5mdW5jdGlvbiBtYXBTdGF0ZVRvUHJvcHMoc3RhdGU6IElBcHBTdGF0ZSkge1xuICBjb25zdCB7IGV2ZW50c19kYXRhIH0gPSBzdGF0ZTtcblxuICByZXR1cm4ge1xuICAgIGV2ZW50c19kYXRhLFxuICB9O1xufVxuXG50eXBlIFByb3BzID0gQ29ubmVjdGVkUHJvcHM8dHlwZW9mIGNvbm5lY3Rvcj4gJiB7XG4gIG1hcDogYW55O1xuICBwb2ludDogSVBvaW50O1xuICByZXJlbmRlcjogc3RyaW5nO1xuICBsYXllckdyb3VwOiBhbnk7XG59O1xuXG5jb25zdCBQb2ludE1hcmtlcjogUmVhY3QuRkM8UHJvcHM+ID0gKHByb3BzKSA9PiB7XG4gIGNvbnN0IHsgbWFwLCBwb2ludCwgcmVyZW5kZXIsIGxheWVyR3JvdXAgfSA9IHByb3BzO1xuXG4gIC8vIHVzZVJlbW92ZUV4aXN0aW5nTGF5ZXJzKG1hcCwgcG9pbnQsICdQb2ludCcpO1xuICAvLyB1c2VSZW1vdmVFeGlzdGluZ0xheWVycyhtYXAsIHBvaW50LCAnT2JzZXJ2YXRpb24nKTtcbiAgLy8gdXNlUmVtb3ZlRXhpc3RpbmdMYXllcnMobWFwLCBwb2ludCwgJ1NhbXBsaW5nJyk7XG4gIC8vIHVzZVJlbW92ZUV4aXN0aW5nTGF5ZXJzKG1hcCwgcG9pbnQsICdJY29uTnVtYmVyJyk7XG5cbiAgY29uc3QgcmVuZGVyTG9naWMgPSAoKSA9PiB7XG4gICAgbGV0IG1hcmtlckxvY2F0aW9uOiBMYXRMbmdUdXBsZSA9IFtwb2ludFsnbGF0aXR1ZGUnXSwgcG9pbnRbJ2xvbmdpdHVkZSddXTtcbiAgICBpZiAobWFya2VyTG9jYXRpb25bMF0gPT09IG51bGwpIHJldHVybjtcblxuICAgIGNyZWF0ZUJ1YmJsZVBvaW50KG1hcmtlckxvY2F0aW9uLCBwb2ludCwgbWFwLCBudWxsLCBsYXllckdyb3VwKTtcblxuICAgIGlmIChwb2ludC5ncm91cC50eXBlID09PSAnR3JvdXBzOjpGYWN0b3J5Jykge1xuICAgICAgYmluZFBvcHVwVG9NYXJrZXIocG9pbnQsIGxheWVyR3JvdXApO1xuXG4gICAgICAvL1RoZSBmb2xsb3dpbmcgaXMgYmVpbmcgY2FsbGVkIGZvciBldmVyeSBwb2ludCwgd2Ugc2hvdWxkIGRvIHRoYXQgb24gdGhlIGxheWVyR3JvdXAgbGV2ZWwgd2hpY2ggd2lsbCBoYXBwZW4gb25jZVxuICAgICAgLy9JdCBpcyBub3RpY2VkIHdoZW4gdGhlcmUgYXJlIHRob3VzYW5kcyBvZiBwb2ludHNcbiAgICAgIGhhbmRsZU1hcmtlckNsaWNrKG1hcCwgcG9pbnQsIGxheWVyR3JvdXApO1xuICAgIH1cbiAgfTtcblxuICB1c2VFZmZlY3QoKCkgPT4ge1xuICAgIHJlbmRlckxvZ2ljKCk7XG4gICAgLy8gcmV0dXJuIGZ1bmN0aW9uIGNsZWFudXAoKSB7XG4gICAgLy8gICAvLyBVTkJJTkQgUE9QVVBcbiAgICAvLyAgIHJlbW92ZUZyb21NYXAobWFwLCBwb2ludCwgJ09ic2VydmF0aW9uJyk7XG4gICAgLy8gICByZW1vdmVGcm9tTWFwKG1hcCwgcG9pbnQsICdQb2ludCcpO1xuICAgIC8vICAgcmVtb3ZlRnJvbU1hcChtYXAsIHBvaW50LCAnU2FtcGxpbmcnKTtcbiAgICAvLyAgIHJlbW92ZUZyb21NYXAobWFwLCBwb2ludCwgJ0ljb25OdW1iZXInKTtcbiAgICAvLyB9O1xuICB9LCBbcmVyZW5kZXJdKTtcblxuICByZXR1cm4gPGRpdj48L2Rpdj47XG59O1xuXG5jb25zdCBjb25uZWN0b3IgPSBjb25uZWN0KG1hcFN0YXRlVG9Qcm9wcyk7XG5leHBvcnQgZGVmYXVsdCBjb25uZWN0b3IoXG4gIFJlYWN0Lm1lbW8oUG9pbnRNYXJrZXIsIChwcmV2UHJvcHMsIG5leHRQcm9wcykgPT4ge1xuICAgIGlmIChcbiAgICAgIHByZXZQcm9wcy5ldmVudHNfZGF0YS5mb2N1c2VkRXZlbnQgIT09IG5leHRQcm9wcy5ldmVudHNfZGF0YS5mb2N1c2VkRXZlbnRcbiAgICApIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICByZXR1cm4gdHJ1ZTtcbiAgfSksXG4pO1xuIl19
@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
13
13
 
14
14
  var _PointMarker = _interopRequireDefault(require("./PointMarker"));
15
15
 
16
+ var _PointUtils = require("./PointUtils");
17
+
16
18
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
19
 
18
20
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -20,39 +22,105 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
20
22
  var PointMarkers = function PointMarkers(props) {
21
23
  var points = props.points,
22
24
  map = props.map,
23
- _props$includeUnmonit = props.includeUnmonitoredPoints,
24
- includeUnmonitoredPoints = _props$includeUnmonit === void 0 ? false : _props$includeUnmonit,
25
- _props$rerender = props.rerender,
26
- rerender = _props$rerender === void 0 ? false : _props$rerender;
25
+ factoriesGroup = props.factoriesGroup,
26
+ wwtpsGroup = props.wwtpsGroup,
27
+ collectorsGroup = props.collectorsGroup,
28
+ rerender = props.rerender; //Handle the mouse click here one for all instead one by one
29
+ // factoriesClusterGroup.on('click', function (a) {
30
+ // console.log('currentSrc', a.originalEvent.target.currentSrc);
31
+ // console.log('src', a.originalEvent.target.src);
32
+ // //a.originalEvent.target.src = '';
33
+ // //Change icon here
34
+ // });
35
+ // console.log('LayerGroups', factoriesClusterGroup);
36
+ //const layerGroups = L.layerGroup();
37
+ //const wwtpsLayerGroup = L.layerGroup();
38
+ //const collectorsLayerGroup = L.layerGroup();
39
+ //console.log('LayerGroups', wwtpsLayerGroup, collectorsLayerGroup);
40
+ //layerGroups.addLayer(wwtpsLayerGroup);
41
+ //layerGroups.addLayer(collectorsLayerGroup);
42
+ //map.addLayer(layerGroups);
43
+ // const isPointBelongToGroupTypes = (point: IPoint) => {
44
+ // return (
45
+ // point.group.type === 'Groups::WastewaterTreatmentPlant' ||
46
+ // (point.group.type === 'Groups::Factory') ||
47
+ // (point.group.type === 'Groups::Collectors' && point.has_device) ||
48
+ // (point.group.type === 'Groups::PumpStation' && point.has_device)
49
+ // );
50
+ // };
51
+ // const includeUnmonitoredPointsLogic = (point: IPoint) => {
52
+ // return includeUnmonitoredPoints ? point.part_of_monitored_path : false;
53
+ // };
54
+ // const filterStatement = (point) => {
55
+ // return (
56
+ // includeUnmonitoredPointsLogic(point) ||
57
+ // isPointBelongToGroupTypes(point) ||
58
+ // point.group.type === 'Groups::WastewaterTreatmentPlant'
59
+ // );
60
+ // };
27
61
 
28
- var isPointBelongToGroupTypes = function isPointBelongToGroupTypes(point) {
29
- return point.group.type === 'Groups::WastewaterTreatmentPlant' || point.group.type === 'Groups::Factory' && point.has_device || point.group.type === 'Groups::Collectors' && point.has_device || point.group.type === 'Groups::PumpStation' && point.has_device;
30
- };
62
+ var filteredPoints = function filteredPoints() {
63
+ return points; //.filter((point: IPoint) => filterStatement(point));
64
+ }; // function countLayersOnMap(map) {
65
+ // let layerCount = 0;
66
+ // map.eachLayer(function (layer) {
67
+ // // Exclude the base layer (the map itself) from the count
68
+ // if (!layer._tiles) {
69
+ // // for(var a in layer)
70
+ // // console.log(a);
71
+ // //console.log('layer', layer);
72
+ // map.removeLayer(layer);
73
+ // layerCount++;
74
+ // }
75
+ // else {
76
+ // //console.log('no layers deleted', layer);
77
+ // }
78
+ // });
79
+ // return layerCount;
80
+ // }
31
81
 
32
- var includeUnmonitoredPointsLogic = function includeUnmonitoredPointsLogic(point) {
33
- return includeUnmonitoredPoints ? point.part_of_monitored_path : false;
34
- };
35
82
 
36
- var filterStatement = function filterStatement(point) {
37
- return includeUnmonitoredPointsLogic(point) || isPointBelongToGroupTypes(point) || point.group.type === 'Groups::WastewaterTreatmentPlant';
38
- };
83
+ (0, _react.useEffect)(function () {
84
+ //console.log('PointMarkers useEffect: rerender: ', rerender);
85
+ //console.log('Layers on map', countLayersOnMap(map));
86
+ if (map) {
87
+ switch (rerender) {
88
+ case 'XLarge':
89
+ (0, _PointUtils.addLayerGroup)(map, factoriesGroup);
90
+ (0, _PointUtils.addLayerGroup)(map, wwtpsGroup);
91
+ (0, _PointUtils.removeLayerGroup)(map, collectorsGroup);
92
+ break;
39
93
 
40
- var filteredPoints = function filteredPoints() {
41
- return points.filter(function (point) {
42
- return filterStatement(point);
43
- });
44
- };
94
+ case 'Large':
95
+ break;
96
+
97
+ case 'MLarge':
98
+ (0, _PointUtils.removeLayerGroup)(map, collectorsGroup);
99
+ break;
100
+
101
+ case 'Medium':
102
+ (0, _PointUtils.addLayerGroup)(map, collectorsGroup);
103
+ break;
104
+
105
+ default:
106
+ break;
107
+ }
108
+ }
45
109
 
46
- (0, _react.useEffect)(function () {}, [rerender]);
110
+ factoriesGroup.doneCreating = true;
111
+ wwtpsGroup.doneCreating = true;
112
+ collectorsGroup.doneCreating = true;
113
+ }, [rerender]);
47
114
  return /*#__PURE__*/_react.default.createElement("div", null, points.length !== 0 && filteredPoints().map(function (point) {
48
- return point.latitude && point.longitude && /*#__PURE__*/_react.default.createElement(_PointMarker.default, {
115
+ return point.latitude && point.longitude && !factoriesGroup.doneCreating && !wwtpsGroup.doneCreating && !collectorsGroup.doneCreating && /*#__PURE__*/_react.default.createElement(_PointMarker.default, {
49
116
  map: map,
50
117
  point: point,
51
118
  key: point.id,
52
- rerender: rerender
119
+ rerender: rerender,
120
+ layerGroup: point.group.type === 'Groups::Factory' ? factoriesGroup : point.group.type === 'Groups::WastewaterTreatmentPlant' ? wwtpsGroup : collectorsGroup
53
121
  });
54
122
  }));
55
123
  };
56
124
 
57
125
  exports.PointMarkers = PointMarkers;
58
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9XaWRnZXRzL01hcC9wb2ludHMvUG9pbnRNYXJrZXJzLnRzeCJdLCJuYW1lcyI6WyJQb2ludE1hcmtlcnMiLCJwcm9wcyIsInBvaW50cyIsIm1hcCIsImluY2x1ZGVVbm1vbml0b3JlZFBvaW50cyIsInJlcmVuZGVyIiwiaXNQb2ludEJlbG9uZ1RvR3JvdXBUeXBlcyIsInBvaW50IiwiZ3JvdXAiLCJ0eXBlIiwiaGFzX2RldmljZSIsImluY2x1ZGVVbm1vbml0b3JlZFBvaW50c0xvZ2ljIiwicGFydF9vZl9tb25pdG9yZWRfcGF0aCIsImZpbHRlclN0YXRlbWVudCIsImZpbHRlcmVkUG9pbnRzIiwiZmlsdGVyIiwibGVuZ3RoIiwibGF0aXR1ZGUiLCJsb25naXR1ZGUiLCJpZCJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7QUFBQTs7QUFFQTs7Ozs7O0FBU08sSUFBTUEsWUFBNkIsR0FBRyxTQUFoQ0EsWUFBZ0MsQ0FBQ0MsS0FBRCxFQUFXO0FBQ3RELE1BQ0VDLE1BREYsR0FLSUQsS0FMSixDQUNFQyxNQURGO0FBQUEsTUFFRUMsR0FGRixHQUtJRixLQUxKLENBRUVFLEdBRkY7QUFBQSw4QkFLSUYsS0FMSixDQUdFRyx3QkFIRjtBQUFBLE1BR0VBLHdCQUhGLHNDQUc2QixLQUg3QjtBQUFBLHdCQUtJSCxLQUxKLENBSUVJLFFBSkY7QUFBQSxNQUlFQSxRQUpGLGdDQUlhLEtBSmI7O0FBT0EsTUFBTUMseUJBQXlCLEdBQUcsU0FBNUJBLHlCQUE0QixDQUFDQyxLQUFELEVBQW1CO0FBQ25ELFdBQ0VBLEtBQUssQ0FBQ0MsS0FBTixDQUFZQyxJQUFaLEtBQXFCLGtDQUFyQixJQUNDRixLQUFLLENBQUNDLEtBQU4sQ0FBWUMsSUFBWixLQUFxQixpQkFBckIsSUFBMENGLEtBQUssQ0FBQ0csVUFEakQsSUFFQ0gsS0FBSyxDQUFDQyxLQUFOLENBQVlDLElBQVosS0FBcUIsb0JBQXJCLElBQTZDRixLQUFLLENBQUNHLFVBRnBELElBR0NILEtBQUssQ0FBQ0MsS0FBTixDQUFZQyxJQUFaLEtBQXFCLHFCQUFyQixJQUE4Q0YsS0FBSyxDQUFDRyxVQUp2RDtBQU1ELEdBUEQ7O0FBU0EsTUFBTUMsNkJBQTZCLEdBQUcsU0FBaENBLDZCQUFnQyxDQUFDSixLQUFELEVBQW1CO0FBQ3ZELFdBQU9ILHdCQUF3QixHQUFHRyxLQUFLLENBQUNLLHNCQUFULEdBQWtDLEtBQWpFO0FBQ0QsR0FGRDs7QUFJQSxNQUFNQyxlQUFlLEdBQUcsU0FBbEJBLGVBQWtCLENBQUNOLEtBQUQsRUFBVztBQUNqQyxXQUNFSSw2QkFBNkIsQ0FBQ0osS0FBRCxDQUE3QixJQUNBRCx5QkFBeUIsQ0FBQ0MsS0FBRCxDQUR6QixJQUVBQSxLQUFLLENBQUNDLEtBQU4sQ0FBWUMsSUFBWixLQUFxQixrQ0FIdkI7QUFLRCxHQU5EOztBQVFBLE1BQU1LLGNBQWMsR0FBRyxTQUFqQkEsY0FBaUIsR0FBTTtBQUMzQixXQUFPWixNQUFNLENBQUNhLE1BQVAsQ0FBYyxVQUFDUixLQUFEO0FBQUEsYUFBbUJNLGVBQWUsQ0FBQ04sS0FBRCxDQUFsQztBQUFBLEtBQWQsQ0FBUDtBQUNELEdBRkQ7O0FBSUEsd0JBQVUsWUFBTSxDQUFFLENBQWxCLEVBQW9CLENBQUNGLFFBQUQsQ0FBcEI7QUFFQSxzQkFDRSwwQ0FDR0gsTUFBTSxDQUFDYyxNQUFQLEtBQWtCLENBQWxCLElBQ0NGLGNBQWMsR0FBR1gsR0FBakIsQ0FDRSxVQUFDSSxLQUFEO0FBQUEsV0FDRUEsS0FBSyxDQUFDVSxRQUFOLElBQ0FWLEtBQUssQ0FBQ1csU0FETixpQkFFRSw2QkFBQyxvQkFBRDtBQUNFLE1BQUEsR0FBRyxFQUFFZixHQURQO0FBRUUsTUFBQSxLQUFLLEVBQUVJLEtBRlQ7QUFHRSxNQUFBLEdBQUcsRUFBRUEsS0FBSyxDQUFDWSxFQUhiO0FBSUUsTUFBQSxRQUFRLEVBQUVkO0FBSlosTUFISjtBQUFBLEdBREYsQ0FGSixDQURGO0FBaUJELENBcERNIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0LCB7IHVzZUVmZmVjdCB9IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IElQb2ludCB9IGZyb20gJ3NyYy9zdG9yZS9wb2ludHMvbW9kZWxzL0lQb2ludCc7XG5pbXBvcnQgUG9pbnRNYXJrZXIgZnJvbSAnLi9Qb2ludE1hcmtlcic7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIG1hcDogYW55O1xuICBwb2ludHM6IGFueTtcbiAgaW5jbHVkZVVubW9uaXRvcmVkUG9pbnRzOiBib29sZWFuO1xuICByZXJlbmRlcjogYm9vbGVhbjtcbn07XG5cbmV4cG9ydCBjb25zdCBQb2ludE1hcmtlcnM6IFJlYWN0LkZDPFByb3BzPiA9IChwcm9wcykgPT4ge1xuICBjb25zdCB7XG4gICAgcG9pbnRzLFxuICAgIG1hcCxcbiAgICBpbmNsdWRlVW5tb25pdG9yZWRQb2ludHMgPSBmYWxzZSxcbiAgICByZXJlbmRlciA9IGZhbHNlLFxuICB9ID0gcHJvcHM7XG5cbiAgY29uc3QgaXNQb2ludEJlbG9uZ1RvR3JvdXBUeXBlcyA9IChwb2ludDogSVBvaW50KSA9PiB7XG4gICAgcmV0dXJuIChcbiAgICAgIHBvaW50Lmdyb3VwLnR5cGUgPT09ICdHcm91cHM6Oldhc3Rld2F0ZXJUcmVhdG1lbnRQbGFudCcgfHxcbiAgICAgIChwb2ludC5ncm91cC50eXBlID09PSAnR3JvdXBzOjpGYWN0b3J5JyAmJiBwb2ludC5oYXNfZGV2aWNlKSB8fFxuICAgICAgKHBvaW50Lmdyb3VwLnR5cGUgPT09ICdHcm91cHM6OkNvbGxlY3RvcnMnICYmIHBvaW50Lmhhc19kZXZpY2UpIHx8XG4gICAgICAocG9pbnQuZ3JvdXAudHlwZSA9PT0gJ0dyb3Vwczo6UHVtcFN0YXRpb24nICYmIHBvaW50Lmhhc19kZXZpY2UpXG4gICAgKTtcbiAgfTtcblxuICBjb25zdCBpbmNsdWRlVW5tb25pdG9yZWRQb2ludHNMb2dpYyA9IChwb2ludDogSVBvaW50KSA9PiB7XG4gICAgcmV0dXJuIGluY2x1ZGVVbm1vbml0b3JlZFBvaW50cyA/IHBvaW50LnBhcnRfb2ZfbW9uaXRvcmVkX3BhdGggOiBmYWxzZTtcbiAgfTtcblxuICBjb25zdCBmaWx0ZXJTdGF0ZW1lbnQgPSAocG9pbnQpID0+IHtcbiAgICByZXR1cm4gKFxuICAgICAgaW5jbHVkZVVubW9uaXRvcmVkUG9pbnRzTG9naWMocG9pbnQpIHx8XG4gICAgICBpc1BvaW50QmVsb25nVG9Hcm91cFR5cGVzKHBvaW50KSB8fFxuICAgICAgcG9pbnQuZ3JvdXAudHlwZSA9PT0gJ0dyb3Vwczo6V2FzdGV3YXRlclRyZWF0bWVudFBsYW50J1xuICAgICk7XG4gIH07XG5cbiAgY29uc3QgZmlsdGVyZWRQb2ludHMgPSAoKSA9PiB7XG4gICAgcmV0dXJuIHBvaW50cy5maWx0ZXIoKHBvaW50OiBJUG9pbnQpID0+IGZpbHRlclN0YXRlbWVudChwb2ludCkpO1xuICB9O1xuXG4gIHVzZUVmZmVjdCgoKSA9PiB7fSwgW3JlcmVuZGVyXSk7XG5cbiAgcmV0dXJuIChcbiAgICA8ZGl2PlxuICAgICAge3BvaW50cy5sZW5ndGggIT09IDAgJiZcbiAgICAgICAgZmlsdGVyZWRQb2ludHMoKS5tYXAoXG4gICAgICAgICAgKHBvaW50OiBJUG9pbnQpID0+XG4gICAgICAgICAgICBwb2ludC5sYXRpdHVkZSAmJlxuICAgICAgICAgICAgcG9pbnQubG9uZ2l0dWRlICYmIChcbiAgICAgICAgICAgICAgPFBvaW50TWFya2VyXG4gICAgICAgICAgICAgICAgbWFwPXttYXB9XG4gICAgICAgICAgICAgICAgcG9pbnQ9e3BvaW50fVxuICAgICAgICAgICAgICAgIGtleT17cG9pbnQuaWR9XG4gICAgICAgICAgICAgICAgcmVyZW5kZXI9e3JlcmVuZGVyfVxuICAgICAgICAgICAgICAvPlxuICAgICAgICAgICAgKSxcbiAgICAgICAgKX1cbiAgICA8L2Rpdj5cbiAgKTtcbn07XG4iXX0=
126
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../../src/Widgets/Map/points/PointMarkers.tsx"],"names":["PointMarkers","props","points","map","factoriesGroup","wwtpsGroup","collectorsGroup","rerender","filteredPoints","doneCreating","length","point","latitude","longitude","id","group","type"],"mappings":";;;;;;;;;;;AAAA;;AAEA;;AACA;;;;;;AAYO,IAAMA,YAA6B,GAAG,SAAhCA,YAAgC,CAACC,KAAD,EAAW;AACtD,MACEC,MADF,GAQID,KARJ,CACEC,MADF;AAAA,MAEEC,GAFF,GAQIF,KARJ,CAEEE,GAFF;AAAA,MAGEC,cAHF,GAQIH,KARJ,CAGEG,cAHF;AAAA,MAIEC,UAJF,GAQIJ,KARJ,CAIEI,UAJF;AAAA,MAKEC,eALF,GAQIL,KARJ,CAKEK,eALF;AAAA,MAOEC,QAPF,GAQIN,KARJ,CAOEM,QAPF,CADsD,CAWtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,MAAMC,cAAc,GAAG,SAAjBA,cAAiB,GAAM;AAC3B,WAAON,MAAP,CAD2B,CACZ;AAChB,GAFD,CAjDsD,CAqDtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;AAEA,wBAAU,YAAM;AACd;AACA;AAEA,QAAIC,GAAJ,EAAS;AACP,cAAQI,QAAR;AACE,aAAK,QAAL;AACE,yCAAcJ,GAAd,EAAmBC,cAAnB;AACA,yCAAcD,GAAd,EAAmBE,UAAnB;AACA,4CAAiBF,GAAjB,EAAsBG,eAAtB;AACA;;AACF,aAAK,OAAL;AACE;;AACF,aAAK,QAAL;AACE,4CAAiBH,GAAjB,EAAsBG,eAAtB;AACA;;AACF,aAAK,QAAL;AACE,yCAAcH,GAAd,EAAmBG,eAAnB;AACA;;AACF;AACE;AAfJ;AAiBD;;AAEDF,IAAAA,cAAc,CAACK,YAAf,GAA8B,IAA9B;AACAJ,IAAAA,UAAU,CAACI,YAAX,GAA0B,IAA1B;AACAH,IAAAA,eAAe,CAACG,YAAhB,GAA+B,IAA/B;AACD,GA3BD,EA2BG,CAACF,QAAD,CA3BH;AA6BA,sBACE,0CACGL,MAAM,CAACQ,MAAP,KAAkB,CAAlB,IACCF,cAAc,GAAGL,GAAjB,CACE,UAACQ,KAAD;AAAA,WACEA,KAAK,CAACC,QAAN,IACAD,KAAK,CAACE,SADN,IAEA,CAACT,cAAc,CAACK,YAFhB,IAGA,CAACJ,UAAU,CAACI,YAHZ,IAIA,CAACH,eAAe,CAACG,YAJjB,iBAKE,6BAAC,oBAAD;AACE,MAAA,GAAG,EAAEN,GADP;AAEE,MAAA,KAAK,EAAEQ,KAFT;AAGE,MAAA,GAAG,EAAEA,KAAK,CAACG,EAHb;AAIE,MAAA,QAAQ,EAAEP,QAJZ;AAKE,MAAA,UAAU,EACRI,KAAK,CAACI,KAAN,CAAYC,IAAZ,KAAqB,iBAArB,GACIZ,cADJ,GAEIO,KAAK,CAACI,KAAN,CAAYC,IAAZ,KAAqB,kCAArB,GACAX,UADA,GAEAC;AAVR,MANJ;AAAA,GADF,CAFJ,CADF;AA2BD,CA/HM","sourcesContent":["import React, { useEffect } from 'react';\nimport { IPoint } from 'src/store/points/models/IPoint';\nimport PointMarker from './PointMarker';\nimport { addLayerGroup, removeLayerGroup } from './PointUtils';\n\ntype Props = {\n  map: any;\n  points: any;\n  includeUnmonitoredPoints: boolean;\n  rerender: string;\n  factoriesGroup: any;\n  wwtpsGroup: any;\n  collectorsGroup: any;\n};\n\nexport const PointMarkers: React.FC<Props> = (props) => {\n  const {\n    points,\n    map,\n    factoriesGroup,\n    wwtpsGroup,\n    collectorsGroup,\n    // includeUnmonitoredPoints = false,\n    rerender,\n  } = props;\n\n  //Handle the mouse click here one for all instead one by one\n  // factoriesClusterGroup.on('click', function (a) {\n  //   console.log('currentSrc', a.originalEvent.target.currentSrc);\n  //   console.log('src', a.originalEvent.target.src);\n  //   //a.originalEvent.target.src = '';\n  //   //Change icon here\n  // });\n  // console.log('LayerGroups', factoriesClusterGroup);\n\n  //const layerGroups = L.layerGroup();\n  //const wwtpsLayerGroup = L.layerGroup();\n  //const collectorsLayerGroup = L.layerGroup();\n  //console.log('LayerGroups', wwtpsLayerGroup, collectorsLayerGroup);\n  //layerGroups.addLayer(wwtpsLayerGroup);\n  //layerGroups.addLayer(collectorsLayerGroup);\n  //map.addLayer(layerGroups);\n\n  // const isPointBelongToGroupTypes = (point: IPoint) => {\n  //   return (\n  //     point.group.type === 'Groups::WastewaterTreatmentPlant' ||\n  //     (point.group.type === 'Groups::Factory') ||\n  //     (point.group.type === 'Groups::Collectors' && point.has_device) ||\n  //     (point.group.type === 'Groups::PumpStation' && point.has_device)\n  //   );\n  // };\n\n  // const includeUnmonitoredPointsLogic = (point: IPoint) => {\n  //   return includeUnmonitoredPoints ? point.part_of_monitored_path : false;\n  // };\n\n  // const filterStatement = (point) => {\n  //   return (\n  //     includeUnmonitoredPointsLogic(point) ||\n  //     isPointBelongToGroupTypes(point) ||\n  //     point.group.type === 'Groups::WastewaterTreatmentPlant'\n  //   );\n  // };\n\n  const filteredPoints = () => {\n    return points; //.filter((point: IPoint) => filterStatement(point));\n  };\n\n  // function countLayersOnMap(map) {\n  //   let layerCount = 0;\n  //   map.eachLayer(function (layer) {\n  //       // Exclude the base layer (the map itself) from the count\n  //       if (!layer._tiles) {\n  //         // for(var a in layer)\n  //         //   console.log(a);\n  //         //console.log('layer', layer);\n  //         map.removeLayer(layer);\n  //         layerCount++;\n  //       }\n  //       else {\n  //         //console.log('no layers deleted', layer);\n  //       }\n  //   });\n  //   return layerCount;\n  // }\n\n  useEffect(() => {\n    //console.log('PointMarkers useEffect: rerender: ', rerender);\n    //console.log('Layers on map', countLayersOnMap(map));\n\n    if (map) {\n      switch (rerender) {\n        case 'XLarge':\n          addLayerGroup(map, factoriesGroup);\n          addLayerGroup(map, wwtpsGroup);\n          removeLayerGroup(map, collectorsGroup);\n          break;\n        case 'Large':\n          break;\n        case 'MLarge':\n          removeLayerGroup(map, collectorsGroup);\n          break;\n        case 'Medium':\n          addLayerGroup(map, collectorsGroup);\n          break;\n        default:\n          break;\n      }\n    }\n\n    factoriesGroup.doneCreating = true;\n    wwtpsGroup.doneCreating = true;\n    collectorsGroup.doneCreating = true;\n  }, [rerender]);\n\n  return (\n    <div>\n      {points.length !== 0 &&\n        filteredPoints().map(\n          (point: IPoint) =>\n            point.latitude &&\n            point.longitude &&\n            !factoriesGroup.doneCreating &&\n            !wwtpsGroup.doneCreating &&\n            !collectorsGroup.doneCreating && (\n              <PointMarker\n                map={map}\n                point={point}\n                key={point.id}\n                rerender={rerender}\n                layerGroup={\n                  point.group.type === 'Groups::Factory'\n                    ? factoriesGroup\n                    : point.group.type === 'Groups::WastewaterTreatmentPlant'\n                    ? wwtpsGroup\n                    : collectorsGroup\n                }\n              />\n            ),\n        )}\n    </div>\n  );\n};\n"]}