Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KML Sink:建物ごとにPlacemarkを作成するように変更 #278

Merged
merged 5 commits into from
Feb 15, 2024
Merged

KML Sink:建物ごとにPlacemarkを作成するように変更 #278

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
773ecf8
use multipolygon for buildings
xinmiaooo Feb 14, 2024
13539ef
fix test nusamai-kml
xinmiaooo Feb 14, 2024
80be9aa
delete example
xinmiaooo Feb 14, 2024
3496603
remove use of clone()
ciscorn Feb 14, 2024
07aa483
simplify
ciscorn Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
268 changes: 42 additions & 226 deletions nusamai-kml/src/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,40 @@ use std::{collections::HashMap, vec};
const EXTRUDE: bool = false;
const ALTITUDEMODE: AltitudeMode = AltitudeMode::RelativeToGround;

pub fn multipolygon_to_kml(mpoly: &MultiPolygon<3>) -> MultiGeometry {
pub fn multipolygon_to_kml(mpoly: &MultiPolygon<3>) -> Vec<KmlPolygon> {
multipolygon_to_kml_with_mapping(mpoly, |c| c)
}

pub fn indexed_multipolygon_to_kml(
vertices: &[[f64; 3]],
mpoly_idx: &MultiPolygon<1, u32>,
) -> MultiGeometry {
) -> Vec<KmlPolygon> {
multipolygon_to_kml_with_mapping(mpoly_idx, |idx| vertices[idx[0] as usize])
}

fn multipolygon_to_kml_with_mapping<const D: usize, T: CoordNum>(
mpoly: &MultiPolygon<D, T>,
mapping: impl Fn([T; D]) -> [f64; 3],
) -> MultiGeometry {
let polygons = mpoly
) -> Vec<KmlPolygon> {
mpoly
.iter()
.map(|poly| polygon_to_kml_with_mapping(poly.clone(), &mapping))
.collect::<Vec<_>>();
MultiGeometry {
geometries: polygons.into_iter().map(Geometry::MultiGeometry).collect(),
.flat_map(|poly| polygon_to_kml_with_mapping(poly.clone(), &mapping)) // Flatten the vector of vectors
.collect::<Vec<_>>()
}
ciscorn marked this conversation as resolved.
Show resolved Hide resolved

fn polygon_to_kml_polygon_with_mapping<const D: usize, T: CoordNum>(
poly: Polygon<D, T>,
mapping: impl Fn([T; D]) -> [f64; 3],
) -> KmlPolygon {
let outer = polygon_to_kml_outer_boundary_with_mapping(poly.clone(), &mapping);
let inner = polygon_to_kml_inner_boundary_with_mapping(poly, &mapping);

KmlPolygon {
outer,
inner,
extrude: EXTRUDE,
tessellate: false,
altitude_mode: ALTITUDEMODE,
ciscorn marked this conversation as resolved.
Show resolved Hide resolved
attrs: HashMap::new(),
}
}
Expand Down Expand Up @@ -81,45 +94,24 @@ fn polygon_to_kml_inner_boundary_with_mapping<const D: usize, T: CoordNum>(
.collect()
}

fn polygon_to_kml_polygon_with_mapping<const D: usize, T: CoordNum>(
poly: Polygon<D, T>,
mapping: impl Fn([T; D]) -> [f64; 3],
) -> KmlPolygon {
let outer = polygon_to_kml_outer_boundary_with_mapping(poly.clone(), &mapping);
let inner = polygon_to_kml_inner_boundary_with_mapping(poly, &mapping);

KmlPolygon {
outer,
inner,
extrude: EXTRUDE,
tessellate: false,
altitude_mode: ALTITUDEMODE,
attrs: HashMap::new(),
}
}

/// Create a kml::MultiGeometry with Polygon from `nusamai_geometry::MultiPoint` with a mapping function.
pub fn polygon_to_kml_with_mapping<const D: usize, T: CoordNum>(
poly: Polygon<D, T>,
mapping: impl Fn([T; D]) -> [f64; 3],
) -> MultiGeometry {
let polygons = vec![polygon_to_kml_polygon_with_mapping(poly, mapping)];
MultiGeometry {
geometries: polygons
.into_iter()
.map(|poly: KmlPolygon| Geometry::Polygon(poly))
.collect(),
attrs: HashMap::new(),
}
) -> Vec<KmlPolygon> {
vec![polygon_to_kml_polygon_with_mapping(poly, mapping)]
}

/// Create a kml::MultiGeometry from a nusamai_geometry::MultiPolygon
pub fn polygon_to_kml(poly: &Polygon<3>) -> MultiGeometry {
pub fn polygon_to_kml(poly: &Polygon<3>) -> Vec<KmlPolygon> {
ciscorn marked this conversation as resolved.
Show resolved Hide resolved
polygon_to_kml_with_mapping(poly.clone(), |c| c)
}

/// Create a kml::MultiGeometry with Polygon vertices and indices.
pub fn indexed_polygon_to_kml(vertices: &[[f64; 3]], poly_idx: &Polygon<1, u32>) -> MultiGeometry {
pub fn indexed_polygon_to_kml(
vertices: &[[f64; 3]],
poly_idx: &Polygon<1, u32>,
) -> Vec<KmlPolygon> {
ciscorn marked this conversation as resolved.
Show resolved Hide resolved
polygon_to_kml_with_mapping(poly_idx.clone(), |idx| vertices[idx[0] as usize])
}

Expand Down Expand Up @@ -222,83 +214,19 @@ mod tests {

let multi_geom = polygon_to_kml(&poly);

assert_eq!(&multi_geom.geometries.len(), &1);
assert_eq!(multi_geom.len(), 1);

assert_eq!(
&multi_geom.geometries[0],
&Geometry::Polygon(KmlPolygon {
outer: LinearRing {
coords: vec![
Coord {
x: 10.,
y: 10.,
z: Some(0.),
},
Coord {
x: 10.,
y: 20.,
z: Some(0.),
},
Coord {
x: 20.,
y: 20.,
z: Some(0.),
},
Coord {
x: 20.,
y: 10.,
z: Some(0.),
},
Coord {
x: 10.0,
y: 10.0,
z: Some(0.0)
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
},
inner: vec![LinearRing {
coords: vec![
Coord {
x: 15.,
y: 15.,
z: Some(0.),
},
Coord {
x: 18.,
y: 10.,
z: Some(0.),
},
Coord {
x: 18.,
y: 18.,
z: Some(0.),
},
Coord {
x: 15.,
y: 18.,
z: Some(0.),
},
Coord {
x: 15.0,
y: 15.0,
z: Some(0.0)
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
}],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
})
);
assert_eq!(multi_geom[0].outer.coords[0], Coord { x: 10., y: 10., z: Some(0.) });
assert_eq!(multi_geom[0].outer.coords[1], Coord { x: 10., y: 20., z: Some(0.) });
assert_eq!(multi_geom[0].outer.coords[2], Coord { x: 20., y: 20., z: Some(0.) });
assert_eq!(multi_geom[0].outer.coords[3], Coord { x: 20., y: 10., z: Some(0.) });
assert_eq!(multi_geom[0].outer.coords[4], Coord { x: 10., y: 10., z: Some(0.) });

assert_eq!(multi_geom[0].inner[0].coords.len(), 4);
assert_eq!(multi_geom[0].inner[0].coords[0], Coord { x: 15., y: 15., z: Some(0.) });
assert_eq!(multi_geom[0].inner[0].coords[1], Coord { x: 18., y: 10., z: Some(0.) });
assert_eq!(multi_geom[0].inner[0].coords[2], Coord { x: 18., y: 18., z: Some(0.) });
assert_eq!(multi_geom[0].inner[0].coords[3], Coord { x: 15., y: 18., z: Some(0.) });
}

#[test]
Expand Down Expand Up @@ -328,119 +256,7 @@ mod tests {

let multi_geom = indexed_polygon_to_kml(&vertices, &poly);

assert_eq!(&multi_geom.geometries.len(), &1);

assert_eq!(
&multi_geom.geometries[0],
&Geometry::Polygon(KmlPolygon {
outer: LinearRing {
coords: vec![
Coord {
x: 0.,
y: 0.,
z: Some(111.),
},
Coord {
x: 5.,
y: 0.,
z: Some(111.),
},
Coord {
x: 5.,
y: 5.,
z: Some(111.),
},
Coord {
x: 0.,
y: 5.,
z: Some(111.),
},
Coord {
x: 0.0,
y: 0.0,
z: Some(111.0)
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
},
inner: vec![
LinearRing {
coords: vec![
Coord {
x: 1.,
y: 1.,
z: Some(111.),
},
Coord {
x: 2.,
y: 1.,
z: Some(111.),
},
Coord {
x: 2.,
y: 2.,
z: Some(111.),
},
Coord {
x: 1.,
y: 2.,
z: Some(111.),
},
Coord {
x: 1.0,
y: 1.0,
z: Some(111.0)
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
},
LinearRing {
coords: vec![
Coord {
x: 3.,
y: 3.,
z: Some(111.),
},
Coord {
x: 4.,
y: 3.,
z: Some(111.),
},
Coord {
x: 4.,
y: 4.,
z: Some(111.),
},
Coord {
x: 3.,
y: 4.,
z: Some(111.),
},
Coord {
x: 3.0,
y: 3.0,
z: Some(111.0)
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
}
],
extrude: false,
tessellate: false,
altitude_mode: AltitudeMode::RelativeToGround,
attrs: HashMap::new(),
})
);
assert_eq!(&multi_geom.len(), &1);

}
}


Loading
Loading