fix(map): remove preventAutoZ for map

apache · Dec 9, 2024 · fd87c34 · fd87c34
1 parent 4d990f7
commit fd87c34
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/chart/map/MapSeries.ts b/src/chart/map/MapSeries.ts
@@ -55,7 +55,6 @@ export interface MapDataItemOption extends MapStateOption,
     StatesOptionMixin<MapStateOption, StatesMixinBase>,
     OptionDataItemObject<OptionDataValueNumeric> {
     cursor?: string
-    z?: number
     silent?: boolean
 }
 

diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts
@@ -302,6 +302,9 @@ class MapDraw {
                     ? mapOrGeoModel.getRegionModel(regionName)
                     : (data ? data.getItemModel(dataIdx) as Model<MapDataItemOption> : null);
 
+                const silent = (regionModel as Model<RegionOption>).get('silent', true);
+                silent != null && (regionGroup.silent = silent);
+
                 regionsInfoByName.set(regionName, { dataIdx, regionModel });
             }
 
@@ -352,12 +355,6 @@ class MapDraw {
                     viewBuildCtx, compoundPath, regionName, regionModel, mapOrGeoModel, dataIdx, centerPt
                 );
 
-                const z = (regionModel as Model<RegionOption>).get('z', true);
-                z != null && (compoundPath.attr('z', z));
-
-                const silent = (regionModel as Model<RegionOption>).get('silent', true);
-                silent != null && (compoundPath.silent = silent);
-
                 if (isLine) {
                     fixLineStyle(compoundPath);
                     zrUtil.each(compoundPath.states, fixLineStyle);
@@ -427,6 +424,9 @@ class MapDraw {
                 el.culling = true;
             }
 
+            const silent = (regionModel as Model<RegionOption>).get('silent', true);
+            silent != null && (el.silent = silent);
+
             // We do not know how the SVG like so we'd better not to change z2.
             // Otherwise it might bring some unexpected result. For example,
             // an area hovered that make some inner city can not be clicked.

diff --git a/src/coord/geo/GeoModel.ts b/src/coord/geo/GeoModel.ts
@@ -63,7 +63,6 @@ export interface RegionOption extends GeoStateOption, StatesOptionMixin<GeoState
     name?: string
     selected?: boolean
     tooltip?: CommonTooltipOption<GeoTooltipFormatterParams>
-    z?: number
     silent?: boolean
 }
 
@@ -140,8 +139,6 @@ class GeoModel extends ComponentModel<GeoOption> {
     static type = 'geo';
     readonly type = GeoModel.type;
 
-    preventAutoZ = true;
-
     coordinateSystem: Geo;
 
     static layoutMode = 'box' as const;