Estimates providers

GeoBus/App/Components/About/AboutGeoBus.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct AboutGeoBus: View {
 
-   @EnvironmentObject var carrisNetworkController: CarrisNetworkController
+   @ObservedObject private var carrisNetworkController = CarrisNetworkController.shared
 
    @State private var showInfoSheet: Bool = false
 
@@ -46,7 +46,7 @@ struct AboutGeoBus: View {
                         .padding(.top, 70)
                         .padding(.bottom, 15)
                      SyncStatus()
-//                     DataProvidersCard()
+                     DataProvidersCard()
                   }
                   .padding(.horizontal)
 

GeoBus/App/Components/About/CloseButton.swift

@@ -9,8 +9,8 @@ import SwiftUI
 
 struct CloseButton: View {
 
-   @EnvironmentObject var appstate: Appstate
-   @EnvironmentObject var carrisNetworkController: CarrisNetworkController
+   @ObservedObject private var appstate = Appstate.shared
+   @ObservedObject private var carrisNetworkController = CarrisNetworkController.shared
 
    @Binding var isPresenting: Bool
 

GeoBus/App/Components/About/DataProvidersCard.swift

@@ -9,73 +9,61 @@ import SwiftUI
 
 struct DataProvidersCard: View {
 
-   private let cardColor: Color = Color(.systemTeal)
-
-   @State var communityProviderIsOn: Bool = false
-
-
-   var providerToggle: some View {
-      Toggle(isOn: $communityProviderIsOn) {
-         HStack {
-            Image(systemName: "staroflife.circle")
-               .renderingMode(.template)
-               .font(Font.system(size: 25))
-               .foregroundColor(cardColor)
-            Text("Community ETAs")
-               .font(Font.system(size: 18, weight: .bold))
-               .foregroundColor(cardColor)
-               .padding(.leading, 5)
-         }
-         .onAppear() {
-//            if (estimationsController.estimationsProvider == .carris) {
-//               communityProviderIsOn = false
-//            } else {
-//               communityProviderIsOn = true
-//            }
-         }
-      }
-      .padding()
-      .frame(maxWidth: .infinity)
-      .tint(cardColor)
-      .background(cardColor.opacity(0.05))
-      .cornerRadius(10)
-//      .onChange(of: estimationsController.estimationsProvider) { value in
-//         if (value == .carris) {
-//            communityProviderIsOn = false
-//         } else {
-//            communityProviderIsOn = true
-//         }
-//      }
-      .onChange(of: communityProviderIsOn) { value in
-         if (value) {
-//            estimationsController.setProvider(selection: .community)
-         } else {
-//            estimationsController.setProvider(selection: .carris)
-         }
-      }
-   }
-
+   private let accentColor: Color = Color(.systemTeal)
 
    var body: some View {
       Card {
          Image(systemName: "clock.arrow.2.circlepath")
             .font(Font.system(size: 30, weight: .regular))
-            .foregroundColor(cardColor)
-         Text("ETA Provider")
+            .foregroundColor(accentColor)
+         Text("Community Data")
             .font(.title)
             .fontWeight(.bold)
-            .foregroundColor(cardColor)
-         Text("Select your prefered Data provider.")
+            .foregroundColor(accentColor)
+         Text("Try an experimental feature made in partnership with people interested in improving transportation in Lisbon.")
             .multilineTextAlignment(.center)
             .font(.headline)
             .fontWeight(.semibold)
             .foregroundColor(Color(.label))
-         Text("Ainda não faz nada.")
+         Text("This includes better arrival time estimates for all stops, more precise vehicle locations and additional route information.")
             .multilineTextAlignment(.center)
             .font(.headline)
             .fontWeight(.semibold)
             .foregroundColor(Color(.secondaryLabel))
-         providerToggle
+         CommunityProviderToggle()
+      }
+   }
+
+}
+
+
+
+struct CommunityProviderToggle: View {
+
+   private let accentColor: Color = Color(.systemTeal)
+
+   @ObservedObject private var carrisNetworkController = CarrisNetworkController.shared
+
+   var body: some View {
+      Toggle(isOn: $carrisNetworkController.communityDataProviderStatus) {
+         HStack {
+            Image(systemName: "staroflife.circle")
+               .renderingMode(.template)
+               .font(Font.system(size: 25))
+               .foregroundColor(accentColor)
+            Text("Community Data")
+               .font(Font.system(size: 18, weight: .bold))
+               .foregroundColor(accentColor)
+               .padding(.leading, 5)
+         }
+      }
+      .padding()
+      .frame(maxWidth: .infinity)
+      .tint(accentColor)
+      .background(accentColor.opacity(0.05))
+      .cornerRadius(10)
+      .onChange(of: carrisNetworkController.communityDataProviderStatus) { value in
+         carrisNetworkController.toggleCommunityDataProviderStatus(to: value)
       }
    }
 

GeoBus/App/Components/About/EstimationsProviderCard.swift

@@ -0,0 +1,84 @@
+//
+//  AboutLiveData.swift
+//  GeoBus
+//
+//  Created by João de Vasconcelos on 19/09/2022.
+//
+
+import SwiftUI
+
+struct EstimationsProviderCard: View {
+
+   @EnvironmentObject var estimationsController: EstimationsController
+
+   private let cardColor: Color = Color(.systemTeal)
+
+   @State var communityProviderIsOn: Bool = false
+
+
+   var providerToggle: some View {
+      Toggle(isOn: $communityProviderIsOn) {
+         HStack {
+            Image(systemName: "staroflife.circle")
+               .renderingMode(.template)
+               .font(Font.system(size: 25))
+               .foregroundColor(cardColor)
+            Text("Community ETAs")
+               .font(Font.system(size: 18, weight: .bold))
+               .foregroundColor(cardColor)
+               .padding(.leading, 5)
+         }
+         .onAppear() {
+            if (estimationsController.estimationsProvider == .carris) {
+               communityProviderIsOn = false
+            } else {
+               communityProviderIsOn = true
+            }
+         }
+      }
+      .padding()
+      .frame(maxWidth: .infinity)
+      .tint(cardColor)
+      .background(cardColor.opacity(0.05))
+      .cornerRadius(10)
+      .onChange(of: estimationsController.estimationsProvider) { value in
+         if (value == .carris) {
+            communityProviderIsOn = false
+         } else {
+            communityProviderIsOn = true
+         }
+      }
+      .onChange(of: communityProviderIsOn) { value in
+         if (value) {
+            estimationsController.setProvider(selection: .community)
+         } else {
+            estimationsController.setProvider(selection: .carris)
+         }
+      }
+   }
+
+
+   var body: some View {
+      Card {
+         Image(systemName: "clock.arrow.2.circlepath")
+            .font(Font.system(size: 30, weight: .regular))
+            .foregroundColor(cardColor)
+         Text("ETA Provider")
+            .font(.title)
+            .fontWeight(.bold)
+            .foregroundColor(cardColor)
+         Text("Select your prefered Time of Arrival provider.")
+            .multilineTextAlignment(.center)
+            .font(.headline)
+            .fontWeight(.semibold)
+            .foregroundColor(Color(.label))
+         Text("Text about differences in provider.")
+            .multilineTextAlignment(.center)
+            .font(.headline)
+            .fontWeight(.semibold)
+            .foregroundColor(Color(.secondaryLabel))
+          providerToggle
+      }
+   }
+
+}

GeoBus/App/Components/About/SyncStatus.swift

@@ -9,8 +9,8 @@ import SwiftUI
 
 struct SyncStatus: View {
 
-   @EnvironmentObject var appstate: Appstate
-   @EnvironmentObject var carrisNetworkController: CarrisNetworkController
+   @ObservedObject private var appstate = Appstate.shared
+   @ObservedObject private var carrisNetworkController = CarrisNetworkController.shared
 
 
    var syncError: some View {

GeoBus/App/Components/ContentView.swift

@@ -7,33 +7,99 @@
 //
 
 import SwiftUI
+import MapKit
 
 struct ContentView: View {
 
+   @StateObject private var mapController = MapController.shared
+   @StateObject private var carrisNetworkController = CarrisNetworkController.shared
+
    var body: some View {
-
-      VStack(alignment: .trailing, spacing: 0) {
-
+      VStack(spacing: 0) {
          ZStack(alignment: .topTrailing) {
-
-            MapView()
-               .edgesIgnoringSafeArea(.vertical)
-
+            MapViewSwiftUI(
+               region: $mapController.region,
+               camera: $mapController.mapCamera,
+               annotations: $mapController.allAnnotations,
+               overlays: $mapController.allOverlays
+            )
+            .edgesIgnoringSafeArea(.vertical)
+            .onReceive(carrisNetworkController.$activeVariant) { newVariant in
+               if (newVariant != nil) {
+                  if (newVariant?.circularShape != nil) {
+                     var tempLinePoints: [CLLocationCoordinate2D] = []
+                     do {
+                        let dataStringData = Data(newVariant!.circularShape!.utf8)
+                        let dataObject = try JSONDecoder().decode(CarrisAPIModel.Shape2.self, from: dataStringData)
+                        print("HJBUYY/TGUYINUHBGVFCTVYGBUHNJHBGVFCDVTGYBHUN")
+                        print(dataObject)
+                        for point in dataObject.coordinates {
+                           tempLinePoints.append(
+                              CLLocationCoordinate2D(latitude: point[1], longitude: point[0])
+                           )
+                        }
+                     } catch {
+                        print(error)
+                     }
+                     self.mapController.allOverlays.append(
+                        MKPolyline(coordinates: tempLinePoints, count: tempLinePoints.count)
+                     )
+                  }
+               }
+            }
+            .onReceive(carrisNetworkController.$activeVehicles) { newVehiclesList in
+               var tempNewAnnotations: [GeoBusMKAnnotation] = []
+               for vehicle in carrisNetworkController.activeVehicles {
+                  tempNewAnnotations.append(
+                     GeoBusMKAnnotation(
+                        type: .vehicle,
+                        id: vehicle.id,
+                        coordinate: CLLocationCoordinate2D(latitude: vehicle.lat ?? 0, longitude: vehicle.lng ?? 0)
+                     )
+                  )
+               }
+               mapController.add(annotations: tempNewAnnotations, ofType: .vehicle)
+            }
+            .onReceive(mapController.$region) { newRegion in
+               var tempNewAnnotations: [GeoBusMKAnnotation] = []
+               if (newRegion.span.latitudeDelta < 0.01 || newRegion.span.longitudeDelta < 0.01) {
+
+                  let latTop = newRegion.center.latitude + newRegion.span.latitudeDelta + 0.01
+                  let latBottom = newRegion.center.latitude - newRegion.span.latitudeDelta - 0.01
+
+                  let lngRight = newRegion.center.longitude + newRegion.span.longitudeDelta + 0.01
+                  let lngLeft = newRegion.center.longitude - newRegion.span.longitudeDelta - 0.01
+
+                  for stop in carrisNetworkController.allStops {
+
+                     let isBetweenLats = stop.lat > latBottom && stop.lat < latTop
+                     let isBetweenLngs = stop.lng > lngLeft && stop.lng < lngRight
+
+                     if (isBetweenLats && isBetweenLngs) {
+                        tempNewAnnotations.append(
+                           GeoBusMKAnnotation(
+                              type: .stop,
+                              id: stop.id,
+                              coordinate: CLLocationCoordinate2D(latitude: stop.lat, longitude: stop.lng)
+                           )
+                        )
+                     }
+
+                  }
+               }
+               mapController.add(annotations: tempNewAnnotations, ofType: .stop)
+            }
             VStack(spacing: 15) {
                AboutGeoBus()
                Spacer()
                StopSearch()
                UserLocation()
             }
             .padding()
-
          }
-
          NavBar()
             .edgesIgnoringSafeArea(.vertical)
-
       }
-
    }
-
+   
 }