Merge pull request #214 from xspanger3770/0.10.1-real-one

Version 0.10.1
xspanger3770 · Jan 26, 2024 · 0e67a73 · 0e67a73
2 parents 7bf0716 + f5092ca
commit 0e67a73
Show file tree

Hide file tree

Showing 86 changed files with 1,631 additions and 564 deletions.
diff --git a/GlobalQuakeAPI/pom.xml b/GlobalQuakeAPI/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>xspanger.GlobalQuake</groupId>
         <artifactId>GlobalQuake</artifactId>
-        <version>0.10.0</version>
+        <version>0.10.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/GlobalQuakeClient/pom.xml b/GlobalQuakeClient/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>xspanger.GlobalQuake</groupId>
         <artifactId>GlobalQuake</artifactId>
-        <version>0.10.0</version>
+        <version>0.10.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>xspanger.GlobalQuake</groupId>
             <artifactId>GlobalQuakeCore</artifactId>
-            <version>0.10.0</version>
+            <version>0.10.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/GlobalQuakeClient/src/main/java/globalquake/alert/AlertManager.java b/GlobalQuakeClient/src/main/java/globalquake/alert/AlertManager.java
@@ -40,14 +40,14 @@ public void onQuakeUpdate(QuakeUpdateEvent event) {
     }
 
     public synchronized void tick() {
-        GlobalQuake.instance.getEarthquakeAnalysis().getEarthquakes().forEach(earthquake -> warnings.putIfAbsent(earthquake, new Warning()));
+        GlobalQuake.instance.getEarthquakeAnalysis().getEarthquakes().forEach(earthquake -> warnings.putIfAbsent(earthquake, new Warning(GlobalQuake.instance.currentTimeMillis())));
 
         for (Iterator<Map.Entry<Warnable, Warning>> iterator = warnings.entrySet().iterator(); iterator.hasNext(); ) {
             var kv = iterator.next();
             Warnable warnable = kv.getKey();
             Warning warning = kv.getValue();
 
-            long age = System.currentTimeMillis() - warning.createdAt;
+            long age = GlobalQuake.instance.currentTimeMillis() - warning.createdAt;
             if(age > 1000 * 60 * STORE_TIME_MINUTES){
                 iterator.remove();
                 continue;

diff --git a/GlobalQuakeClient/src/main/java/globalquake/alert/Warning.java b/GlobalQuakeClient/src/main/java/globalquake/alert/Warning.java
@@ -2,8 +2,8 @@
 
 public class Warning {
 
-    public Warning() {
-        createdAt = System.currentTimeMillis();
+    public Warning(long time) {
+        createdAt = time;
         metConditions = false;
     }
 

diff --git a/GlobalQuakeClient/src/main/java/globalquake/client/ClusterAnalysisClient.java b/GlobalQuakeClient/src/main/java/globalquake/client/ClusterAnalysisClient.java
@@ -32,7 +32,7 @@ public ClusterAnalysisClient() {
     private void checkClusters() {
         List<Cluster> toRemove = new ArrayList<>();
         for(Cluster cluster : clusters){
-            if(System.currentTimeMillis() - cluster.getLastUpdate() > 30 * 60 * 1000){
+            if(GlobalQuake.instance.currentTimeMillis() - cluster.getLastUpdate() > 30 * 60 * 1000){
                 toRemove.add(cluster);
             }
         }

diff --git a/GlobalQuakeClient/src/main/java/globalquake/client/GlobalStationManagerClient.java b/GlobalQuakeClient/src/main/java/globalquake/client/GlobalStationManagerClient.java
@@ -64,7 +64,7 @@ private void processDataRecordPacket(DataRecordPacket dataRecordPacket) {
         try {
             DataRecord dataRecord = (DataRecord) DataRecord.read(dataRecordPacket.data());
             station.getAnalysis().analyse(dataRecord);
-            station.getAnalysis().second(System.currentTimeMillis());
+            station.getAnalysis().second(GlobalQuakeLocal.instance.currentTimeMillis());
         } catch (IOException | SeedFormatException e) {
             Logger.error(e);
         }

diff --git a/GlobalQuakeClient/src/main/java/globalquake/client/data/ClientStation.java b/GlobalQuakeClient/src/main/java/globalquake/client/data/ClientStation.java
@@ -1,5 +1,6 @@
 package globalquake.client.data;
 
+import globalquake.core.GlobalQuake;
 import gqserver.api.packets.station.InputType;
 import globalquake.core.station.GlobalStation;
 
@@ -27,7 +28,7 @@ public boolean isInEventMode() {
 
     @Override
     public long getDelayMS() {
-        return System.currentTimeMillis() - lastDataTime;
+        return GlobalQuake.instance.currentTimeMillis() - lastDataTime;
     }
 
     @Override

diff --git a/GlobalQuakeClient/src/main/java/globalquake/main/Main.java b/GlobalQuakeClient/src/main/java/globalquake/main/Main.java
@@ -25,17 +25,17 @@ public static void main(String[] args) {
         initErrorHandler();
         initMainDirectory();
         GlobalQuake.prepare(MAIN_FOLDER, getErrorHandler());
-
+        
         Options options = new Options();
-
+        
         Option maxGpuMemOption = new Option("g", "gpu-max-mem", true, "maximum GPU memory limit in GB");
         maxGpuMemOption.setRequired(false);
         options.addOption(maxGpuMemOption);
 
         CommandLineParser parser = new org.apache.commons.cli.BasicParser();
         HelpFormatter formatter = new HelpFormatter();
         CommandLine cmd = null;
-
+        
         try {
             cmd = parser.parse(options, args);
         } catch (ParseException e) {
@@ -69,6 +69,12 @@ private static void initMainDirectory() {
                 getErrorHandler().handleException(new FatalIOException("Unable to create main directory!", null));
             }
         }
+        File VOLUME_FOLDER = new File(MAIN_FOLDER, "volume/");
+        if (!VOLUME_FOLDER.exists()) {
+            if (!VOLUME_FOLDER.mkdirs()) {
+                getErrorHandler().handleException(new FatalIOException("Unable to create volume directory!", null));
+            }
+        }
     }
 
     public static ApplicationErrorHandler getErrorHandler() {

diff --git a/GlobalQuakeClient/src/main/java/globalquake/sounds/Sounds.java b/GlobalQuakeClient/src/main/java/globalquake/sounds/Sounds.java
diff --git a/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsInfo.java b/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsInfo.java
@@ -2,8 +2,7 @@
 
 public class SoundsInfo {
 
-	public boolean firstSound;
-	public int maxLevel;
+	public int maxLevel = -1;
 	public double maxPGA;
 	public double maxPGAHome;
 	public boolean warningPlayed;

diff --git a/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsService.java b/GlobalQuakeClient/src/main/java/globalquake/sounds/SoundsService.java
@@ -10,7 +10,6 @@
 import globalquake.core.events.specific.QuakeUpdateEvent;
 import globalquake.core.geo.taup.TauPTravelTimeCalculator;
 import globalquake.core.intensity.IntensityScales;
-import globalquake.core.intensity.MMIIntensityScale;
 import globalquake.utils.GeoUtils;
 import org.tinylog.Logger;
 
@@ -32,16 +31,21 @@ public SoundsService(){
         GlobalQuake.instance.getEventHandler().registerEventListener(new GlobalQuakeEventListener(){
             @Override
             public void onQuakeCreate(QuakeCreateEvent event) {
-                Sounds.playSound(Sounds.found);
+                if(SoundsService.this.canPing(event.earthquake())) {
+                    Sounds.playSound(Sounds.found);
+                }
             }
 
             @Override
             public void onQuakeUpdate(QuakeUpdateEvent event) {
-                Sounds.playSound(Sounds.update);
+                if(SoundsService.this.canPing(event.earthquake())) {
+                    Sounds.playSound(Sounds.update);
+                }
             }
         });
     }
 
+
     private void checkSounds() {
         try {
             if(GlobalQuake.instance.getClusterAnalysis() == null ||GlobalQuake.instance.getEarthquakeAnalysis() == null){
@@ -69,13 +73,11 @@ public void determineSounds(Cluster cluster) {
             clusterSoundsInfo.put(cluster, info = new SoundsInfo());
         }
 
-        if (!info.firstSound) {
-            Sounds.playSound(Sounds.level_0);
-            info.firstSound = true;
-        }
-
         int level = cluster.getLevel();
-        if (level > info.maxLevel) {
+        if (level > info.maxLevel && canPing(cluster)) {
+            if(info.maxLevel < 0){
+                Sounds.playSound(Sounds.level_0);
+            }
             if (level >= 1 && info.maxLevel < 1) {
                 Sounds.playSound(Sounds.level_1);
             }
@@ -102,7 +104,8 @@ public void determineSounds(Cluster cluster) {
             double pga = GeoUtils.pgaFunction(quake.getMag(), quake.getDepth(), quake.getDepth());
             if (info.maxPGA < pga) {
                 info.maxPGA = pga;
-                if (info.maxPGA >= MMIIntensityScale.VI.getPga() && !info.warningPlayed && level >= 2) {
+                double threshold_eew = IntensityScales.INTENSITY_SCALES[Settings.eewScale].getLevels().get(Settings.eewLevelIndex).getPga();
+                if (info.maxPGA >= threshold_eew && !info.warningPlayed && level >= Settings.eewClusterLevel) {
                     Sounds.playSound(Sounds.eew_warning);
                     info.warningPlayed = true;
                 }
@@ -131,7 +134,7 @@ public void determineSounds(Cluster cluster) {
             if (shakingExpected) {
                 double sTravel = (long) (TauPTravelTimeCalculator.getSWaveTravelTime(quake.getDepth(),
                         TauPTravelTimeCalculator.toAngle(distGCD)));
-                double age = (System.currentTimeMillis() - quake.getOrigin()) / 1000.0;
+                double age = (GlobalQuake.instance.currentTimeMillis() - quake.getOrigin()) / 1000.0;
                 int secondsS = (int) Math.max(0, Math.ceil(sTravel - age));
 
                 if (secondsS < info.lastCountdown && secondsS <= 10) {
@@ -143,6 +146,24 @@ public void determineSounds(Cluster cluster) {
         }
     }
 
+
+    private boolean canPing(Earthquake earthquake) {
+        if(!Settings.enableEarthquakeSounds){
+            return false;
+        }
+
+        double distGCD = GeoUtils.greatCircleDistance(earthquake.getLat(), earthquake.getLon(), Settings.homeLat, Settings.homeLon);
+        return !(earthquake.getMag() < Settings.earthquakeSoundsMinMagnitude) || !(distGCD > Settings.earthquakeSoundsMaxDist);
+    }
+
+    private boolean canPing(Cluster cluster) {
+        if(!Settings.alertPossibleShaking){
+            return false;
+        }
+        double distGCD = GeoUtils.greatCircleDistance(cluster.getRootLat(), cluster.getRootLon(), Settings.homeLat, Settings.homeLon);
+        return !(distGCD > Settings.alertPossibleShakingDistance);
+    }
+
     public void destroy(){
         GlobalQuake.instance.stopService(soundCheckService);
     }

diff --git a/GlobalQuakeClient/src/main/java/globalquake/ui/StationMonitorPanel.java b/GlobalQuakeClient/src/main/java/globalquake/ui/StationMonitorPanel.java
@@ -311,7 +311,7 @@ public void updateImage() {
 	}
 
 	private long getTime() {
-		return System.currentTimeMillis();
+		return GlobalQuake.instance != null ? GlobalQuake.instance.currentTimeMillis() : System.currentTimeMillis();
 	}
 
 	private double getX(long time) {