@antv/gpt-vis 0.3.2 → 0.3.4

package/dist/esm/Map/index.js

@@ -1,50 +1,33 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { LarkMap } from '@antv/larkmap';
-import React from 'react';
-import { formatMapStyle, setMapContext, setMapView, setMarkers, setPolyline } from "../utils/map";
+import React, { useMemo } from 'react';
+import { formatMapStyle } from "../utils/map";
+import { MapView, Marker, Polyline } from "./Component/";
 var Map = function Map(props) {
   var className = props.className,
     containerStyle = props.containerStyle,
     children = props.children;
-  var allLayers = [];
-  var mapConfig = formatMapStyle(props);
+  var mapConfig = useMemo(function () {
+    return formatMapStyle(props);
+  }, [props]);
   var onSceneLoaded = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(scene) {
-      var polylineLayer, markerLayer;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            // 初始地图视野
-            setMapView(props, scene);
-            // 初始化地图资源和状态
-            _context.next = 3;
-            return setMapContext(props, scene);
-          case 3:
-            // 添加线图层
-            if (props.polyline) {
-              polylineLayer = setPolyline(props.polyline || []);
-              allLayers.push.apply(allLayers, _toConsumableArray(polylineLayer));
+            if (props.onInitComplete) {
+              props.onInitComplete();
             }
-
-            // 添加标记
-            if (props.markers) {
-              markerLayer = setMarkers(props.markers || []);
-              allLayers.push.apply(allLayers, _toConsumableArray(markerLayer));
-            }
-            allLayers.forEach(function (item) {
-              scene.addLayer(item);
-            });
-          case 6:
+          case 1:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onSceneLoaded(_x) {
+    return function onSceneLoaded() {
       return _ref.apply(this, arguments);
     };
   }();
@@ -55,6 +38,6 @@ var Map = function Map(props) {
     }, containerStyle)
   }, mapConfig, {
     onSceneLoaded: onSceneLoaded
-  }), children);
+  }), /*#__PURE__*/React.createElement(MapView, props), /*#__PURE__*/React.createElement(Marker, props), /*#__PURE__*/React.createElement(Polyline, props), children);
 };
 export default Map;

package/dist/esm/utils/map/context.js

@@ -16,11 +16,17 @@ export function setMapContext(props, scene) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               id = urlToMarkerId(url);
-              _context.next = 3;
-              return scene.addImage(id, url);
+              if (!scene.hasImage(id)) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return");
             case 3:
+              _context.next = 5;
+              return scene.addImage(id, url);
+            case 5:
               return _context.abrupt("return", _context.sent);
-            case 4:
+            case 6:
             case "end":
               return _context.stop();
           }

package/dist/esm/utils/map/view.d.ts

@@ -1,3 +1,5 @@
 import type { Scene } from '@antv/l7';
 import type { Map } from '../../types/map';
 export declare const setMapView: (props: Map, scene: Scene) => void;
+export declare const fitBounds: (props: Map, scene: Scene) => void;
+export declare const setMapStatus: (props: Map, scene: Scene) => void;

package/dist/esm/utils/map/view.js

@@ -32,7 +32,10 @@ function fitIncludePoints(includePoints, scene, includePadding) {
   }
 }
 export var setMapView = function setMapView(props, scene) {
-  // 单个点,多个点
+  fitBounds(props, scene);
+  setMapStatus(props, scene);
+};
+export var fitBounds = function fitBounds(props, scene) {
   if (props.includePoints) {
     fitIncludePoints(props.includePoints, scene, props.includePadding);
   } else {
@@ -59,6 +62,8 @@ export var setMapView = function setMapView(props, scene) {
       fitIncludePoints(points, scene, props.includePadding);
     }
   }
+};
+export var setMapStatus = function setMapStatus(props, scene) {
   if (props.enableZoom !== undefined) {
     scene.setMapStatus({
       zoomEnable: props.enableZoom
@@ -74,8 +79,4 @@ export var setMapView = function setMapView(props, scene) {
       dragEnable: props.enableScroll
     });
   }
-  if (props.onInitComplete) {
-    scene.off('loaded', props.onInitComplete);
-    scene.on('loaded', props.onInitComplete);
-  }
 };

package/dist/esm/utils/plot.js

@@ -1,6 +1,6 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { isUndefined } from 'lodash';
+import { get } from 'lodash';
 var ADC_ENCODE_FIELDS = new Map([['x', 'xField'], ['y', 'yField'], ['series', 'seriesField'], ['size', 'sizeField'], ['color', 'colorField'], ['shape', 'shapeField'], ['y', 'angleField']]);
 
 /**
@@ -34,23 +34,27 @@ function visG2Encode2ADCEncode(config) {
  */
 function axisTitle2G2axis(config) {
   var axisXTitle = config.axisXTitle,
-    axisYTitle = config.axisYTitle,
-    axis = config.axis;
-  if (!isUndefined(axis)) return config;
+    axisYTitle = config.axisYTitle;
   var _config = _objectSpread({
     axis: {}
   }, config);
   if (axisXTitle) {
-    // @ts-expect-error
-    _config.axis.x = {
-      title: axisXTitle
-    };
+    if (get(_config, 'axis.x')) {
+      _config.axis.x.title = axisXTitle;
+    } else {
+      _config.axis.x = {
+        title: axisXTitle
+      };
+    }
   }
   if (axisYTitle) {
-    // @ts-expect-error
-    _config.axis.y = {
-      title: axisYTitle
-    };
+    if (get(_config, 'axis.y')) {
+      _config.axis.y.title = axisYTitle;
+    } else {
+      _config.axis.y = {
+        title: axisYTitle
+      };
+    }
   }
   return _config;
 }

package/dist/esm/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.3.2";
+declare const _default: "0.3.4";
 export default _default;

package/dist/esm/version.js

@@ -1 +1 @@
-export default '0.3.2';
+export default '0.3.4';