@dmdata/telegram-json-types 1.1.4 → 1.1.8

package/types/component/earthquake.d.ts

@@ -1,56 +1,77 @@
 import { Coordinate } from './coordinate';
 import { UnitValueNotNull } from './unit-value';
 
-type Depth = {
+interface DepthBase {
   type: '深さ';
   unit: 'km';
-} & ({
-  value: null;
-  condition: '不明';
-} | {
+  value: string | null;
+  condition: string | never;
+}
+
+interface DepthNormal extends DepthBase {
+  value: string;
+  condition: never;
+}
+
+interface DepthShallow extends DepthBase {
   value: '0';
   condition: 'ごく浅い';
-} | {
+}
+
+interface DepthDeep extends DepthBase {
   value: '700';
   condition: '７００ｋｍ以上';
-} | {
-  value: string;
-  condition: never;
-});
-type Magnitude = {
+}
+
+interface DepthUnknown extends DepthBase {
+  value: null;
+  condition: '不明';
+}
+
+type Depth = DepthNormal | DepthShallow | DepthDeep | DepthUnknown;
+
+
+interface MagnitudeBase {
   type: 'マグニチュード';
   unit: 'Mj' | 'M';
-} & ({
-  value: null;
-  condition: 'Ｍ不明' | 'Ｍ８を超える巨大地震';
-} | {
+  value: string | null;
+  condition: string | never;
+}
+
+interface MagnitudeNormal extends MagnitudeBase {
   value: string;
   condition: never;
-});
+}
 
-export interface Earthquake {
-  originTime: string;
-  arrivalTime: string;
-  hypocenter: {
+interface MagnitudeUnknown extends MagnitudeBase {
+  value: null;
+  condition: 'Ｍ不明' | 'Ｍ８を超える巨大地震';
+}
+
+type Magnitude = MagnitudeNormal | MagnitudeUnknown;
+
+interface Hypocenter {
+  name: string;
+  code: string;
+  coordinate: Coordinate<'日本測地系' | undefined>;
+  depth: Depth;
+  detailed?: {
+    code: string;
     name: string;
+  };
+  auxiliary?: {
+    text: string;
     code: string;
-    coordinate: Coordinate<'日本測地系' | undefined>;
-    depth: Depth;
-    detailed?: {
-      code: string;
-      name: string;
-    };
-    auxiliary?: {
-      text: string;
-      code: string;
-      name: string;
-      direction: string;
-      distance: Omit<UnitValueNotNull<never, 'km'>, 'type' | 'condition'>;
-    };
-    source?: 'ＰＴＷＣ' | 'ＵＳＧＳ' | 'ＷＣＡＴＷＣ';
+    name: string;
+    direction: string;
+    distance: Omit<UnitValueNotNull<never, 'km'>, 'type' | 'condition'>;
   };
-  magnitude: Magnitude;
+  source?: 'ＰＴＷＣ' | 'ＵＳＧＳ' | 'ＷＣＡＴＷＣ';
 }
 
-
-
+export interface Earthquake {
+  originTime: string;
+  arrivalTime: string;
+  hypocenter: Hypocenter;
+  magnitude: Magnitude;
+}

package/types/schema/earthquake-information/1.0.0.d.ts

@@ -30,7 +30,7 @@ export namespace EarthquakeInformation {
     condition?: '震度５弱以上未入電';
   }
 
-  export type Comment = {
+  export interface Comments {
     free?: string;
     forecast?: {
       text: string;
@@ -40,7 +40,7 @@ export namespace EarthquakeInformation {
       text: string;
       codes: string[];
     };
-  };
+  }
 
 
   export interface IntensityVXSE51 {
@@ -61,20 +61,20 @@ export namespace EarthquakeInformation {
   export interface PublicBodyVXSE51 {
     intensity: IntensityVXSE51;
     text?: string;
-    comments: Omit<Comment, 'var'>;
+    comments: Omit<Comments, 'var'>;
   }
 
   export interface PublicBodyVXSE52 {
     earthquake: Components.Earthquake;
     text?: string;
-    comments: Omit<Comment, 'var'>;
+    comments: Omit<Comments, 'var'>;
   }
 
   export interface PublicBodyVXSE53 {
     earthquake: Components.Earthquake;
     intensity?: IntensityVXSE53;
     text?: string;
-    comments: Comment;
+    comments: Comments;
   }
 
   export interface PublicBodyVXZSE40 {

package/types/schema/earthquake-information/1.1.0.d.ts

@@ -46,7 +46,7 @@ export namespace EarthquakeInformation {
     prePeriods: IntensityLpgmStationPrePeriod[];
   }
 
-  export type Comment = {
+  export interface Comments {
     free?: string;
     forecast?: {
       text: string;
@@ -56,7 +56,7 @@ export namespace EarthquakeInformation {
       text: string;
       codes: string[];
     };
-  };
+  }
 
 
   export interface IntensityVXSE51 {
@@ -86,27 +86,27 @@ export namespace EarthquakeInformation {
   export interface PublicBodyVXSE51 {
     intensity: IntensityVXSE51;
     text?: string;
-    comments: Omit<Comment, 'var'>;
+    comments: Omit<Comments, 'var'>;
   }
 
   export interface PublicBodyVXSE52 {
     earthquake: Components.Earthquake;
     text?: string;
-    comments: Omit<Comment, 'var'>;
+    comments: Omit<Comments, 'var'>;
   }
 
   export interface PublicBodyVXSE53 {
     earthquake: Components.Earthquake;
     intensity?: IntensityVXSE53;
     text?: string;
-    comments: Comment;
+    comments: Comments;
   }
 
   export interface PublicBodyVXSE62 {
     earthquake: Components.Earthquake;
     intensity?: IntensityVXSE62;
     text?: string;
-    comments: Comment;
+    comments: Comments;
   }
 
   export interface PublicBodyVXZSE40 {

package/types/schema/eew-information/1.0.0.d.ts

@@ -80,44 +80,82 @@ export namespace EewInformation {
   export interface IntensityRegion extends Components.CodeName {
     forecastMaxInt: IntensityForecastMaxInt;
     forecastLpgmMaxInt?: IntensityForecastLpgmMaxInt;
+    isPlum: boolean;
+    isWarning: boolean;
     kind: IntensityRegionKind;
+    condition?: '既に主要動到達と推測';
+    arrivalTime?: string;
   }
 
+  export interface IntensityRegionReached extends IntensityRegion {
+    condition: '既に主要動到達と推測';
+    arrivalTime: never;
+  }
+
+  export interface IntensityRegionUnReached extends IntensityRegion {
+    condition: never;
+    arrivalTime: string;
+  }
+
+  export type IntensityRegionItem = IntensityRegionReached | IntensityRegionUnReached
+
+  export interface IntensityRealtimeStation {
+    code: string;
+    name: string;
+    int: IntensityClass;
+    k: string;
+  }
 
   export interface Intensity {
     forecastMaxInt: IntensityForecastMaxInt;
     forecastLpgmMaxInt?: IntensityForecastLpgmMaxInt;
     appendix?: IntensityAppendix;
-    regions: IntensityRegion[];
+    regions: IntensityRegionItem[];
+  }
+
+  export interface IntensityRealtime {
+    stations: IntensityRealtimeStation[];
   }
 
 
-  export type Comment = {
+  export interface Comments {
     free?: string;
     warning?: {
       text: string;
       codes: string[];
     };
-  };
+  }
 
   export interface PublicCommonBody {
     isLastInfo: boolean;
+    isCanceled: boolean;
+    isWarning: boolean;
     zones?: WarningArea[];
     prefectures?: WarningArea[];
     regions?: WarningArea[];
     earthquake: Earthquake;
     intensity?: Intensity;
     text?: string;
-    comments: Comment;
+    comments: Comments;
+  }
+
+  export interface PublicRealtimeBody {
+    isLastInfo: boolean;
+    isCanceled: boolean;
+    earthquake: Earthquake;
+    intensity?: IntensityRealtime;
+    text?: string;
   }
 
   export interface PublicTestingBody {
     isLastInfo: false;
+    isCanceled: false;
     text: string;
   }
 
   export interface CancelBody {
     isLastInfo: true;
+    isCanceled: true;
     text: string;
   }
 
@@ -135,6 +173,21 @@ export namespace EewInformation {
     body: PublicCommonBody;
   }
 
+  export interface PublicRealtime extends TelegramJSONMain {
+    _schema: Schema;
+    type: 'リアルタイム震度';
+    title: 'リアルタイム震度';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: string;
+    infoKind: '緊急地震速報';
+    body: PublicRealtimeBody;
+  }
+
+
   export interface PublicTesting extends TelegramJSONMain {
     _schema: Schema;
     type: '緊急地震速報配信テスト';
@@ -151,8 +204,8 @@ export namespace EewInformation {
 
   export interface Cancel extends TelegramJSONMain {
     _schema: Schema;
-    type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報配信テスト';
-    title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報配信テスト';
+    type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | 'リアルタイム震度' | '緊急地震速報配信テスト';
+    title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | 'リアルタイム震度' | '緊急地震速報配信テスト';
     infoType: '取消';
     targetDateTimeDubious: never;
     targetDuration: never;
@@ -163,6 +216,6 @@ export namespace EewInformation {
     body: CancelBody;
   }
 
-  export type Main = PublicCommon | PublicTesting | Cancel;
+  export type Main = PublicCommon | PublicRealtime | PublicTesting | Cancel;
 
 }