feat(geo): support styling region in original GeoJSON data

apache · Dec 5, 2024 · cdb0ebc · cdb0ebc
1 parent 2009644
commit cdb0ebc
Show file tree

Hide file tree

Showing 3 changed files with 482 additions and 428 deletions.
diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts
@@ -302,6 +302,14 @@ class MapDraw {
                     ? mapOrGeoModel.getRegionModel(regionName)
                     : (data ? data.getItemModel(dataIdx) as Model<MapDataItemOption> : null);
 
+                // allow specified itemStyle in GeoJSON data
+                const regionItemStyle = region.properties && region.properties.itemStyle;
+                if (regionItemStyle) {
+                    const regionModelOption = regionModel.option;
+                    const modelItemStyle = regionModelOption.itemStyle || (regionModelOption.itemStyle = {});
+                    modelItemStyle && zrUtil.defaults(modelItemStyle, regionItemStyle);
+                }
+
                 regionsInfoByName.set(regionName, { dataIdx, regionModel });
             }
 

diff --git a/src/coord/geo/Region.ts b/src/coord/geo/Region.ts
@@ -23,8 +23,9 @@ import * as vec2 from 'zrender/src/core/vector';
 import * as polygonContain from 'zrender/src/contain/polygon';
 import { GeoJSON, GeoProjection, GeoSVGGraphicRoot } from './geoTypes';
 import * as matrix from 'zrender/src/core/matrix';
-import Element from 'zrender/src/Element';
+import type Element from 'zrender/src/Element';
 import { each } from 'zrender/src/core/util';
+import type { GeoItemStyleOption } from './GeoModel';
 
 const TMP_TRANSFORM = [] as number[];
 
@@ -135,7 +136,9 @@ export class GeoJSONRegion extends Region {
     readonly geometries: (GeoJSONPolygonGeometry | GeoJSONLineStringGeometry)[];
 
     // Injected outside.
-    properties: GeoJSON['features'][0]['properties'];
+    properties: GeoJSON['features'][0]['properties'] & {
+        itemStyle?: GeoItemStyleOption
+    };
 
     constructor(
         name: string,