Merge pull request #157 from Carifio24/two-many-locations

Reduce number of MapBox requests
cosmicds · Apr 5, 2024 · 6d71cb5 · 6d71cb5
2 parents da4e44d + ae499d4
commit 6d71cb5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/AdvancedWeatherView.vue b/src/AdvancedWeatherView.vue
@@ -1230,10 +1230,17 @@ export default defineComponent({
         this.firstOpen = false;
         // this.displayData = false;
       }
+
+      if (value && (this.defaultLocation.latitudeDeg !== this.location.latitudeDeg || this.defaultLocation.longitudeDeg !== this.location.longitudeDeg)) {
+        this.location = this.defaultLocation;
+      }
     }, 
     
     defaultLocation(value: CityLocation) {
       console.log('defaultLocation', value);
+      if (!this.modelValue) {
+        return;
+      }
       // check if they are the same, if so do nothing
       if (value.latitudeDeg === this.location.latitudeDeg && value.longitudeDeg === this.location.longitudeDeg) {
         return;
@@ -1273,10 +1280,12 @@ export default defineComponent({
     },
     
     location(value: CityLocation, old: CityLocation) {
-      console.log('location', value);
       if (value.latitudeDeg === old.latitudeDeg && value.longitudeDeg === old.longitudeDeg) {
         return;
       }
+      if (!this.modelValue) {
+        return;
+      }
       if (
         value.latitudeDeg !== this.defaultLocation.latitudeDeg
         ||

diff --git a/src/SolarEclipse2024.vue b/src/SolarEclipse2024.vue
@@ -897,7 +897,9 @@
                 };
                 locationDeg = myLocation;
                 showMyLocationDialog = false;
-                updateSelectedLocationText();
+                if (myLocation.latitudeDeg !== locationDeg.latitudeDeg || myLocation.longitudeDeg !== locationDeg.longitudeDeg) {
+                  updateSelectedLocationText();
+                }
               }"
               @error="(error: GeolocationPositionError) => { 
                 $notify({