feat(map): support regions[].silent and update map data in tests

src/chart/map/MapSeries.ts

@@ -55,6 +55,8 @@ export interface MapDataItemOption extends MapStateOption,
     StatesOptionMixin<MapStateOption, StatesMixinBase>,
     OptionDataItemObject<OptionDataValueNumeric> {
     cursor?: string
+    z?: number
+    silent?: boolean
 }
 
 export type MapValueCalculationType = 'sum' | 'average' | 'min' | 'max';

src/component/helper/MapDraw.ts

@@ -352,6 +352,12 @@ 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);

src/coord/geo/GeoModel.ts

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

src/coord/geo/geoCreator.ts

@@ -271,16 +271,17 @@ class GeoCreator implements CoordinateSystemCreator {
         const source = geoSourceManager.load(mapName, nameMap, nameProperty);
         zrUtil.each(source.regions, function (region) {
             const name = region.name;
-            if (!dataNameMap.get(name)) {
-                const regionOption = {
-                    name: name
+            let regionOption = dataNameMap.get(name);
+            // apply specified echarts style in GeoJSON data
+            const specifiedGeoJSONRegionStyle = (region as GeoJSONRegion).properties
+                && (region as GeoJSONRegion).properties.echartsStyle;
+            if (!regionOption) {
+                regionOption = {
+                   name: name
                 };
-                // apply specified echarts style in GeoJSON data
-                const specifiedGeoJSONRegionStyle = (region as GeoJSONRegion).properties
-                    && (region as GeoJSONRegion).properties.echartsStyle;
-                specifiedGeoJSONRegionStyle && zrUtil.merge(regionOption, specifiedGeoJSONRegionStyle);
                 regionsArr.push(regionOption);
             }
+            specifiedGeoJSONRegionStyle && zrUtil.merge(regionOption, specifiedGeoJSONRegionStyle);
         });
 
         return regionsArr;