diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c7afd7c..cfd8748df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * Fix resource form input counter * Remove hideVotes option from resource representation * Move docker builds from travis to github actions +* Remove global option mapImageFlag ## v0.23.0 diff --git a/packages/cms/lib/modules/openstad-global/lib/arrangeFields.js b/packages/cms/lib/modules/openstad-global/lib/arrangeFields.js index 694836ec3..57dfee06f 100644 --- a/packages/cms/lib/modules/openstad-global/lib/arrangeFields.js +++ b/packages/cms/lib/modules/openstad-global/lib/arrangeFields.js @@ -38,7 +38,7 @@ module.exports = [ { name: 'map', label: 'Map', - fields: ['mapCenterLat', 'mapCenterLng', 'mapZoomLevel', 'openstreetmapsServerUrl', 'mapPolygonsKey', 'mapImageFlag', 'mapUploadedFlag', 'mapFlagWidth', 'mapFlagHeight'] + fields: ['mapCenterLat', 'mapCenterLng', 'mapZoomLevel', 'openstreetmapsServerUrl', 'mapPolygonsKey', 'mapUploadedFlag', 'mapFlagWidth', 'mapFlagHeight'] }, { name: 'mainMenu', diff --git a/packages/cms/lib/modules/openstad-global/lib/fields.js b/packages/cms/lib/modules/openstad-global/lib/fields.js index 92637bb5c..be45a72c6 100644 --- a/packages/cms/lib/modules/openstad-global/lib/fields.js +++ b/packages/cms/lib/modules/openstad-global/lib/fields.js @@ -319,13 +319,6 @@ module.exports = [ type: 'boolean', label: 'Display login and logout link in top links?' }, - { - name: 'mapImageFlag', - type: 'select', - label: 'Welke kleur vlag moet er getoond worden op de plattegrond in het begroten overzicht en op de planpagina?', - choices: flagChoices, - def: 'red' - }, { name: 'openstreetmapsServerUrl', type: 'string', diff --git a/packages/cms/lib/modules/openstad-pages/lib/load-ideas.js b/packages/cms/lib/modules/openstad-pages/lib/load-ideas.js index ce9cfb3e6..e7f7f484a 100644 --- a/packages/cms/lib/modules/openstad-pages/lib/load-ideas.js +++ b/packages/cms/lib/modules/openstad-pages/lib/load-ideas.js @@ -76,14 +76,6 @@ module.exports = function (req, res, next) { idea.overviewUrl = `${siteUrl}/${ideaOverviewSlug}?ideaId=${idea.id}`; idea.createdTime = createdData.getTime(); - if (idea.location && idea.location.coordinates[0] && idea.location.coordinates[1]) { - let lat = idea.location.coordinates[0]; - let lng = idea.location.coordinates[1]; - let flag = req.data.global.mapImageFlag ? 'flag-' + req.data.global.mapImageFlag : 'flag-red'; - idea.locationMapImage = `https://maps.googleapis.com/maps/api/staticmap?center=${lat},${lng}&zoom=15&size=380x214&maptype=roadmap&markers=icon:${appUrl}/modules/openstad-assets/img/idea/${flag}.png|${lat},${lng}&key=${googleMapsApiKey}`; - idea.locationUrl = `https://maps.google.com/?ll=${lat},${lng}`; - } - return idea; });