@mint-ui/map 0.5.6-beta → 0.5.7-beta

package/dist/index.umd.js

@@ -736,6 +736,309 @@
     }));
   }
 
+  var AnimationPlayer =
+  /** @class */
+  function () {
+    function AnimationPlayer(drawFunction, fps) {
+      this.prevtime = 0;
+      this.elapsedTime = 0;
+      this.fps = null;
+      this.baseDrawGapTime = null;
+      this.deltaTime = 0;
+      this.playing = false;
+      this.draw = drawFunction;
+      this.fps = fps || null;
+
+      if (fps !== undefined) {
+        this.baseDrawGapTime = 1000 / fps;
+      }
+
+      this.init();
+    }
+
+    AnimationPlayer.prototype.init = function () {
+      this.deltaTime = 0;
+      this.prevtime = 0;
+      this.elapsedTime = 0;
+      this.playing = false;
+    };
+
+    AnimationPlayer.prototype.start = function () {
+      this.init();
+      this.resume();
+    };
+
+    AnimationPlayer.prototype.stop = function () {
+      this.playing = false;
+    };
+
+    AnimationPlayer.prototype.resume = function () {
+      this.playing = true; //@ts-ignore
+
+      window.requestAnimationFrame(this.makeFrame.bind(this));
+    };
+
+    AnimationPlayer.prototype.makeFrame = function (timestamp) {
+      //frame 간 시간 변화
+      if (this.prevtime === 0) {
+        this.prevtime = timestamp;
+      }
+
+      this.deltaTime += timestamp - this.prevtime; //정해진 시간이 없거나, 정해진 시간이 지났으면 draw 호출
+
+      this.prevtime = timestamp;
+
+      if (!this.baseDrawGapTime || this.baseDrawGapTime <= this.deltaTime) {
+        //다음 루프 준비
+        this.elapsedTime += this.deltaTime; //draw 콜백에서 stop 신호오면 멈춤
+
+        var stopFlag = this.draw(this.deltaTime, this.elapsedTime); //delta 초기화
+
+        this.deltaTime = 0;
+
+        if (stopFlag) {
+          this.stop();
+        }
+      }
+
+      if (this.playing) {
+        //@ts-ignore
+        window.requestAnimationFrame(this.makeFrame.bind(this));
+      }
+    };
+
+    return AnimationPlayer;
+  }();
+
+  function waiting(evaluation, timeoutSeconds) {
+    return tslib.__awaiter(this, void 0, void 0, function () {
+      var max;
+      return tslib.__generator(this, function (_a) {
+        max = (timeoutSeconds || 5) * 1000;
+        return [2
+        /*return*/
+        , new Promise(function (resolve) {
+          var start = new Date().getTime();
+          var inter = setInterval(function () {
+            //타임아웃 체크
+            var time = new Date().getTime();
+
+            if (time - start > max) {
+              clearInterval(inter);
+              resolve(false);
+              return;
+            } //평가식 체크
+
+
+            if (evaluation()) {
+              clearInterval(inter);
+              resolve(true);
+            }
+          }, 100);
+        })];
+      });
+    });
+  }
+
+  var getClusterInfo = function (basePixelSize, mapBounds, mapWidth, mapHeight, itemList, sizeFunction) {
+    var _a; //1. basePixelSize 기준으로 현재 지도 크기를 베이스로 영역 갯수 정하기
+
+
+    var rowCount = Number((mapWidth / basePixelSize).toFixed(0)) || 1;
+    var colCount = Number((mapHeight / basePixelSize).toFixed(0)) || 1; //console.log('rowCount', rowCount, 'colCount', colCount)
+
+    var boundsLineSizeX = Number(((mapBounds.ne.lng - mapBounds.nw.lng) / rowCount).toFixed(7));
+    var boundsLineSizeY = Number(((mapBounds.nw.lat - mapBounds.se.lat) / colCount).toFixed(7)); //console.log('boundsLineSize', boundsLineSizeX, boundsLineSizeY)
+    var boundsPos = [];
+    var tempX1, tempY1, tempX2, tempY2;
+
+    for (var i = 0; i < rowCount; i++) {
+      tempX1 = mapBounds.nw.lng + boundsLineSizeX * i;
+      tempX2 = mapBounds.nw.lng + boundsLineSizeX * (i + 1);
+      var rows = [];
+      boundsPos.push(rows);
+
+      for (var k = 0; k < colCount; k++) {
+        tempY2 = mapBounds.se.lat + boundsLineSizeY * k;
+        tempY1 = mapBounds.se.lat + boundsLineSizeY * (k + 1);
+        var thisBounds = Bounds.fromNWSE(new Position(tempY1, tempX1), new Position(tempY2, tempX2));
+        var includedList = thisBounds.getIncludedPositions(itemList);
+        rows.push({
+          bounds: thisBounds,
+          checked: false,
+          center: false,
+          centerPosition: thisBounds.getCenter(),
+          incList: [],
+          itemList: includedList,
+          size: basePixelSize
+        });
+      }
+    } //좌표마다 검사해서 인접셀 병합 처리
+
+
+    var centerList = [];
+    var totalItemCount = 0;
+    var min;
+    var max;
+
+    for (var i = 0; i < boundsPos.length; i++) {
+      for (var k = 0; k < boundsPos[i].length; k++) {
+        var curr = boundsPos[i][k];
+        if (curr.checked) continue;
+        curr.checked = true; //현재기준 8방향 객체 모으기
+
+        var incList = [];
+
+        if (boundsPos[i]) {
+          boundsPos[i][k - 1] && incList.push(boundsPos[i][k - 1]);
+          boundsPos[i][k + 1] && incList.push(boundsPos[i][k + 1]);
+        }
+
+        if (boundsPos[i - 1]) {
+          boundsPos[i - 1][k - 1] && incList.push(boundsPos[i - 1][k - 1]);
+          boundsPos[i - 1][k] && incList.push(boundsPos[i - 1][k]);
+          boundsPos[i - 1][k + 1] && incList.push(boundsPos[i - 1][k + 1]);
+        }
+
+        if (boundsPos[i + 1]) {
+          boundsPos[i + 1][k + 1] && incList.push(boundsPos[i + 1][k + 1]);
+          boundsPos[i + 1][k] && incList.push(boundsPos[i + 1][k]);
+          boundsPos[i + 1][k - 1] && incList.push(boundsPos[i + 1][k - 1]);
+        }
+
+        for (var _i = 0, incList_1 = incList; _i < incList_1.length; _i++) {
+          var inc = incList_1[_i];
+          if (inc.checked) continue;
+          inc.checked = true;
+
+          if (inc.itemList && inc.itemList.length > 0) {
+            curr.incList.push(inc);
+
+            (_a = curr.itemList).push.apply(_a, inc.itemList);
+
+            curr.center = true;
+          }
+        }
+
+        if (curr.center) {
+          centerList.push(curr);
+          var avrLat = calculateAverage(curr.itemList.map(function (item) {
+            return item.lat;
+          }));
+          var avrLng = calculateAverage(curr.itemList.map(function (item) {
+            return item.lng;
+          }));
+          curr.centerPosition = new Position(avrLat, avrLng);
+          totalItemCount += curr.itemList.length;
+
+          if (!min || curr.itemList.length < min) {
+            min = curr.itemList.length;
+          }
+
+          if (!max || curr.itemList.length > max) {
+            max = curr.itemList.length;
+          }
+        }
+      }
+    }
+
+    var status = {
+      total: totalItemCount,
+      average: totalItemCount / centerList.length,
+      min: min,
+      max: max
+    };
+
+    sizeFunction = sizeFunction || function (info, status) {
+      var minSize = basePixelSize / 4;
+      var maxSize = basePixelSize;
+      return Math.min(Math.max(basePixelSize * info.itemList.length / status.average, minSize), maxSize);
+    };
+
+    for (var _b = 0, centerList_1 = centerList; _b < centerList_1.length; _b++) {
+      var center = centerList_1[_b];
+      center.size = sizeFunction(center, status);
+    } // console.log('centerList', centerList, status);
+
+
+    return centerList;
+  };
+
+  var calculateAverage = function (nums) {
+    var sum = 0;
+
+    for (var _i = 0, nums_1 = nums; _i < nums_1.length; _i++) {
+      var num = nums_1[_i];
+      sum += num;
+    }
+
+    return Number((sum / nums.length).toFixed(7));
+  };
+
+  function log(debug, label) {
+    var args = [];
+
+    for (var _i = 2; _i < arguments.length; _i++) {
+      args[_i - 2] = arguments[_i];
+    }
+
+    if (!debug) return;
+    args && console.log.apply(console, tslib.__spreadArray(['[mint-map debug]', label || ''], args, false));
+  }
+
+  var MintMapStatus =
+  /** @class */
+  function () {
+    function MintMapStatus() {
+      this.marker = 0;
+      this.byLabel = new Map();
+    }
+
+    MintMapStatus.prototype.init = function () {
+      this.marker = 0;
+      this.byLabel.clear();
+    };
+
+    MintMapStatus.prototype.print = function () {
+      var str = "[mint-map status]\n\nmarker : ".concat(this.marker, "\n ");
+
+      if (this.byLabel.size > 0) {
+        str += '\n-------- status detail (by label) ----------';
+        this.byLabel.forEach(function (val, key) {
+          str += "\n(".concat(key, ") : ").concat(val);
+        });
+        str += '\n\n';
+      }
+
+      console.log(str);
+    };
+
+    MintMapStatus.prototype.setMarker = function (inc, label) {
+      this.marker += inc;
+
+      if (label) {
+        var curr = this.byLabel.get(label);
+        var calc = 0;
+
+        if (curr === undefined) {
+          calc = inc;
+        } else {
+          calc = curr + inc;
+        }
+
+        if (calc === 0) {
+          this.byLabel.delete(label);
+        } else {
+          this.byLabel.set(label, calc);
+        }
+      }
+    };
+
+    return MintMapStatus;
+  }();
+
+  var Status = new MintMapStatus();
+
   var MintMapController =
   /** @class */
   function () {
@@ -898,6 +1201,10 @@
       throw new Error("[getMapToBaseZoom][".concat(mapZoom, "] is not valid zoom level"));
     };
 
+    MintMapController.prototype.printStatus = function () {
+      Status.print();
+    };
+
     return MintMapController;
   }();
 
@@ -1095,36 +1402,6 @@
     return MapZoomInfo;
   }();
 
-  function waiting(evaluation, timeoutSeconds) {
-    return tslib.__awaiter(this, void 0, void 0, function () {
-      var max;
-      return tslib.__generator(this, function (_a) {
-        max = (timeoutSeconds || 5) * 1000;
-        return [2
-        /*return*/
-        , new Promise(function (resolve) {
-          var start = new Date().getTime();
-          var inter = setInterval(function () {
-            //타임아웃 체크
-            var time = new Date().getTime();
-
-            if (time - start > max) {
-              clearInterval(inter);
-              resolve(false);
-              return;
-            } //평가식 체크
-
-
-            if (evaluation()) {
-              clearInterval(inter);
-              resolve(true);
-            }
-          }, 100);
-        })];
-      });
-    });
-  }
-
   // export type MapEvent = 'bounds_changed'|'center_changed'|'idle'|'zoom_changed'|'zoomstart'
   // export type MapUIEvent = 'click'|'dblclick'|''
   var MapEvent =
@@ -1385,8 +1662,7 @@
           map: this.map,
           position: marker.options.position,
           visible: marker.options.visible === undefined || marker.options.visible
-        }; //console.log('controller createMarker', marker.options);
-
+        };
         marker.element && (options.icon = {
           content: marker.element,
           anchor: marker.options.anchor
@@ -1404,6 +1680,8 @@
           marker.native = naverMarker_1;
         }
 
+        log(this.mapProps.debug || marker.options.debug, marker.options.debugLabel, this.type + ' marker created');
+        Status.setMarker(1, marker.options.debugLabel);
         ((_a = marker.options) === null || _a === void 0 ? void 0 : _a.event) && marker.options.event.forEach(function (handler, key) {
           if (_this.markerEvents.includes(key)) {
             naver.maps.Event.addListener(naverMarker_1, key, handler);
@@ -1437,7 +1715,9 @@
             marker.native.setIcon(tslib.__assign(tslib.__assign({}, marker.native.getIcon()), {
               anchor: options.anchor
             }));
-          } // const newOption = {
+          }
+
+          log(this.mapProps.debug || options.debug, marker.options.debugLabel, this.type + ' marker updated'); // const newOption = {
           //   map:map,
           //   position:options.position instanceof Position?options.position:marker.native.getPosition(),
           //   visible:options.visible === undefined || options.visible,
@@ -1451,7 +1731,6 @@
           //   visible:options.visible === undefined || options.visible,
           //   icon:{...marker.native.getIcon(), anchor:options.anchor}
           // })
-
         }
       }
     };
@@ -1509,6 +1788,9 @@
           } else {
             drawable.native.setMap(null);
           }
+
+          log(this.mapProps.debug || drawable.options.debug, drawable.options.debugLabel, this.type + ' marker cleared');
+          Status.setMarker(-1, drawable.options.debugLabel);
         } else {
           drawable.native.setMap(null);
         }
@@ -2114,6 +2396,8 @@
           googleMarker_1 = new google.maps.Marker(options);
         }
 
+        log(this.mapProps.debug || marker.options.debug, marker.options.debugLabel, this.type + ' marker created');
+        Status.setMarker(1, marker.options.debugLabel);
         marker.native = googleMarker_1;
         ((_a = marker.options) === null || _a === void 0 ? void 0 : _a.event) && marker.options.event.forEach(function (handler, key) {
           if (_this.markerEvents.includes(key)) {
@@ -2152,6 +2436,8 @@
             marker.native.position = options.position;
           }
         }
+
+        log(this.mapProps.debug || options.debug, marker.options.debugLabel, this.type + ' marker updated');
       }
     };
 
@@ -2218,6 +2504,8 @@
         } else if (drawable.native instanceof google.maps.marker.AdvancedMarkerView) {
           google.maps.event.clearInstanceListeners(drawable.native);
           drawable.native.map = null;
+          log(this.mapProps.debug || drawable.options.debug, drawable.options.debugLabel, this.type + ' marker cleared');
+          Status.setMarker(-1, drawable.options.debugLabel);
           return true;
         }
       }
@@ -2800,6 +3088,8 @@
           this.updateMarker(marker, marker.options);
         } else {
           kakaoMarker_1 = new kakao.maps.CustomOverlay(options);
+          log(this.mapProps.debug || marker.options.debug, marker.options.debugLabel, this.type + ' marker created');
+          Status.setMarker(1, marker.options.debugLabel);
           marker.options.visible !== undefined && kakaoMarker_1.setVisible(marker.options.visible);
           this.removeParentElementsMargin(marker);
           marker.native = kakaoMarker_1;
@@ -2828,6 +3118,7 @@
             marker.native.setVisible(options.visible);
           }
 
+          log(this.mapProps.debug || options.debug, marker.options.debugLabel, this.type + ' marker updated');
           this.removeParentElementsMargin(marker);
         }
       }
@@ -2900,6 +3191,8 @@
             (_a = this.markerPool) === null || _a === void 0 ? void 0 : _a.releasePoolItem(drawable.native);
           } else {
             drawable.native.setMap(null);
+            log(this.mapProps.debug || drawable.options.debug, drawable.options.debugLabel, this.type + ' marker cleared');
+            Status.setMarker(-1, drawable.options.debugLabel);
           }
         } else {
           drawable.native.setMap(null);
@@ -3637,80 +3930,6 @@
     }, children));
   }
 
-  var AnimationPlayer =
-  /** @class */
-  function () {
-    function AnimationPlayer(drawFunction, fps) {
-      this.prevtime = 0;
-      this.elapsedTime = 0;
-      this.fps = null;
-      this.baseDrawGapTime = null;
-      this.deltaTime = 0;
-      this.playing = false;
-      this.draw = drawFunction;
-      this.fps = fps || null;
-
-      if (fps !== undefined) {
-        this.baseDrawGapTime = 1000 / fps;
-      }
-
-      this.init();
-    }
-
-    AnimationPlayer.prototype.init = function () {
-      this.deltaTime = 0;
-      this.prevtime = 0;
-      this.elapsedTime = 0;
-      this.playing = false;
-    };
-
-    AnimationPlayer.prototype.start = function () {
-      this.init();
-      this.resume();
-    };
-
-    AnimationPlayer.prototype.stop = function () {
-      this.playing = false;
-    };
-
-    AnimationPlayer.prototype.resume = function () {
-      this.playing = true; //@ts-ignore
-
-      window.requestAnimationFrame(this.makeFrame.bind(this));
-    };
-
-    AnimationPlayer.prototype.makeFrame = function (timestamp) {
-      //frame 간 시간 변화
-      if (this.prevtime === 0) {
-        this.prevtime = timestamp;
-      }
-
-      this.deltaTime += timestamp - this.prevtime; //정해진 시간이 없거나, 정해진 시간이 지났으면 draw 호출
-
-      this.prevtime = timestamp;
-
-      if (!this.baseDrawGapTime || this.baseDrawGapTime <= this.deltaTime) {
-        //다음 루프 준비
-        this.elapsedTime += this.deltaTime; //draw 콜백에서 stop 신호오면 멈춤
-
-        var stopFlag = this.draw(this.deltaTime, this.elapsedTime); //delta 초기화
-
-        this.deltaTime = 0;
-
-        if (stopFlag) {
-          this.stop();
-        }
-      }
-
-      if (this.playing) {
-        //@ts-ignore
-        window.requestAnimationFrame(this.makeFrame.bind(this));
-      }
-    };
-
-    return AnimationPlayer;
-  }();
-
   var Drawable =
   /** @class */
   function () {
@@ -4101,141 +4320,6 @@
     return reactDom.createPortal(children, divElement);
   }
 
-  var getClusterInfo = function (basePixelSize, mapBounds, mapWidth, mapHeight, itemList, sizeFunction) {
-    var _a; //1. basePixelSize 기준으로 현재 지도 크기를 베이스로 영역 갯수 정하기
-
-
-    var rowCount = Number((mapWidth / basePixelSize).toFixed(0)) || 1;
-    var colCount = Number((mapHeight / basePixelSize).toFixed(0)) || 1; //console.log('rowCount', rowCount, 'colCount', colCount)
-
-    var boundsLineSizeX = Number(((mapBounds.ne.lng - mapBounds.nw.lng) / rowCount).toFixed(7));
-    var boundsLineSizeY = Number(((mapBounds.nw.lat - mapBounds.se.lat) / colCount).toFixed(7)); //console.log('boundsLineSize', boundsLineSizeX, boundsLineSizeY)
-    var boundsPos = [];
-    var tempX1, tempY1, tempX2, tempY2;
-
-    for (var i = 0; i < rowCount; i++) {
-      tempX1 = mapBounds.nw.lng + boundsLineSizeX * i;
-      tempX2 = mapBounds.nw.lng + boundsLineSizeX * (i + 1);
-      var rows = [];
-      boundsPos.push(rows);
-
-      for (var k = 0; k < colCount; k++) {
-        tempY2 = mapBounds.se.lat + boundsLineSizeY * k;
-        tempY1 = mapBounds.se.lat + boundsLineSizeY * (k + 1);
-        var thisBounds = Bounds.fromNWSE(new Position(tempY1, tempX1), new Position(tempY2, tempX2));
-        var includedList = thisBounds.getIncludedPositions(itemList);
-        rows.push({
-          bounds: thisBounds,
-          checked: false,
-          center: false,
-          centerPosition: thisBounds.getCenter(),
-          incList: [],
-          itemList: includedList,
-          size: basePixelSize
-        });
-      }
-    } //좌표마다 검사해서 인접셀 병합 처리
-
-
-    var centerList = [];
-    var totalItemCount = 0;
-    var min;
-    var max;
-
-    for (var i = 0; i < boundsPos.length; i++) {
-      for (var k = 0; k < boundsPos[i].length; k++) {
-        var curr = boundsPos[i][k];
-        if (curr.checked) continue;
-        curr.checked = true; //현재기준 8방향 객체 모으기
-
-        var incList = [];
-
-        if (boundsPos[i]) {
-          boundsPos[i][k - 1] && incList.push(boundsPos[i][k - 1]);
-          boundsPos[i][k + 1] && incList.push(boundsPos[i][k + 1]);
-        }
-
-        if (boundsPos[i - 1]) {
-          boundsPos[i - 1][k - 1] && incList.push(boundsPos[i - 1][k - 1]);
-          boundsPos[i - 1][k] && incList.push(boundsPos[i - 1][k]);
-          boundsPos[i - 1][k + 1] && incList.push(boundsPos[i - 1][k + 1]);
-        }
-
-        if (boundsPos[i + 1]) {
-          boundsPos[i + 1][k + 1] && incList.push(boundsPos[i + 1][k + 1]);
-          boundsPos[i + 1][k] && incList.push(boundsPos[i + 1][k]);
-          boundsPos[i + 1][k - 1] && incList.push(boundsPos[i + 1][k - 1]);
-        }
-
-        for (var _i = 0, incList_1 = incList; _i < incList_1.length; _i++) {
-          var inc = incList_1[_i];
-          if (inc.checked) continue;
-          inc.checked = true;
-
-          if (inc.itemList && inc.itemList.length > 0) {
-            curr.incList.push(inc);
-
-            (_a = curr.itemList).push.apply(_a, inc.itemList);
-
-            curr.center = true;
-          }
-        }
-
-        if (curr.center) {
-          centerList.push(curr);
-          var avrLat = calculateAverage(curr.itemList.map(function (item) {
-            return item.lat;
-          }));
-          var avrLng = calculateAverage(curr.itemList.map(function (item) {
-            return item.lng;
-          }));
-          curr.centerPosition = new Position(avrLat, avrLng);
-          totalItemCount += curr.itemList.length;
-
-          if (!min || curr.itemList.length < min) {
-            min = curr.itemList.length;
-          }
-
-          if (!max || curr.itemList.length > max) {
-            max = curr.itemList.length;
-          }
-        }
-      }
-    }
-
-    var status = {
-      total: totalItemCount,
-      average: totalItemCount / centerList.length,
-      min: min,
-      max: max
-    };
-
-    sizeFunction = sizeFunction || function (info, status) {
-      var minSize = basePixelSize / 4;
-      var maxSize = basePixelSize;
-      return Math.min(Math.max(basePixelSize * info.itemList.length / status.average, minSize), maxSize);
-    };
-
-    for (var _b = 0, centerList_1 = centerList; _b < centerList_1.length; _b++) {
-      var center = centerList_1[_b];
-      center.size = sizeFunction(center, status);
-    } // console.log('centerList', centerList, status);
-
-
-    return centerList;
-  };
-
-  var calculateAverage = function (nums) {
-    var sum = 0;
-
-    for (var _i = 0, nums_1 = nums; _i < nums_1.length; _i++) {
-      var num = nums_1[_i];
-      sum += num;
-    }
-
-    return Number((sum / nums.length).toFixed(7));
-  };
-
   /**
    * CircleMarker
    *
@@ -5448,7 +5532,9 @@
   exports.SVGCircle = SVGCircle;
   exports.SVGPolygon = SVGPolygon;
   exports.SVGRect = SVGRect;
+  exports.Status = Status;
   exports.getClusterInfo = getClusterInfo;
+  exports.log = log;
   exports.useMarkerMoving = useMarkerMoving;
   exports.useMintMapController = useMintMapController;
   exports.waiting = waiting;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mint-ui/map",
-  "version": "0.5.6-beta",
+  "version": "0.5.7-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.es.js",
   "browser": "./dist/index.umd.js",