diff --git a/model/scwx.notation b/model/scwx.notation
index 5a3a888c..d20e8787 100644
--- a/model/scwx.notation
+++ b/model/scwx.notation
@@ -62,22 +62,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -90,6 +74,10 @@
+
+
+
+
@@ -110,7 +98,7 @@
-
+
diff --git a/model/scwx.uml b/model/scwx.uml
index a33c5ec8..7d4123d0 100644
--- a/model/scwx.uml
+++ b/model/scwx.uml
@@ -52,33 +52,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -94,6 +67,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -144,6 +128,6 @@
-
+
diff --git a/model/scwx_en_US.properties b/model/scwx_en_US.properties
index b151da3a..040f06c7 100644
--- a/model/scwx_en_US.properties
+++ b/model/scwx_en_US.properties
@@ -1,2 +1,2 @@
-#Sat Oct 30 22:49:04 CDT 2021
+#Sun Oct 31 14:43:42 CDT 2021
_label_asdf=asdf2
diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
index ee15fda0..78f081fe 100644
--- a/scwx-qt/source/scwx/qt/map/map_widget.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -104,8 +104,7 @@ void MapWidget::changeStyle()
void MapWidget::AddLayers()
{
std::shared_ptr radarProductView =
- std::make_shared(p->radarProductManager_,
- p->map_);
+ std::make_shared(p->radarProductManager_);
radarProductView->Initialize();
diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
index 9fab0cff..ae4499fb 100644
--- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
@@ -199,7 +199,7 @@ void RadarProductLayer::render(
p->shaderProgram_.Use();
- const float scale = p->radarProductView_->scale() * 2.0f *
+ const float scale = std::pow(2.0, params.zoom) * 2.0f *
mbgl::util::tileSize / mbgl::util::DEGREES_MAX;
const float xScale = scale / params.width;
const float yScale = scale / params.height;
diff --git a/scwx-qt/source/scwx/qt/view/radar_product_view.cpp b/scwx-qt/source/scwx/qt/view/radar_product_view.cpp
index c436be81..35b91c37 100644
--- a/scwx-qt/source/scwx/qt/view/radar_product_view.cpp
+++ b/scwx-qt/source/scwx/qt/view/radar_product_view.cpp
@@ -24,10 +24,8 @@ class RadarProductViewImpl
{
public:
explicit RadarProductViewImpl(
- std::shared_ptr radarProductManager,
- std::shared_ptr map) :
+ std::shared_ptr radarProductManager) :
radarProductManager_(radarProductManager),
- map_(map),
plotTime_(),
colorTable_ {boost::gil::rgba8_pixel_t(0, 128, 0, 255),
boost::gil::rgba8_pixel_t(255, 192, 0, 255),
@@ -37,7 +35,6 @@ public:
~RadarProductViewImpl() = default;
std::shared_ptr radarProductManager_;
- std::shared_ptr map_;
std::vector vertices_;
std::vector dataMoments8_;
@@ -49,9 +46,8 @@ public:
};
RadarProductView::RadarProductView(
- std::shared_ptr radarProductManager,
- std::shared_ptr map) :
- p(std::make_unique(radarProductManager, map))
+ std::shared_ptr radarProductManager) :
+ p(std::make_unique(radarProductManager))
{
connect(radarProductManager.get(),
&manager::RadarProductManager::Level2DataLoaded,
@@ -60,26 +56,6 @@ RadarProductView::RadarProductView(
}
RadarProductView::~RadarProductView() = default;
-double RadarProductView::bearing() const
-{
- return p->map_->bearing();
-}
-
-double RadarProductView::scale() const
-{
- return p->map_->scale();
-}
-
-const std::vector& RadarProductView::data_moments8() const
-{
- return p->dataMoments8_;
-}
-
-const std::vector& RadarProductView::data_moments16() const
-{
- return p->dataMoments16_;
-}
-
const std::vector& RadarProductView::vertices() const
{
return p->vertices_;
diff --git a/scwx-qt/source/scwx/qt/view/radar_product_view.hpp b/scwx-qt/source/scwx/qt/view/radar_product_view.hpp
index 29ff6fe8..78b64a91 100644
--- a/scwx-qt/source/scwx/qt/view/radar_product_view.hpp
+++ b/scwx-qt/source/scwx/qt/view/radar_product_view.hpp
@@ -7,8 +7,6 @@
#include
#include
-#include
-
namespace scwx
{
namespace qt
@@ -24,16 +22,10 @@ class RadarProductView : public QObject
public:
explicit RadarProductView(
- std::shared_ptr radarProductManager,
- std::shared_ptr map);
+ std::shared_ptr radarProductManager);
~RadarProductView();
- double bearing() const;
- double scale() const;
- const std::vector& data_moments8() const;
- const std::vector& data_moments16() const;
- const std::vector& vertices() const;
-
+ const std::vector& vertices() const;
const std::vector& color_table() const;
void Initialize();