V4.4

Fixes #162
Reduced Rainviewer feature set due to discontinuation of their services

Author: woheller69

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "org.woheller69.omweather"
         minSdk 21
         targetSdk 35
-        versionCode 43
-        versionName "4.3"
+        versionCode 44
+        versionName "4.4"
 
         buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\""
         buildConfigField "String", "GITHUB_URL","\"https://github.com/woheller69/omweather/\""
@@ -48,5 +48,5 @@ dependencies {
     implementation 'org.osmdroid:osmdroid-android:6.1.18'
     implementation 'net.lingala.zip4j:zip4j:2.9.1'
     implementation 'androidx.work:work-runtime:2.10.2'
-    implementation 'com.github.woheller69:FreeDroidWarn:+'
+    implementation 'com.github.woheller69:FreeDroidWarn:V1.6'
 }

app/src/main/java/org/woheller69/weather/activities/RainViewerActivity.java

@@ -10,12 +10,10 @@
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.os.Build;
 import android.os.Bundle;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.config.Configuration;
 
@@ -24,7 +22,6 @@
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.WindowInsetsController;
 import android.view.WindowManager;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
@@ -78,16 +75,14 @@ public class RainViewerActivity extends AppCompatActivity {
     private int lastPastFramePosition;
     private boolean nightmode;
     private JSONArray radarFrames;
-    private JSONArray infraredFrames;
     private String host;
     private ScheduledExecutorService scheduledExecutorService;
     private boolean crossfadeRunning = false;
     private List<TilesOverlayEntry> radarTilesOverlayEntries;
-    private List<TilesOverlayEntry> infraredTilesOverlayEntries;
     private GeoPoint startPoint;
-    public static int rainViewerWidgetZoom = 10;
-    public static int rainViewerMaxZoom = 11;  //Todo: max 7 starting Jan 2026 and infrared frames + nowcast must be removed
-    private double initialZoom = 8d;
+    public static int rainViewerWidgetZoom = 7;
+    public static int rainViewerMaxZoom = 11;  //max 7 starting Jan 2026
+    private double initialZoom = 7d;
 
     @Override
     protected void onPause() {
@@ -196,7 +191,6 @@ public boolean onZoom(ZoomEvent event) {
         });
 
     radarTilesOverlayEntries = new ArrayList<>();
-    infraredTilesOverlayEntries = new ArrayList<>();
     licenseText = findViewById(R.id.license);
     String text = "© <a href=\"https://www.openstreetmap.org/copyright/\">OpenStreetMap</a> contributors &amp; <a href=\"https://www.rainviewer.com/api.html\">RainViewer</a>";
     licenseText.setText(Html.fromHtml(text));
@@ -215,21 +209,12 @@ protected void onResume() {
                     // Parse the JSON response
                     try {
                         if (response != null && response.has("host")) host = response.getString("host");
-                        //Store the infrared frames
-                        if (response != null && response.has("satellite") && response.getJSONObject("satellite").has("infrared")) {
-                            infraredFrames = response.getJSONObject("satellite").getJSONArray("infrared");
-                        }
 
                         //Store the radar frames and show current frame
                         if (response != null && response.has("radar") && response.getJSONObject("radar").has("past")){
                             radarFrames = response.getJSONObject("radar").getJSONArray("past");
                             lastPastFramePosition = radarFrames.length() - 1;
-                            if (response.getJSONObject("radar").has("nowcast")) {
-                                JSONArray nowcastFrames = response.getJSONObject("radar").getJSONArray("nowcast");
-                                for (int i = 0; i < nowcastFrames.length(); i++) {
-                                    radarFrames.put(nowcastFrames.get(i));
-                                }
-                            }
+
                             showFrame(lastPastFramePosition);
                         }
 
@@ -279,23 +264,23 @@ public void run() {
     public void showFrame(int position){
         int preloadingDirection = position - animationPosition > 0 ? 1 : -1;
 
-        if (radarFrames == null || infraredFrames == null || crossfadeRunning){
+        if (radarFrames == null || crossfadeRunning){
             return;
         }
         try {
             position = (position + radarFrames.length()) % radarFrames.length();
             final TilesOverlay newRadarOverlay = getNewRadarOverlay(position);
-            final TilesOverlay newInfraredOverlay = getNewInfraredOverlay(position);
+
             IGeoPoint center;
             double zoom;
             if (mapView.getVisibility() == View.VISIBLE){
                 zoom = mapView.getZoomLevelDouble(); //take zoom from visible map
                 center = mapView.getMapCenter(); //take center from visible map
-                replaceLayer(mapView2, newRadarOverlay, newInfraredOverlay, center, zoom);
+                replaceLayer(mapView2, newRadarOverlay, center, zoom);
             } else {
                 zoom = mapView2.getZoomLevelDouble(); //take zoom from visible map
                 center = mapView2.getMapCenter(); //take center from visible map
-                replaceLayer(mapView, newRadarOverlay, newInfraredOverlay, center, zoom);
+                replaceLayer(mapView, newRadarOverlay, center, zoom);
             }
 
 
@@ -317,8 +302,7 @@ public void showFrame(int position){
             //now preload next frame
             int preloadPosition = (position + preloadingDirection + radarFrames.length()) % radarFrames.length();
             final TilesOverlay newRadarPreloadOverlay = getNewRadarOverlay(preloadPosition);
-            final TilesOverlay newInfraredPreloadOverlay = getNewInfraredOverlay(preloadPosition);
-            replaceLayer(mapPreload, newRadarPreloadOverlay, newInfraredPreloadOverlay, center, zoom);
+            replaceLayer(mapPreload, newRadarPreloadOverlay, center, zoom);
 
         } catch (JSONException e) {
             throw new RuntimeException(e);
@@ -355,9 +339,8 @@ private static void refreshMap(MapView map) {
         map.getController().animateTo(map.getMapCenter());  //maybe no longer needed
     }
 
-    private void replaceLayer(MapView map, TilesOverlay newRadarOverlay, TilesOverlay newInfraredOverlay, IGeoPoint center, double zoom) {
+    private void replaceLayer(MapView map, TilesOverlay newRadarOverlay, IGeoPoint center, double zoom) {
         map.getOverlays().clear();
-        map.getOverlays().add(newInfraredOverlay);
         map.getOverlays().add(newRadarOverlay);
 
         Marker positionMarker = new Marker(map);
@@ -372,77 +355,6 @@ private void replaceLayer(MapView map, TilesOverlay newRadarOverlay, TilesOverla
         map.getController().animateTo(center); //maybe no longer needed
     }
 
-    public JSONObject findClosestInfraredFrame(long radarTime) throws JSONException {
-        JSONObject closestFrame = null;
-        long closestTimeDiff = Long.MAX_VALUE;
-
-        for (int i = 0; i < infraredFrames.length(); i++) {
-            JSONObject frame = infraredFrames.getJSONObject(i);
-            long frameTime = frame.getLong("time");
-            long timeDiff = Math.abs(frameTime - radarTime);
-            if (timeDiff < closestTimeDiff) {
-                closestFrame = frame;
-                closestTimeDiff = timeDiff;
-            }
-        }
-        return closestFrame;
-    }
-
-    @NonNull
-    private TilesOverlay getNewInfraredOverlay(int position) throws JSONException {
-        long radarTime = Long.parseLong(radarFrames.getJSONObject(position).getString("time"));
-        JSONObject infraredFrame = findClosestInfraredFrame(radarTime);
-        long time = infraredFrame.getLong("time");
-        for (TilesOverlayEntry entry : infraredTilesOverlayEntries) {
-            if (entry.getTime() == time){
-                final TilesOverlay newOverlay = entry.getTilesOverlay();
-                if (nightmode){
-                    ColorMatrix colorMatrix = new ColorMatrix(new float[]{
-                            1, 0, 0, 0, 255,
-                            0, 1, 0, 0, 255,
-                            0, 0, 1, 0, 255,
-                            0, 0, 0, 0.2f, 0
-                    });
-                    newOverlay.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
-                } else {
-                    ColorMatrix colorMatrix = new ColorMatrix(new float[]{
-                            -1, 0, 0, 0, 255,
-                            0, -1, 0, 0, 255,
-                            0, 0, -1, 0, 255,
-                            0, 0, 0, 0.3f, 0
-                    });
-                    newOverlay.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
-                }
-                return newOverlay;
-            }
-        }
-
-        final MapTileProviderBasic rainViewerTileProvider = new MapTileProviderBasic(this);
-        final ITileSource RainViewerTileSource = new XYTileSource("I"+ time, 1, rainViewerMaxZoom, 256, "/0/0_0.png", new String[]{host+infraredFrame.getString("path")+"/256/"});
-        rainViewerTileProvider.setTileSource(RainViewerTileSource);
-        rainViewerTileProvider.getTileRequestCompleteHandlers().add(mapView.getTileRequestCompleteHandler());
-        rainViewerTileProvider.getTileRequestCompleteHandlers().add(mapView2.getTileRequestCompleteHandler());
-        final TilesOverlay newOverlay = new TilesOverlay(rainViewerTileProvider, this);
-        newOverlay.setLoadingBackgroundColor(R.color.middlegrey);
-        TilesOverlayEntry newEntry = new TilesOverlayEntry(newOverlay,time);
-        infraredTilesOverlayEntries.add(newEntry);
-        if (nightmode) {
-            ColorMatrix colorMatrix = new ColorMatrix(new float[]{
-                    -1, 0, 0, 0, 255,
-                    0, -1, 0, 0, 255,
-                    0, 0, -1, 0, 255,
-                    0, 0, 0, 0.4f, 0
-            });
-
-            newOverlay.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
-        } else {
-            int transparency = 128; // 128 is 50% transparent
-            PorterDuffColorFilter filter = new PorterDuffColorFilter(Color.argb(transparency, 255, 255, 255), PorterDuff.Mode.MULTIPLY);
-            newOverlay.setColorFilter(filter);
-        }
-        return newOverlay;
-    }
-
     @NonNull
     private TilesOverlay getNewRadarOverlay(int position) throws JSONException {
         long time = Long.parseLong(radarFrames.getJSONObject(position).getString("time"));

app/src/main/java/org/woheller69/weather/services/UpdateDataService.java

@@ -166,7 +166,7 @@ private void handleUpdateRadar(Intent intent) {
                 0, 0, ImageView.ScaleType.CENTER_CROP, Bitmap.Config.RGB_565,
                 error1 -> {
                     // Handle the error
-                    Log.d("DownloadRadarTile:", error1.toString());
+                    Log.d("DownloadRadarTile:", error1.toString()+" "+radarUrl);
                 });
         imageRequest.setRetryPolicy(
                 new DefaultRetryPolicy(

fastlane/metadata/android/en-US/changelogs/44.txt

@@ -0,0 +1,4 @@
+RainViewer:
+- removed infrared layers
+- reduced zoom, also in Widget
+due to discontinuation of services