More redux work

lib/models/appState.dart

@@ -72,16 +72,17 @@ class AppState extends Object with _$AppStateSerializerMixin {
     return 'AppState{\nuser: ${user}\nisLoading: $isLoading\nisLoaded: $isLoaded\napiKey: ${ellipse(
       firesApiKey, 8)}\napiUrl: ${ellipse(
       firesApiUrl, 8)}\nyourLocations count: ${yourLocations
-      .length}\nyourLocations: ${yourLocations}';
+      .length}\nyourLocations: ${yourLocations}\nfireMapState: $fireMapState}';
   }
 }
 
 typedef void AddYourLocationFunction(YourLocation loc);
-typedef void DeleteYourLocationFunction(ObjectId id);
+typedef void DeleteYourLocationFunction(YourLocation loc);
 typedef void ToggleSubscriptionFunction(YourLocation loc);
 
 typedef void OnLocationTapFunction(YourLocation loc);
 typedef void OnSubscribeFunction(YourLocation loc);
+typedef void OnSubscribeDistanceChangeFunction(YourLocation loc);
 typedef void OnUnSubscribeFunction(YourLocation loc);
 typedef void OnSubscribeConfirmedFunction(YourLocation loc);
 

lib/models/fireMapState.dart

@@ -1,33 +1,75 @@
-import 'package:meta/meta.dart';
 import 'package:fires_flutter/models/yourLocation.dart';
-import 'package:redux/redux.dart';
+import 'package:meta/meta.dart';
+
 enum FireMapStatus { view, subscriptionConfirm, unsubscribe }
 
 @immutable
 class FireMapState {
   final FireMapStatus status;
+  final int numFires;
+  final List<dynamic> fires;
+  final List<dynamic> falsePos;
+  final List<dynamic> industries;
   final YourLocation yourLocation;
 
-  const FireMapState.initial(): this.status = FireMapStatus.view, this.yourLocation = null;
+  const FireMapState.initial()
+      : this.status = FireMapStatus.view,
+        this.yourLocation = null,
+        this.numFires = 0,
+        this.fires = const [],
+        this.falsePos = const [],
+        this.industries = const [];
 
-  FireMapState({this.status: FireMapStatus.view, this.yourLocation});
+  FireMapState(
+      {this.status: FireMapStatus.view,
+      this.yourLocation,
+      this.numFires,
+      this.fires,
+      this.falsePos,
+      this.industries});
 
-  FireMapState copyWith({FireMapStatus status, YourLocation yourLocation}) {
+  FireMapState copyWith({
+    FireMapStatus status,
+    YourLocation yourLocation,
+    int numFires,
+    List<dynamic> fires,
+    List<dynamic> falsePos,
+    List<dynamic> industries,
+  }) {
     return new FireMapState(
-      yourLocation: yourLocation ?? this.yourLocation,
+        yourLocation: yourLocation ?? this.yourLocation,
+        numFires: numFires ?? this.numFires,
+        fires: fires ?? this.fires,
+        falsePos: falsePos ?? this.falsePos,
+        industries: industries ?? this.industries,
         status: status ?? this.status);
   }
 
   @override
   bool operator ==(Object other) =>
-    identical(this, other) ||
+      identical(this, other) ||
       other is FireMapState &&
-        runtimeType == other.runtimeType &&
-        status == other.status &&
-        yourLocation == other.yourLocation;
+          runtimeType == other.runtimeType &&
+          status == other.status &&
+          numFires == other.numFires &&
+          fires == other.fires &&
+          falsePos == other.falsePos &&
+          industries == other.industries &&
+          yourLocation == other.yourLocation;
 
   @override
   int get hashCode =>
-    status.hashCode ^
-    yourLocation.hashCode;
+      status.hashCode ^
+      numFires.hashCode ^
+      fires.hashCode ^
+      falsePos.hashCode ^
+      industries.hashCode ^
+      yourLocation.hashCode;
+
+  @override
+  String toString() {
+    return 'FireMapState{status: $status, numFires: $numFires, fires: ${fires
+      .length}, falsePos: ${falsePos.length}, industries: ${industries
+      .length}, yourLocation: $yourLocation}';
+  }
 }

lib/models/firesApi.dart

@@ -6,6 +6,8 @@ import 'package:fires_flutter/models/yourLocation.dart';
 import 'package:http/http.dart' as ht;
 import 'package:jaguar_resty/jaguar_resty.dart' as resty;
 
+import '../globals.dart' as globals;
+import '../redux/actions.dart';
 import 'appState.dart';
 
 class FiresApi {
@@ -110,4 +112,35 @@ class FiresApi {
       }
     });
   }
+
+  Future<UpdateYourLocationMapStatsAction> getYourLocationFireStats(
+      AppState state, YourLocation location) async {
+    assert(state.firesApiUrl != null);
+    assert(state.firesApiKey != null);
+    var url = '${state.firesApiUrl}fires-in-full/${state
+      .firesApiKey}/${location.lat}/${location.lon}/${location.distance}';
+    return await resty.get(url).go().then((response) {
+      if (response.statusCode == 200) {
+        var resultDecoded = json.decode(response.body);
+        // print(resultDecoded);
+        int numFires = resultDecoded['real'];
+        List fires = resultDecoded['fires'];
+        List falsePos = resultDecoded['falsePos'];
+        List industries = resultDecoded['industries'];
+
+        if (globals.isDevelopment) {
+          var firesCount = fires.length;
+          var industriesCount = industries.length;
+          var falsePosCount = falsePos.length;
+          print(
+              'real: $numFires, fire: $firesCount falsePos: $falsePosCount industries: $industriesCount');
+        }
+        return new UpdateYourLocationMapStatsAction(
+            numFires: numFires,
+            fires: fires,
+            falsePos: falsePos,
+            industries: industries);
+      } else throw Exception('Wrong response trying to get stats');
+    });
+  }
 }