tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

normalizedZoom() == zoom level of the visual appearance

Browse Source
This commit is contained in:
Konstantin Käfer
2014-03-24 14:44:44 +01:00
parent 31912731d4
commit 5c613b5455
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/map.cpp
View File

@@ -46,7 +46,7 @@ void Map::loadSettings() {
transform.setAngle(settings.angle);
transform.setScale(settings.scale);
transform.setLonLat(settings.longitude, settings.latitude);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
}
@@ -87,7 +87,7 @@ void Map::stopPanning() {
void Map::scaleBy(double ds, double cx, double cy, double duration) {
transform.scaleBy(ds, cx, cy, duration);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
transform.getLonLat(settings.longitude, settings.latitude);
@@ -137,7 +137,7 @@ void Map::getLonLat(double& lon, double& lat) const {
void Map::setLonLatZoom(double lon, double lat, double zoom, double duration) {
transform.setLonLatZoom(lon, lat, zoom, duration);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
transform.getLonLat(settings.longitude, settings.latitude);
@@ -151,7 +151,7 @@ void Map::getLonLatZoom(double& lon, double& lat, double& zoom) const {
void Map::setScale(double scale, double cx, double cy, double duration) {
transform.setScale(scale, cx, cy, duration);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
transform.getLonLat(settings.longitude, settings.latitude);
@@ -161,7 +161,7 @@ void Map::setScale(double scale, double cx, double cy, double duration) {
void Map::setZoom(double zoom, double duration) {
transform.setZoom(zoom, duration);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
transform.getLonLat(settings.longitude, settings.latitude);
@@ -215,7 +215,7 @@ void Map::resetPosition() {
transform.setAngle(0);
transform.setLonLat(0, 0);
transform.setZoom(0);
style.cascade(transform.getZoom());
style.cascade(transform.getNormalizedZoom());
update();
transform.getLonLat(settings.longitude, settings.latitude);