cascade styles

src/map/map.cpp

@@ -39,6 +39,7 @@ void Map::loadSettings() {
     transform.setAngle(settings.angle);
     transform.setScale(settings.scale);
     transform.setLonLat(settings.longitude, settings.latitude);
+    style.cascade(transform.getZoom());
     update();
 }
 
@@ -60,6 +61,7 @@ void Map::moveBy(double dx, double dy) {
 
 void Map::scaleBy(double ds, double cx, double cy) {
     transform.scaleBy(ds, cx, cy);
+    style.cascade(transform.getZoom());
     update();
 
     transform.getLonLat(settings.longitude, settings.latitude);
@@ -87,6 +89,7 @@ void Map::resetPosition() {
     transform.setAngle(0);
     transform.setLonLat(0, 0);
     transform.setZoom(0);
+    style.cascade(transform.getZoom());
     update();
 
     transform.getLonLat(settings.longitude, settings.latitude);

src/map/transform.cpp

@@ -164,8 +164,8 @@ void Transform::matrixFor(float matrix[16], const vec3<int32_t>& id) const {
     mat4::translate(matrix, matrix, 0, 0, -1);
 }
 
-int32_t Transform::getZoom() const {
-    return floor(log(scale) / M_LN2);
+float Transform::getZoom() const {
+    return log(scale) / M_LN2;
 }
 
 double Transform::getScale() const {