fix: go_router

Author: lowrt

lib/app/home/_widgets/eew_card.dart

@@ -1,17 +1,15 @@
 import 'dart:async';
 
 import 'package:dpip/api/model/eew.dart';
-import 'package:dpip/app/map/_lib/utils.dart';
-import 'package:dpip/app/map/page.dart';
 import 'package:dpip/core/eew.dart';
 import 'package:dpip/core/i18n.dart';
 import 'package:dpip/core/providers.dart';
 import 'package:dpip/models/settings/location.dart';
+import 'package:dpip/router.dart';
 import 'package:dpip/utils/extensions/build_context.dart';
 import 'package:dpip/utils/extensions/number.dart';
 import 'package:dpip/widgets/responsive/responsive_container.dart';
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 import 'package:i18n_extension/i18n_extension.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:provider/provider.dart';
@@ -345,11 +343,7 @@ class _EewCardState extends State<EewCard> {
             child: Material(
               color: Colors.transparent,
               child: InkWell(
-                onTap: () => context.push(
-                  MapPage.route(
-                    options: MapPageOptions(initialLayers: {MapLayer.monitor}),
-                  ),
-                ),
+                onTap: () => MapRoute(layers: 'monitor').push(context),
                 splashColor: context.colors.error.withValues(alpha: 0.2),
                 borderRadius: BorderRadius.circular(16),
               ),

lib/app/home/_widgets/radar_card.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:dpip/api/exptech.dart';
 import 'package:dpip/api/route.dart';
 import 'package:dpip/app/map/_lib/utils.dart';
-import 'package:dpip/app/map/page.dart';
 import 'package:dpip/core/compass.dart';
 import 'package:dpip/core/i18n.dart';
 import 'package:dpip/core/providers.dart';
@@ -17,7 +16,6 @@ import 'package:dpip/widgets/map/map.dart';
 import 'package:dpip/widgets/responsive/responsive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_compass/flutter_compass.dart';
-import 'package:go_router/go_router.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
@@ -275,11 +273,7 @@ class _RadarMapCardState extends State<RadarMapCard>
             child: Material(
               type: MaterialType.transparency,
               child: InkWell(
-                onTap: () => context.push(
-                  MapPage.route(
-                    options: MapPageOptions(initialLayers: {MapLayer.radar}),
-                  ),
-                ),
+                onTap: () => MapRoute(layers: 'radar').push(context),
                 borderRadius: BorderRadius.circular(16),
               ),
             ),

lib/core/notify.dart

@@ -1,12 +1,9 @@
 import 'dart:async';
 
 import 'package:awesome_notifications/awesome_notifications.dart';
-import 'package:dpip/app/map/_lib/utils.dart';
-import 'package:dpip/app/map/page.dart';
 import 'package:dpip/router.dart';
 import 'package:dpip/utils/log.dart';
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 
 String? _pendingChannelKey;
 
@@ -47,16 +44,12 @@ void _navigateBasedOnChannelKey(BuildContext context, String? channelKey) {
   if (channelKey.startsWith('eew') ||
       channelKey.startsWith('int_report') ||
       channelKey.startsWith('eq')) {
-    context.push(
-      MapPage.route(options: MapPageOptions(initialLayers: {MapLayer.monitor})),
-    );
+    MapRoute(layers: 'monitor').push(context);
     return;
   }
 
   if (channelKey.startsWith('report')) {
-    context.push(
-      MapPage.route(options: MapPageOptions(initialLayers: {MapLayer.report})),
-    );
+    MapRoute(layers: 'report').push(context);
     return;
   }