Skip to content

Commit 24e0bb9

Browse files
committed
Merge branch '137-fit-max-zoom-level-cause-map-flicker' into 'develop'
Resolve "Fit max zoom level cause map flicker" Closes #137 See merge request gtt/redmine_gtt!42
2 parents 1c4bc05 + d2c25ee commit 24e0bb9

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

assets/javascripts/app.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ var App = (function ($, publ) {
423423
publ.setView = function () {
424424

425425
var view = new ol.View({
426-
center: ol.proj.fromLonLat([defaults.lon, defaults.lat]),
426+
// Avoid flicker (map move)
427+
//center: ol.proj.fromLonLat([defaults.lon, defaults.lat]),
427428
zoom: defaults.zoom,
428429
maxZoom: defaults.maxzoom // applies for Mierune Tiles
429430
});
@@ -469,12 +470,19 @@ var App = (function ($, publ) {
469470
});
470471
});
471472
}
472-
else if (geolocation) {
473-
geolocation.once('change:position', function (error) {
474-
maps.forEach(function (m) {
475-
m.getView().setCenter(geolocation.getPosition());
476-
});
473+
else {
474+
// Set default center, once
475+
maps.forEach(function (m) {
476+
m.getView().setCenter(ol.proj.transform([defaults.lon, defaults.lat],
477+
'EPSG:4326', 'EPSG:3857'));
477478
});
479+
if (geolocation) {
480+
geolocation.once('change:position', function (error) {
481+
maps.forEach(function (m) {
482+
m.getView().setCenter(geolocation.getPosition());
483+
});
484+
});
485+
}
478486
}
479487
};
480488

0 commit comments

Comments
 (0)