Merge pull request #422 from NikitaMakovey/fixes

Fixes
geophystech · Oct 28, 2022 · d4101ee · d4101ee
2 parents 9f136df + c683316
commit d4101ee
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 54 deletions.
diff --git a/src/components/event/GeneralInformation.vue b/src/components/event/GeneralInformation.vue
@@ -63,7 +63,7 @@
         this.items[8].value = data.processingMethod.long
         this.items[9].value = agency(data.agency)
         this.items[10].value = data.nearestCity.data.feltReportAnalysis ?
-          data.nearestCity.data.feltReportAnalysis.data.felt_reports_count : 0
+          data.nearestCity.data.feltReportAnalysis.data.felt_reports_count : data.felt_reports_count
       }
     },
     watch: {

diff --git a/src/components/maps/GeneralInformation.vue b/src/components/maps/GeneralInformation.vue
@@ -23,7 +23,7 @@
     },
     methods: {
       syncFeltReportData: function(event) {
-        if (this.event.nearestCity.data.feltReportAnalysis) {
+        if (this.event.nearestCity.data.feltReportAnalysis || this.event.felt_reports_count) {
           this.$http.get(apiSettings.endpointEventMeasuredIntensityAggregations(this.event.id))
             .then(response => {
               this.addData(event.data.data, response.data.feltReports)

diff --git a/src/components/maps/Settlements.vue b/src/components/maps/Settlements.vue
@@ -63,7 +63,7 @@
         let feltReportsData = []
 
         try {
-          if (this.event.nearestCity.data.feltReportAnalysis) {
+          if (this.event.nearestCity.data.feltReportAnalysis || this.event.felt_reports_count) {
             const response = await this.$http.get(apiSettings.endpointEventMeasuredIntensityAggregations(this.event.id))
             feltReportsData = response.data.feltReports
           }

diff --git a/src/components/poll/FeltReportPoll.vue b/src/components/poll/FeltReportPoll.vue
@@ -60,16 +60,20 @@
 <script>
 import apiSettings from '@/settings/api'
 import EarthquakeQuestions from './EarthquakeQuestions'
-import geolocation from './mixins/geolocation'
+import timezone from './mixins/timezone'
 import DateTimeQuestions from './DateTimeQuestions'
 import LocationQuestions from './LocationQuestions'
 
 export default {
   name: 'FeltReportPoll',
   components: {LocationQuestions, DateTimeQuestions, EarthquakeQuestions},
-  mixins: [geolocation],
+  mixins: [timezone],
   data() {
     return {
+      location: {
+        lat: null,
+        lon: null
+      },
       localisations: [],
       questions: [],
       actions: {},
@@ -109,6 +113,7 @@ export default {
       deep: true,
       handler: function(value) {
         this.requestData.location = value
+        this.getTimezone()
       }
     }
   },

diff --git a/src/components/poll/LocationQuestions.vue b/src/components/poll/LocationQuestions.vue
@@ -48,28 +48,36 @@ export default {
       }
       this.$emit('update', location)
       this.marker = window.L.marker(event.latlng, {icon}).addTo(this.map.object)
+    },
+    getCurrentPosition() {
+      let vm = this
+      window.navigator.geolocation.getCurrentPosition(
+        function(position) {
+          vm.map.coordinates = [position.coords.latitude, position.coords.longitude]
+          vm.map.object = createMap(vm.map.id, vm.map.coordinates, {zoom: 10})
+          vm.addMarker({latlng: {lat: position.coords.latitude, lng: position.coords.longitude}})
+          vm.watchMapClick()
+        },
+        function(error) {
+          const errorTypes = {
+            1: 'PERMISSION_DENIED',
+            2: 'POSITION_UNAVAILABLE',
+            3: 'TIMEOUT'
+          }
+          console.error(error.message, {code: errorTypes[error.code]})
+          vm.map.object = createMap(vm.map.id, vm.map.coordinates, {zoom: 10})
+          vm.watchMapClick()
+        }
+      )
     }
   },
   mounted() {
-    let vm = this
-    window.navigator.geolocation.getCurrentPosition(
-      function(position) {
-        vm.map.coordinates = [position.coords.latitude, position.coords.longitude]
-        vm.map.object = createMap(vm.map.id, vm.map.coordinates, {zoom: 10})
-        vm.addMarker({latlng: {lat: position.coords.latitude, lng: position.coords.longitude}})
-        vm.watchMapClick()
-      },
-      function(error) {
-        const errorTypes = {
-          1: 'PERMISSION_DENIED',
-          2: 'POSITION_UNAVAILABLE',
-          3: 'TIMEOUT'
-        }
-        console.error(error.message, {code: errorTypes[error.code]})
-        vm.map.object = createMap(vm.map.id, vm.map.coordinates, {zoom: 10})
-        vm.watchMapClick()
-      }
-    )
+    if (window.navigator.geolocation) {
+      this.getCurrentPosition()
+    }
+    else {
+      console.warn('GeoLocation API is unavailable for your browser')
+    }
   }
 }
 </script>

diff --git a/src/components/poll/mixins/geolocation.js → src/components/poll/mixins/timezone.js b/src/components/poll/mixins/geolocation.js → src/components/poll/mixins/timezone.js
@@ -3,10 +3,6 @@ import ts from '@mapbox/timespace'
 export default {
   data() {
     return {
-      location: {
-        lat: null,
-        lon: null
-      },
       timezoneOffset: 0,
       timezone: 'UTC'
     }
@@ -29,32 +25,6 @@ export default {
       const time = ts.getFuzzyLocalTimeFromPoint(timestamp, point)
       this.timezoneOffset = time._d.getTimezoneOffset()
       this.timezone = this.formatTimezone(this.timezoneOffset)
-    },
-    getCurrentLocation() {
-      let vm = this
-      window.navigator.geolocation.getCurrentPosition(
-        function(position) {
-          vm.location.lat = position.coords.latitude
-          vm.location.lon = position.coords.longitude
-          vm.getTimezone()
-        },
-        function(error) {
-          const errorTypes = {
-            1: 'PERMISSION_DENIED',
-            2: 'POSITION_UNAVAILABLE',
-            3: 'TIMEOUT'
-          }
-          console.error(error.message, {code: errorTypes[error.code]})
-        }
-      )
-    }
-  },
-  mounted() {
-    if (window.navigator.geolocation) {
-      this.getCurrentLocation()
-    }
-    else {
-      console.warn('GeoLocation API is unavailable for your browser')
     }
   }
 }