Feature/torrent removal (#630)

* Remove torrent-based synchronization downloads
 * Add download URL to error message if HTTPSynchronization download fails
 * Add a grace factor to the distance conversion
 * Don't use scientific notation when displaying distances

src/util/distanceconversion.cpp

@@ -29,6 +29,8 @@
 namespace openspace {
 
 std::pair<double, std::string> simplifyDistance(double meters, bool forceSingularForm) {
+    constexpr const double GraceFactor = 0.5;
+
     const double metersVal = glm::abs(meters);
 
     if (metersVal == 0.0) {
@@ -51,39 +53,39 @@ std::pair<double, std::string> simplifyDistance(double meters, bool forceSingula
         return { val, (val == 1.0 || forceSingularForm) ? "millimeter" : "millimeters" };
     }
 
-    if (metersVal > (1e9 * distanceconstants::Parsec)) {
+    if (metersVal > (1e9 * GraceFactor * distanceconstants::Parsec)) {
         const double val = meters / (1e9 * distanceconstants::Parsec);
         return { val, (val == 1.0 || forceSingularForm) ? "Gigaparsec" : "Gigaparsecs" };
     }
-    else if (metersVal > (1e6 * distanceconstants::Parsec)) {
+    else if (metersVal > (1e6 * GraceFactor * distanceconstants::Parsec)) {
         const double val = meters / (1e6 * distanceconstants::Parsec);
         return { val, (val == 1.0 || forceSingularForm) ? "Megaparsec" : "Megaparsecs" };
     }
-    else if (metersVal > (1e3 * distanceconstants::Parsec)) {
+    else if (metersVal > (1e3 * GraceFactor * distanceconstants::Parsec)) {
         const double val = meters / (1e3 * distanceconstants::Parsec);
         return { val, (val == 1.0 || forceSingularForm) ? "Kiloparsec" : "Kiloparsecs" };
     }
-    else if (metersVal > distanceconstants::Parsec) {
+    else if (metersVal > GraceFactor * distanceconstants::Parsec) {
         const double val = meters / distanceconstants::Parsec;
         return { val, (val == 1.0 || forceSingularForm) ? "Parsec" : "Parsecs" };
     }
-    else if (metersVal > distanceconstants::LightYear) {
+    else if (metersVal > GraceFactor * distanceconstants::LightYear) {
         const double val = meters / distanceconstants::LightYear;
         return { val, (val == 1.0 || forceSingularForm) ? "Lightyear" : "Lightyears" };
     }
-    else if (metersVal > distanceconstants::LightMonth) {
+    else if (metersVal > GraceFactor * distanceconstants::LightMonth) {
         const double val = meters / distanceconstants::LightMonth;
         return { val, (val == 1.0 || forceSingularForm) ? "Lightmonth" : "Lightmonths" };
     }
-    else if (metersVal > distanceconstants::LightDay) {
+    else if (metersVal > GraceFactor * distanceconstants::LightDay) {
         const double val = meters / distanceconstants::LightDay;
         return { val, (val == 1.0 || forceSingularForm) ? "Lightday" : "Lightdays" };
     }
-    else if (metersVal > distanceconstants::LightHour) {
+    else if (metersVal > GraceFactor * distanceconstants::LightHour) {
         const double val = meters / distanceconstants::LightHour;
         return { val, (val == 1.0 || forceSingularForm) ? "Lighthour" : "Lighthours" };
     }
-    else if (metersVal > distanceconstants::AstronomicalUnit) {
+    else if (metersVal > GraceFactor * distanceconstants::AstronomicalUnit) {
         return { meters / distanceconstants::AstronomicalUnit, "AU" };
     }
     else {

src/util/httprequest.cpp

@@ -151,6 +151,10 @@ void HttpRequest::setReadyState(openspace::HttpRequest::ReadyState state) {
     _onReadyStateChange(state);
 }
 
+const std::string& HttpRequest::url() const {
+    return _url;
+}
+
 HttpDownload::HttpDownload() : _onProgress([](HttpRequest::Progress) { return true; }) {}
 
 void HttpDownload::onProgress(ProgressCallback progressCallback) {
@@ -211,6 +215,10 @@ void SyncHttpDownload::download(HttpRequest::RequestOptions opt) {
     deinitDownload();
 }
 
+const std::string& SyncHttpDownload::url() const {
+    return _httpRequest.url();
+}
+
 AsyncHttpDownload::AsyncHttpDownload(std::string url) : _httpRequest(std::move(url)) {}
 
 AsyncHttpDownload::AsyncHttpDownload(AsyncHttpDownload&& d)
@@ -282,6 +290,10 @@ void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) {
     deinitDownload();
 }
 
+const std::string& AsyncHttpDownload::url() const {
+    return _httpRequest.url();
+}
+
 const std::vector<char>& HttpMemoryDownload::downloadedData() const {
     return _downloadedData;
 }