You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/04/07 03:43:10 UTC

[echarts] branch master updated (1320c28 -> b059e22)

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts.git.


    from 1320c28  Merge pull request #14600 from apache/fix-symbol
     add cc7001d  fix: tweak
     add 6a22cc6  fix: [geo] clean code and add comment and make interface better.
     add e9af050  fix: [geo] (1) refactor of geoJSON & SVG source loader and management. (2) remove the support of "load multiple geoJSON or SVG in one map name". This feature is never documented and published. And this feature have a inherent problem that it's not easy to normalize the unit among the different SVG. After this commit, one map name can only have one geoJSON or one SVG.
     add 6b5a0e5  fix: [geo] (1) label scale implementation change: user afterUpdate rather than / parentScale. (2) some refactor and clean code.
     add ca58174  feature: [geo] support geo svg named elements have the same behavior as regions of geoJSON
     add 30c861c  feature: [geo] (1) "geoselectchanged" event: add param: allSelected: { geoIndex: number, name: string[] }[] (2) geoSVG resource support: + label + emphasis/select/blur state + "geoselectchanged" event (on geo component) + "selectchanged" event (on map series) (3) some refactor to make those happen: + The original `Region` is migrated to `GeoJSONRegion`. And make `Region` as the base class of `GeoJSONRegion` and `GeoSVGRegion`. + Modify the constructor of `Geo`.
     add f2c35fa  fix: [geo] tweak a little.
     add 86522a1  fix: [geo] modified default item color for geoSVG and some tweak.
     add 886d041  Merge branch 'master' into fix/geo-svg
     add 152ab8e  fix: [geo] (1) fix contain point calculation. (2) remove Geo['_nameCoordMap'], instead, calculate center on demand. (3) fix that some API missing nameProperty and geoJSON should cached not only by mapName but also by nameProperty. (4) do not support nameMap in geoSVG until some real requirements come. (5) svg line polyline use 'region.lineStyle' rather than 'region.itemStyle' (6) svg text tspan image are enabled to trigger tooltip and user event (but not supported to cha [...]
     add 426f371  Merge branch 'master' into fix/geo-svg
     add c35a522  fix: [tooltip] (1) add missing test:visual (2) fix tooltip component default position: should apply `position` on option firstly.
     add c2d7873  fix: [blur] make API trigger emphasis blur correct (should leave blur firstly for other series).
     add 9c2cb8e  fix: tweak the last commit.
     add b0d4a35  feature: [geo] (1) Support component focus blur. The option `emphasis.focus` can be specified to enable this feature. `emphasis.focus` only supports the value `'self'`. The option `emphasis.focusScope` is not supported in component. That is, the focus scope can be only a single component itself. All of the elements in this component will be blurred. Added `Component['focusBlurEnabled']` to enable component blur. (2) Support component hover link when highlight with a give [...]
     add 8235095  featrue: [geo] (1) support name on <g>. (2) some refactor.
     add fc311a0  fix: geoJSON focus-blur
     add 4f47a93  fix: param validation: throw error -> console.error.
     add ad3d433  fix: [geo] fix label z on hover and simplify label code.
     add dfb58ad  fix: label should only apply the translate of this host el.
     add d8ebb5f  fix: [geo] svg fix converter and add test case.
     add fc4ca57  fix: [geo svg] fix viewBox and add test cases.
     add 43e99ef  fix: [geo svg] add test files to echarts folder.
     add 31c7787  fix: [geo svg] make test case better.
     add ca83c55  Merge branch 'master' into fix/geo-svg
     add 76625ba  test: [geo svg] add visual test.
     add 36dcf1f  test: [geo svg] add test case.
     add b059e22  Merge pull request #14571 from apache/fix/geo-svg

No new revisions were added by this update.

Summary of changes:
 src/chart/graph/GraphView.ts                       |    4 +-
 src/chart/helper/SymbolDraw.ts                     |    9 +-
 src/chart/map/MapSeries.ts                         |    7 +-
 src/chart/map/mapSymbolLayout.ts                   |    4 +-
 src/chart/sunburst/SunburstPiece.ts                |   10 +-
 src/chart/treemap/TreemapView.ts                   |   11 +-
 src/component/geo/GeoView.ts                       |   17 +-
 src/component/geo/install.ts                       |   16 +-
 src/component/helper/MapDraw.ts                    |  725 +-
 src/component/tooltip/TooltipView.ts               |   99 +-
 src/coord/View.ts                                  |   68 +-
 src/coord/geo/Geo.ts                               |  100 +-
 src/coord/geo/GeoJSONResource.ts                   |  171 +
 src/coord/geo/GeoModel.ts                          |   58 +-
 src/coord/geo/GeoSVGResource.ts                    |  367 +
 src/coord/geo/Region.ts                            |  112 +-
 src/coord/geo/fix/diaoyuIsland.ts                  |    6 +-
 src/coord/geo/fix/geoCoord.ts                      |   16 +-
 src/coord/geo/fix/nanhai.ts                        |    6 +-
 src/coord/geo/fix/textCoord.ts                     |   10 +-
 src/coord/geo/geoCreator.ts                        |   37 +-
 src/coord/geo/geoJSONLoader.ts                     |   99 -
 src/coord/geo/geoSVGLoader.ts                      |  153 -
 src/coord/geo/geoSourceManager.ts                  |  217 +-
 src/coord/geo/geoTypes.ts                          |   26 +
 src/coord/geo/mapDataStorage.ts                    |  158 -
 src/coord/geo/parseGeoJson.ts                      |    8 +-
 src/core/echarts.ts                                |   96 +-
 src/data/OrdinalMeta.ts                            |    2 +-
 src/model/mixin/lineStyle.ts                       |    2 +-
 src/util/graphic.ts                                |    7 +-
 src/util/innerStore.ts                             |   18 +-
 src/util/states.ts                                 |  186 +-
 src/util/types.ts                                  |    2 +-
 src/view/Component.ts                              |   18 +-
 test/data/svg/Beef_cuts_France.svg                 | 1430 ++++
 test/data/svg/MacOdrum-LV5-floorplan-web.svg       | 2694 ++++++++
 test/data/svg/Map_of_Iceland.svg                   | 7211 ++++++++++++++++++++
 .../svg/Sicily_prehellenic_topographic_map.svg     | 1303 ++++
 test/data/svg/Veins_Medical_Diagram_clip_art.svg   | 1012 +++
 test/data/svg/flight-seats.svg                     | 2997 ++++++++
 test/data/svg/ksia-ext-plan-min.svg                | 3698 ++++++++++
 test/data/svg/seatmap-example.svg                  |  842 +++
 test/geo-layout.html                               |  346 +
 test/geo-svg-demo.html                             |  909 +++
 test/geo-svg.html                                  |  873 +++
 test/hoverFocus2.html                              |   88 +
 test/runTest/actions/__meta__.json                 |    4 +-
 test/runTest/actions/geo-svg-demo.json             |    1 +
 test/runTest/actions/geo-svg.json                  |    1 +
 test/runTest/actions/hoverFocus2.json              |    2 +-
 test/runTest/actions/tooltip-component.json        |    1 +
 test/tooltip-component.html                        |   36 +-
 53 files changed, 25319 insertions(+), 974 deletions(-)
 create mode 100644 src/coord/geo/GeoJSONResource.ts
 create mode 100644 src/coord/geo/GeoSVGResource.ts
 delete mode 100644 src/coord/geo/geoJSONLoader.ts
 delete mode 100644 src/coord/geo/geoSVGLoader.ts
 delete mode 100644 src/coord/geo/mapDataStorage.ts
 create mode 100644 test/data/svg/Beef_cuts_France.svg
 create mode 100644 test/data/svg/MacOdrum-LV5-floorplan-web.svg
 create mode 100644 test/data/svg/Map_of_Iceland.svg
 create mode 100644 test/data/svg/Sicily_prehellenic_topographic_map.svg
 create mode 100644 test/data/svg/Veins_Medical_Diagram_clip_art.svg
 create mode 100644 test/data/svg/flight-seats.svg
 create mode 100644 test/data/svg/ksia-ext-plan-min.svg
 create mode 100644 test/data/svg/seatmap-example.svg
 create mode 100644 test/geo-layout.html
 create mode 100644 test/geo-svg-demo.html
 create mode 100644 test/geo-svg.html
 create mode 100644 test/runTest/actions/geo-svg-demo.json
 create mode 100644 test/runTest/actions/geo-svg.json
 create mode 100644 test/runTest/actions/tooltip-component.json

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org