last

peacekeeper228 · peacekeeper228 · commit 2b2c65b22fce · 2025-05-23T19:21:01.000+03:00
diff --git a/analysis/create_sql.py b/analysis/create_sql.py
@@ -0,0 +1,7 @@
+sql = []
+with open("data/fires_after.csv", 'r') as f:
+    for i in f.readlines():
+        sql.append(f"""INSERT INTO FIRE_After SELECT 100, ST_AsText(ST_Transform(ST_Translate(ST_Transform(ST_SetSRID(ST_MakePoint('-124','54'), 4326), 32654), -(630+{i.split(',')[1]})*30, -(530+{i.split(',')[0]})*40), 4326));""")
+
+with open("data.txt", "w+") as f:
+    f.writelines(sql)
diff --git a/include/Cell.h b/include/Cell.h
@@ -36,6 +36,8 @@ class cell
     /// @brief possible state becomes present, often is called during iteration
     void setNewState();
 
+    /// @brief set altitude to the cell
+    /// @param altitude 
     void setAltitude(int altitude);
     int getAltitude() const;
     ~cell();
diff --git a/include/CellStorage.h b/include/CellStorage.h
@@ -23,16 +23,16 @@ class CellStorage
     int16_t x_size_;
     int16_t y_size_; 
     std::vector<std::vector<std::shared_ptr<cell>>> terrain_;
-    Math* formula_;
+    IMath* formula_;
 
     //cell terrain_[getXArea()][getYArea()];
 
     void iterateSquare(int xMin, int yMin, int xMax, int yMax);
 
 public:
 
-    CellStorage(Math* formula);
-    CellStorage(Math* formula, int16_t x_size, int16_t y_size);
+    CellStorage(IMath* formula);
+    CellStorage(IMath* formula, int16_t x_size, int16_t y_size);
     ~CellStorage();
 
     /// @brief set state of a particular cell with no checking bound invariant
@@ -84,6 +84,7 @@ class CellStorage
 
     void saveFiresToJson();
 
+    /// @brief load the states from the file "previous.txt"
     void uploadFromTxt();
 
     CellStorage* CopySquare(int xMin, int yMin, int xMax, int yMax) const;
diff --git a/include/Math.h b/include/Math.h
@@ -50,16 +50,16 @@ struct std::hash<WindMetaData>
     }
 };
 
-class Math
+class IMath
 {
 private:
 public:
-    Math();
+    IMath();
     // virtual double calculateKoef(float windSpeed, double slopeAngleRad) const = 0;
     // virtual double calculateWindKoef(const cell* c, directions InvestigatedDirection) const = 0;
     virtual bool willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const = 0;
     virtual bool willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const = 0;
-    ~Math();
+    ~IMath();
 };
 
 constexpr int ignitionPercentage()
@@ -76,7 +76,7 @@ constexpr int throughPercentage()
 /// "Aildland fire spread modelling using cellular
 /// automata: evolution in large-scale spatially heterogeneous environments
 /// under fire suppression tactics"
-class Math1 final : public Math
+class Math final : public IMath
 {
 private:
     mutable std::unordered_map<SlopeMetaData, int> slope_counter_;
@@ -104,6 +104,6 @@ class Math1 final : public Math
 public:
     bool willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const override;
     bool willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const override;
-    Math1();
-    ~Math1();
+    Math();
+    ~Math();
 };
diff --git a/include/ProfilingDecorator.h b/include/ProfilingDecorator.h
@@ -32,18 +32,19 @@ struct std::hash<metaData>
     }
 };
 
-class ProfilingDecorator final : public Math
+/// @brief class that store metrics and call Math primary class atttributes
+class ProfilingDecorator final : public IMath
 {
 private:
-    Math *primary_class_;
+    IMath *primary_class_;
     mutable int positive_counter_;
     mutable int counter_;
     mutable clock_t overall_timer_; 
     mutable std::unordered_map<metaData, int> results_;
     mutable std::unordered_map<directions, int> results_directions_;
 
 public:
-    ProfilingDecorator(Math *formula);
+    ProfilingDecorator(IMath *formula);
     bool willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const override;
     bool willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const override;
     ~ProfilingDecorator();
diff --git a/include/Wind.h b/include/Wind.h
@@ -14,7 +14,7 @@ class Wind
     float getWindSpeed() const;
     int getMoistureCoeff() const;
 
-    /// @deprecated now calculates over math module
+    /// @deprecated now calculates in math module
     /// @brief calculate the wind coeff based on mathematical model
     /// @param InvestigatedDirection direction in which koeff is investigated
     /// @return calculated coefficient
diff --git a/parsing/CMRParser.py b/parsing/CMRParser.py
@@ -0,0 +1,12 @@
+from utils import IBoundingBox, IDataset
+import requests
+
+class CMSParser:
+    def __init__(self, box: IBoundingBox, dataset: IDataset) -> None:
+        self.box = box
+        self.dataset = dataset
+
+    def parse_file_names(self) -> list[str]:
+        req = requests.get(f'https://cmr.earthdata.nasa.gov/search/granules.json?{self.dataset.identifier}&page_size=2000&pageNum=1&bounding_box={self.box.W},{self.box.S},{self.box.E},{self.box.N}').json()['feed']['entry'] 
+        files = [g['links'][0]['href'] for g in req]
+        return self.dataset.process_file_names(files)
diff --git a/parsing/FileDownloader.py b/parsing/FileDownloader.py
@@ -0,0 +1,24 @@
+import requests
+
+def read_token():
+    return "eyJ0eXAiOiJKV1QiLCJvcmlnaW4iOiJFYXJ0aGRhdGEgTG9naW4iLCJzaWciOiJlZGxqd3RwdWJrZXlfb3BzIiwiYWxnIjoiUlMyNTYifQ.eyJ0eXBlIjoiVXNlciIsInVpZCI6ImVhcnRoZGF0YWZvcnN0dWR5IiwiZXhwIjoxNzM0OTgzMDQ0LCJpYXQiOjE3Mjk3OTkwNDQsImlzcyI6Imh0dHBzOi8vdXJzLmVhcnRoZGF0YS5uYXNhLmdvdiJ9.jrRFN_ViJAFd2aKs2lgAjcOSwo4Yf7sfUCap5eDFHz700VupWPlCJyOyFUH6VjvjB8Ystoo3Gx3ReKgn8JIspB4bdxVocPzoOKqr1xV_cHYmloK5U9wyqTWV9yQlSieAKPgbXpaGZqMP5XqZMpgVGHEZKsObUWqEJCKf8ZFFAn66uNMKA3EPsyUOGF5inVhzbWt4yC79pfIRAoNaBefqcjYFjuMAvgkRg7YmCV4l19fihYl9ubNAvSJAGrsQxRrK5RSOs2UDO5P2nksuiuiDat1Soi95h7iuGAiWZBeqeFq2_KROXf78VmNVxbyZCHQ0RfSuqmNgkjNoEtaYkLFXbA"
+
+class FileDownloader:
+    def __init__(self, folder_to_save: str = "./data/") -> None:
+        self.folder_to_save = folder_to_save
+        self.__token = read_token()
+
+    def download(self, files: list[str]):
+        sess = requests.Session()
+        sess.headers = {'Authorization': 'Bearer {0}'.format(self.__token)}
+        for i in files:
+            response = sess.get(i, allow_redirects=True)
+            print(response.status_code)
+            if response.status_code == 200:
+                filename = i.split('/')[-1]
+                with open(f'{self.folder_to_save}{filename}', 'wb') as f:
+                    f.write(response.content)
+                
+
+
+    
diff --git a/parsing/docker-compose.yml b/parsing/docker-compose.yml
@@ -0,0 +1,31 @@
+version: '3.1'
+services:
+
+    database:
+        image: postgis/postgis:17-3.5-alpine
+        container_name: database
+        ports:
+            - '5431:5432'
+        environment:
+            POSTGRES_PASSWORD: postgis
+            PGUSER: postgis
+            POSTGRES_USER: postgis
+            POSTGRES_DATABSE: postgis
+        volumes:
+            - ./enableExt.sql:/docker-entrypoint-initdb.d/enableExt.sql:ro
+            - ./data/:/home/database/
+            - ./to_database.bash:/home/database/to_database.bash
+
+            # raster2pgsql -F -I -C -t 10000x10000  /home/database/file1.tif /home/database/file2.tif public.dem > /home/database/out.sql
+
+# raster2pgsql -F -I -C -t 10000x10000  /home/database/1/*.tif public.dem > /home/database/out.sql
+
+# psql -d postgis -f /home/database/out.sql
+
+# raster2pgsql -F -I -C -t 10000x10000  /home/database/2/*.tif public.biomass > /home/database/out.sql
+
+# psql -d postgis -f /home/database/out.sql
+
+# raster2pgsql -F -I -C -t 10000x10000  /home/database/3/*.nc public.weather > /home/database/out.sql
+
+# psql -d postgis -f /home/database/out.sql
diff --git a/parsing/enableExt.sql b/parsing/enableExt.sql
@@ -0,0 +1,7 @@
+CREATE EXTENSION postgis_raster;
+
+CREATE TABLE IF NOT EXISTS FIRE
+(
+    brightness NUMERIC(3),
+    geom geometry(Point, 4326)
+)
diff --git a/parsing/fires.py b/parsing/fires.py
@@ -0,0 +1,59 @@
+from utils import BoundingBox
+from datetime import date, timedelta
+import requests
+import psycopg2
+from abc import ABC, abstractmethod
+
+def _read_token():
+    return "5685909bb99ad93463136579663de02c"
+
+def resolve_data_type(parse_date: date):
+    data_type_SP = "SP"
+    data_type_NRT = "NRT"
+    if parse_date < (date.today() - timedelta(days=180)):
+        return data_type_SP
+    else:
+        return data_type_NRT   
+
+class IFireDataSet(ABC):
+
+    @abstractmethod
+    def is_valid(confidence: str|int) -> bool:
+        pass
+
+class VIIRS(IFireDataSet):
+    method = "VIIRS_SNPP"
+
+    def is_valid(self, confidence: str) -> bool:
+        return confidence == "n" or confidence == "h"
+
+class MODIS(IFireDataSet):
+    method = "MODIS"
+
+    def is_valid(self, confidence: int) -> bool:
+        return int(confidence) > 30
+
+def parse(dataset: IFireDataSet, parse_date: date, bb: BoundingBox):
+
+    link = f"https://firms.modaps.eosdis.nasa.gov/api/area/csv/{_read_token()}/{dataset.method}_{resolve_data_type(parse_date)}/{bb.W},{bb.S},{bb.E},{bb.N}/1/{parse_date:%Y-%m-%d}"
+
+    sess = requests.Session()
+    response = sess.get(link, allow_redirects=True)
+    print(response.text)
+
+    conn = psycopg2.connect("dbname=postgis user=postgis password=postgis port=5431")
+    cursor = conn.cursor()
+
+    for i in response.text.splitlines()[1:]:
+        line = i.split(',')
+        if not dataset.is_valid(line[9]):
+            continue
+        print(f"lat: {line[0]}, lon {line[1]}, confidence {line[9]}")
+        cursor.execute("INSERT INTO fire VALUES (%s, ST_GeomFromText('POINT(%s %s)', 4326));", (int(float(line[11])), float(line[1]), float(line[0])))
+
+    conn.commit()
+    cursor.close()
+    conn.close()
+
+if __name__ == "__main__":
+    parse(MODIS(), date(2024, 12, 1), BoundingBox(70, 10, 30, 40))
diff --git a/parsing/main.py b/parsing/main.py
@@ -0,0 +1,45 @@
+from CMRParser import CMSParser
+from FileDownloader import FileDownloader
+from utils import BoundingBox, collections, DataType, IDataset
+import os
+from fires import parse, VIIRS
+from datetime import date
+
+def main():
+    box = BoundingBox(56, 55, 37, 38)
+    parse_date = date(2024, 1, 1)
+
+    for data_type in DataType:
+        collections_to_parse : list[IDataset] = list(filter(lambda el: el.data_type == data_type, collections))
+        really_parse : list[IDataset] = []
+        for collection in collections_to_parse:
+            if collection.geo_coverage.covers(box):
+                really_parse = [collection]
+                break
+            elif collection.geo_coverage.intersects(box):
+                really_parse.append(collection)
+        
+        print(f'collections to parse {data_type} are: {really_parse}')
+        for collection in really_parse:
+            parser = CMSParser(box, collection)
+
+            links = parser.parse_file_names()
+            print(links)
+            folder_name = f"./data/{collection.data_type.value}/"
+            if os.path.isdir(folder_name):
+                os.rmdir(folder_name)
+            os.mkdir(folder_name)
+            downloader = FileDownloader(folder_name)
+            downloader.download(links)
+
+    parse(VIIRS, parse_date, box)
+
+
+if __name__ == "__main__":
+    main()
+# box = BoundingBox(50, 49, 37, 38)
+
+# parser = CMSParser(box, VIIRS())
+
+# links = parser.parse_file_names()
+# print(links)
diff --git a/parsing/readme.md b/parsing/readme.md
@@ -0,0 +1,6 @@
+no data here, cause it weights more than 0.5 Gb
+But, You can download it by running python script:)
+
+new files to look:
+* fires.py
+* enableExt.sql
diff --git a/parsing/to_database.bash b/parsing/to_database.bash
@@ -0,0 +1,4 @@
+raster2pgsql -F -I -C -t 10000x10000  /home/database/1/*.tif public.dem > /home/database/out.sql
+psql -d postgis -f /home/database/out.sql
+raster2pgsql -F -I -C -t 10000x10000  /home/database/2/*.tif public.biomass > /home/database/out.sql
+psql -d postgis -f /home/database/out.sql
diff --git a/parsing/utils.py b/parsing/utils.py
diff --git a/src/CellStorage.cpp b/src/CellStorage.cpp
diff --git a/src/Connection.cpp b/src/Connection.cpp
diff --git a/src/Math.cpp b/src/Math.cpp
diff --git a/src/ProfilingDecorator.cpp b/src/ProfilingDecorator.cpp
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
