From da2c89730eb5fdd350c2f460b3e003e76f89593f Mon Sep 17 00:00:00 2001 From: James Lyne Date: Fri, 18 Dec 2020 16:12:14 +0000 Subject: [PATCH] Cleanup console logs --- src/components/map/control/CoordinatesControl.vue | 2 -- src/components/map/layer/MapLayer.vue | 3 --- src/components/map/layer/MarkerSetLayer.vue | 1 - src/components/map/layer/PlayersLayer.vue | 3 --- src/components/map/marker/PlayerMarker.vue | 4 ---- src/components/map/vector/Areas.vue | 3 --- src/components/map/vector/Circles.vue | 3 --- src/components/map/vector/Lines.vue | 3 --- src/components/map/vector/Markers.vue | 3 --- src/store/actions.ts | 8 ++++---- src/store/mutations.ts | 10 +++++----- src/util.ts | 2 +- 12 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/components/map/control/CoordinatesControl.vue b/src/components/map/control/CoordinatesControl.vue index 06a971c..8e92b32 100644 --- a/src/components/map/control/CoordinatesControl.vue +++ b/src/components/map/control/CoordinatesControl.vue @@ -40,12 +40,10 @@ export default defineComponent({ mounted() { this.leaflet.addControl(this.control); - // console.log('Mounted coordinatesControl'); }, unmounted() { this.leaflet.removeControl(this.control); - // console.log('Unmounted coordinatesControl'); }, render() { diff --git a/src/components/map/layer/MapLayer.vue b/src/components/map/layer/MapLayer.vue index 11692b2..77c1b34 100644 --- a/src/components/map/layer/MapLayer.vue +++ b/src/components/map/layer/MapLayer.vue @@ -52,7 +52,6 @@ export default defineComponent({ active = computed(() => props.map === store.state.currentMap), enableLayer = () => { - console.log('Set current projection'); useStore().commit(MutationTypes.SET_CURRENT_PROJECTION, layer.getProjection()); props.leaflet.addLayer(layer); @@ -74,12 +73,10 @@ export default defineComponent({ handlePendingUpdates = () => { useStore().dispatch(ActionTypes.POP_TILE_UPDATES, 10).then(updates => { for(const update of updates) { - // console.log('Updating tile ' + update.name); layer.updateNamedTile(update.name, update.timestamp); } if(pendingUpdates.value) { - console.log('More updates left, scheduling frame'); // eslint-disable-next-line no-unused-vars updateFrame = requestAnimationFrame(() => handlePendingUpdates()); } else { diff --git a/src/components/map/layer/MarkerSetLayer.vue b/src/components/map/layer/MarkerSetLayer.vue index 645f958..aa45ece 100644 --- a/src/components/map/layer/MarkerSetLayer.vue +++ b/src/components/map/layer/MarkerSetLayer.vue @@ -72,7 +72,6 @@ export default defineComponent({ }, unmounted() { - // console.log('Unmounted markerSetLayer'); this.leaflet.getLayerManager().removeLayer(this.layerGroup); }, diff --git a/src/components/map/layer/PlayersLayer.vue b/src/components/map/layer/PlayersLayer.vue index 24f51cd..f76a444 100644 --- a/src/components/map/layer/PlayersLayer.vue +++ b/src/components/map/layer/PlayersLayer.vue @@ -55,15 +55,12 @@ export default defineComponent({ }, mounted() { - // console.log('Mounted playersLayer'); if(!this.componentSettings!.hideByDefault) { - // console.log('Adding playersLayer'); this.leaflet.getLayerManager().addLayer(this.layerGroup, true, useStore().state.messages.players, 1); } }, unmounted() { - // console.log('Unmounted playersLayer'); this.leaflet.removeLayer(this.layerGroup); }, diff --git a/src/components/map/marker/PlayerMarker.vue b/src/components/map/marker/PlayerMarker.vue index 54a2a78..9f2185c 100644 --- a/src/components/map/marker/PlayerMarker.vue +++ b/src/components/map/marker/PlayerMarker.vue @@ -89,10 +89,6 @@ export default defineComponent({ pane: 'players', }); - if(this.currentWorld) { - console.log(this.currentWorld.name, this.player.location.world); - } - if(this.currentWorld && this.currentWorld.name === this.player.location.world) { this.enableLayer(); } diff --git a/src/components/map/vector/Areas.vue b/src/components/map/vector/Areas.vue index 37540b2..fcb06da 100644 --- a/src/components/map/vector/Areas.vue +++ b/src/components/map/vector/Areas.vue @@ -78,16 +78,13 @@ export default defineComponent({ for(const update of updates) { if(update.removed) { - // console.log(`Deleting area ${update.id}`); deleteArea(update.id); } else { - // console.log(`Updating/creating area ${update.id}`); layers.set(update.id, updateArea(layers.get(update.id), update.payload as DynmapArea, converter)); } } if(pendingUpdates.value) { - console.log('More updates left, scheduling frame'); // eslint-disable-next-line no-unused-vars updateFrame = requestAnimationFrame(() => handlePendingUpdates()); } else { diff --git a/src/components/map/vector/Circles.vue b/src/components/map/vector/Circles.vue index 08fad38..f13ebbc 100644 --- a/src/components/map/vector/Circles.vue +++ b/src/components/map/vector/Circles.vue @@ -78,10 +78,8 @@ export default defineComponent({ for(const update of updates) { if(update.removed) { - // console.log(`Deleting circle ${update.id}`); deleteCircle(update.id); } else { - // console.log(`Updating/creating circle ${update.id}`); const layer = updateCircle(layers.get(update.id), update.payload as DynmapCircle, converter) if(!layers.has(update.id)) { @@ -92,7 +90,6 @@ export default defineComponent({ } if(pendingUpdates.value) { - console.log('More updates left, scheduling frame'); // eslint-disable-next-line no-unused-vars updateFrame = requestAnimationFrame(() => handlePendingUpdates()); } else { diff --git a/src/components/map/vector/Lines.vue b/src/components/map/vector/Lines.vue index 7096db1..65fc0a1 100644 --- a/src/components/map/vector/Lines.vue +++ b/src/components/map/vector/Lines.vue @@ -78,10 +78,8 @@ export default defineComponent({ for(const update of updates) { if(update.removed) { - // console.log(`Deleting line ${update.id}`); deleteLine(update.id); } else { - // console.log(`Updating/creating line ${update.id}`); const layer = updateLine(layers.get(update.id), update.payload as DynmapLine, converter) if(!layers.has(update.id)) { @@ -92,7 +90,6 @@ export default defineComponent({ } if(pendingUpdates.value) { - console.log('More updates left, scheduling frame'); // eslint-disable-next-line no-unused-vars updateFrame = requestAnimationFrame(() => handlePendingUpdates()); } else { diff --git a/src/components/map/vector/Markers.vue b/src/components/map/vector/Markers.vue index a5c88b4..c711fd8 100644 --- a/src/components/map/vector/Markers.vue +++ b/src/components/map/vector/Markers.vue @@ -77,16 +77,13 @@ export default defineComponent({ for(const update of updates) { if(update.removed) { - // console.log(`Deleting marker ${update.id}`); deleteMarker(update.id); } else { - // console.log(`Updating/creating marker ${update.id}`); layers.set(update.id, updateMarker(layers.get(update.id), update.payload as DynmapMarker, projection)); } } if(pendingUpdates.value) { - console.log('More updates left, scheduling frame'); // eslint-disable-next-line no-unused-vars updateFrame = requestAnimationFrame(() => handlePendingUpdates()); } else { diff --git a/src/store/actions.ts b/src/store/actions.ts index 025b363..d439def 100644 --- a/src/store/actions.ts +++ b/src/store/actions.ts @@ -182,7 +182,7 @@ export const actions: ActionTree & Actions = { [ActionTypes.POP_MARKER_UPDATES]({commit, state}, {markerSet, amount}: {markerSet: string, amount: number}): Promise { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_MARKER_UPDATES: Marker set ${markerSet} doesn't exist`); return Promise.resolve([]); } @@ -195,7 +195,7 @@ export const actions: ActionTree & Actions = { [ActionTypes.POP_AREA_UPDATES]({commit, state}, {markerSet, amount}: {markerSet: string, amount: number}): Promise { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_AREA_UPDATES: Marker set ${markerSet} doesn't exist`); return Promise.resolve([]); } @@ -208,7 +208,7 @@ export const actions: ActionTree & Actions = { [ActionTypes.POP_CIRCLE_UPDATES]({commit, state}, {markerSet, amount}: {markerSet: string, amount: number}): Promise { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_CIRCLE_UPDATES: Marker set ${markerSet} doesn't exist`); return Promise.resolve([]); } @@ -221,7 +221,7 @@ export const actions: ActionTree & Actions = { [ActionTypes.POP_LINE_UPDATES]({commit, state}, {markerSet, amount}: {markerSet: string, amount: number}): Promise { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_LINE_UPDATES: Marker set ${markerSet} doesn't exist`); return Promise.resolve([]); } diff --git a/src/store/mutations.ts b/src/store/mutations.ts index 0cfdbc9..99c6794 100644 --- a/src/store/mutations.ts +++ b/src/store/mutations.ts @@ -140,7 +140,7 @@ export const mutations: MutationTree & Mutations = { [MutationTypes.ADD_MARKER_SET_UPDATES](state: State, updates: Map) { for(const entry of updates) { if(!state.markerSets.has(entry[0])) { - console.log(`Marker set ${entry[0]} doesn't exist`); + console.warn(`ADD_MARKER_SET_UPDATES: Marker set ${entry[0]} doesn't exist`); continue; } @@ -201,7 +201,7 @@ export const mutations: MutationTree & Mutations = { //Pops the specified number of marker updates from the pending updates list [MutationTypes.POP_MARKER_UPDATES](state: State, {markerSet, amount}) { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_MARKER_UPDATES: Marker set ${markerSet} doesn't exist`); return; } @@ -211,7 +211,7 @@ export const mutations: MutationTree & Mutations = { //Pops the specified number of area updates from the pending updates list [MutationTypes.POP_AREA_UPDATES](state: State, {markerSet, amount}) { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_AREA_UPDATES: Marker set ${markerSet} doesn't exist`); return; } @@ -221,7 +221,7 @@ export const mutations: MutationTree & Mutations = { //Pops the specified number of circle updates from the pending updates list [MutationTypes.POP_CIRCLE_UPDATES](state: State, {markerSet, amount}) { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_CIRCLE_UPDATES: Marker set ${markerSet} doesn't exist`); return; } @@ -231,7 +231,7 @@ export const mutations: MutationTree & Mutations = { //Pops the specified number of line updates from the pending updates list [MutationTypes.POP_LINE_UPDATES](state: State, {markerSet, amount}) { if(!state.markerSets.has(markerSet)) { - console.log(`Marker set ${markerSet} doesn't exist`); + console.warn(`POP_LINE_UPDATES: Marker set ${markerSet} doesn't exist`); return; } diff --git a/src/util.ts b/src/util.ts index 23e62a4..ca4fe86 100644 --- a/src/util.ts +++ b/src/util.ts @@ -51,7 +51,7 @@ export default { }; faceImage.onerror = function() { - console.error('Failed to retrieve face of "', player, '" with size "', size, '"!'); + console.warn('Failed to retrieve face of "', player, '" with size "', size, '"!'); reject(); };