From f06369ad7cd6d85a8276e978430dbf36101ba600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 27 Jun 2023 12:52:18 +0200 Subject: [PATCH 01/10] =?UTF-8?q?Setup=20displaying=20events=20on=20map=20?= =?UTF-8?q?=E2=80=93=20first=20step?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/pages/map.vue | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 1a34cbda1..e6c0950a6 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -66,6 +66,7 @@ import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' import { mapGetters } from 'vuex' import { profileUserQuery, mapUserQuery } from '~/graphql/User' import { groupQuery } from '~/graphql/groups' +import { filterPosts } from '~/graphql/PostQuery.js' import mobile from '~/mixins/mobile' import Empty from '~/components/Empty/Empty' import MapStylesButtons from '~/components/Map/MapStylesButtons' @@ -95,6 +96,7 @@ export default { currentUserCoordinates: null, users: null, groups: null, + posts: null, markers: { icons: [ { @@ -483,6 +485,29 @@ export default { }, fetchPolicy: 'cache-and-network', }, + Post: { + query() { + return filterPosts(this.$i18n) + }, + variables() { + return { + // Wolle: postType: 'Event', + filter: { + postType_in: ['Event'], + eventLocation: true, + eventStart_gte: new Date(), + }, + // Wolle first: this.pageSize, + // Wolle orderBy: ['pinned_asc', this.orderBy], + // Wolle offset: 0, + } + }, + update({ Post }) { + this.posts = Post + console.log('this.posts: ', this.posts) + }, + fetchPolicy: 'cache-and-network', + }, }, } From f247e6bd7b7554442493b799780186b916890043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 27 Jun 2023 12:53:47 +0200 Subject: [PATCH 02/10] Try to filter only for events with location --- backend/src/schema/resolvers/posts.ts | 9 +++++++-- backend/src/schema/types/type/Location.gql | 8 +++++++- backend/src/schema/types/type/Post.gql | 6 ++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/backend/src/schema/resolvers/posts.ts b/backend/src/schema/resolvers/posts.ts index 0bd4507b5..c4d695e88 100644 --- a/backend/src/schema/resolvers/posts.ts +++ b/backend/src/schema/resolvers/posts.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid' import { neo4jgraphql } from 'neo4j-graphql-js' -import { isEmpty } from 'lodash' +import { isEmpty, cloneDeep } from 'lodash' import { UserInputError } from 'apollo-server' import { mergeImage, deleteImage } from './images/images' import Resolver from './helpers/Resolver' @@ -12,12 +12,15 @@ import { createOrUpdateLocations } from './users/location' import CONFIG from '../../config' const maintainPinnedPosts = (params) => { + const filter = cloneDeep(params.filter) const pinnedPostFilter = { pinned: true } if (isEmpty(params.filter)) { params.filter = { OR: [pinnedPostFilter, {}] } } else { - params.filter = { OR: [pinnedPostFilter, { ...params.filter }] } + console.log('maintainPinnedPosts before: ', {...filter}) + params.filter = { OR: [pinnedPostFilter, { ...filter }] } } + console.log('maintainPinnedPosts after: ', {...filter}) return params } @@ -38,6 +41,8 @@ export default { params = await filterForMutedUsers(params, context) params = filterEventDates(params) params = await maintainPinnedPosts(params) + console.log('maintainPinnedPosts filter.OR[1].eventLocation: ', params.filter.OR[1].eventLocation) + console.log('maintainPinnedPosts filter: ', params.filter) return neo4jgraphql(object, params, context, resolveInfo) }, profilePagePosts: async (object, params, context, resolveInfo) => { diff --git a/backend/src/schema/types/type/Location.gql b/backend/src/schema/types/type/Location.gql index fad24cc26..96e2479d2 100644 --- a/backend/src/schema/types/type/Location.gql +++ b/backend/src/schema/types/type/Location.gql @@ -1,3 +1,10 @@ +input _LocationFilter { + NOT: _LocationFilter + id: ID + id_not: ID + name: String +} + type Location { id: ID! name: String! @@ -25,4 +32,3 @@ type LocationMapBox { type Query { queryLocations(place: String!, lang: String!): [LocationMapBox]! } - diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql index 0a7277515..41525f47e 100644 --- a/backend/src/schema/types/type/Post.gql +++ b/backend/src/schema/types/type/Post.gql @@ -84,8 +84,10 @@ input _PostFilter { group: _GroupFilter postsInMyGroups: Boolean postType_in: [PostType] - eventStart_gte: String - eventEnd_gte: String + eventLocation_not: _LocationFilter + eventLocation: _LocationFilter + eventStart_gte: String + eventEnd_gte: String } enum _PostOrdering { From 7fa970ad1ab76598fb076263205eb682dd28386a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 09:15:49 +0200 Subject: [PATCH 03/10] Add event to map legend --- webapp/locales/de.json | 16 +++++++++------- webapp/locales/en.json | 14 ++++++++------ webapp/pages/map.vue | 29 +++++++++++++++++++++++------ 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index febb8898c..eae0faa88 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -595,9 +595,16 @@ "button": { "tooltip": "Landkarte anzeigen" }, - "markerTypes": { + "legend": { + "event": "Veranstaltung", "group": "Gruppe", - "theUser": "deine Position", + "theUser": "Meine Position", + "user": "Nutzer" + }, + "markerTypes": { + "event": "Veranstaltung", + "group": "Gruppe", + "theUser": "meine Position", "user": "Nutzer" }, "pageTitle": "Landkarte", @@ -710,11 +717,6 @@ "title": "Benachrichtigungen", "user": "Nutzer" }, - "position": { - "group": "Gruppe", - "my": "Meine Position", - "user": "Nutzer" - }, "post": { "comment": { "reply": "Antworten", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index c0fb5c2f6..c724f0509 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -595,9 +595,16 @@ "button": { "tooltip": "Show map" }, + "legend": { + "event": "Event", + "group": "Group", + "theUser": "My position", + "user": "User" + }, "markerTypes": { + "event": "event", "group": "group", - "theUser": "your position", + "theUser": "my position", "user": "user" }, "pageTitle": "Map", @@ -710,11 +717,6 @@ "title": "Notifications", "user": "User" }, - "position": { - "group": "Group", - "my": "My position", - "user": "User" - }, "post": { "comment": { "reply": "Reply", diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index e6c0950a6..297b151f7 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -6,15 +6,32 @@
my position - {{ $t('position.my') }} - user - {{ $t('position.user') }} - group - {{ $t('position.group') }} + {{ $t('map.legend.theUser') }} +    + + {{ $t('map.legend.user') }} +    + + {{ $t('map.legend.group') }} +    + + {{ $t('map.legend.event') }}
From 6c32eb918dc8bfc35434d6ce3a805b957e7fcdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 11:33:24 +0200 Subject: [PATCH 04/10] Add markers for events to map --- webapp/graphql/PostQuery.js | 4 ++ webapp/pages/map.vue | 109 +++++++++++++++++++++++------------- 2 files changed, 74 insertions(+), 39 deletions(-) diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js index 83eec2a30..29b7a1f07 100644 --- a/webapp/graphql/PostQuery.js +++ b/webapp/graphql/PostQuery.js @@ -77,6 +77,10 @@ export const filterPosts = (i18n) => { eventEnd eventVenue eventLocationName + eventLocation { + lng + lat + } eventIsOnline ...post ...postCounts diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 297b151f7..5bb800ba8 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -120,13 +120,17 @@ export default { id: 'marker-blue', name: 'mapbox-marker-icon-20px-blue.png', }, + { + id: 'marker-green', + name: 'mapbox-marker-icon-20px-green.png', + }, { id: 'marker-orange', name: 'mapbox-marker-icon-20px-orange.png', }, { - id: 'marker-green', - name: 'mapbox-marker-icon-20px-green.png', + id: 'marker-purple', + name: 'mapbox-marker-icon-20px-purple.png', }, ], isImagesLoaded: false, @@ -156,7 +160,8 @@ export default { this.markers.isImagesLoaded && this.currentUser && this.users && - this.groups + this.groups && + this.posts ) }, styles() { @@ -255,17 +260,27 @@ export default { // Copy coordinates array. const coordinates = e.features[0].geometry.coordinates.slice() - const markerTypeLabel = - e.features[0].properties.type === 'group' - ? this.$t('map.markerTypes.group') - : e.features[0].properties.type === 'user' - ? this.$t('map.markerTypes.user') - : this.$t('map.markerTypes.theUser') - const markerProfileLinkTitle = - (e.features[0].properties.type === 'group' ? '&' : '@') + e.features[0].properties.slug - const markerProfileLink = - (e.features[0].properties.type === 'group' ? '/group' : '/profile') + - `/${e.features[0].properties.id}/${e.features[0].properties.slug}` + const markerTypeLabel = this.$t(`map.markerTypes.${e.features[0].properties.type}`) + const markerProfile = { + theUser: { + linkTitle: '@' + e.features[0].properties.slug, + link: `/profile/${e.features[0].properties.id}/${e.features[0].properties.slug}`, + }, + user: { + linkTitle: '@' + e.features[0].properties.slug, + link: `/profile/${e.features[0].properties.id}/${e.features[0].properties.slug}`, + }, + group: { + linkTitle: '&' + e.features[0].properties.slug, + link: `/group/${e.features[0].properties.id}/${e.features[0].properties.slug}`, + }, + event: { + linkTitle: e.features[0].properties.slug, + link: `/post/${e.features[0].properties.id}/${e.features[0].properties.slug}`, + }, + } + const markerProfileLinkTitle = markerProfile[e.features[0].properties.type].linkTitle + const markerProfileLink = markerProfile[e.features[0].properties.type].link let description = `
@@ -365,6 +380,25 @@ export default { }) } }) + // add marker for "currentUser" + if (this.currentUserCoordinates) { + this.markers.geoJSON.push({ + type: 'Feature', + properties: { + type: 'theUser', + iconName: 'marker-orange', + iconRotate: 45.0, + id: this.currentUser.id, + slug: this.currentUser.slug, + name: this.currentUser.name, + about: this.currentUser.about ? this.currentUser.about : undefined, + }, + geometry: { + type: 'Point', + coordinates: this.currentUserCoordinates, + }, + }) + } // add markers for "groups" this.groups.forEach((group) => { if (group.location) { @@ -386,25 +420,27 @@ export default { }) } }) - // add marker for "currentUser" - if (this.currentUserCoordinates) { - this.markers.geoJSON.push({ - type: 'Feature', - properties: { - type: 'theUser', - iconName: 'marker-orange', - iconRotate: 45.0, - id: this.currentUser.id, - slug: this.currentUser.slug, - name: this.currentUser.name, - about: this.currentUser.about ? this.currentUser.about : undefined, - }, - geometry: { - type: 'Point', - coordinates: this.currentUserCoordinates, - }, - }) - } + // add markers for "posts", post type "Event" with location coordinates + this.posts.forEach((post) => { + if (post.postType.includes('Event') && post.eventLocation) { + this.markers.geoJSON.push({ + type: 'Feature', + properties: { + type: 'event', + iconName: 'marker-purple', + iconRotate: 0.0, + id: post.id, + slug: post.slug, + name: post.title, + about: post.contentExcerpt, + }, + geometry: { + type: 'Point', + coordinates: this.getCoordinates(post.eventLocation), + }, + }) + } + }) this.markers.isGeoJSON = true } @@ -508,20 +544,15 @@ export default { }, variables() { return { - // Wolle: postType: 'Event', filter: { postType_in: ['Event'], - eventLocation: true, eventStart_gte: new Date(), + // would be good to just query for events with defined "eventLocation". couldn't get it working }, - // Wolle first: this.pageSize, - // Wolle orderBy: ['pinned_asc', this.orderBy], - // Wolle offset: 0, } }, update({ Post }) { this.posts = Post - console.log('this.posts: ', this.posts) }, fetchPolicy: 'cache-and-network', }, From 11afa1f6d54e98b600cd864d3011c8035f0c490e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 12:14:21 +0200 Subject: [PATCH 05/10] Simplify the map legend --- webapp/pages/map.vue | 85 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 5bb800ba8..8fffad1cf 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -5,33 +5,15 @@ {{ $t('map.pageTitle') }}
- - {{ $t('map.legend.theUser') }} -    - - {{ $t('map.legend.user') }} -    - - {{ $t('map.legend.group') }} -    - - {{ $t('map.legend.event') }} + + + {{ $t('map.legend.' + type.id) }} +    +
@@ -115,22 +97,38 @@ export default { groups: null, posts: null, markers: { - icons: [ + types: [ { - id: 'marker-blue', - name: 'mapbox-marker-icon-20px-blue.png', + id: 'theUser', + icon: { + id: 'marker-orange', + legendName: 'mapbox-marker-icon-orange.svg', + mapName: 'mapbox-marker-icon-20px-orange.png', + }, }, { - id: 'marker-green', - name: 'mapbox-marker-icon-20px-green.png', + id: 'user', + icon: { + id: 'marker-green', + legendName: 'mapbox-marker-icon-green.svg', + mapName: 'mapbox-marker-icon-20px-green.png', + }, }, { - id: 'marker-orange', - name: 'mapbox-marker-icon-20px-orange.png', + id: 'group', + icon: { + id: 'marker-blue', + legendName: 'mapbox-marker-icon-blue.svg', + mapName: 'mapbox-marker-icon-20px-blue.png', + }, }, { - id: 'marker-purple', - name: 'mapbox-marker-icon-20px-purple.png', + id: 'event', + icon: { + id: 'marker-purple', + legendName: 'mapbox-marker-icon-purple.svg', + mapName: 'mapbox-marker-icon-20px-purple.png', + }, }, ], isImagesLoaded: false, @@ -339,15 +337,18 @@ export default { }, loadMarkersIconsAndAddMarkers() { Promise.all( - this.markers.icons.map( + this.markers.types.map( (marker) => new Promise((resolve, reject) => { // our images have to be in the 'static/img/*' folder otherwise they are not reachable via URL - this.map.loadImage('img/mapbox/marker-icons/' + marker.name, (error, image) => { - if (error) throw error - this.map.addImage(marker.id, image) - resolve() - }) + this.map.loadImage( + 'img/mapbox/marker-icons/' + marker.icon.mapName, + (error, image) => { + if (error) throw error + this.map.addImage(marker.icon.id, image) + resolve() + }, + ) }), ), ).then(() => { From f217c1d63c2eb10f6f77ac71f9f5f7c9b8397235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 12:22:07 +0200 Subject: [PATCH 06/10] Replace `properties.about` by `properties.description` on map --- webapp/pages/map.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 8fffad1cf..1db2b189a 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -290,11 +290,11 @@ export default {
` description += - e.features[0].properties.about && e.features[0].properties.about.length > 0 + e.features[0].properties.description && e.features[0].properties.description.length > 0 ? `
- ${e.features[0].properties.about} + ${e.features[0].properties.description}
` : '' @@ -372,7 +372,7 @@ export default { id: user.id, slug: user.slug, name: user.name, - about: user.about ? user.about : undefined, + description: user.about ? user.about : undefined, }, geometry: { type: 'Point', @@ -392,7 +392,7 @@ export default { id: this.currentUser.id, slug: this.currentUser.slug, name: this.currentUser.name, - about: this.currentUser.about ? this.currentUser.about : undefined, + description: this.currentUser.about ? this.currentUser.about : undefined, }, geometry: { type: 'Point', @@ -412,7 +412,7 @@ export default { id: group.id, slug: group.slug, name: group.name, - about: group.about ? group.about : undefined, + description: group.about ? group.about : undefined, }, geometry: { type: 'Point', @@ -433,7 +433,7 @@ export default { id: post.id, slug: post.slug, name: post.title, - about: post.contentExcerpt, + description: post.contentExcerpt, }, geometry: { type: 'Point', From a427b21948a68a25d43044b4bfc5ab1911d464dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 13:19:35 +0200 Subject: [PATCH 07/10] Renew submodule 'stage.ocelot.social' --- deployment/configurations/stage.ocelot.social | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social index 350237c62..fdc2e52fa 160000 --- a/deployment/configurations/stage.ocelot.social +++ b/deployment/configurations/stage.ocelot.social @@ -1 +1 @@ -Subproject commit 350237c62dcff1a5c34f1e8d718f89b05ce3d33f +Subproject commit fdc2e52fa444b300e1c4736600bc0e9ae3314222 From 737a8f4380c92cf089efc0dc943d05640dd513d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 13:20:38 +0200 Subject: [PATCH 08/10] Revert "Try to filter only for events with location" This reverts commit f247e6bd7b7554442493b799780186b916890043. --- backend/src/schema/resolvers/posts.ts | 9 ++------- backend/src/schema/types/type/Location.gql | 8 +------- backend/src/schema/types/type/Post.gql | 6 ++---- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/backend/src/schema/resolvers/posts.ts b/backend/src/schema/resolvers/posts.ts index c4d695e88..0bd4507b5 100644 --- a/backend/src/schema/resolvers/posts.ts +++ b/backend/src/schema/resolvers/posts.ts @@ -1,6 +1,6 @@ import { v4 as uuid } from 'uuid' import { neo4jgraphql } from 'neo4j-graphql-js' -import { isEmpty, cloneDeep } from 'lodash' +import { isEmpty } from 'lodash' import { UserInputError } from 'apollo-server' import { mergeImage, deleteImage } from './images/images' import Resolver from './helpers/Resolver' @@ -12,15 +12,12 @@ import { createOrUpdateLocations } from './users/location' import CONFIG from '../../config' const maintainPinnedPosts = (params) => { - const filter = cloneDeep(params.filter) const pinnedPostFilter = { pinned: true } if (isEmpty(params.filter)) { params.filter = { OR: [pinnedPostFilter, {}] } } else { - console.log('maintainPinnedPosts before: ', {...filter}) - params.filter = { OR: [pinnedPostFilter, { ...filter }] } + params.filter = { OR: [pinnedPostFilter, { ...params.filter }] } } - console.log('maintainPinnedPosts after: ', {...filter}) return params } @@ -41,8 +38,6 @@ export default { params = await filterForMutedUsers(params, context) params = filterEventDates(params) params = await maintainPinnedPosts(params) - console.log('maintainPinnedPosts filter.OR[1].eventLocation: ', params.filter.OR[1].eventLocation) - console.log('maintainPinnedPosts filter: ', params.filter) return neo4jgraphql(object, params, context, resolveInfo) }, profilePagePosts: async (object, params, context, resolveInfo) => { diff --git a/backend/src/schema/types/type/Location.gql b/backend/src/schema/types/type/Location.gql index 96e2479d2..fad24cc26 100644 --- a/backend/src/schema/types/type/Location.gql +++ b/backend/src/schema/types/type/Location.gql @@ -1,10 +1,3 @@ -input _LocationFilter { - NOT: _LocationFilter - id: ID - id_not: ID - name: String -} - type Location { id: ID! name: String! @@ -32,3 +25,4 @@ type LocationMapBox { type Query { queryLocations(place: String!, lang: String!): [LocationMapBox]! } + diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql index 41525f47e..0a7277515 100644 --- a/backend/src/schema/types/type/Post.gql +++ b/backend/src/schema/types/type/Post.gql @@ -84,10 +84,8 @@ input _PostFilter { group: _GroupFilter postsInMyGroups: Boolean postType_in: [PostType] - eventLocation_not: _LocationFilter - eventLocation: _LocationFilter - eventStart_gte: String - eventEnd_gte: String + eventStart_gte: String + eventEnd_gte: String } enum _PostOrdering { From c3912304f480efbb7ccac64044de5db008ca69ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 11 Jul 2023 13:24:55 +0200 Subject: [PATCH 09/10] Fix formating --- backend/src/schema/types/type/Location.gql | 1 - backend/src/schema/types/type/Post.gql | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/schema/types/type/Location.gql b/backend/src/schema/types/type/Location.gql index fad24cc26..9cb5c970a 100644 --- a/backend/src/schema/types/type/Location.gql +++ b/backend/src/schema/types/type/Location.gql @@ -25,4 +25,3 @@ type LocationMapBox { type Query { queryLocations(place: String!, lang: String!): [LocationMapBox]! } - diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql index 0a7277515..7e6d1d0e7 100644 --- a/backend/src/schema/types/type/Post.gql +++ b/backend/src/schema/types/type/Post.gql @@ -84,8 +84,8 @@ input _PostFilter { group: _GroupFilter postsInMyGroups: Boolean postType_in: [PostType] - eventStart_gte: String - eventEnd_gte: String + eventStart_gte: String + eventEnd_gte: String } enum _PostOrdering { From a5cb81ceacf1ff4974a26fabf93fa1631ff44efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 12 Jul 2023 11:24:12 +0200 Subject: [PATCH 10/10] Change group marker from blue to red on map --- webapp/pages/map.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/pages/map.vue b/webapp/pages/map.vue index 1db2b189a..2bf1817f7 100644 --- a/webapp/pages/map.vue +++ b/webapp/pages/map.vue @@ -117,9 +117,9 @@ export default { { id: 'group', icon: { - id: 'marker-blue', - legendName: 'mapbox-marker-icon-blue.svg', - mapName: 'mapbox-marker-icon-20px-blue.png', + id: 'marker-red', + legendName: 'mapbox-marker-icon-red.svg', + mapName: 'mapbox-marker-icon-20px-red.png', }, }, { @@ -407,7 +407,7 @@ export default { type: 'Feature', properties: { type: 'group', - iconName: 'marker-blue', + iconName: 'marker-red', iconRotate: 0.0, id: group.id, slug: group.slug,