archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Rename struct

Browse Source
This commit is contained in:
Maximilian Ammann 2022-04-05 21:10:24 +02:00
parent b70f8933c1
commit a382f9246a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/io/geometry_index.rs
View File

@ -34,7 +34,7 @@ impl GeometryIndex {
world_coords: &WorldCoords, world_coords: &WorldCoords,
z: u8, z: u8,
zoom: f64, zoom: f64,
) -> Option<Vec<&IndexGeometry<f64>>> { ) -> Option<Vec<&IndexedGeometry<f64>>> {
let world_tile_coords = world_coords.into_world_tile(z, zoom); let world_tile_coords = world_coords.into_world_tile(z, zoom);
if let Some(index) = world_tile_coords if let Some(index) = world_tile_coords
@ -56,12 +56,12 @@ impl GeometryIndex {
} }
pub enum TileIndex { pub enum TileIndex {
Spatial { tree: RTree<IndexGeometry<f64>> }, Spatial { tree: RTree<IndexedGeometry<f64>> },
Linear { list: Vec<IndexGeometry<f64>> }, Linear { list: Vec<IndexedGeometry<f64>> },
} }
impl TileIndex { impl TileIndex {
pub fn point_query(&self, inner_coords: InnerCoords) -> Vec<&IndexGeometry<f64>> { pub fn point_query(&self, inner_coords: InnerCoords) -> Vec<&IndexedGeometry<f64>> {
let point = geo_types::Point::new(inner_coords.x, inner_coords.y); let point = geo_types::Point::new(inner_coords.x, inner_coords.y);
let coordinate: Coordinate<_> = point.into(); let coordinate: Coordinate<_> = point.into();
@ -86,7 +86,7 @@ impl TileIndex {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct IndexGeometry<T> pub struct IndexedGeometry<T>
where where
T: CoordFloat + Bounded + Signed, T: CoordFloat + Bounded + Signed,
{ {
@ -104,7 +104,7 @@ where
LineString(LineString<T>), LineString(LineString<T>),
} }
impl<T> IndexGeometry<T> impl<T> IndexedGeometry<T>
where where
T: CoordFloat + Bounded + Signed + PartialOrd, T: CoordFloat + Bounded + Signed + PartialOrd,
{ {
@ -131,7 +131,7 @@ where
} }
} }
impl<T> RTreeObject for IndexGeometry<T> impl<T> RTreeObject for IndexedGeometry<T>
where where
T: CoordFloat + Bounded + Signed + PartialOrd, T: CoordFloat + Bounded + Signed + PartialOrd,
{ {
@ -142,7 +142,7 @@ where
} }
} }
impl<T> PointDistance for IndexGeometry<T> impl<T> PointDistance for IndexedGeometry<T>
where where
T: CoordFloat + Bounded + Signed + PartialOrd, T: CoordFloat + Bounded + Signed + PartialOrd,
{ {
@ -160,7 +160,7 @@ where
pub struct IndexProcessor { pub struct IndexProcessor {
geo_writer: GeoWriter, geo_writer: GeoWriter,
geometries: Vec<IndexGeometry<f64>>, geometries: Vec<IndexedGeometry<f64>>,
properties: Option<HashMap<String, String>>, properties: Option<HashMap<String, String>>,
} }
@ -173,11 +173,11 @@ impl IndexProcessor {
} }
} }
pub fn build_tree(self) -> RTree<IndexGeometry<f64>> { pub fn build_tree(self) -> RTree<IndexedGeometry<f64>> {
RTree::bulk_load(self.geometries) RTree::bulk_load(self.geometries)
} }
pub fn get_geometries(self) -> Vec<IndexGeometry<f64>> { pub fn get_geometries(self) -> Vec<IndexedGeometry<f64>> {
self.geometries self.geometries
} }
} }
@ -271,10 +271,10 @@ impl FeatureProcessor for IndexProcessor {
match geometry { match geometry {
Geometry::Polygon(polygon) => self.geometries.push( Geometry::Polygon(polygon) => self.geometries.push(
IndexGeometry::from_polygon(polygon, self.properties.take().unwrap()).unwrap(), IndexedGeometry::from_polygon(polygon, self.properties.take().unwrap()).unwrap(),
), ),
Geometry::LineString(linestring) => self.geometries.push( Geometry::LineString(linestring) => self.geometries.push(
IndexGeometry::from_linestring(linestring, self.properties.take().unwrap()) IndexedGeometry::from_linestring(linestring, self.properties.take().unwrap())
.unwrap(), .unwrap(),
), ),
_ => {} _ => {}

6
src/io/scheduler.rs
View File

@ -18,7 +18,7 @@ use crate::io::{
}; };
use crate::error::Error; use crate::error::Error;
use crate::io::geometry_index::{GeometryIndex, IndexGeometry, IndexProcessor, TileIndex}; use crate::io::geometry_index::{GeometryIndex, IndexProcessor, IndexedGeometry, TileIndex};
use crate::io::source_client::{HttpSourceClient, SourceClient}; use crate::io::source_client::{HttpSourceClient, SourceClient};
use crate::io::tile_request_state::TileRequestState; use crate::io::tile_request_state::TileRequestState;
use crate::tessellation::Tessellated; use crate::tessellation::Tessellated;
@ -168,7 +168,7 @@ impl ThreadLocalState {
world_coords: &WorldCoords, world_coords: &WorldCoords,
z: u8, z: u8,
zoom: f64, zoom: f64,
) -> Option<Vec<IndexGeometry<f64>>> { ) -> Option<Vec<IndexedGeometry<f64>>> {
if let Ok(mut geometry_index) = self.geometry_index.lock() { if let Ok(mut geometry_index) = self.geometry_index.lock() {
geometry_index geometry_index
.query_point(world_coords, z, zoom) .query_point(world_coords, z, zoom)
@ -177,7 +177,7 @@ impl ThreadLocalState {
.iter() .iter()
.cloned() .cloned()
.cloned() .cloned()
.collect::<Vec<IndexGeometry<f64>>>() .collect::<Vec<IndexedGeometry<f64>>>()
}) })
} else { } else {
unimplemented!() unimplemented!()