Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 0 additions & 15 deletions lib/app/map/_lib/managers/monitor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ class MonitorMapLayerManager extends MapLayerManager {

if (location.isValid) {
await controller.animateCamera(CameraUpdate.newLatLngZoom(location, 7.4));
TalkerManager.instance.info('Moved Camera to $location');
} else {
await controller.animateCamera(CameraUpdate.newLatLngZoom(DpipMap.kTaiwanCenter, 6.4));
TalkerManager.instance.info('Moved Camera to ${DpipMap.kTaiwanCenter}');
Expand Down Expand Up @@ -534,23 +533,16 @@ class MonitorMapLayerManager extends MapLayerManager {

// rts
await controller.setLayerVisibility(rtsLayerId, false);
TalkerManager.instance.info('Hiding Layer "$rtsLayerId"');

// intensity
await controller.setLayerVisibility(intensityLayerId, false);
TalkerManager.instance.info('Hiding Layer "$intensityLayerId"');
await controller.setLayerVisibility(intensity0LayerId, false);
TalkerManager.instance.info('Hiding Layer "$intensity0LayerId"');
await controller.setLayerVisibility(boxLayerId, false);
TalkerManager.instance.info('Hiding Layer "$boxLayerId"');

// eew
await controller.setLayerVisibility(epicenterLayerId, false);
TalkerManager.instance.info('Hiding Layer "$epicenterLayerId"');
await controller.setLayerVisibility(pWaveLayerId, false);
TalkerManager.instance.info('Hiding Layer "$pWaveLayerId"');
await controller.setLayerVisibility(sWaveLayerId, false);
TalkerManager.instance.info('Hiding Layer "$sWaveLayerId"');

visible = false;
} catch (e, s) {
Expand All @@ -577,21 +569,14 @@ class MonitorMapLayerManager extends MapLayerManager {
final hasBox = GlobalProviders.data.rts?.box.isNotEmpty ?? false;

await controller.setLayerVisibility(rtsLayerId, !hasBox);
TalkerManager.instance.info('Showing Layer "$rtsLayerId"');

await controller.setLayerVisibility(intensityLayerId, hasBox);
TalkerManager.instance.info('Showing Layer "$intensityLayerId"');
await controller.setLayerVisibility(intensity0LayerId, hasBox);
TalkerManager.instance.info('Showing Layer "$intensity0LayerId"');
await controller.setLayerVisibility(boxLayerId, hasBox);
TalkerManager.instance.info('Showing Layer "$boxLayerId"');

await controller.setLayerVisibility(epicenterLayerId, true);
TalkerManager.instance.info('Showing Layer "$epicenterLayerId"');
await controller.setLayerVisibility(pWaveLayerId, true);
TalkerManager.instance.info('Showing Layer "$pWaveLayerId"');
await controller.setLayerVisibility(sWaveLayerId, true);
TalkerManager.instance.info('Showing Layer "$sWaveLayerId"');

await _focus();

Expand Down
13 changes: 1 addition & 12 deletions lib/app/map/_lib/managers/precipitation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {

onTimeChanged?.call(time);

TalkerManager.instance.info('Updated Precipitation data to "$time"');
} catch (e, s) {
TalkerManager.instance.error('PrecipitationMapLayerManager.setPrecipitationTime', e, s);
} finally {
Expand All @@ -83,10 +82,8 @@ class PrecipitationMapLayerManager extends MapLayerManager {
final hideLayerId = '$layerId-${currentPrecipitationInterval.value}';

await controller.setLayerVisibility(showLayerId, true);
TalkerManager.instance.info('Showing Layer "$showLayerId"');

await controller.setLayerVisibility(hideLayerId, false);
TalkerManager.instance.info('Hiding Layer "$hideLayerId"');

currentPrecipitationInterval.value = interval;
} catch (e, s) {
Expand All @@ -100,7 +97,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {

if (location.isValid) {
await controller.animateCamera(CameraUpdate.newLatLngZoom(location, 7.4));
TalkerManager.instance.info('Moved Camera to $location');
} else {
await controller.animateCamera(CameraUpdate.newLatLngZoom(DpipMap.kTaiwanCenter, 6.4));
TalkerManager.instance.info('Moved Camera to ${DpipMap.kTaiwanCenter}');
Expand Down Expand Up @@ -150,7 +146,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {
final properties = GeojsonSourceProperties(data: data);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');

if (!context.mounted) return;
}
Expand Down Expand Up @@ -223,9 +218,7 @@ class PrecipitationMapLayerManager extends MapLayerManager {
properties.entries.map(
(entry) => controller
.addLayer(sourceId, '$layerId-${entry.key}', entry.value, belowLayerId: BaseMapLayerIds.userLocation)
.then((value) {
TalkerManager.instance.info('Added Layer "$layerId-${entry.key}"');
}),
.then((value) {}),
),
);
}
Expand All @@ -247,7 +240,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(hideLayerId, false);
TalkerManager.instance.info('Hiding Layer "$hideLayerId"');

visible = false;
} catch (e, s) {
Expand All @@ -264,7 +256,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(showLayerId, true);
TalkerManager.instance.info('Showing Layer "$showLayerId"');

await _focus();

Expand All @@ -282,11 +273,9 @@ class PrecipitationMapLayerManager extends MapLayerManager {

for (final interval in precipitationIntervals) {
await controller.removeLayer('$layerId-$interval');
TalkerManager.instance.info('Removed Layer "$layerId-$interval"');
}

await controller.removeSource(sourceId);
TalkerManager.instance.info('Removed Source "$sourceId"');
} catch (e, s) {
TalkerManager.instance.error('PrecipitationMapLayerManager.remove', e, s);
}
Expand Down
8 changes: 0 additions & 8 deletions lib/app/map/_lib/managers/radar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ class RadarMapLayerManager extends MapLayerManager {
currentRadarTime.value = time;

await _setupAndShowLayer(time);

TalkerManager.instance.info('Updated Radar tiles to "$time"');
} catch (e, s) {
TalkerManager.instance.error('RadarMapLayerManager._updateRadarTileUrl', e, s);
} finally {
Expand All @@ -161,14 +159,12 @@ class RadarMapLayerManager extends MapLayerManager {
);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');
}

if (!isLayerExists) {
final properties = RasterLayerProperties(visibility: visible ? 'visible' : 'none');

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.exptechCountyOutline);
TalkerManager.instance.info('Added Layer "$layerId"');
} else if (visible) {
await controller.setLayerVisibility(layerId, true);
}
Expand Down Expand Up @@ -209,7 +205,6 @@ class RadarMapLayerManager extends MapLayerManager {
try {
await _setupAndShowLayer(time);
await _hideLayer(time);
TalkerManager.instance.info('Preloaded radar layer: $time');
} catch (e, s) {
TalkerManager.instance.error('Failed to preload radar layer: $time', e, s);
}
Expand Down Expand Up @@ -323,7 +318,6 @@ class RadarMapLayerManager extends MapLayerManager {

if (location.isValid) {
await controller.animateCamera(CameraUpdate.newLatLngZoom(location, 7.4));
TalkerManager.instance.info('Moved Camera to $location');
} else {
await controller.animateCamera(CameraUpdate.newLatLngZoom(DpipMap.kTaiwanCenter, 6.4));
TalkerManager.instance.info('Moved Camera to ${DpipMap.kTaiwanCenter}');
Expand Down Expand Up @@ -367,7 +361,6 @@ class RadarMapLayerManager extends MapLayerManager {
}

visible = false;
TalkerManager.instance.info('Hidden all radar layers');
} catch (e, s) {
TalkerManager.instance.error('RadarMapLayerManager.hide', e, s);
}
Expand All @@ -381,7 +374,6 @@ class RadarMapLayerManager extends MapLayerManager {
if (currentRadarTime.value != null) {
final layerId = MapLayerIds.radar(currentRadarTime.value);
await controller.setLayerVisibility(layerId, true);
TalkerManager.instance.info('Showing Layer "$layerId"');
}

await _focus();
Expand Down
14 changes: 0 additions & 14 deletions lib/app/map/_lib/managers/report.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ class ReportMapLayerManager extends MapLayerManager {
final properties = GeojsonSourceProperties(data: data);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');

if (!context.mounted) return;
}
Expand Down Expand Up @@ -157,8 +156,6 @@ class ReportMapLayerManager extends MapLayerManager {
);

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.userLocation);

TalkerManager.instance.info('Added Layer "$layerId"');
}

didSetup = true;
Expand All @@ -179,7 +176,6 @@ class ReportMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(layerId, false);
TalkerManager.instance.info('Hiding Layer "$layerId"');

visible = false;
} catch (e, s) {
Expand All @@ -199,7 +195,6 @@ class ReportMapLayerManager extends MapLayerManager {
initialReportId = null;
} else {
await controller.setLayerVisibility(layerId, true);
TalkerManager.instance.info('Showing Layer "$layerId"');

await _focus();
}
Expand All @@ -217,10 +212,7 @@ class ReportMapLayerManager extends MapLayerManager {
final sourceId = MapSourceIds.report();

await controller.removeLayer(layerId);
TalkerManager.instance.info('Removed Layer "$layerId"');

await controller.removeSource(sourceId);
TalkerManager.instance.info('Removed Source "$sourceId"');
} catch (e, s) {
TalkerManager.instance.error('ReportMapLayerManager.dispose', e, s);
}
Expand Down Expand Up @@ -261,7 +253,6 @@ class ReportMapLayerManager extends MapLayerManager {
final properties = GeojsonSourceProperties(data: data);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');

if (!context.mounted) return;
}
Expand All @@ -276,13 +267,11 @@ class ReportMapLayerManager extends MapLayerManager {
);

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.userLocation);
TalkerManager.instance.info('Added Layer "$layerId"');
}

if (focus) await _focus(report);

await controller.setLayerVisibility(MapLayerIds.report(), false);
TalkerManager.instance.info('Hiding Layer "$layerId"');
} catch (e, s) {
TalkerManager.instance.error('ReportMapLayerManager._addReport', e, s);
}
Expand All @@ -300,18 +289,15 @@ class ReportMapLayerManager extends MapLayerManager {

if (isLayerExists) {
await controller.removeLayer(layerId);
TalkerManager.instance.info('Removed Layer "$layerId"');
}

if (isSourceExists) {
await controller.removeSource(sourceId);
TalkerManager.instance.info('Removed Source "$sourceId"');
}

if (focus) await _focus();

await controller.setLayerVisibility(MapLayerIds.report(), true);
TalkerManager.instance.info('Showing Layer "$layerId"');
} catch (e, s) {
TalkerManager.instance.error('ReportMapLayerManager._removeReport', e, s);
}
Expand Down
12 changes: 0 additions & 12 deletions lib/app/map/_lib/managers/temperature.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ class TemperatureMapLayerManager extends MapLayerManager {
await setup();

onTimeChanged?.call(time);

TalkerManager.instance.info('Updated Temperature data time to "$time"');
} catch (e, s) {
TalkerManager.instance.error('TemperatureMapLayerManager.setTemperatureTime', e, s);
} finally {
Expand All @@ -79,10 +77,8 @@ class TemperatureMapLayerManager extends MapLayerManager {

if (location.isValid) {
await controller.animateCamera(CameraUpdate.newLatLngZoom(location, 7.4));
TalkerManager.instance.info('Moved Camera to $location');
} else {
await controller.animateCamera(CameraUpdate.newLatLngZoom(DpipMap.kTaiwanCenter, 6.4));
TalkerManager.instance.info('Moved Camera to ${DpipMap.kTaiwanCenter}');
}
} catch (e, s) {
TalkerManager.instance.error('TemperatureMapLayerManager._focus', e, s);
Expand Down Expand Up @@ -133,7 +129,6 @@ class TemperatureMapLayerManager extends MapLayerManager {
final properties = GeojsonSourceProperties(data: data);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');

if (!context.mounted) return;
}
Expand Down Expand Up @@ -176,7 +171,6 @@ class TemperatureMapLayerManager extends MapLayerManager {
);

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.userLocation);
TalkerManager.instance.info('Added Layer "$layerId"');
}

if (isSourceExists && isLayerExists) return;
Expand All @@ -195,7 +189,6 @@ class TemperatureMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(layerId, false);
TalkerManager.instance.info('Hiding Layer "$layerId"');

visible = false;
} catch (e, s) {
Expand All @@ -211,8 +204,6 @@ class TemperatureMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(layerId, true);
TalkerManager.instance.info('Showing Layer "$layerId"');

await _focus();

visible = true;
Expand All @@ -228,10 +219,7 @@ class TemperatureMapLayerManager extends MapLayerManager {
final sourceId = MapSourceIds.temperature(currentTemperatureTime.value);

await controller.removeLayer(layerId);
TalkerManager.instance.info('Removed Layer "$layerId"');

await controller.removeSource(sourceId);
TalkerManager.instance.info('Removed Source "$sourceId"');
} catch (e, s) {
TalkerManager.instance.error('TemperatureMapLayerManager.remove', e, s);
}
Expand Down
9 changes: 0 additions & 9 deletions lib/app/map/_lib/managers/wind.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ class WindMapLayerManager extends MapLayerManager {
await setup();

onTimeChanged?.call(time);

TalkerManager.instance.info('Updated Wind data time to "$time"');
} catch (e, s) {
TalkerManager.instance.error('WindMapLayerManager.setWindTime', e, s);
} finally {
Expand Down Expand Up @@ -111,7 +109,6 @@ class WindMapLayerManager extends MapLayerManager {
final properties = GeojsonSourceProperties(data: data);

await controller.addSource(sourceId, properties);
TalkerManager.instance.info('Added Source "$sourceId"');

if (!context.mounted) return;
}
Expand All @@ -127,7 +124,6 @@ class WindMapLayerManager extends MapLayerManager {
);

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.userLocation);
TalkerManager.instance.info('Added Layer "$layerId"');
}

if (isSourceExists && isLayerExists) return;
Expand All @@ -146,7 +142,6 @@ class WindMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(layerId, false);
TalkerManager.instance.info('Hiding Layer "$layerId"');

visible = false;
} catch (e, s) {
Expand All @@ -162,7 +157,6 @@ class WindMapLayerManager extends MapLayerManager {

try {
await controller.setLayerVisibility(layerId, true);
TalkerManager.instance.info('Showing Layer "$layerId"');

visible = true;
} catch (e, s) {
Expand All @@ -177,10 +171,7 @@ class WindMapLayerManager extends MapLayerManager {
final sourceId = MapSourceIds.wind(currentWindTime.value);

await controller.removeLayer(layerId);
TalkerManager.instance.info('Removed Layer "$layerId"');

await controller.removeSource(sourceId);
TalkerManager.instance.info('Removed Source "$sourceId"');
} catch (e, s) {
TalkerManager.instance.error('WindMapLayerManager.dispose', e, s);
}
Expand Down
Loading
Loading