pasture_vigor_col8 -> pasture_vigor_col9

lapig-ufg · Oct 25, 2024 · 8a6d7d4 · 8a6d7d4
1 parent f791f4f
commit 8a6d7d4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/client/src/app/components/right-side-bar/right-side-bar.component.ts b/src/client/src/app/components/right-side-bar/right-side-bar.component.ts
@@ -129,7 +129,7 @@ export class RightSideBarComponent implements OnInit {
 
     this.layersForStatistics = {
       pasture: { year: "year=2023", switch: true, valueType: "pasture_col9_s100" },
-      pasture_quality: { year: "year=0", switch: false, valueType: "pasture_vigor_col8_s100" },
+      pasture_quality: { year: "year=0", switch: false, valueType: "pasture_vigor_col9_s100" },
       carbono: { year: "year=0", switch: false, valueType: "pa_br_somsc_2022" },
     }
 

diff --git a/src/server/database/queries/charts.js b/src/server/database/queries/charts.js
@@ -69,7 +69,7 @@ module.exports = function (app) {
                 source: 'lapig',
                 id: 'pasture_quality',
                 sql: " SELECT b.name as classe, b.color, CAST(sum(a.st_area_ha) as double precision) as value "
-                    + " FROM pasture_vigor_col8 a " + "INNER JOIN graphic_colors as b on cast(a.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality'"
+                    + " FROM pasture_vigor_col9 a " + "INNER JOIN graphic_colors as b on cast(a.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality'"
                     + " WHERE " + regionFilter
                     + " AND " + yearFilter
                     + " GROUP BY 1,2;",
@@ -152,7 +152,7 @@ module.exports = function (app) {
                 source: 'lapig',
                 id: 'pasture_quality',
                 sql: " SELECT a.year::int as label,b.color, b.name as classe, sum(a.st_area_ha) as value, (SELECT CAST(SUM(pol_ha) / 1000 as double precision) FROM regions WHERE " + regionFilter + ") as area_mun " +
-                    " FROM pasture_vigor_col8 a " + "INNER JOIN graphic_colors as b on cast(a.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality'" +
+                    " FROM pasture_vigor_col9 a " + "INNER JOIN graphic_colors as b on cast(a.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality'" +
                     "WHERE " + regionFilter +
                     // " AND " + yearFilter +
                     " GROUP BY 1,2,3 ORDER BY 1 ASC;",
@@ -190,7 +190,7 @@ module.exports = function (app) {
                 id: 'pasture_quality',
                 sql: "SELECT b.name as label, b.color, sum(a.st_area_ha) as value, "
                     + "(SELECT CAST(SUM(pol_ha) as double precision) FROM regions WHERE " + regionFilter + ") as area_mun "
-                    + "FROM pasture_vigor_col8 as A "
+                    + "FROM pasture_vigor_col9 as A "
                     + "INNER JOIN graphic_colors as B on cast(a.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality' "
                     + "WHERE " + regionFilter
                     + " AND " + yearFilter

diff --git a/src/server/database/queries/upload.js b/src/server/database/queries/upload.js
@@ -96,7 +96,7 @@ module.exports = function (app) {
             source: 'lapig',
             id: 'pasture_quality',
             sql: "SELECT p.year as label, b.name as classe, b.color, SUM((ST_Area(safe_intersection(st_transform(p.geom,4674), up.geom)::GEOGRAPHY) / 1000000.0)*100.0) AS value "
-                + " FROM pasture_vigor_col8 p "
+                + " FROM pasture_vigor_col9 p "
                 + " INNER JOIN graphic_colors as b on cast(p.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality' "
                 + " INNER JOIN fdw_general.upload_shapes up on ST_INTERSECTS(ST_TRANSFORM(p.geom,4674), up.geom)  where p.year IS NOT NULL "
                 + (year ? "AND year = ${year}" : "")
@@ -129,7 +129,7 @@ module.exports = function (app) {
         const token = params['token']
         const year = params['year']
         const sql = "SELECT p.year, b.name as classe, b.color, SUM((ST_Area(safe_intersection(st_transform(p.geom,4674), up.geom)::GEOGRAPHY) / 1000000.0)*100.0) AS area_pastagem "
-            + " FROM pasture_vigor_col8 p "
+            + " FROM pasture_vigor_col9 p "
             + " INNER JOIN graphic_colors as b on cast(p.classe as varchar) = b.class_number AND b.table_rel = 'pasture_quality' "
             + " INNER JOIN fdw_general.upload_shapes up on ST_INTERSECTS(ST_TRANSFORM(p.geom,4674), up.geom)  where p.year IS NOT NULL "
             + (year ? "AND year = ${year}" : "")
@@ -170,7 +170,7 @@ module.exports = function (app) {
             {
                 source: 'lapig',
                 id: 'pasture_quality',
-                sql: "select distinct year from pasture_vigor_col8 pc order by year asc",
+                sql: "select distinct year from pasture_vigor_col9 pc order by year asc",
                 mantain: true
             }
         ]

diff --git a/src/server/descriptor/groups/pasture.json b/src/server/descriptor/groups/pasture.json
@@ -17,9 +17,9 @@
                 "idLayer": "pasture_quality",
                 "labelLayer": "translate",
                 "visible": false,
-                "selectedType": "pasture_vigor_col8_s100",
+                "selectedType": "pasture_vigor_col9_s100",
                 "types": [
-                    "pasture_vigor_col8_s100"
+                    "pasture_vigor_col9_s100"
                 ]
             }
         ]