@vtx/map 1.2.38 → 2.0.0-beta.2

package/lib/VtxMap/GMap/Map.js

@@ -7,7 +7,8 @@ exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _MapToolFunction = require("../MapToolFunction");
 var _immutable = _interopRequireDefault(require("immutable"));
-var _default2 = _interopRequireDefault(require("../../default"));
+var _default2 = _interopRequireWildcard(require("../../default"));
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -127,42 +128,44 @@ var ArcgisMap = /*#__PURE__*/function (_React$Component) {
     key: "loadMapJs",
     value: function loadMapJs() {
       this.loadMapComplete = new Promise(function (resolve, reject) {
-        if (window.GMap) {
-          resolve(window.GMap);
-        } else {
-          //加载 js
-          // $.getScript('http://222.92.212.126:25048/gis/html/js/arcgis_js_api/library/3.9/3.9/init.js',()=>{
-          $.getScript("".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/init.js"), function () {
-            var Heatmap = new Promise(function (resolve, reject) {
-              $.getScript("".concat(_default2["default"].mapServerURL, "/gisheatmap.js"), function () {
-                resolve();
+        (0, _default2.ensurejQuery)().then(function () {
+          if (window.GMap) {
+            resolve(window.GMap);
+          } else {
+            //加载 js
+            // $.getScript('http://222.92.212.126:25048/gis/html/js/arcgis_js_api/library/3.9/3.9/init.js',()=>{
+            $.getScript("".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/init.js"), function () {
+              var Heatmap = new Promise(function (resolve, reject) {
+                $.getScript("".concat(_default2["default"].mapServerURL, "/gisheatmap.js"), function () {
+                  resolve();
+                });
               });
-            });
-            var PointCollection = new Promise(function (resolve, reject) {
-              $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
-                resolve();
+              var PointCollection = new Promise(function (resolve, reject) {
+                $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
+                  resolve();
+                });
               });
-            });
-            Promise.all([Heatmap, PointCollection]).then(function () {
-              //require是关键字 这边用window区别
-              window.require(["esri/map", "esri/layers/ArcGISTiledMapServiceLayer", "dojo/on", 'esri/geometry/Point', 'esri/symbols/SimpleMarkerSymbol', "esri/Color", "esri/graphic", "esri/domUtils", "esri/toolbars/edit", "esri/symbols/PictureMarkerSymbol", "esri/symbols/TextSymbol", "esri/symbols/SimpleLineSymbol", "esri/toolbars/draw", "esri/layers/WMTSLayer", "esri/geometry/Extent", "esri/layers/WMTSLayerInfo", "esri/geometry/Polyline", "esri/symbols/SimpleFillSymbol", "esri/geometry/Circle", "esri/layers/TileInfo", "esri/SpatialReference", "esri/dijit/BasemapToggle"], function (Map) {
-                window.GMap = Map;
-                resolve(window.GMap);
+              Promise.all([Heatmap, PointCollection]).then(function () {
+                //require是关键字 这边用window区别
+                window.require(["esri/map", "esri/layers/ArcGISTiledMapServiceLayer", "dojo/on", 'esri/geometry/Point', 'esri/symbols/SimpleMarkerSymbol', "esri/Color", "esri/graphic", "esri/domUtils", "esri/toolbars/edit", "esri/symbols/PictureMarkerSymbol", "esri/symbols/TextSymbol", "esri/symbols/SimpleLineSymbol", "esri/toolbars/draw", "esri/layers/WMTSLayer", "esri/geometry/Extent", "esri/layers/WMTSLayerInfo", "esri/geometry/Polyline", "esri/symbols/SimpleFillSymbol", "esri/geometry/Circle", "esri/layers/TileInfo", "esri/SpatialReference", "esri/dijit/BasemapToggle"], function (Map) {
+                  window.GMap = Map;
+                  resolve(window.GMap);
+                });
               });
             });
-          });
-          //加载 css
-          $("<link>").attr({
-            rel: "stylesheet",
-            type: "text/css",
-            href: "".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/js/dojo/dijit/themes/tundra/tundra.css")
-          }).appendTo("head");
-          $("<link>").attr({
-            rel: "stylesheet",
-            type: "text/css",
-            href: "".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/js/esri/css/esri.css")
-          }).appendTo("head");
-        }
+            //加载 css
+            $("<link>").attr({
+              rel: "stylesheet",
+              type: "text/css",
+              href: "".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/js/dojo/dijit/themes/tundra/tundra.css")
+            }).appendTo("head");
+            $("<link>").attr({
+              rel: "stylesheet",
+              type: "text/css",
+              href: "".concat(_default2["default"].arcgisServerURL, "/html/js/arcgis_js_api/library/3.9/3.9/js/esri/css/esri.css")
+            }).appendTo("head");
+          }
+        });
       });
     }
     //初始化地图数据
@@ -2582,8 +2585,6 @@ var ArcgisMap = /*#__PURE__*/function (_React$Component) {
             t.dealLabelGraphics(eid, label);
           }
         };
-        console.log(t.editToolbar);
-
         /*点位编辑事件*/
         //编辑关闭事件
         t.editToolbar.on('deactivate', function (e) {
@@ -2909,11 +2910,10 @@ var ArcgisMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "endEdit",
     value: function endEdit() {
-      var _t$editToolbar, _t$editToolbarC;
       var t = this;
-      (_t$editToolbar = t.editToolbar) === null || _t$editToolbar === void 0 || _t$editToolbar.deactivate();
+      t.editToolbar.deactivate();
       //单独为了圆的
-      (_t$editToolbarC = t.editToolbarC) === null || _t$editToolbarC === void 0 || _t$editToolbarC.deactivate();
+      t.editToolbarC.deactivate();
     }
     //绘制图元
   }, {
@@ -3042,7 +3042,6 @@ var ArcgisMap = /*#__PURE__*/function (_React$Component) {
           // t.GM.setGraphicParam(t.drawParam.data.id,param);
           //绘制返回
           if ('drawEnd' in t.props && typeof t.props.drawEnd == 'function') {
-            console.log(param);
             t.props.drawEnd(param);
           }
         });