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

[echarts] branch fix/geo updated (cee6c65bc -> 16016881a)

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

wangzx pushed a change to branch fix/geo
in repository https://gitbox.apache.org/repos/asf/echarts.git


 discard cee6c65bc fix(geo): add back two missing arguments to `projectedToPoint` in Geo `dataToPoint` coord.
     new 16016881a fix(geo): add back two missing arguments to `projectedToPoint` called in Geo `dataToPoint` function.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (cee6c65bc)
            \
             N -- N -- N   refs/heads/fix/geo (16016881a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


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


[echarts] 01/01: fix(geo): add back two missing arguments to `projectedToPoint` called in Geo `dataToPoint` function.

Posted by wa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wangzx pushed a commit to branch fix/geo
in repository https://gitbox.apache.org/repos/asf/echarts.git

commit 16016881a6332ec129040ba5598e087ad9dc73cd
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Fri Jun 3 10:55:27 2022 +0800

    fix(geo): add back two missing arguments to `projectedToPoint` called in Geo `dataToPoint` function.
---
 src/coord/geo/Geo.ts            | 2 +-
 test/linesGL-ny-appendData.html | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/coord/geo/Geo.ts b/src/coord/geo/Geo.ts
index 7bc50f2dc..e0b44025f 100644
--- a/src/coord/geo/Geo.ts
+++ b/src/coord/geo/Geo.ts
@@ -211,7 +211,7 @@ class Geo extends View {
                 // projection may return null point.
                 data = projection.project(data);
             }
-            return data && this.projectedToPoint(data);
+            return data && this.projectedToPoint(data, noRoam, out);
         }
     }
 
diff --git a/test/linesGL-ny-appendData.html b/test/linesGL-ny-appendData.html
index 55e62c689..7168ffb49 100644
--- a/test/linesGL-ny-appendData.html
+++ b/test/linesGL-ny-appendData.html
@@ -23,6 +23,7 @@ under the License.
         <meta charset='utf-8'>
         <script src='../dist/echarts.js'></script>
         <script src="../../echarts-gl/dist/echarts-gl.js"></script>
+        <!-- <script src="https://fastly.jsdelivr.net/npm/echarts-gl@2/dist/echarts-gl.min.js"></script> -->
         <script src='./data/map/js/world.js'></script>
         <meta name='viewport' content='width=device-width, initial-scale=1' />
     </head>
@@ -51,6 +52,7 @@ under the License.
                     return;
                 }
                 var dataURL = `../../echarts-examples/public/data/asset/data/links-ny/links_ny_${idx}.bin`;
+                // var dataURL = `https://fastly.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/links-ny/links_ny_${idx}.bin`;
                 var xhr = new XMLHttpRequest();
                 xhr.open('GET', dataURL, true);
                 xhr.responseType = 'arraybuffer';
@@ -109,7 +111,7 @@ under the License.
                         }
                     },
                     series: [{
-                        type: 'lines',
+                        type: 'linesGL',
 
                         coordinateSystem: 'geo',
 
@@ -135,4 +137,4 @@ under the License.
 
         </script>
     </body>
-</html>
\ No newline at end of file
+</html>


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