Add kml:Link, kml:Icon #28
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| use std::collections::HashMap; | ||
| use std::fmt; | ||
| use std::str::FromStr; | ||
|
|
||
| use crate::Error; | ||
|
|
||
| /// `kml:Link`, [13.1](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html#974) in the KML specification. | ||
| #[derive(Clone, Debug, PartialEq)] | ||
| pub struct Link { | ||
| pub href: Option<String>, | ||
| pub refresh_mode: Option<RefreshMode>, | ||
| pub refresh_interval: f64, | ||
| pub view_refresh_mode: Option<ViewRefreshMode>, | ||
| pub view_refresh_time: f64, | ||
| pub view_bound_scale: f64, | ||
| pub view_format: Option<String>, | ||
| pub http_query: Option<String>, | ||
| pub attrs: HashMap<String, String>, | ||
| } | ||
|
|
||
| impl Default for Link { | ||
| fn default() -> Self { | ||
| Self { | ||
| href: None, | ||
| refresh_mode: None, | ||
| refresh_interval: 4.0, | ||
| view_refresh_mode: None, | ||
| view_refresh_time: 4.0, | ||
| view_bound_scale: 1.0, | ||
| view_format: None, | ||
| http_query: None, | ||
| attrs: HashMap::new(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// `kml:Icon`, [13.1](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html#974) in the KML specification. | ||
| #[derive(Clone, Debug, PartialEq)] | ||
| pub struct Icon { | ||
| pub href: Option<String>, | ||
| pub refresh_mode: Option<RefreshMode>, | ||
| pub refresh_interval: f64, | ||
| pub view_refresh_mode: Option<ViewRefreshMode>, | ||
| pub view_refresh_time: f64, | ||
| pub view_bound_scale: f64, | ||
| pub view_format: Option<String>, | ||
| pub http_query: Option<String>, | ||
| pub attrs: HashMap<String, String>, | ||
| } | ||
|
|
||
| impl Default for Icon { | ||
| fn default() -> Self { | ||
| Self { | ||
| href: None, | ||
| refresh_mode: None, | ||
| refresh_interval: 4.0, | ||
| view_refresh_mode: None, | ||
| view_refresh_time: 4.0, | ||
| view_bound_scale: 1.0, | ||
| view_format: None, | ||
| http_query: None, | ||
| attrs: HashMap::new(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// `kml:refreshModeEnumType`, [16.21](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html#1239) in the KML specification. | ||
| #[derive(Clone, Debug, PartialEq)] | ||
| pub enum RefreshMode { | ||
| OnChange, | ||
| OnInterval, | ||
| OnExpire, | ||
| } | ||
|
|
||
| impl Default for RefreshMode { | ||
| fn default() -> RefreshMode { | ||
| RefreshMode::OnChange | ||
| } | ||
| } | ||
|
|
||
| impl FromStr for RefreshMode { | ||
| type Err = Error; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| match s { | ||
| "onChange" => Ok(Self::OnChange), | ||
| "onInterval" => Ok(Self::OnInterval), | ||
| "onExpire" => Ok(Self::OnExpire), | ||
| v => Err(Error::InvalidRefreshMode(v.to_string())), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Display for RefreshMode { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| match self { | ||
| RefreshMode::OnChange => write!(f, "onChange"), | ||
| RefreshMode::OnInterval => write!(f, "onInterval"), | ||
| RefreshMode::OnExpire => write!(f, "onExpire"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// `kml:viewRefreshModeEnumType`, [16.27](https://docs.opengeospatial.org/is/12-007r2/12-007r2.html#1270) in the KML specification. | ||
| #[derive(Clone, Debug, PartialEq)] | ||
| pub enum ViewRefreshMode { | ||
|
There was a problem hiding this comment. It would be great to implement |
||
| Never, | ||
| OnRequest, | ||
| OnStop, | ||
| OnRegion, | ||
| } | ||
|
|
||
| impl Default for ViewRefreshMode { | ||
| fn default() -> ViewRefreshMode { | ||
| ViewRefreshMode::Never | ||
| } | ||
| } | ||
|
|
||
| impl FromStr for ViewRefreshMode { | ||
| type Err = Error; | ||
|
|
||
| fn from_str(s: &str) -> Result<Self, Self::Err> { | ||
| match s { | ||
| "never" => Ok(Self::Never), | ||
| "onRequest" => Ok(Self::OnRequest), | ||
| "onStop" => Ok(Self::OnStop), | ||
| "onRegion" => Ok(Self::OnRegion), | ||
| v => Err(Error::InvalidViewRefreshMode(v.to_string())), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Display for ViewRefreshMode { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| match self { | ||
| ViewRefreshMode::Never => write!(f, "never"), | ||
| ViewRefreshMode::OnRequest => write!(f, "onRequest"), | ||
| ViewRefreshMode::OnStop => write!(f, "onStop"), | ||
| ViewRefreshMode::OnRegion => write!(f, "onRegion"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_refresh_mode_from_str() { | ||
| assert_eq!( | ||
| RefreshMode::OnChange, | ||
| RefreshMode::from_str("onChange").unwrap() | ||
| ); | ||
| assert_eq!( | ||
| RefreshMode::OnExpire, | ||
| RefreshMode::from_str("onExpire").unwrap() | ||
| ); | ||
| assert_eq!( | ||
| RefreshMode::OnInterval, | ||
| RefreshMode::from_str("onInterval").unwrap() | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_view_refresh_mode_from_str() { | ||
| assert_eq!( | ||
| ViewRefreshMode::Never, | ||
| ViewRefreshMode::from_str("never").unwrap() | ||
| ); | ||
| assert_eq!( | ||
| ViewRefreshMode::OnRegion, | ||
| ViewRefreshMode::from_str("onRegion").unwrap() | ||
| ); | ||
| assert_eq!( | ||
| ViewRefreshMode::OnRequest, | ||
| ViewRefreshMode::from_str("onRequest").unwrap() | ||
| ); | ||
| assert_eq!( | ||
| ViewRefreshMode::OnStop, | ||
| ViewRefreshMode::from_str("onStop").unwrap() | ||
| ); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this test,
viewFormatis an empty element, and this is treated as a value. Any desire to identify this and assign the optional String value toNone?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the test and behavior work as-is, since I would assume
Nonewould mean the tag isn't present at all