ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

use lodash instead of homebrewn stuff, fix typo

Browse Source
This commit is contained in:
Moriz Wahl 2023-02-03 20:16:32 +01:00
parent b8228db9f3
commit 30bb0c4596
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -269,7 +269,7 @@ jobs:
report_name: Coverage Webapp report_name: Coverage Webapp
type: lcov type: lcov
result_path: ./coverage/lcov.info result_path: ./coverage/lcov.info
min_coverage: 61 min_coverage: 63
token: ${{ github.token }} token: ${{ github.token }}
############################################################################## ##############################################################################

11
webapp/pages/map.vue
View File

@ -44,12 +44,11 @@
</template> </template>
<script> <script>
import isEmpty from 'lodash/isEmpty' import { isEmpty, toArray } from 'lodash'
import mapboxgl from 'mapbox-gl' import mapboxgl from 'mapbox-gl'
import MapboxGeocoder from '@mapbox/mapbox-gl-geocoder' import MapboxGeocoder from '@mapbox/mapbox-gl-geocoder'
import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { objectValuesToArray } from '~/utils/utils'
import { profileUserQuery, mapUserQuery } from '~/graphql/User' import { profileUserQuery, mapUserQuery } from '~/graphql/User'
import { groupQuery } from '~/graphql/groups' import { groupQuery } from '~/graphql/groups'
import mobile from '~/mixins/mobile' import mobile from '~/mixins/mobile'
@ -127,7 +126,7 @@ export default {
) )
}, },
styles() { styles() {
return objectValuesToArray(this.availableStyles) return toArray(this.availableStyles)
}, },
availableStyles() { availableStyles() {
// https://docs.mapbox.com/api/maps/styles/ // https://docs.mapbox.com/api/maps/styles/
@ -187,7 +186,7 @@ export default {
// Triggered when `setStyle` is called. // Triggered when `setStyle` is called.
this.markers.isImagesLoaded = false this.markers.isImagesLoaded = false
this.markers.isSourceAndLayerAdded = false this.markers.isSourceAndLayerAdded = false
this.loadMarkesIconsAndAddMarkers() this.loadMarkersIconsAndAddMarkers()
}) })
// add search field for locations // add search field for locations
@ -272,7 +271,7 @@ export default {
} }
}) })
this.loadMarkesIconsAndAddMarkers() this.loadMarkersIconsAndAddMarkers()
}, },
language(map) { language(map) {
// example in mapbox-gl-language: https://github.com/mapbox/mapbox-gl-language/blob/master/index.js // example in mapbox-gl-language: https://github.com/mapbox/mapbox-gl-language/blob/master/index.js
@ -288,7 +287,7 @@ export default {
this.map.setStyle(url) this.map.setStyle(url)
this.activeStyle = url this.activeStyle = url
}, },
loadMarkesIconsAndAddMarkers() { loadMarkersIconsAndAddMarkers() {
Promise.all( Promise.all(
this.markers.icons.map( this.markers.icons.map(
(marker) => (marker) =>

5
webapp/utils/utils.js
View File

@ -1,5 +0,0 @@
export const objectValuesToArray = (obj) => {
return Object.keys(obj).map(function (key) {
return obj[key]
})
}