Skip to content

Staging #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ankit-work7 merged 3 commits into from
Aug 29, 2026
Merged

Staging #1221

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a819ee
Fix : Fixed the waterbodies boundaries not visible
Ksheetiz-24 Aug 28, 2026
858367c
Merge pull request #1219 from core-stack-org/hotfix/mws-report-fix
amanodt Aug 28, 2026
5d560e7
Merge pull request #1220 from core-stack-org/dev
amanodt Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions templates/mws-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3404,7 +3404,7 @@ <h4>MGNREGA works</h4>
source: new ol.source.ImageWMS({
url: 'https://geoserver.core-stack.org:8443/geoserver/wms',
params: {
'LAYERS': "LULC_level_3:LULC_22_23_{{district}}_{{block}}_level_3",
'LAYERS': "LULC_level_3:LULC_24_25_{{district}}_{{block}}_level_3",
'STYLES': "lulc_water_pixels"
},
ratio: 1,
Expand Down Expand Up @@ -4198,19 +4198,15 @@ <h4>MGNREGA works</h4>
// FETCH SURFACE WATERBODIES
// ============================================================================

fetch("https://geoserver.core-stack.org:8443/geoserver/swb/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=swb:surface_waterbodies_{{district}}_{{block}}&outputFormat=application/json")
.then(response => response.json())
.then(data => {
swbMap.addLayer(waterRaster);
})
.catch(error => {
// Silently handle fetch errors
});

// Waterbodies for this MWS, colored by type (river vs other), for the village maps
fetch(`https://geoserver.core-stack.org:8443/geoserver/swb/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=swb:surface_waterbodies_{{district}}_{{block}}&outputFormat=application/json&CQL_FILTER=MWS_UID='{{mws_id}}'`)
.then(response => response.json())
.then(data => {
(async () => {
const typeName = `swb:surface_waterbodies_{{district}}_{{block}}`;
const url = `https://geoserver.core-stack.org:8443/geoserver/swb/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${typeName}&outputFormat=application/json`;

try {
const response = await fetch(url);
const data = await response.json();

const waterbodyStyleFunction = feature => {
const isRiver = (feature.get('waterbody_type') || '').toLowerCase() === 'river';
return new ol.style.Style({
Expand All @@ -4229,10 +4225,12 @@ <h4>MGNREGA works</h4>
});

swbMap.addLayer(new ol.layer.Vector({ source: swbVillageSource, style: waterbodyStyleFunction, zIndex: 4 }));
})
.catch(error => {
swbMap.addLayer(waterRaster);
console.log(swbVillageSource)
} catch (error) {
// Silently handle fetch errors
});
}
})();

// ============================================================================
// FETCH GROUNDWATER EXTRACTION STATUS
Expand Down