Merge pull request #12156 from alex2wong/fix-11799

fix 11799 add new option 'nameProperty' in map series option
apache · Feb 16, 2020 · da128eb · da128eb
2 parents 8028f41 + 055dea0
commit da128eb
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 8 deletions.
diff --git a/src/chart/map/MapSeries.js b/src/chart/map/MapSeries.js
@@ -66,7 +66,7 @@ var MapSeries = SeriesModel.extend({
             });
         }
 
-        var geoSource = geoSourceManager.load(this.getMapType(), this.option.nameMap);
+        var geoSource = geoSourceManager.load(this.getMapType(), this.option.nameMap, this.option.nameProperty);
         zrUtil.each(geoSource.regions, function (region) {
             var name = region.name;
             if (!dataNameMap.get(name)) {
@@ -256,7 +256,8 @@ var MapSeries = SeriesModel.extend({
             itemStyle: {
                 areaColor: 'rgba(255,215,0,0.8)'
             }
-        }
+        },
+        nameProperty: 'name'
     }
 
 });

diff --git a/src/coord/geo/geoJSONLoader.js b/src/coord/geo/geoJSONLoader.js
@@ -34,9 +34,10 @@ export default {
     /**
      * @param {string} mapName
      * @param {Object} mapRecord {specialAreas, geoJSON}
+     * @param {string} nameProperty
      * @return {Object} {regions, boundingRect}
      */
-    load: function (mapName, mapRecord) {
+    load: function (mapName, mapRecord, nameProperty) {
 
         var parsed = inner(mapRecord).parsed;
 
@@ -50,7 +51,7 @@ export default {
 
         // https://jsperf.com/try-catch-performance-overhead
         try {
-            regions = geoJSON ? parseGeoJson(geoJSON) : [];
+            regions = geoJSON ? parseGeoJson(geoJSON, nameProperty) : [];
         }
         catch (e) {
             throw new Error('Invalid geoJson format\n' + e.message);

diff --git a/src/coord/geo/geoSourceManager.js b/src/coord/geo/geoSourceManager.js
@@ -34,17 +34,18 @@ export default {
     /**
      * @param {string} mapName
      * @param {Object} nameMap
+     * @param {string} nameProperty
      * @return {Object} source {regions, regionsMap, nameCoordMap, boundingRect}
      */
-    load: function (mapName, nameMap) {
+    load: function (mapName, nameMap, nameProperty) {
         var regions = [];
         var regionsMap = createHashMap();
         var nameCoordMap = createHashMap();
         var boundingRect;
         var mapRecords = retrieveMap(mapName);
 
         each(mapRecords, function (record) {
-            var singleSource = loaders[record.type].load(mapName, record);
+            var singleSource = loaders[record.type].load(mapName, record, nameProperty);
 
             each(singleSource.regions, function (region) {
                 var regionName = region.name;

diff --git a/src/coord/geo/parseGeoJson.js b/src/coord/geo/parseGeoJson.js
@@ -96,9 +96,10 @@ function decodePolygon(coordinate, encodeOffsets, encodeScale) {
 /**
  * @alias module:echarts/coord/geo/parseGeoJson
  * @param {Object} geoJson
+ * @param {string} nameProperty
  * @return {module:zrender/container/Group}
  */
-export default function (geoJson) {
+export default function (geoJson, nameProperty) {
 
     decode(geoJson);
 
@@ -136,7 +137,7 @@ export default function (geoJson) {
         }
 
         var region = new Region(
-            properties.name,
+            properties[nameProperty],
             geometries,
             properties.cp
         );

diff --git a/test/map-nameProperty.html b/test/map-nameProperty.html