Merge branch 'master' into stephen-improve-accuracy-for-cameraupstream/stephen-improve-accuracy-for-camera

1 files changed, 26 insertions, 0 deletions

diff --git a/platform/qt/src/number_format.cpp b/platform/qt/src/number_format.cpp
new file mode 100644
index 0000000000..b6fe3558e6
--- /dev/null
+++ b/platform/qt/src/number_format.cpp
@@ -0,0 +1,26 @@
+#include <mbgl/util/platform.hpp>
+
+#include <QLocale>
+#include <QString>
+
+namespace mbgl {
+namespace platform {
+
+std::string formatNumber(double number, const std::string& localeId, const std::string& currency,
+                         uint8_t minFractionDigits, uint8_t maxFractionDigits) {
+
+    QString formatted;
+    // Qt Locale::toString() API takes only one precision argument
+    (void)minFractionDigits;
+    QLocale locale = QLocale(QString::fromStdString(localeId));
+
+    if (!currency.empty()) {
+        formatted = locale.toCurrencyString(number);
+    } else {
+        formatted = locale.toString(number, 'f', maxFractionDigits);
+    }
+    return formatted.toStdString();
+}
+
+} // namespace platform
+} // namespace mbgl