Skip to content

Commit 2cb510b

Browse files
committed
DBC22-6524: reverted to pre version
1 parent 5966371 commit 2cb510b

5 files changed

Lines changed: 2 additions & 23 deletions

File tree

src/backend/apps/cms/migrations/0026_alter_advisory_geometry.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/backend/apps/cms/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def rendered_body(self):
213213
]
214214

215215
# Geo fields
216-
geometry = models.MultiPolygonField(null=True, blank=True)
216+
geometry = models.MultiPolygonField()
217217

218218
# Editor panels configuration
219219
content_panels = [

src/frontend/src/Components/map/helpers/spatial.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const filterAdvisoryByRoute = (data, route) => {
6060
const bufferedRouteLineString = buffer(routeLineString, 150, {units: 'meters'});
6161
const filteredAdvisoryList = [];
6262
data.forEach(advisory =>{
63-
if (advisory.geometry && booleanIntersects(bufferedRouteLineString, multiPolygon(advisory.geometry.coordinates))) {
63+
if (booleanIntersects(bufferedRouteLineString, multiPolygon(advisory.geometry.coordinates))) {
6464
filteredAdvisoryList.push(advisory);
6565
}
6666
});

src/frontend/src/Components/map/layers/advisoriesLayer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export function getAdvisoriesLayer(
3030

3131
advisories.forEach(advisory => {
3232
// Build a new OpenLayers feature
33-
if (!advisory.geometry) return;
3433
const olGeometry = new MultiPolygon(advisory.geometry.coordinates);
3534
const olFeature = new ol.Feature({ geometry: olGeometry, type: 'advisory' });
3635

src/frontend/src/pages/AdvisoryDetailsPage.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ export default function AdvisoryDetailsPage() {
218218

219219
// Map functions
220220
const fitMap = (data) => {
221-
if (!data?.geometry) return;
222221
const geom = new GeoJSON().readGeometry(data.geometry, {
223222
dataProjection: 'EPSG:4326',
224223
featureProjection: 'EPSG:3857'

0 commit comments

Comments
 (0)