fix: EEW震央が表示されない問題

YumNumm · Feb 12, 2024 · bee9a4c · bee9a4c
1 parent d46fd21
commit bee9a4c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -517,7 +517,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -552,7 +552,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -594,7 +594,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -635,7 +635,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -779,7 +779,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;
@@ -811,7 +811,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1124;
+				CURRENT_PROJECT_VERSION = 1125;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CPL7H8SHVM;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1124</string>
+	<string>1125</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

diff --git a/lib/feature/home/features/map/viewmodel/main_map_viewmodel.dart b/lib/feature/home/features/map/viewmodel/main_map_viewmodel.dart
@@ -168,6 +168,7 @@ class MainMapViewModel extends _$MainMapViewModel {
         )
         .toList();
     _eewPsWaveService!.update(normalEews);
+    await _eewHypocenterService!.update(aliveBodies);
     final transformed = _EewEstimatedIntensityService.transform(
       aliveBodies
           .map((e) => e.regions)
@@ -426,7 +427,7 @@ class _KmoniObservationPointService {
     await controller.addCircleLayer(
       layerId,
       layerId,
-      const CircleLayerProperties(
+      CircleLayerProperties(
         circleRadius: [
           'interpolate',
           ['linear'],
@@ -440,9 +441,19 @@ class _KmoniObservationPointService {
           'get',
           'color',
         ],
+        circleStrokeColor: Colors.grey.toHexStringRGB(),
+        circleStrokeWidth: [
+          'interpolate',
+          ['linear'],
+          ['zoom'],
+          3,
+          0.5,
+          10,
+          1,
+        ],
       ),
       sourceLayer: layerId,
-      belowLayerId: BaseLayer.areaForecastLocalELine.name,
+      //      belowLayerId: BaseLayer.areaForecastLocalELine.name,
     );
   }