Merge pull request #98 from undpindia/feature-mobileview

Feature mobileview
undpindia · Sep 16, 2023 · 4f54b60 · 4f54b60
2 parents 463a2dc + 1126eb8
commit 4f54b60
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/src/web_portal/src/components/MapComponent/Common/Legend/CropLegend.js b/src/web_portal/src/components/MapComponent/Common/Legend/CropLegend.js
@@ -285,7 +285,7 @@ const LayerDesc = useSelector((state) => state.LayerDescription);
                 style={{
                   height: '12px',
                   width: '12px',
-                  backgroundColor: '#80FF00',
+                  backgroundColor: '#00FF01',
                   display: 'inline-block',
                 }}
               ></span>{' '}
@@ -381,7 +381,7 @@ const LayerDesc = useSelector((state) => state.LayerDescription);
                 style={{
                   height: '12px',
                   width: '12px',
-                  backgroundColor: '#EE82EF',
+                  backgroundColor: '#E0697B',
                   display: 'inline-block',
                 }}
               ></span>{' '}
@@ -537,7 +537,7 @@ const LayerDesc = useSelector((state) => state.LayerDescription);
                 style={{
                   height: '12px',
                   width: '12px',
-                  backgroundColor: '#FFB6C1',
+                  backgroundColor: '#E0697B',
                   display: 'inline-block',
                 }}
               ></span>{' '}

diff --git a/src/web_portal/src/components/MapComponent/Map/Drawer/Drawer.js b/src/web_portal/src/components/MapComponent/Map/Drawer/Drawer.js
@@ -1040,7 +1040,7 @@ class DrawerComp extends Component {
           {
             from_date: start_date,
             to_date: to_date,
-            currentCharttime: "3year",
+            currentCharttime: "5year",
           },
           () => {
             this.gettrendchart(this.state.current_Details.layer.feature);
@@ -1742,7 +1742,7 @@ class DrawerComp extends Component {
             this.props.currentLayer === "POPULATION"
               ? item[1]
               : isNaN(parseFloat(item[1]))
-              ? 0
+              ? null
               : parseFloat(item[1]).toFixed(2),
         })
       );
@@ -2371,7 +2371,9 @@ class DrawerComp extends Component {
               (this.props.CurrentLayer === "LULC" ||
                 this.props.CurrentLayer === "crop_stress") &&
               (this.props.CurrentRegion === "DISTRICT" ||
-                this.props.CurrentRegion === "MANDAL")
+                this.props.CurrentRegion === "MANDAL") ||
+                this.props.CurrentLayer === "NO2"
+
                 ? { display: "none" }
                 : {}
             }
@@ -2385,8 +2387,8 @@ class DrawerComp extends Component {
                 this.props.CurrentLayer === "LST_DPPD" ||
                 this.props.CurrentLayer === "PM25_DPPD" ||
                 this.props.CurrentLayer === "NDVI_DPPD" ||
-                this.props.CurrentLayer === "NDWI_DPPD" ||
-                this.props.CurrentLayer === "NO2_DPPD"
+                this.props.CurrentLayer === "NDWI_DPPD"
+                // this.props.CurrentLayer === "NO2_DPPD"
                   ? {}
                   : { display: "none" }
               }

diff --git a/src/web_portal/src/components/MapComponent/Map/MSCogRaster.jsx b/src/web_portal/src/components/MapComponent/Map/MSCogRaster.jsx
@@ -289,15 +289,15 @@ export default function GeoRaster({ url }) {
                   } else if (currentLayer === 'crop_type' && layerDesc.id === 134) {
                     const scale = chroma
                       .scale([
-                        '#80FF00',
+                        '#00FF01',
                         '#80FF00',
                         '#FFFF01',
                         '#006401',
                         '#01FFFF',
                         '#FED700',
                         '#D1B48C',
                         '#FEA500',
-                        '#EE82EF',
+                        '#E0697B',
                         '#A020EF',
                         '#FF00FE',
                         '#FFC0CB',
@@ -325,7 +325,8 @@ export default function GeoRaster({ url }) {
                         '#FFFF01',
                         '#EE82EF',
                         '#A020EF',
-                        '#FFB6C1',
+                        // '#FFB6C1',
+                        '#e0697b',
                         '#D1B48C',
                         '#A52B2A',
                         '#FFC0CB',

diff --git a/src/web_portal/src/components/MapComponent/Map/Map.css b/src/web_portal/src/components/MapComponent/Map/Map.css
@@ -997,6 +997,18 @@ input.nosubmit {
     top: -210px;
     right: 10px;
   }
+  .leaflet-draw-actions.leaflet-draw-actions-top{
+    top: 35px !important;
+    display: block;
+  }
+  .leaflet-draw-actions.leaflet-draw-actions-bottom {
+    top: 70px !important;
+    display: block;
+  }
+  .leaflet-draw-actions.leaflet-draw-actions-top.leaflet-draw-actions-bottom{
+    top: -15px !important;
+    display: block;
+  }
 }
 
 .btn-toggleBaseMap-theme {