@mint-ui/map 0.5.4-beta → 0.5.5-beta

package/dist/components/mint-map/core/advanced/shapes/PolygonMarker.js

@@ -13,6 +13,7 @@ require('../../util/animation.js');
 require('../../util/geo.js');
 require('tslib');
 var polygon = require('../../util/polygon.js');
+var NaverMintMapController = require('../../../naver/NaverMintMapController.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -131,9 +132,10 @@ function PolygonMarker(_a) {
 
       if (minLng === undefined || minLng > pos.lng) {
         minLng = pos.lng;
-      }
+      } //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+
 
-      return controller.positionToOffset(pos);
+      return controller instanceof NaverMintMapController.NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
     });
     var simplified = simplifyPath ? polygon.PolygonCalculator.simplifyPoints(offsets, simplifyTolerance, lastReapeated) : offsets;
     setOffsets(simplified); //inner path
@@ -144,7 +146,8 @@ function PolygonMarker(_a) {
       for (var _i = 0, innerPositions_1 = innerPositions; _i < innerPositions_1.length; _i++) {
         var innerPosition = innerPositions_1[_i];
         var offsets_1 = innerPosition.map(function (pos) {
-          return controller.positionToOffset(pos);
+          //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+          return controller instanceof NaverMintMapController.NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
         });
         var simplified_1 = simplifyPath ? polygon.PolygonCalculator.simplifyPoints(offsets_1, simplifyTolerance, lastReapeated) : offsets_1;
         innerPath.push(simplified_1);

package/dist/components/mint-map/core/wrapper/MapCanvasWrapper.js

@@ -130,7 +130,7 @@ function MapCanvasWrapper(_a) {
         var pos = item.position; // console.log('canvas mouseevent check', pos.offset);
 
         if (pos && !pos.offset) {
-          pos.offset = positionToOffset(pos);
+          pos.offset = controller.positionToOffset(pos);
         }
 
         if (!pos || !pos.offset || !includes(clickedOffset, pos.offset, item.boxWidth, item.boxHeight)) {
@@ -209,7 +209,7 @@ function MapCanvasWrapper(_a) {
 
         map.addListener('mousemove', function (e) {
           var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-          var clickedOffset = positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
+          var clickedOffset = controller.positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
 
           var hitSet = processMouseEvent(clickedOffset, 'onMouseOver'); //mouse out 처리
 
@@ -223,7 +223,7 @@ function MapCanvasWrapper(_a) {
 
         map.addListener('click', function (e) {
           var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-          var clickedOffset = positionToOffset(clickPosition);
+          var clickedOffset = controller.positionToOffset(clickPosition);
           processMouseEvent(clickedOffset, 'onClick');
         });
       }
@@ -294,7 +294,7 @@ function MapCanvasWrapper(_a) {
       if (item.visible === undefined || item.visible) {
         var pos = item.position; //위치 변환
 
-        pos.offset = positionToOffset(pos);
+        pos.offset = controller.positionToOffset(pos);
 
         if (item.anchor) {
           pos.offset.x += item.anchor.x;
@@ -323,22 +323,6 @@ function MapCanvasWrapper(_a) {
   }, []); //render!!!
 
   renderMain();
-
-  var positionToOffset = React.useCallback(function (position) {
-    var div = controller.mapDivElement;
-    var w = div === null || div === void 0 ? void 0 : div.offsetWidth;
-    var h = div === null || div === void 0 ? void 0 : div.offsetHeight;
-    var bounds = controller.getCurrBounds();
-    var maxLng = bounds.ne.lng;
-    var minLng = bounds.sw.lng;
-    var lng = Math.abs(maxLng - minLng);
-    var x = w * (position.lng - minLng) / lng;
-    var maxLat = bounds.ne.lat;
-    var minLat = bounds.sw.lat;
-    var lat = Math.abs(maxLat - minLat);
-    var y = h * (maxLat - position.lat) / lat;
-    return new MapTypes.Offset(x, y);
-  }, []);
   return React__default["default"].createElement("div", {
     ref: containerRef,
     style: {

package/dist/components/mint-map/naver/NaverMintMapController.d.ts

@@ -45,7 +45,7 @@ export declare class NaverMintMapController extends MintMapController {
     setZoomLevel(zoom: number): void;
     getCenter(): Position;
     setCenter(position: Position): void;
-    positionToOffset(position: Position): Offset;
+    naverPositionToOffset(position: Position): Offset;
     private eventMap;
     addEventListener(eventName: MapEventName, callback: EventCallback<EventParamType>): void;
     removeEventListener(eventName: MapEventName, callback: EventCallback<EventParamType>): void;

package/dist/components/mint-map/naver/NaverMintMapController.js

@@ -632,7 +632,7 @@ function (_super) {
     (_a = this.map) === null || _a === void 0 ? void 0 : _a.setCenter(position);
   };
 
-  NaverMintMapController.prototype.positionToOffset = function (position) {
+  NaverMintMapController.prototype.naverPositionToOffset = function (position) {
     if (!this.map) {
       return new MapTypes.Offset(0, 0);
     }

package/dist/index.es.js

@@ -1768,7 +1768,7 @@ function (_super) {
     (_a = this.map) === null || _a === void 0 ? void 0 : _a.setCenter(position);
   };
 
-  NaverMintMapController.prototype.positionToOffset = function (position) {
+  NaverMintMapController.prototype.naverPositionToOffset = function (position) {
     if (!this.map) {
       return new Offset(0, 0);
     }
@@ -4433,9 +4433,10 @@ function PolygonMarker(_a) {
 
       if (minLng === undefined || minLng > pos.lng) {
         minLng = pos.lng;
-      }
+      } //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+
 
-      return controller.positionToOffset(pos);
+      return controller instanceof NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
     });
     var simplified = simplifyPath ? PolygonCalculator.simplifyPoints(offsets, simplifyTolerance, lastReapeated) : offsets;
     setOffsets(simplified); //inner path
@@ -4446,7 +4447,8 @@ function PolygonMarker(_a) {
       for (var _i = 0, innerPositions_1 = innerPositions; _i < innerPositions_1.length; _i++) {
         var innerPosition = innerPositions_1[_i];
         var offsets_1 = innerPosition.map(function (pos) {
-          return controller.positionToOffset(pos);
+          //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+          return controller instanceof NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
         });
         var simplified_1 = simplifyPath ? PolygonCalculator.simplifyPoints(offsets_1, simplifyTolerance, lastReapeated) : offsets_1;
         innerPath.push(simplified_1);
@@ -5157,7 +5159,7 @@ function MapCanvasWrapper(_a) {
         var pos = item.position; // console.log('canvas mouseevent check', pos.offset);
 
         if (pos && !pos.offset) {
-          pos.offset = positionToOffset(pos);
+          pos.offset = controller.positionToOffset(pos);
         }
 
         if (!pos || !pos.offset || !includes(clickedOffset, pos.offset, item.boxWidth, item.boxHeight)) {
@@ -5236,7 +5238,7 @@ function MapCanvasWrapper(_a) {
 
         map.addListener('mousemove', function (e) {
           var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-          var clickedOffset = positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
+          var clickedOffset = controller.positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
 
           var hitSet = processMouseEvent(clickedOffset, 'onMouseOver'); //mouse out 처리
 
@@ -5250,7 +5252,7 @@ function MapCanvasWrapper(_a) {
 
         map.addListener('click', function (e) {
           var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-          var clickedOffset = positionToOffset(clickPosition);
+          var clickedOffset = controller.positionToOffset(clickPosition);
           processMouseEvent(clickedOffset, 'onClick');
         });
       }
@@ -5321,7 +5323,7 @@ function MapCanvasWrapper(_a) {
       if (item.visible === undefined || item.visible) {
         var pos = item.position; //위치 변환
 
-        pos.offset = positionToOffset(pos);
+        pos.offset = controller.positionToOffset(pos);
 
         if (item.anchor) {
           pos.offset.x += item.anchor.x;
@@ -5350,22 +5352,6 @@ function MapCanvasWrapper(_a) {
   }, []); //render!!!
 
   renderMain();
-
-  var positionToOffset = useCallback(function (position) {
-    var div = controller.mapDivElement;
-    var w = div === null || div === void 0 ? void 0 : div.offsetWidth;
-    var h = div === null || div === void 0 ? void 0 : div.offsetHeight;
-    var bounds = controller.getCurrBounds();
-    var maxLng = bounds.ne.lng;
-    var minLng = bounds.sw.lng;
-    var lng = Math.abs(maxLng - minLng);
-    var x = w * (position.lng - minLng) / lng;
-    var maxLat = bounds.ne.lat;
-    var minLat = bounds.sw.lat;
-    var lat = Math.abs(maxLat - minLat);
-    var y = h * (maxLat - position.lat) / lat;
-    return new Offset(x, y);
-  }, []);
   return React.createElement("div", {
     ref: containerRef,
     style: {

package/dist/index.umd.js

@@ -1772,7 +1772,7 @@
       (_a = this.map) === null || _a === void 0 ? void 0 : _a.setCenter(position);
     };
 
-    NaverMintMapController.prototype.positionToOffset = function (position) {
+    NaverMintMapController.prototype.naverPositionToOffset = function (position) {
       if (!this.map) {
         return new Offset(0, 0);
       }
@@ -4437,9 +4437,10 @@
 
         if (minLng === undefined || minLng > pos.lng) {
           minLng = pos.lng;
-        }
+        } //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+
 
-        return controller.positionToOffset(pos);
+        return controller instanceof NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
       });
       var simplified = simplifyPath ? PolygonCalculator.simplifyPoints(offsets, simplifyTolerance, lastReapeated) : offsets;
       setOffsets(simplified); //inner path
@@ -4450,7 +4451,8 @@
         for (var _i = 0, innerPositions_1 = innerPositions; _i < innerPositions_1.length; _i++) {
           var innerPosition = innerPositions_1[_i];
           var offsets_1 = innerPosition.map(function (pos) {
-            return controller.positionToOffset(pos);
+            //offset 계산 정확도를 위해 네이버 맵은 전용 projection 베이스의 function 을 사용한다.
+            return controller instanceof NaverMintMapController ? controller.naverPositionToOffset(pos) : controller.positionToOffset(pos);
           });
           var simplified_1 = simplifyPath ? PolygonCalculator.simplifyPoints(offsets_1, simplifyTolerance, lastReapeated) : offsets_1;
           innerPath.push(simplified_1);
@@ -5161,7 +5163,7 @@
           var pos = item.position; // console.log('canvas mouseevent check', pos.offset);
 
           if (pos && !pos.offset) {
-            pos.offset = positionToOffset(pos);
+            pos.offset = controller.positionToOffset(pos);
           }
 
           if (!pos || !pos.offset || !includes(clickedOffset, pos.offset, item.boxWidth, item.boxHeight)) {
@@ -5240,7 +5242,7 @@
 
           map.addListener('mousemove', function (e) {
             var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-            var clickedOffset = positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
+            var clickedOffset = controller.positionToOffset(clickPosition); // console.log('canvas mousemove', clickedOffset);
 
             var hitSet = processMouseEvent(clickedOffset, 'onMouseOver'); //mouse out 처리
 
@@ -5254,7 +5256,7 @@
 
           map.addListener('click', function (e) {
             var clickPosition = parseClickParamToPosition(controller.getMapType(), e);
-            var clickedOffset = positionToOffset(clickPosition);
+            var clickedOffset = controller.positionToOffset(clickPosition);
             processMouseEvent(clickedOffset, 'onClick');
           });
         }
@@ -5325,7 +5327,7 @@
         if (item.visible === undefined || item.visible) {
           var pos = item.position; //위치 변환
 
-          pos.offset = positionToOffset(pos);
+          pos.offset = controller.positionToOffset(pos);
 
           if (item.anchor) {
             pos.offset.x += item.anchor.x;
@@ -5354,22 +5356,6 @@
     }, []); //render!!!
 
     renderMain();
-
-    var positionToOffset = React.useCallback(function (position) {
-      var div = controller.mapDivElement;
-      var w = div === null || div === void 0 ? void 0 : div.offsetWidth;
-      var h = div === null || div === void 0 ? void 0 : div.offsetHeight;
-      var bounds = controller.getCurrBounds();
-      var maxLng = bounds.ne.lng;
-      var minLng = bounds.sw.lng;
-      var lng = Math.abs(maxLng - minLng);
-      var x = w * (position.lng - minLng) / lng;
-      var maxLat = bounds.ne.lat;
-      var minLat = bounds.sw.lat;
-      var lat = Math.abs(maxLat - minLat);
-      var y = h * (maxLat - position.lat) / lat;
-      return new Offset(x, y);
-    }, []);
     return React__default["default"].createElement("div", {
       ref: containerRef,
       style: {

package/package.json

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