@antv/l7-map 2.9.33 → 2.9.35

package/lib/handler/touch/two_touch.js

@@ -1,105 +1,144 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/handler/touch/two_touch.ts
-var two_touch_exports = {};
-__export(two_touch_exports, {
-  default: () => TwoTouchHandler
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(two_touch_exports);
-var import_dom = __toESM(require("../../utils/dom"));
-var TwoTouchHandler = class {
-  constructor() {
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _dom = _interopRequireDefault(require("../../utils/dom"));
+
+// @ts-ignore
+var TwoTouchHandler = /*#__PURE__*/function () {
+  function TwoTouchHandler() {
+    (0, _classCallCheck2.default)(this, TwoTouchHandler);
     this.reset();
   }
-  reset() {
-    this.active = false;
-    delete this.firstTwoTouches;
-  }
-  start(points) {
-    return;
-  }
-  move(points, pinchAround, e) {
-    return;
-  }
-  touchstart(e, points, mapTouches) {
-    if (this.firstTwoTouches || mapTouches.length < 2) {
-      return;
+
+  (0, _createClass2.default)(TwoTouchHandler, [{
+    key: "reset",
+    value: function reset() {
+      this.active = false; //@ts-ignore
+
+      delete this.firstTwoTouches;
     }
-    this.firstTwoTouches = [mapTouches[0].identifier, mapTouches[1].identifier];
-    this.start([points[0], points[1]]);
-  }
-  touchmove(e, points, mapTouches) {
-    if (!this.firstTwoTouches) {
+  }, {
+    key: "start",
+    value: function start(points) {
       return;
-    }
-    e.preventDefault();
-    const [idA, idB] = this.firstTwoTouches;
-    const a = getTouchById(mapTouches, points, idA);
-    const b = getTouchById(mapTouches, points, idB);
-    if (!a || !b) {
+    } // eslint-disable-line
+
+  }, {
+    key: "move",
+    value: function move(points, pinchAround, e) {
       return;
+    } // eslint-disable-line
+
+  }, {
+    key: "touchstart",
+    value: function touchstart(e, points, mapTouches) {
+      // console.log(e.target, e.targetTouches.length ? e.targetTouches[0].target : null);
+      // log('touchstart', points, e.target.innerHTML, e.targetTouches.length ? e.targetTouches[0].target.innerHTML: undefined);
+      if (this.firstTwoTouches || mapTouches.length < 2) {
+        return;
+      }
+
+      this.firstTwoTouches = [mapTouches[0].identifier, mapTouches[1].identifier]; // implemented by child classes
+
+      this.start([points[0], points[1]]);
     }
-    const pinchAround = this.aroundCenter ? null : a.add(b).div(2);
-    return this.move([a, b], pinchAround, e);
-  }
-  touchend(e, points, mapTouches) {
-    if (!this.firstTwoTouches) {
-      return;
+  }, {
+    key: "touchmove",
+    value: function touchmove(e, points, mapTouches) {
+      if (!this.firstTwoTouches) {
+        return;
+      }
+
+      e.preventDefault();
+
+      var _this$firstTwoTouches = (0, _slicedToArray2.default)(this.firstTwoTouches, 2),
+          idA = _this$firstTwoTouches[0],
+          idB = _this$firstTwoTouches[1];
+
+      var a = getTouchById(mapTouches, points, idA);
+      var b = getTouchById(mapTouches, points, idB);
+
+      if (!a || !b) {
+        return;
+      }
+
+      var pinchAround = this.aroundCenter ? null : a.add(b).div(2); // implemented by child classes
+
+      return this.move([a, b], pinchAround, e);
     }
-    const [idA, idB] = this.firstTwoTouches;
-    const a = getTouchById(mapTouches, points, idA);
-    const b = getTouchById(mapTouches, points, idB);
-    if (a && b) {
-      return;
+  }, {
+    key: "touchend",
+    value: function touchend(e, points, mapTouches) {
+      if (!this.firstTwoTouches) {
+        return;
+      }
+
+      var _this$firstTwoTouches2 = (0, _slicedToArray2.default)(this.firstTwoTouches, 2),
+          idA = _this$firstTwoTouches2[0],
+          idB = _this$firstTwoTouches2[1];
+
+      var a = getTouchById(mapTouches, points, idA);
+      var b = getTouchById(mapTouches, points, idB);
+
+      if (a && b) {
+        return;
+      }
+
+      if (this.active) {
+        _dom.default.suppressClick();
+      }
+
+      this.reset();
     }
-    if (this.active) {
-      import_dom.default.suppressClick();
+  }, {
+    key: "touchcancel",
+    value: function touchcancel() {
+      this.reset();
     }
-    this.reset();
-  }
-  touchcancel() {
-    this.reset();
-  }
-  enable(options) {
-    this.enabled = true;
-    this.aroundCenter = !!options && options.around === "center";
-  }
-  disable() {
-    this.enabled = false;
-    this.reset();
-  }
-  isEnabled() {
-    return this.enabled;
-  }
-  isActive() {
-    return this.active;
-  }
-};
+  }, {
+    key: "enable",
+    value: function enable(options) {
+      this.enabled = true;
+      this.aroundCenter = !!options && options.around === 'center';
+    }
+  }, {
+    key: "disable",
+    value: function disable() {
+      this.enabled = false;
+      this.reset();
+    }
+  }, {
+    key: "isEnabled",
+    value: function isEnabled() {
+      return this.enabled;
+    }
+  }, {
+    key: "isActive",
+    value: function isActive() {
+      return this.active;
+    }
+  }]);
+  return TwoTouchHandler;
+}();
+
+exports.default = TwoTouchHandler;
+
 function getTouchById(mapTouches, points, identifier) {
-  for (let i = 0; i < mapTouches.length; i++) {
+  for (var i = 0; i < mapTouches.length; i++) {
     if (mapTouches[i].identifier === identifier) {
       return points[i];
     }
   }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+}

package/lib/hash.js

@@ -1,120 +1,169 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/hash.ts
-var hash_exports = {};
-__export(hash_exports, {
-  default: () => hash_default
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(hash_exports);
-var import_l7_utils = require("@antv/l7-utils");
-var import_lodash = require("lodash");
-var Hash = class {
-  constructor(hashName) {
-    this.onHashChange = () => {
-      const loc = this.getCurrentHash();
-      if (loc.length >= 3 && !loc.some((v) => isNaN(+v))) {
-        const bearing = this.map.dragRotate.isEnabled() && this.map.touchZoomRotate.isEnabled() ? +(loc[3] || 0) : this.map.getBearing();
-        this.map.jumpTo({
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _l7Utils = require("@antv/l7-utils");
+
+var _lodash = require("lodash");
+
+// @ts-ignore
+// tslint:disable-next-line:no-submodule-imports
+
+/*
+ * Adds the map's position to its page's location hash.
+ * Passed as an option to the map object.
+ *
+ * @returns {Hash} `this`
+ */
+var Hash = /*#__PURE__*/function () {
+  function Hash(hashName) {
+    var _this = this;
+
+    (0, _classCallCheck2.default)(this, Hash);
+    (0, _defineProperty2.default)(this, "onHashChange", function () {
+      var loc = _this.getCurrentHash();
+
+      if (loc.length >= 3 && !loc.some(function (v) {
+        return isNaN(+v);
+      })) {
+        var bearing = _this.map.dragRotate.isEnabled() && _this.map.touchZoomRotate.isEnabled() ? +(loc[3] || 0) : _this.map.getBearing();
+
+        _this.map.jumpTo({
           center: [+loc[2], +loc[1]],
           zoom: +loc[0],
-          bearing,
+          bearing: bearing,
           pitch: +(loc[4] || 0)
         });
+
         return true;
       }
+
       return false;
-    };
-    this.getCurrentHash = () => {
-      const hash = window.location.hash.replace("#", "");
-      if (this.hashName) {
-        let keyval;
-        hash.split("&").map((part) => part.split("=")).forEach((part) => {
-          if (part[0] === this.hashName) {
+    });
+    (0, _defineProperty2.default)(this, "getCurrentHash", function () {
+      // Get the current hash from location, stripped from its number sign
+      var hash = window.location.hash.replace('#', '');
+
+      if (_this.hashName) {
+        // Split the parameter-styled hash into parts and find the value we need
+        var keyval;
+        hash.split('&').map(function (part) {
+          return part.split('=');
+        }).forEach(function (part) {
+          if (part[0] === _this.hashName) {
             keyval = part;
           }
         });
-        return (keyval ? keyval[1] || "" : "").split("/");
+        return (keyval ? keyval[1] || '' : '').split('/');
       }
-      return hash.split("/");
-    };
-    this.updateHashUnthrottled = () => {
-      const hash = this.getHashString();
+
+      return hash.split('/');
+    });
+    (0, _defineProperty2.default)(this, "updateHashUnthrottled", function () {
+      var hash = _this.getHashString();
+
       try {
-        window.history.replaceState(window.history.state, "", hash);
-      } catch (SecurityError) {
+        window.history.replaceState(window.history.state, '', hash);
+      } catch (SecurityError) {// IE11 does not allow this if the page is within an iframe created
+        // with iframe.contentWindow.document.write(...).
+        // https://github.com/mapbox/mapbox-gl-js/issues/7410
       }
-    };
-    this.hashName = hashName && encodeURIComponent(hashName);
-    this.updateHash = (0, import_lodash.throttle)(this.updateHashUnthrottled, 30 * 1e3 / 100);
-  }
-  addTo(map) {
-    this.map = map;
-    import_l7_utils.$window.addEventListener("hashchange", this.onHashChange, false);
-    this.map.on("moveend", this.updateHash);
-    return this;
-  }
-  remove() {
-    import_l7_utils.$window.removeEventListener("hashchange", this.onHashChange, false);
-    this.map.off("moveend", this.updateHash);
-    delete this.map;
-    return this;
+    });
+    this.hashName = hashName && encodeURIComponent(hashName); // Mobile Safari doesn't allow updating the hash more than 100 times per 30 seconds.
+
+    this.updateHash = (0, _lodash.throttle)(this.updateHashUnthrottled, 30 * 1000 / 100);
   }
-  getHashString(mapFeedback) {
-    const center = this.map.getCenter();
-    const zoom = Math.round(this.map.getZoom() * 100) / 100;
-    const precision = Math.ceil((zoom * Math.LN2 + Math.log(512 / 360 / 0.5)) / Math.LN10);
-    const m = Math.pow(10, precision);
-    const lng = Math.round(center.lng * m) / m;
-    const lat = Math.round(center.lat * m) / m;
-    const bearing = this.map.getBearing();
-    const pitch = this.map.getPitch();
-    let hash = "";
-    if (mapFeedback) {
-      hash += `/${lng}/${lat}/${zoom}`;
-    } else {
-      hash += `${zoom}/${lat}/${lng}`;
-    }
-    if (bearing || pitch) {
-      hash += `/${Math.round(bearing * 10) / 10}`;
+
+  (0, _createClass2.default)(Hash, [{
+    key: "addTo",
+    value: function addTo(map) {
+      this.map = map;
+
+      _l7Utils.$window.addEventListener('hashchange', this.onHashChange, false);
+
+      this.map.on('moveend', this.updateHash);
+      return this;
     }
-    if (pitch) {
-      hash += `/${Math.round(pitch)}`;
+  }, {
+    key: "remove",
+    value: function remove() {
+      _l7Utils.$window.removeEventListener('hashchange', this.onHashChange, false);
+
+      this.map.off('moveend', this.updateHash); // clearTimeout(this.updateHash());
+      // @ts-ignore
+
+      delete this.map;
+      return this;
     }
-    if (this.hashName) {
-      const hashName = this.hashName;
-      let found = false;
-      const parts = window.location.hash.slice(1).split("&").map((part) => {
-        const key = part.split("=")[0];
-        if (key === hashName) {
-          found = true;
-          return `${key}=${hash}`;
+  }, {
+    key: "getHashString",
+    value: function getHashString(mapFeedback) {
+      var center = this.map.getCenter();
+      var zoom = Math.round(this.map.getZoom() * 100) / 100; // derived from equation: 512px * 2^z / 360 / 10^d < 0.5px
+
+      var precision = Math.ceil((zoom * Math.LN2 + Math.log(512 / 360 / 0.5)) / Math.LN10);
+      var m = Math.pow(10, precision);
+      var lng = Math.round(center.lng * m) / m;
+      var lat = Math.round(center.lat * m) / m;
+      var bearing = this.map.getBearing();
+      var pitch = this.map.getPitch();
+      var hash = '';
+
+      if (mapFeedback) {
+        // new map feedback site has some constraints that don't allow
+        // us to use the same hash format as we do for the Map hash option.
+        hash += "/".concat(lng, "/").concat(lat, "/").concat(zoom);
+      } else {
+        hash += "".concat(zoom, "/").concat(lat, "/").concat(lng);
+      }
+
+      if (bearing || pitch) {
+        hash += "/".concat(Math.round(bearing * 10) / 10);
+      }
+
+      if (pitch) {
+        hash += "/".concat(Math.round(pitch));
+      }
+
+      if (this.hashName) {
+        var hashName = this.hashName;
+        var found = false;
+        var parts = window.location.hash.slice(1).split('&').map(function (part) {
+          var key = part.split('=')[0];
+
+          if (key === hashName) {
+            found = true;
+            return "".concat(key, "=").concat(hash);
+          }
+
+          return part;
+        }).filter(function (a) {
+          return a;
+        });
+
+        if (!found) {
+          parts.push("".concat(hashName, "=").concat(hash));
         }
-        return part;
-      }).filter((a) => a);
-      if (!found) {
-        parts.push(`${hashName}=${hash}`);
+
+        return "#".concat(parts.join('&'));
       }
-      return `#${parts.join("&")}`;
+
+      return "#".concat(hash);
     }
-    return `#${hash}`;
-  }
-};
-var hash_default = Hash;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return Hash;
+}();
+
+var _default = Hash;
+exports.default = _default;

package/lib/index.js

@@ -1,21 +1,44 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/index.ts
-var src_exports = {};
-module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("./map"), module.exports);
-__reExport(src_exports, require("./earthmap"), module.exports);
-__reExport(src_exports, require("./interface"), module.exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _map = require("./map");
+
+Object.keys(_map).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _map[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _map[key];
+    }
+  });
+});
+
+var _earthmap = require("./earthmap");
+
+Object.keys(_earthmap).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _earthmap[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _earthmap[key];
+    }
+  });
+});
+
+var _interface = require("./interface");
+
+Object.keys(_interface).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _interface[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _interface[key];
+    }
+  });
+});

package/lib/interface.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/interface.ts
-var interface_exports = {};
-module.exports = __toCommonJS(interface_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});