Skip to content

Quantize contours request time #4941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihoryakovenko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Quantize contours request time #4941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 92 additions & 17 deletions Sources/Controllers/Map/Layers/OAWeatherContourLayer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ @implementation OAWeatherContourLayer
OAAutoObserverProxy* _weatherUseOfflineDataChangeObserver;
OAAutoObserverProxy* _alphaChangeObserver;
NSMutableArray<OAAutoObserverProxy *> *_layerChangeObservers;

OsmAnd::BandIndex _cachedBand;
int64_t _cachedDateTime;

NSDate *_pendingDate;
OsmAnd::BandIndex _pendingBand;
NSTimer *_initProvidersTimer;
}

- (instancetype) initWithMapViewController:(OAMapViewController *)mapViewController layerIndex:(int)layerIndex date:(NSDate *)date
Expand All @@ -67,6 +74,13 @@ - (void) initLayer
_weatherHelper = [OAWeatherHelper sharedInstance];
_styleSettings = [OAMapStyleSettings sharedInstance];

_cachedBand = -1;
_cachedDateTime = 0;

_pendingDate = nil;
_pendingBand = -1;
_initProvidersTimer = nil;

_weatherToolbarStateChangeObservable = [[OAAutoObserverProxy alloc] initWith:self
withHandler:@selector(onWeatherToolbarStateChanged)
andObserve:[OARootViewController instance].mapPanel.weatherToolbarStateChangeObservable];
Expand Down Expand Up @@ -193,27 +207,76 @@ - (BOOL) updateLayer

- (void) initProviders:(NSDate *)date band:(OsmAnd::BandIndex)band
{
[self deinitProviders];
_pendingDate = date;
_pendingBand = band;

if (_initProvidersTimer)
{
[_initProvidersTimer invalidate];
}

OAMapRendererEnvironment *env = self.mapViewController.mapRendererEnv;
_initProvidersTimer = [NSTimer scheduledTimerWithTimeInterval:0.25
target:self
selector:@selector(executeInitProviders)
userInfo:nil
repeats:NO];
}

NSDate *roundedDate = [OAWeatherHelper roundForecastTimeToHour:date];
int64_t dateTime = roundedDate.timeIntervalSince1970 * 1000;
CGSize screenSize = [UIScreen mainScreen].bounds.size;
int cacheSize = (screenSize.width * 2 / _resourcesManager->getTileSize()) * (screenSize.height * 2 / _resourcesManager->getTileSize());
int rasterTileSize = (int) (_resourcesManager->getTileSize() * _resourcesManager->getDensityFactor());
_geoTileObjectsProvider = std::make_shared<OsmAnd::GeoTileObjectsProvider>(_resourcesManager, dateTime, band, self.app.data.weatherUseOfflineData, cacheSize);
_mapPrimitivesProvider = std::make_shared<OsmAnd::MapPrimitivesProvider>(
_geoTileObjectsProvider,
env.mapPrimitiviser,
rasterTileSize);
- (void) executeInitProviders
{
if (!_pendingDate)
return;

NSDate *date = _pendingDate;
OsmAnd::BandIndex band = _pendingBand;

_pendingDate = nil;
_pendingBand = -1;
_initProvidersTimer = nil;

NSTimeInterval timeInterval = date.timeIntervalSince1970;
NSTimeInterval quantizationInterval = 3600.0;

if ([self.app.data.weatherSource isEqualToString:@"ecmwf"])
{
quantizationInterval = 3600.0 * 3;
}

_mapObjectsSymbolsProvider = std::make_shared<OsmAnd::MapObjectsSymbolsProvider>(
_mapPrimitivesProvider, rasterTileSize, nullptr, true);
self.mapView.renderer->addSymbolsProvider(_mapObjectsSymbolsProvider);
NSTimeInterval flooredTimeInterval = floor(timeInterval / quantizationInterval) * quantizationInterval;
int64_t dateTime = flooredTimeInterval * 1000;

_rasterMapProvider = std::make_shared<OsmAnd::MapRasterLayerProvider_Software>(_mapPrimitivesProvider, false, true);
self.mapView.renderer->setMapLayerProvider(self.layerIndex, _rasterMapProvider);
BOOL needRecreate = (_geoTileObjectsProvider == nullptr ||
_mapPrimitivesProvider == nullptr ||
_mapObjectsSymbolsProvider == nullptr ||
_rasterMapProvider == nullptr ||
_cachedBand != band ||
dateTime != _cachedDateTime);

if (needRecreate)
{
[self deinitProviders];

OAMapRendererEnvironment *env = self.mapViewController.mapRendererEnv;
CGSize screenSize = [UIScreen mainScreen].bounds.size;
int cacheSize = (screenSize.width * 2 / _resourcesManager->getTileSize()) * (screenSize.height * 2 / _resourcesManager->getTileSize());
int rasterTileSize = (int) (_resourcesManager->getTileSize() * _resourcesManager->getDensityFactor());

_geoTileObjectsProvider = std::make_shared<OsmAnd::GeoTileObjectsProvider>(_resourcesManager, dateTime, band, self.app.data.weatherUseOfflineData, cacheSize);
_mapPrimitivesProvider = std::make_shared<OsmAnd::MapPrimitivesProvider>(
_geoTileObjectsProvider,
env.mapPrimitiviser,
rasterTileSize);

_mapObjectsSymbolsProvider = std::make_shared<OsmAnd::MapObjectsSymbolsProvider>(
_mapPrimitivesProvider, rasterTileSize, nullptr, true);
self.mapView.renderer->addSymbolsProvider(_mapObjectsSymbolsProvider);

_rasterMapProvider = std::make_shared<OsmAnd::MapRasterLayerProvider_Software>(_mapPrimitivesProvider, false, true);
self.mapView.renderer->setMapLayerProvider(self.layerIndex, _rasterMapProvider);

_cachedBand = band;
_cachedDateTime = dateTime;
}
}

- (void) deinitProviders
Expand All @@ -225,6 +288,18 @@ - (void) deinitProviders
_mapObjectsSymbolsProvider = nullptr;
_mapPrimitivesProvider = nullptr;
_geoTileObjectsProvider = nullptr;
_rasterMapProvider = nullptr;

_cachedBand = -1;
_cachedDateTime = 0;

if (_initProvidersTimer)
{
[_initProvidersTimer invalidate];
_initProvidersTimer = nil;
}
_pendingDate = nil;
_pendingBand = -1;
}

- (void)onWeatherToolbarStateChanged
Expand Down