feat 对天地图map的支持 (#2238)

* fix: fillImage中uniform没对齐的bug * feat: 适配天地图的底图 * chore: 修改天地图map中lngLatToCoord的方法实现 * feat: 添加天地图的markerContainer,但是不能更新其定位 * fix: marker和popup在地图拖动时不跟随的bug * feat: 图层显隐组件 LayerSwitch 新增单选模式 (#2211) * feat: layerSwitch组件新增单选属性 * chore: 更新markdown路径 * feat: layerSwitch组件添加单选模式 * chore: 恢复setting配置 * chore: 删除调试代码 --------- Co-authored-by: 谨欣 <echo.cmy@antgroup.com> * Fix raster webgl1 (#2213) * chore: g-device version & dev command * fix: raster g.LUMINANCE 回滚到webgl1 * chore: publish (#2214) * fix: single component data texture (#2215) * fix: 修复图层显隐控件LayerSwitch单选模式下未默认展示单个图层问题 (#2218) * fix: 修复图层显隐控件LayerSwitch单选模式下未默认展示单个图层问题 * feat: 图层显隐控件选择模式更新时，销毁图层内容重建 * chore: 修复空格 * chore: 新增todo * feat: 修改单选模式只显示第一个图层逻辑到onAdd函数中 --------- Co-authored-by: 谨欣 <echo.cmy@antgroup.com> * chore: multiband rgb raster parse (#2219) * chore: multiband rgb raster parse * fix: 单测 * chore: publish (#2220) * fix: 修复配置更新时，处理单选模式图层问题 (#2221) Co-authored-by: 谨欣 <echo.cmy@antgroup.com> * Update site&新增 raster ndi 计算 (#2222) * feat: 添加归一化指数 parse * chore: 更新文档 * Fix encode update (#2229) * fix: encode update * fix: encode update * chore: publish (#2230) * fix: 修复图层隐藏时，LayerPopup 未跟随隐藏的问题 (#2231) * chore: publish (#2232) * fix: 修正L7Plot官网图表示例按钮跳转链接 (#2233) * fix: 修复配置更新时，处理单选模式图层问题 * feat: 修改函数名 * fix: 修正L7Plot官网图表示例按钮跳转链接 --------- Co-authored-by: 谨欣 <echo.cmy@antgroup.com> * chore: publish (#2235) * Migrate tile layer (#2236) * fix: 修复栅格瓦片显示 * fix: 修复冲突 * chore: renderer ts 定义 * docs: add 矢量瓦片demo * fix: clear depth & stencil before rende mask * chore: update tile snapshot * chore: update tile vector snapshot --------- Co-authored-by: yuqi.pyq <yuqi.pyq@antgroup.com> * chore: add threejs demo (#2245) * chore: add threejs demo * docs: add screenshot url --------- Co-authored-by: zhnny <zhanny@LAPTOP-1UJN7PP7.localdomain> * 支持 WebGPU 渲染 (#2225) * fix: webgpu point fill example * fix: adjust order of varying in fill image shader * fix: remove redundant varying in extrude vert shader * fix: recreate main & depth rt when resizing * fix: load image in webgpu * fix: heatmap * fix: heatmap grid3d in webgpu * fix: heatmap grid3d in webgpu * fix: line * fix: change readpixel from sync to async * fix: resize picking fbo * fix: picking in webgpu * fix: arc line layer * fix: use diagnosticDerivativeUniformity in water demo * fix: add render cache * fix: point text layer * chore: update point text layer snapshot * fix: raster layer * chore: add screenshot callback on test cases * chore: sleep * chore: cancel point image test case for now * fix: 合并冲突 * fix: fillImage中uniform没对齐的bug * chore: 天地图导出类型 --------- Co-authored-by: huyang <huyang@uinnova.com> Co-authored-by: Dreammy23 <caomengyuan2015@163.com> Co-authored-by: 谨欣 <echo.cmy@antgroup.com> Co-authored-by: @thinkingGIS <lzx199065@gmail.com> Co-authored-by: xiaoiver <yuqi.pyq@antgroup.com> Co-authored-by: heiyexing <oujinhui.ojh@antgroup.com> Co-authored-by: zhnny <58084743+zhnny@users.noreply.github.com> Co-authored-by: zhnny <zhanny@LAPTOP-1UJN7PP7.localdomain> Co-authored-by: lzxue <120635640@qq.com>
antvis · Jan 10, 2024 · 85f4a4f · 85f4a4f
1 parent f699046
commit 85f4a4f
Show file tree

Hide file tree

Showing 9 changed files with 546 additions and 6 deletions.
diff --git a/dev-demos/features/customLayer/marker.md b/dev-demos/features/customLayer/marker.md
@@ -2,14 +2,14 @@
 
 ```tsx
 import { Marker, PointLayer, PolygonLayer, Popup, Scene } from '@antv/l7';
-import { GaodeMap, Mapbox } from '@antv/l7-maps';
+import { GaodeMap, Mapbox,TdtMap } from '@antv/l7-maps';
 import React, { useEffect } from 'react';
 
 export default () => {
   useEffect(() => {
     const scene = new Scene({
       id: 'map-marker',
-      map: new GaodeMap({
+      map: new TdtMap({
         center: [120.184824, 30.248341],
         pitch: 0,
         zoom: 18,

diff --git a/examples/demos/index.ts b/examples/demos/index.ts
@@ -51,7 +51,7 @@ export default [{
 }
 ]
 
-export const MapType = ['Map','GaodeMap','BaiduMap','MapLibre','TencentMap','Mapbox']
+export const MapType = ['Map','GaodeMap','BaiduMap','MapLibre','TencentMap','Mapbox','TMap']
 export const InitMapOptions = {
     map: 'Map',
     renderer:'device',

diff --git a/packages/layers/src/point/models/fillImage.ts b/packages/layers/src/point/models/fillImage.ts
@@ -50,9 +50,7 @@ export default class FillImageModel extends BaseModel {
       u_heightfixed: Number(heightfixed),
       u_raisingHeight: Number(raisingHeight),
       u_size_unit: SizeUnitType[unit] as SizeUnitType,
-      u_texture: this.texture,
-    };
-    this.textures = [this.texture];
+    };//2+1+1+1
     const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
 
     return commonBufferInfo;

diff --git a/packages/maps/src/index.ts b/packages/maps/src/index.ts
@@ -7,6 +7,7 @@ import Map from './map/';
 import Mapbox from './mapbox/';
 import MapLibre from './maplibre';
 import TencentMap from './tmap';
+import TMap from './tdtmap';
 export * from './utils';
 export {
   BaiduMap,
@@ -19,4 +20,5 @@ export {
   Mapbox,
   TencentMap,
   MapType,
+  TMap
 };
diff --git a/packages/maps/src/tdtmap/index.ts b/packages/maps/src/tdtmap/index.ts
@@ -0,0 +1,10 @@
+/* eslint-disable */
+import BaseMapWrapper from '../utils/BaseMapWrapper';
+import TdtMapService from './map';
+
+export default class TdtMapWrapper extends BaseMapWrapper<any> {
+  // @ts-ignore
+  protected getServiceConstructor() {
+    return TdtMapService;
+  }
+}
diff --git a/packages/maps/src/tdtmap/logo.css b/packages/maps/src/tdtmap/logo.css
@@ -0,0 +1,3 @@
+img[src*='//mapapi.qq.com/web/jsapi/logo/logo_def.png'],.logo-text {
+  display: none !important;
+}