Merge pull request #3 from YuukiToriyama/fix/avoid-crash-when-lat-or-…

…lng-is-null lat,lngがnullの場合パースエラーでクラッシュする問題を解消
YuukiToriyama · Nov 23, 2023 · 82a3470 · 82a3470
2 parents 4bb8d0e + 9c85884
commit 82a3470
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/src/api/mock.rs b/src/api/mock.rs
@@ -39,38 +39,38 @@ impl Api for ApiMock {
                     Town {
                         name: "御殿一丁目".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.341184,
-                        lng: 139.331577,
+                        lat: Some(35.341184),
+                        lng: Some(139.331577),
                     },
                     Town {
                         name: "御殿二丁目".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.344605,
-                        lng: 139.329437,
+                        lat: Some(35.344605),
+                        lng: Some(139.329437),
                     },
                     Town {
                         name: "御殿三丁目".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.347622,
-                        lng: 139.328261,
+                        lat: Some(35.347622),
+                        lng: Some(139.328261),
                     },
                     Town {
                         name: "御殿四丁目".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.34606,
-                        lng: 139.323896,
+                        lat: Some(35.34606),
+                        lng: Some(139.323896),
                     },
                     Town {
                         name: "幸町".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.321227,
-                        lng: 139.3602,
+                        lat: Some(35.321227),
+                        lng: Some(139.3602),
                     },
                     Town {
                         name: "桜ケ丘".to_string(),
                         koaza: "".to_string(),
-                        lat: 35.32798,
-                        lng: 139.326709,
+                        lat: Some(35.32798),
+                        lng: Some(139.326709),
                     },
                 ],
             })

diff --git a/src/api/wasm.rs b/src/api/wasm.rs
@@ -92,8 +92,8 @@ mod api_tests {
         let town = Town {
             name: "末吉".to_string(),
             koaza: "千古".to_string(),
-            lat: 37.006235,
-            lng: 136.779155,
+            lat: Some(37.006235),
+            lng: Some(136.779155),
         };
         assert!(city.towns.contains(&town));
     }

diff --git a/src/entity.rs b/src/entity.rs
@@ -17,8 +17,9 @@ pub struct Town {
     #[serde(alias = "town")]
     pub name: String,
     pub koaza: String,
-    pub lat: f32,
-    pub lng: f32,
+    // TODO: https://github.com/geolonia/japanese-addresses/issues/148 が解消されたらOptionを外すことができる
+    pub lat: Option<f32>,
+    pub lng: Option<f32>,
 }
 
 #[derive(Serialize)]

diff --git a/src/parser/read_town.rs b/src/parser/read_town.rs
@@ -26,14 +26,14 @@ mod parser_tests {
                 Town {
                     name: "旭町".to_string(),
                     koaza: "".to_string(),
-                    lat: 35.016292,
-                    lng: 138.489362,
+                    lat: Some(35.016292),
+                    lng: Some(138.489362),
                 },
                 Town {
                     name: "新丹谷".to_string(),
                     koaza: "".to_string(),
-                    lat: 35.072403,
-                    lng: 138.474199,
+                    lat: Some(35.072403),
+                    lng: Some(138.474199),
                 },
             ],
         };