Skip to content

feat: map symbol value #348

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

Merged
merged 2 commits into from
Aug 7, 2025
Merged

feat: map symbol value #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcfb580
feat: map symbol value
kamiya4047 Aug 7, 2025
cb901b0
Merge branch 'main' into feat/map-values
lowrt Aug 7, 2025
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
139 changes: 77 additions & 62 deletions lib/app/map/_lib/managers/precipitation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import 'package:dpip/app/map/_widgets/map_legend.dart';
import 'package:dpip/core/i18n.dart';
import 'package:dpip/core/providers.dart';
import 'package:dpip/models/data.dart';
import 'package:dpip/utils/constants.dart';
import 'package:dpip/utils/extensions/build_context.dart';
import 'package:dpip/utils/extensions/latlng.dart';
import 'package:dpip/utils/extensions/string.dart';
Expand Down Expand Up @@ -65,7 +66,6 @@ class PrecipitationMapLayerManager extends MapLayerManager {
await setup();

onTimeChanged?.call(time);

} catch (e, s) {
TalkerManager.instance.error('PrecipitationMapLayerManager.setPrecipitationTime', e, s);
} finally {
Expand Down Expand Up @@ -110,6 +110,8 @@ class PrecipitationMapLayerManager extends MapLayerManager {
Future<void> setup() async {
if (didSetup) return;

final colors = context.colors;

try {
if (GlobalProviders.data.precipitation.isEmpty) {
final precipitationList = (await ExpTech().getRainList()).reversed.toList();
Expand Down Expand Up @@ -151,75 +153,83 @@ class PrecipitationMapLayerManager extends MapLayerManager {
}

if (!isLayerExists) {
final properties = {
final Map<String, LayerProperties> properties = {
for (final interval in precipitationIntervals)
interval: CircleLayerProperties(
circleRadius: [
Expressions.interpolate,
['linear'],
[Expressions.zoom],
7,
5,
12,
15,
],
circleColor: [
Expressions.interpolate,
['linear'],
[Expressions.get, interval],
0,
'#c2c2c2',
10,
'#9cfcff',
30,
'#059bff',
50,
'#39ff03',
100,
'#fffb03',
200,
'#ff9500',
300,
'#ff0000',
500,
'#fb00ff',
1000,
'#960099',
2000,
'#000000',
],
circleOpacity: [
'case',
[
'<',
...({
interval: CircleLayerProperties(
circleColor: [
Expressions.interpolate,
['linear'],
[Expressions.get, interval],
0,
'#c2c2c2',
10,
'#9cfcff',
30,
'#059bff',
50,
'#39ff03',
100,
'#fffb03',
200,
'#ff9500',
300,
'#ff0000',
500,
'#fb00ff',
1000,
'#960099',
2000,
'#000000',
],
0,
0.7,
],
circleStrokeWidth: 0.2,
circleStrokeColor: '#000000',
circleStrokeOpacity: [
'case',
[
'<',
[Expressions.get, interval],
0,
circleRadius: kCircleIconSize,
circleOpacity: 0.75,
circleStrokeColor: colors.outlineVariant.toHexStringRGB(),
circleStrokeWidth: 0.5,
circleStrokeOpacity: 0.75,
visibility: interval == currentPrecipitationInterval.value ? 'visible' : 'none',
),
'$interval-label': SymbolLayerProperties(
textField: [
Expressions.concat,
[Expressions.get, 'name'],
'\n',
[
Expressions.concat,
[Expressions.get, interval],
'mm',
],
],
0,
0.7,
],
visibility: interval == currentPrecipitationInterval.value ? 'visible' : 'none',
),
textSize: 10,
textColor: colors.onSurfaceVariant.toHexStringRGB(),
textHaloColor: colors.outlineVariant.toHexStringRGB(),
textHaloWidth: 1,
textFont: ['Noto Sans TC Bold'],
textOffset: [0, 1],
textAnchor: 'top',
visibility: interval == currentPrecipitationInterval.value ? 'visible' : 'none',
),
}),
};

await Future.wait(
properties.entries.map(
(entry) => controller
.addLayer(sourceId, '$layerId-${entry.key}', entry.value, belowLayerId: BaseMapLayerIds.userLocation)
.then((value) {}),
),
properties.entries.map((entry) {
final isValueLayer = entry.key.endsWith('-label');
final interval = isValueLayer ? entry.key.substring(0, entry.key.length - 6) : entry.key;

return controller.addLayer(
sourceId,
'$layerId-${entry.key}',
entry.value,
belowLayerId: BaseMapLayerIds.userLocation,
minzoom: isValueLayer ? 10 : null,
filter: [
Expressions.largerOrEqual,
[Expressions.get, interval],
0,
],
);
}),
);
}

Expand All @@ -237,9 +247,11 @@ class PrecipitationMapLayerManager extends MapLayerManager {

final layerId = MapLayerIds.precipitation(currentPrecipitationTime.value);
final hideLayerId = '$layerId-${currentPrecipitationInterval.value}';
final hideValueLayerId = '$layerId-${currentPrecipitationInterval.value}-label';

try {
await controller.setLayerVisibility(hideLayerId, false);
await controller.setLayerVisibility(hideValueLayerId, false);

visible = false;
} catch (e, s) {
Expand All @@ -253,9 +265,11 @@ class PrecipitationMapLayerManager extends MapLayerManager {

final layerId = MapLayerIds.precipitation(currentPrecipitationTime.value);
final showLayerId = '$layerId-${currentPrecipitationInterval.value}';
final showValueLayerId = '$layerId-${currentPrecipitationInterval.value}-label';

try {
await controller.setLayerVisibility(showLayerId, true);
await controller.setLayerVisibility(showValueLayerId, true);

await _focus();

Expand All @@ -273,6 +287,7 @@ class PrecipitationMapLayerManager extends MapLayerManager {

for (final interval in precipitationIntervals) {
await controller.removeLayer('$layerId-$interval');
await controller.removeLayer('$layerId-$interval-label');
}

await controller.removeSource(sourceId);
Expand Down
69 changes: 56 additions & 13 deletions lib/app/map/_lib/managers/temperature.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import 'package:dpip/core/i18n.dart';
import 'package:dpip/core/providers.dart';
import 'package:dpip/models/data.dart';
import 'package:dpip/models/settings/ui.dart';
import 'package:dpip/utils/constants.dart';
import 'package:dpip/utils/extensions/build_context.dart';
import 'package:dpip/utils/extensions/int.dart';
import 'package:dpip/utils/extensions/latlng.dart';
Expand Down Expand Up @@ -89,6 +90,8 @@ class TemperatureMapLayerManager extends MapLayerManager {
Future<void> setup() async {
if (didSetup) return;

final colors = context.colors;

try {
if (GlobalProviders.data.temperature.isEmpty) {
final temperatureList = (await ExpTech().getWeatherList()).reversed.toList();
Expand Down Expand Up @@ -134,16 +137,8 @@ class TemperatureMapLayerManager extends MapLayerManager {
}

if (!isLayerExists) {
// circles
final properties = CircleLayerProperties(
circleRadius: [
Expressions.interpolate,
['linear'],
[Expressions.zoom],
7,
5,
12,
15,
],
circleColor: [
Expressions.interpolate,
['linear'],
Expand All @@ -163,14 +158,57 @@ class TemperatureMapLayerManager extends MapLayerManager {
40,
'#8B0000',
],
circleOpacity: 0.7,
circleStrokeWidth: 0.2,
circleStrokeColor: '#000000',
circleStrokeOpacity: 0.7,
circleRadius: kCircleIconSize,
circleOpacity: 0.75,
circleStrokeColor: colors.outlineVariant.toHexStringRGB(),
circleStrokeWidth: 0.5,
circleStrokeOpacity: 0.75,
visibility: visible ? 'visible' : 'none',
);

// labels
final temperature = [
Expressions.caseExpression,
GlobalProviders.ui.useFahrenheit,
[
Expressions.round,
[
Expressions.plus,
[
Expressions.multiply,
[Expressions.get, 'temperature'],
1.8,
],
32,
],
],
[Expressions.get, 'temperature'],
];
final properties2 = SymbolLayerProperties(
textField: [
Expressions.concat,
[Expressions.get, 'name'],
'\n',
[Expressions.concat, temperature, if (GlobalProviders.ui.useFahrenheit) '℉' else '℃'],
],
textSize: 10,
textColor: colors.onSurfaceVariant.toHexStringRGB(),
textHaloColor: colors.outlineVariant.toHexStringRGB(),
textHaloWidth: 1,
textFont: ['Noto Sans TC Bold'],
textOffset: [0, 1],
textAnchor: 'top',
visibility: visible ? 'visible' : 'none',
);

await controller.addLayer(sourceId, layerId, properties, belowLayerId: BaseMapLayerIds.userLocation);
await controller.addLayer(
sourceId,
'$layerId-label',
properties2,
belowLayerId: BaseMapLayerIds.userLocation,
minzoom: 10,
);
}

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

try {
await controller.setLayerVisibility(layerId, false);
await controller.setLayerVisibility('$layerId-label', false);

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

try {
await controller.setLayerVisibility(layerId, true);
await controller.setLayerVisibility('$layerId-label', true);

await _focus();

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

await controller.removeLayer(layerId);
await controller.removeLayer('$layerId-label');

await controller.removeSource(sourceId);
} catch (e, s) {
TalkerManager.instance.error('TemperatureMapLayerManager.remove', e, s);
Expand Down
2 changes: 1 addition & 1 deletion lib/app/map/_lib/managers/tsunami.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class _TsunamiMapLayerSheetState extends State<TsunamiMapLayerSheet> {
textColor: '#ffffff',
textHaloColor: '#000000',
textHaloWidth: 1,
textFont: ['Noto Sans Regular'],
textFont: ['Noto Sans TC Bold'],
textOffset: [
Expressions.literal,
[0, 3.5],
Expand Down
Loading
Loading