Skip to content

Commit d326758

Browse files
committed
Add OrderedColumns
1 parent b6983b7 commit d326758

3 files changed

Lines changed: 18 additions & 9 deletions

File tree

src/v0_6_1/ser/layer.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
use std::borrow::Cow;
22

3-
pub struct PreOrderedKeys {
4-
_keys: Vec<Cow<'static, str>>,
3+
use serde::Serialize;
4+
5+
pub struct OrderedColumns {
6+
_keys: Vec<Column>,
57
}
68

7-
impl PreOrderedKeys {
9+
impl OrderedColumns {
810
pub fn new() -> Self {
911
Self { _keys: Vec::new() }
1012
}
13+
14+
pub fn merge(&mut self, properties: impl Serialize) {}
15+
}
16+
17+
struct Column {
18+
name: Cow<'static, str>,
19+
col_type: super::FieldValue<'static>,
1120
}

src/v0_6_1/ser/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ mod layer;
33
mod prop;
44

55
pub use feat::AsFeature;
6-
pub use layer::PreOrderedKeys;
6+
pub use layer::OrderedColumns;
77
pub use prop::*;
88

99
#[derive(Debug)]

src/v0_6_2/fgb/ser.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ use geo_traits::{
88
};
99

1010
use crate::v0_6_1::ser::{
11-
AsFeature, FieldValue, FlattenOption, PreOrderedKeys, SerializeProperties, TableError,
11+
AsFeature, FieldValue, FlattenOption, OrderedColumns, SerializeProperties, TableError,
1212
TableSerializer,
1313
};
1414

1515
pub struct LayerSerializer<'a> {
1616
writer: FgbWriter<'a>,
17-
pre_orderd_keys: PreOrderedKeys,
17+
ordered_columns: OrderedColumns,
1818
_flatten_opt: FlattenOption,
1919
}
2020

2121
impl<'a> LayerSerializer<'a> {
2222
pub fn new(writer: FgbWriter<'a>) -> Self {
2323
LayerSerializer {
2424
writer,
25-
pre_orderd_keys: PreOrderedKeys::new(),
25+
ordered_columns: OrderedColumns::new(),
2626
_flatten_opt: FlattenOption::full(),
2727
}
2828
}
2929

3030
pub fn serialize_layer(&mut self, layer: &[impl AsFeature]) -> Result<(), Error> {
3131
// first loop
32-
for _feat in layer.into_iter() {
33-
//
32+
for feat in layer.into_iter() {
33+
self.ordered_columns.merge(feat.as_properties());
3434
}
3535

3636
// second loop

0 commit comments

Comments
 (0)