Merge pull request #20566 from apache/fix-map

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

src/chart/map/MapSeries.ts

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

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 });
             }
 
@@ -421,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.

src/coord/geo/GeoModel.ts

@@ -63,6 +63,7 @@ export interface RegionOption extends GeoStateOption, StatesOptionMixin<GeoState
     name?: string
     selected?: boolean
     tooltip?: CommonTooltipOption<GeoTooltipFormatterParams>
+    silent?: boolean
 }
 
 /**

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;