Skip to content

Commit 6746f52

Browse files
author
Cindy Wang
committed
DM-10241 Fix East arrow in the North/East compass
1 parent ff29e4f commit 6746f52

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/firefly/js/drawingLayers/NorthUpCompass.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,8 @@ function makeCompass(plotId, action){
148148
var cdelt1 = cc.getImagePixelScaleInDeg();
149149
var zf= cc.zoomFactor || 1;
150150
var wpt2= makeWorldPt(wpStart.getLon(), wpStart.getLat() + (Math.abs(cdelt1)/zf)*(px));
151-
var wptE2= makeWorldPt(wpStart.getLon()+(Math.abs(cdelt1)/zf)*(px), wpStart.getLat());
152151
var spt2= cc.getScreenCoords(wpt2);
153-
var sptE2= cc.getScreenCoords(wptE2);
152+
var sptE2 = getEastFromNorthOnScreen(cc, sptStart, spt2, Math.PI/2);
154153

155154
if (sptStart===null || spt2===null || sptE2===null) {
156155
return null;
@@ -160,4 +159,14 @@ function makeCompass(plotId, action){
160159
var dataE= makeDirectionArrowDrawObj(sptStart, sptE2,'E');
161160

162161
return [dataE, dataN];
163-
}
162+
}
163+
164+
function getEastFromNorthOnScreen(cc, origin, nVec) {
165+
var originSpt = cc.getScreenCoords(origin);
166+
var vec1Spt = cc.getScreenCoords(nVec);
167+
168+
var x2 = (vec1Spt.y - originSpt.y) + originSpt.x;
169+
var y2 = -(vec1Spt.x - originSpt.x) + originSpt.y;
170+
171+
return makeScreenPt(x2, y2);
172+
}

0 commit comments

Comments
 (0)