This is an automated email from the ASF dual-hosted git repository. shenyi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/master by this push: new 4355d25 fix(map): fix label position in china map (#11411) 4355d25 is described below commit 4355d25dbf66c5ec55072d56d4b28fa6dba4037c Author: ryan ouyang <ouyang...@gmail.com> AuthorDate: Thu Oct 17 23:00:14 2019 +0800 fix(map): fix label position in china map (#11411) * fix '南海诸岛' label not in correct place let the `fixTextCoord` take effect with '南海诸岛' * fix all province label to correct place. * fix province label position in JSON version --- map/js/china.js | 4 ++-- map/json/china.json | 2 +- src/coord/geo/geoJSONLoader.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/map/js/china.js b/map/js/china.js index c58d516..df744aa 100644 --- a/map/js/china.js +++ b/map/js/china.js @@ -42,5 +42,5 @@ log('ECharts Map is not loaded') return; } - echarts.registerMap('china', {"type":"FeatureCollection","features":[{"id":"710000","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@°Ü¯Û"],["@@ƛĴÕƊÉɼģºðʀ\\ƎsÆNŌÔĚänÜƤɊĂǀĆĴĤNJŨxĚĮǂƺòƌâÔ®ĮXŦţƸZûÐƕƑGđ¨ĭMó·ęcëƝɉlÝƯֹÅŃ^Ó·śŃNjƏďíåɛGɉ¿@ăƑ¥ĘWǬÏĶŁâ"],["@@\\p|WoYG¿¥Ij@¢"],["@@ ¡@V^RqBbAnTXeRz¤L«³I"],["@@ÆEEkWqë @"],["@@fced"]],"encodeOffsets":[[[122886,24033]],[[123335,22980]],[[122375,24193]],[[122518,24117]],[[124427,22618]],[[124862,26043]]]},"prope [...] -})); \ No newline at end of file + echarts.registerMap('china', {"type":"FeatureCollection","features":[{"id":"710000","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@°Ü¯Û"],["@@ƛĴÕƊÉɼģºðʀ\\ƎsÆNŌÔĚänÜƤɊĂǀĆĴĤNJŨxĚĮǂƺòƌâÔ®ĮXŦţƸZûÐƕƑGđ¨ĭMó·ęcëƝɉlÝƯֹÅŃ^Ó·śŃNjƏďíåɛGɉ¿@ăƑ¥ĘWǬÏĶŁâ"],["@@\\p|WoYG¿¥Ij@¢"],["@@ ¡@V^RqBbAnTXeRz¤L«³I"],["@@ÆEEkWqë @"],["@@fced"]],"encodeOffsets":[[[122886,24033]],[[123335,22980]],[[122375,24193]],[[122518,24117]],[[124427,22618]],[[124862,26043]]]},"prope [...] +})); diff --git a/map/json/china.json b/map/json/china.json index 41c16a0..01d6594 100644 --- a/map/json/china.json +++ b/map/json/china.json @@ -1 +1 @@ -{"type":"FeatureCollection","features":[{"id":"710000","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@°Ü¯Û"],["@@ƛĴÕƊÉɼģºðʀ\\ƎsÆNŌÔĚänÜƤɊĂǀĆĴĤNJŨxĚĮǂƺòƌâÔ®ĮXŦţƸZûÐƕƑGđ¨ĭMó·ęcëƝɉlÝƯֹÅŃ^Ó·śŃNjƏďíåɛGɉ¿@ăƑ¥ĘWǬÏĶŁâ"],["@@\\p|WoYG¿¥Ij@¢"],["@@ ¡@V^RqBbAnTXeRz¤L«³I"],["@@ÆEEkWqë @"],["@@fced"]],"encodeOffsets":[[[122886,24033]],[[123335,22980]],[[122375,24193]],[[122518,24117]],[[124427,22618]],[[124862,26043]]]},"properties":{"cp":[121.509062,25.04433 [...] \ No newline at end of file +{"type":"FeatureCollection","features":[{"id":"710000","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@°Ü¯Û"],["@@ƛĴÕƊÉɼģºðʀ\\ƎsÆNŌÔĚänÜƤɊĂǀĆĴĤNJŨxĚĮǂƺòƌâÔ®ĮXŦţƸZûÐƕƑGđ¨ĭMó·ęcëƝɉlÝƯֹÅŃ^Ó·śŃNjƏďíåɛGɉ¿@ăƑ¥ĘWǬÏĶŁâ"],["@@\\p|WoYG¿¥Ij@¢"],["@@ ¡@V^RqBbAnTXeRz¤L«³I"],["@@ÆEEkWqë @"],["@@fced"]],"encodeOffsets":[[[122886,24033]],[[123335,22980]],[[122375,24193]],[[122518,24117]],[[124427,22618]],[[124862,26043]]]},"properties":{"cp":[121.509062,24.04433 [...] diff --git a/src/coord/geo/geoJSONLoader.js b/src/coord/geo/geoJSONLoader.js index 5f0c05a..381c1f9 100644 --- a/src/coord/geo/geoJSONLoader.js +++ b/src/coord/geo/geoJSONLoader.js @@ -56,6 +56,8 @@ export default { throw new Error('Invalid geoJson format\n' + e.message); } + fixNanhai(mapName, regions); + each(regions, function (region) { var regionName = region.name; @@ -73,8 +75,6 @@ export default { } }); - fixNanhai(mapName, regions); - return (inner(mapRecord).parsed = { regions: regions, boundingRect: getBoundingRect(regions) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org For additional commands, e-mail: commits-h...@echarts.apache.org