DM-10379,DM-9824: Merge PR #372 from dm-10379-global-cov-bug

robyww · web-flow · commit a0d8ac12856e · 2017-05-03T17:07:21.000-07:00
DM-10379: fixed: After a catalog search with a globe coverage map, the catalog search doesn't work anymore. Also Fixes DM-9824
diff --git a/src/firefly/js/ui/CatalogSearchMethodType.jsx b/src/firefly/js/ui/CatalogSearchMethodType.jsx
@@ -176,7 +176,9 @@ function calcCornerString(pv, method) {
         pt2 = makeWorldPt( pt3.x, pt1.y, pt1.cSys );
         pt4 = makeWorldPt( pt1.x, pt3.y, pt1.cSys );
     }
-    return `${f5(pt1.x)} ${f5(pt1.y)}, ${f5(pt2.x)} ${f5(pt2.y)}, ${f5(pt3.x)} ${f5(pt3.y)}, ${f5(pt4.x)} ${f5(pt4.y)}`;
+    return (pt1 && pt2 && pt3 && pt4) ?
+             `${f5(pt1.x)} ${f5(pt1.y)}, ${f5(pt2.x)} ${f5(pt2.y)}, ${f5(pt3.x)} ${f5(pt3.y)}, ${f5(pt4.x)} ${f5(pt4.y)}` :
+             '';
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,9 @@ function calcCornerString(pv, method) {`
`176`	`176`	`pt2 = makeWorldPt( pt3.x, pt1.y, pt1.cSys );`
`177`	`177`	`pt4 = makeWorldPt( pt1.x, pt3.y, pt1.cSys );`
`178`	`178`	`}`
`179`		- return `${f5(pt1.x)} ${f5(pt1.y)}, ${f5(pt2.x)} ${f5(pt2.y)}, ${f5(pt3.x)} ${f5(pt3.y)}, ${f5(pt4.x)} ${f5(pt4.y)}`;
	`179`	`+ return (pt1 && pt2 && pt3 && pt4) ?`
	`180`	+ `${f5(pt1.x)} ${f5(pt1.y)}, ${f5(pt2.x)} ${f5(pt2.y)}, ${f5(pt3.x)} ${f5(pt3.y)}, ${f5(pt4.x)} ${f5(pt4.y)}` :
	`181`	`+ '';`
`180`	`182`	`}`
`181`	`183`
`182`	`184`