Merged dev into main and resolved main.cpp conflict

JsonService.cpp

@@ -0,0 +1,25 @@
+#include "JsonService.h"
+#include "thirdparty/json.hpp"
+#include <fstream>
+#include <stdexcept>
+
+using nlohmann::json;
+
+Weather JsonService::getWeather(std::string s) {
+    std::ifstream fin(s);
+    if (!fin)
+        throw std::runtime_error("error"); // Linux support
+
+    json j;
+    j = json::parse(fin);
+
+    std::string city = j["name"]; //  Киров
+    double lon = j["coord"]["lon"]; // 49.6601
+    double lat = j["coord"]["lat"]; // 58.5966
+    double temperature = j["main"]["temp"]; // 5.69
+    std::string weather = j["weather"][0]["description"]; // дождь
+    double windSpeed = j["wind"]["speed"]; // 4.27
+    int clouds = j["clouds"]["all"]; // 100
+
+    return Weather(city, lon, lat, temperature, weather, windSpeed, clouds);
+}

JsonService.h

@@ -0,0 +1,8 @@
+#include "Service.h"
+#include <string>
+
+class JsonService : public Service {
+public:
+    virtual Weather getWeather(std::string s) override;
+    virtual ~JsonService() {}
+};

Service.h

@@ -1,9 +1,10 @@
+#pragma once
 #include <string>
 #include "Weather.h"
 
 class Service {
 public:
     virtual ~Service() = default;
-    
+
     virtual Weather getWeather(std::string s) = 0;
 };

XmlService.h

@@ -5,4 +5,4 @@ class XmlService : public Service {
 public:
     virtual Weather getWeather(std::string s) override;
     virtual ~XmlService() {}
-};
+};

main.cpp

@@ -1,15 +1,22 @@
 #include <iostream>
 #include <exception>
+#include "JsonService.h"
 #include "XmlService.h"
 #include "Weather.h"
 
 int main() {
     try {
-        XmlService xs;
-        Weather w = xs.getWeather("endpoints/weather.xml");
+        std::cout << "Testing JSON Service" << std::endl;
+        JsonService js;
+        Weather w1 = js.getWeather("endpoints/weather.json");
+        std::cout << "Weather object created (JSON)" << std::endl;
+        w1.printWeather();
 
-        std::cout << "Weather object created" << std::endl;
-        w.printWeather();
+        std::cout << "\nTesting XML Service" << std::endl;
+        XmlService xs;
+        Weather w2 = xs.getWeather("endpoints/weather.xml");
+        std::cout << "Weather object created (XML)" << std::endl;
+        w2.printWeather();
     }
     catch (const std::exception& e) {
         std::cerr << "Error: " << e.what() << std::endl;