Start work on parsing logic for urls

spatial-coordinate-systems/src/urls.rs

@@ -17,13 +17,29 @@ impl CoordinateUrls {
     pub fn parse(i: &str) -> Result<Self, Error> {
         let url = Url::parse(i.trim())?;
 
-        // Try to parse a url from google maps
+        let pairs = url.query_pairs();
-        url.query_pairs()
+        let mut possible_latlon = vec![];
-            .find_map(|(key, value)| {
-                if key != "query" {
-                    return None;
-                }
 
+        for (key, value) in pairs {
+            if key == "query" {
+                possible_latlon.push(value.to_string());
+            }
+        }
+
+        if let Some(fragment) = url.fragment() {
+            if let Some(("map", v)) = fragment.split_once("=") {
+                if let Some((_, lat_slash_lon)) = v.split_once("/") {
+                    if let Some((lat, lon)) = lat_slash_lon.split_once("/") {
+                        possible_latlon.push(format!("{lat},{lon}"));
+                    }
+                }
+            }
+        }
+
+        // Try to parse a url from google maps
+        possible_latlon
+            .iter()
+            .find_map(|value| {
                 LatLon::parse_full(value.as_ref())
                     .map(|(_, ret)| ret)
                     .ok()
@@ -31,6 +47,29 @@ impl CoordinateUrls {
             })
             .ok_or_else(|| Error::NoUrlLatLon(i.to_string()))?
     }
+
+    // fn parse_openstreetmap(i: Url) ->IResult<(), LatLon> {
+    //     map_res(tuple((
+    //         tag("map="),
+    //         digit1,
+    //         tag("/"),
+    //         parse_f64 ,
+    //         tag("/"),
+    //         parse_f64 ,
+    //         eof
+    //     )), |(
+    //         _,
+    //         _,
+    //         _,
+    //         lat ,
+    //         _,
+    //         lon ,
+    //         _,
+    //     )| {
+    //         LatLon::new(lat,lon)
+
+    //     })(i.fragment().ok_or((Err(()))))
+    // }
 }
 
 impl From<&CoordinateUrls> for LatLon {

web-frontend/src/routes/app/CoordinateInfo.svelte

@@ -19,14 +19,6 @@
 		<th />
 	</tr>
 
-	{#each formats as format}
-		<tr>
-			<th>{format.toUpperCase()}</th>
-			<td>{xpin.allCoordinates[format]}</td>
-			<td><CopyButton data={xpin.allCoordinates[format]} /></td>
-		</tr>
-	{/each}
-
 	{#each urlFormats as format}
 		<tr>
 			<th>{format.toUpperCase()}</th>
@@ -38,4 +30,12 @@
 			<td><CopyButton data={xpin.coordinateUrls[format]} /></td>
 		</tr>
 	{/each}
+
+	{#each formats as format}
+		<tr>
+			<th>{format.toUpperCase()}</th>
+			<td>{xpin.allCoordinates[format]}</td>
+			<td><CopyButton data={xpin.allCoordinates[format]} /></td>
+		</tr>
+	{/each}
 </table>