tg-map-core 4.1.0 → 4.1.2

package/dist/tg-map-core.cjs

@@ -758,20 +758,22 @@ const HERE_SUPPORTED_VERSIONS = ['3.0'];
 const defaultConfig = {
     baidu: {
         version: '3.0',
-        // 在build时会被静态替换, 导致使用者不能无法设置它
+        // import.meta.env是Vite的功能, 在打包时会被静态替换, 故使用者无法设置它
+        // 若使用Rollup打包, 默认不会做任何处理, 原样输出, 所以使用者如果用的Vite, 就可以设置它, 如果用的Vue Cli, 默认就会报错
+        // 为了让使用者可以任意选择打包工具, 这里不使用import.meta.env, 改成填充默认的空字符串
         // @see https://cn.vitejs.dev/guide/build.html#library-mode:~:text=%E6%A8%A1%E5%BC%8F%E4%B8%8B%EF%BC%8C%E6%89%80%E6%9C%89-,import.meta.env.*,-%E7%94%A8%E6%B3%95%E5%9C%A8%E6%9E%84
         // @see @vite_process_env_detail
-        key: undefined.VITE_APP_DEV_KEY_BAIDU,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_BAIDU,
     },
     google: {
         version: 'quarterly',
-        key: undefined.VITE_APP_DEV_KEY_GOOGLE,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_GOOGLE,
         language: 'en-us',
         libraries: ['places', 'visualization'],
     },
     here: {
         version: HERE_SUPPORTED_VERSIONS[0],
-        key: undefined.VITE_APP_DEV_KEY_HERE,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_HERE,
     },
     baiduFree: {},
     amap: {},
@@ -1403,45 +1405,6 @@ class TalksZoomControl extends EmptyControl {
     }
 }
 
-/**
- * Google地图官方提供的载入方式, 使用{@link google.map.importLibrary}动态载入依赖
- *
- * 实验性的特性, 实测当前只有`3.52`版支持
- *
- * @see https://developers.google.com/maps/documentation/javascript/load-maps-js-api#dynamic-library-import
- */
-function initGoogleMapDynamicLibraryImport(args) {
-    let promise;
-    let script;
-    let arg;
-    const googleTitle = 'The Google Maps JavaScript API';
-    const googleName = 'google';
-    const importMethod = 'importLibrary';
-    const callbackId = '__ib__';
-    const dom = document;
-    const global = window;
-    const google = global[googleName] || (global[googleName] = {});
-    const googleMaps = google.maps || (google.maps = {});
-    const libraries = new Set();
-    const url = new URLSearchParams();
-    // eslint-disable-next-line no-async-promise-executor
-    const loader = () => promise || (promise = new Promise(async (resolve, reject) => {
-        await (script = dom.createElement('script'));
-        url.set('libraries', [...libraries] + '');
-        for (arg in args)
-            url.set(arg.replace(/[A-Z]/g, t => '_' + t[0].toLowerCase()), args[arg]);
-        url.set('callback', googleName + '.maps.' + callbackId);
-        script.src = `https://maps.${googleName}apis.com/maps/api/js?` + url;
-        googleMaps[callbackId] = resolve;
-        // eslint-disable-next-line no-return-assign
-        script.onerror = () => promise = reject(Error(googleTitle + ' could not load.'));
-        script.nonce = dom.querySelector('script[nonce]')?.nonce || '';
-        dom.head.append(script);
-    }));
-    googleMaps[importMethod]
-        ? console.warn(googleTitle + ' only loads once. Ignoring:', args)
-        : googleMaps[importMethod] = (library, ...rest) => libraries.add(library) && loader().then(() => googleMaps[importMethod](library, ...rest));
-}
 let _LATLNG_ZERO;
 let _BOUNDS_ZERO;
 const GoogleConst = {
@@ -5250,15 +5213,6 @@ function loadMap({ type, config }) {
     }
     switch (type) {
         case exports.TgMapType.google:
-            if (undefined.VITE_FALSE) {
-                // 测试新的动态载入方式
-                initGoogleMapDynamicLibraryImport({
-                    key: config.key,
-                    v: '3.52',
-                    // v: config.version,
-                });
-                return google.maps.importLibrary('core');
-            }
             // TODO: 修改语言后, 要重新载入
             return loadJsonp(`https://maps.googleapis.com/maps/api/js?key=${config.key}&language=${config.language}&v=${config.version}&libraries=${config.libraries.join(',')}`);
         case exports.TgMapType.baidu:

package/dist/tg-map-core.mjs

@@ -737,20 +737,22 @@ const HERE_SUPPORTED_VERSIONS = ['3.0'];
 const defaultConfig = {
     baidu: {
         version: '3.0',
-        // 在build时会被静态替换, 导致使用者不能无法设置它
+        // import.meta.env是Vite的功能, 在打包时会被静态替换, 故使用者无法设置它
+        // 若使用Rollup打包, 默认不会做任何处理, 原样输出, 所以使用者如果用的Vite, 就可以设置它, 如果用的Vue Cli, 默认就会报错
+        // 为了让使用者可以任意选择打包工具, 这里不使用import.meta.env, 改成填充默认的空字符串
         // @see https://cn.vitejs.dev/guide/build.html#library-mode:~:text=%E6%A8%A1%E5%BC%8F%E4%B8%8B%EF%BC%8C%E6%89%80%E6%9C%89-,import.meta.env.*,-%E7%94%A8%E6%B3%95%E5%9C%A8%E6%9E%84
         // @see @vite_process_env_detail
-        key: import.meta.env.VITE_APP_DEV_KEY_BAIDU,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_BAIDU,
     },
     google: {
         version: 'quarterly',
-        key: import.meta.env.VITE_APP_DEV_KEY_GOOGLE,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_GOOGLE,
         language: 'en-us',
         libraries: ['places', 'visualization'],
     },
     here: {
         version: HERE_SUPPORTED_VERSIONS[0],
-        key: import.meta.env.VITE_APP_DEV_KEY_HERE,
+        key: '', // import.meta.env.VITE_APP_DEV_KEY_HERE,
     },
     baiduFree: {},
     amap: {},
@@ -1382,45 +1384,6 @@ class TalksZoomControl extends EmptyControl {
     }
 }
 
-/**
- * Google地图官方提供的载入方式, 使用{@link google.map.importLibrary}动态载入依赖
- *
- * 实验性的特性, 实测当前只有`3.52`版支持
- *
- * @see https://developers.google.com/maps/documentation/javascript/load-maps-js-api#dynamic-library-import
- */
-function initGoogleMapDynamicLibraryImport(args) {
-    let promise;
-    let script;
-    let arg;
-    const googleTitle = 'The Google Maps JavaScript API';
-    const googleName = 'google';
-    const importMethod = 'importLibrary';
-    const callbackId = '__ib__';
-    const dom = document;
-    const global = window;
-    const google = global[googleName] || (global[googleName] = {});
-    const googleMaps = google.maps || (google.maps = {});
-    const libraries = new Set();
-    const url = new URLSearchParams();
-    // eslint-disable-next-line no-async-promise-executor
-    const loader = () => promise || (promise = new Promise(async (resolve, reject) => {
-        await (script = dom.createElement('script'));
-        url.set('libraries', [...libraries] + '');
-        for (arg in args)
-            url.set(arg.replace(/[A-Z]/g, t => '_' + t[0].toLowerCase()), args[arg]);
-        url.set('callback', googleName + '.maps.' + callbackId);
-        script.src = `https://maps.${googleName}apis.com/maps/api/js?` + url;
-        googleMaps[callbackId] = resolve;
-        // eslint-disable-next-line no-return-assign
-        script.onerror = () => promise = reject(Error(googleTitle + ' could not load.'));
-        script.nonce = dom.querySelector('script[nonce]')?.nonce || '';
-        dom.head.append(script);
-    }));
-    googleMaps[importMethod]
-        ? console.warn(googleTitle + ' only loads once. Ignoring:', args)
-        : googleMaps[importMethod] = (library, ...rest) => libraries.add(library) && loader().then(() => googleMaps[importMethod](library, ...rest));
-}
 let _LATLNG_ZERO;
 let _BOUNDS_ZERO;
 const GoogleConst = {
@@ -5229,15 +5192,6 @@ function loadMap({ type, config }) {
     }
     switch (type) {
         case TgMapType.google:
-            if (import.meta.env.VITE_FALSE) {
-                // 测试新的动态载入方式
-                initGoogleMapDynamicLibraryImport({
-                    key: config.key,
-                    v: '3.52',
-                    // v: config.version,
-                });
-                return google.maps.importLibrary('core');
-            }
             // TODO: 修改语言后, 要重新载入
             return loadJsonp(`https://maps.googleapis.com/maps/api/js?key=${config.key}&language=${config.language}&v=${config.version}&libraries=${config.libraries.join(',')}`);
         case TgMapType.baidu: