weather upload

KUJIcheng · Apr 26, 2024 · 7a7109b · 7a7109b
1 parent 9cc1030
commit 7a7109b
Show file tree

Hide file tree

Showing 28 changed files with 10 additions and 5 deletions.
diff --git a/src/components/App.svelte b/src/components/App.svelte
@@ -358,13 +358,19 @@
   async function fetchCityName(lat, lon) {
     const mapKey = 'AIzaSyDh3JpTYnFa1UpGU4p-m396b3VjiymJ0O4';
     const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lon}&key=${mapKey}`;
-    
+
+    // const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=22.333564,114.269492&key=AIzaSyDh3JpTYnFa1UpGU4p-m396b3VjiymJ0O4`;
+    // const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=32.715736,-117.161087&key=AIzaSyDh3JpTYnFa1UpGU4p-m396b3VjiymJ0O4`;
+
     try {
         const response = await fetch(url);
         const data = await response.json();
         if (data.results && data.results.length > 0) {
             const addressComponents = data.results[0].address_components;
-            const locality = addressComponents.find(component => component.types.includes('locality'));
+            let locality = addressComponents.find(component => component.types.includes('locality'));
+            if (!locality) {
+                locality = addressComponents.find(component => component.types.includes('country'));
+            }
             const sublocality = addressComponents.find(component =>  component.types.includes('neighborhood'));
 
             let locationName = locality ? locality.long_name : '未知城市';
@@ -383,9 +389,7 @@
 </script>
 
 <main>
-  <!-- 引入RainyDay.js库 -->
-  <!-- <script src="pack/rainyday.min.js" defer></script> -->
-
+
   <!-- 设置图片为全屏背景 -->
   <img id="myImage" src="backgrounds/background2.jpg" alt="Background" class="fullscreen-image">
 
@@ -705,5 +709,6 @@
   }
   .day, .date {
     display: block; /* 上下排列 */
+    white-space: nowrap;
   }
 </style>
diff --git a/static/weathericon/cloudy_foggy_color.png b/static/weathericon/cloudy_foggy_color.png
diff --git a/static/weathericon/cloudy_foggy_night__color.png b/static/weathericon/cloudy_foggy_night__color.png
diff --git a/static/weathericon/cloudy_foggy_sunny_color.png b/static/weathericon/cloudy_foggy_sunny_color.png
diff --git a/static/weathericon/cloudy_night_color.png b/static/weathericon/cloudy_night_color.png
diff --git a/static/weathericon/cloudy_windy_color.png b/static/weathericon/cloudy_windy_color.png
diff --git a/static/weathericon/cloudy_windy_night_color.png b/static/weathericon/cloudy_windy_night_color.png
diff --git a/static/weathericon/cloudy_windy_sunny_color.png b/static/weathericon/cloudy_windy_sunny_color.png
diff --git a/static/weathericon/foggy_night_color.png b/static/weathericon/foggy_night_color.png
diff --git a/static/weathericon/night_color.png b/static/weathericon/night_color.png
diff --git a/static/weathericon/rain_heavy_color.png b/static/weathericon/rain_heavy_color.png
diff --git a/static/weathericon/rain_light_color.png b/static/weathericon/rain_light_color.png
diff --git a/static/weathericon/rain_light_night_color.png b/static/weathericon/rain_light_night_color.png
diff --git a/static/weathericon/rain_sunny_color.png b/static/weathericon/rain_sunny_color.png
diff --git a/static/weathericon/snowy_heavy_color.png b/static/weathericon/snowy_heavy_color.png
diff --git a/static/weathericon/snowy_heavy_night_color.png b/static/weathericon/snowy_heavy_night_color.png
diff --git a/static/weathericon/snowy_light_color.png b/static/weathericon/snowy_light_color.png
diff --git a/static/weathericon/snowy_light_night_color.png b/static/weathericon/snowy_light_night_color.png
diff --git a/static/weathericon/sunny_color.png b/static/weathericon/sunny_color.png
diff --git a/static/weathericon/sunny_foggy_color.png b/static/weathericon/sunny_foggy_color.png
diff --git a/static/weathericon/sunny_windy_color.png b/static/weathericon/sunny_windy_color.png
diff --git a/static/weathericon/thunder_color.png b/static/weathericon/thunder_color.png
diff --git a/static/weathericon/thunder_night_color.png b/static/weathericon/thunder_night_color.png
diff --git a/static/weathericon/thunder_sunny_color.png b/static/weathericon/thunder_sunny_color.png
diff --git a/static/weathericon/windy_color.png b/static/weathericon/windy_color.png
diff --git a/static/weathericon/windy_night_color.png b/static/weathericon/windy_night_color.png
diff --git a/static/weathericon/windy_snowy_color.png b/static/weathericon/windy_snowy_color.png
diff --git a/static/weathericon/windy_snowy_night_color.png b/static/weathericon/windy_snowy_night_color.png