Merge pull request #87 from antoine-de/split_crates

 split the crate in 2 separate crates

Author: amatissart

.dockerignore

@@ -1,5 +1,6 @@
 *
 !src/
+!cosmogony/
 !tests/
 !Cargo*
 !build.rs

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

.travis.yml

@@ -8,10 +8,11 @@ matrix:
     - rustup component add rustfmt
     script:
     - cargo fmt --all -- --check
-    - cargo test
+    - cargo test --all
     after_success:
     - |-
       [ "$TRAVIS_TAG" = v$(cargo run -- --version | awk '{print $2}') ] &&
+      cd cosmogony &&
       cargo publish --token ${CRATESIO_TOKEN}
 env:
   global:

Cargo.lock

@@ -1,28 +1,21 @@
 [package]
-name = "cosmogony"
-version = "0.5.3"
+name = "cosmogony_builder"
+version = "0.6.0"
 authors = ["Adrien Matissart <[email protected]>", "Antoine Desbordes <[email protected]>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"
-homepage = "http://cosmogony.world"
-keywords = ["osm", "boundary", "geography"]
-categories = ["science", "algorithms"]
-description = "Provides geographical zones with a structured hierarchy"
-readme = "README.md"
 edition = "2018"
 
-
-[badges]
-travis-ci = { repository = "osm-without-borders/cosmogony" }
-
 [dependencies]
+cosmogony = { path = "cosmogony" }
 log = "0.4"
 env_logger = "0.6"
 geo = "0.12"
 geo-types = { version = "0.4", features = ["rstar"] }
 structopt = "0.2"
 structopt-derive = "0.1"
 osmpbfreader = "0.13"
+lazy_static = "1"
 serde = {version = "1", features = ["rc"]}
 serde_derive = "1"
 serde_json = "1"
@@ -34,7 +27,6 @@ failure_derive = "0.1"
 osm_boundaries_utils = "0.4"
 geos = { version = "5.0", features= ["geo"] }
 regex = "1"
-lazy_static = "1"
 ordered-float = "0.0.2"
 flate2 = "1.0"
 rayon = "1.0"

Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "cosmogony"
+version = "0.6.0"
+authors = ["Adrien Matissart <[email protected]>", "Antoine Desbordes <[email protected]>"]
+license = "Apache-2.0"
+repository = "https://github.com/osm-without-borders/cosmogony"
+homepage = "http://cosmogony.world"
+keywords = ["osm", "boundary", "geography"]
+categories = ["science", "algorithms"]
+description = "Provides geographical zones with a structured hierarchy"
+readme = "README.md"
+edition = "2018"
+
+[badges]
+travis-ci = { repository = "osm-without-borders/cosmogony" }
+
+[dependencies]
+log = "0.4"
+env_logger = "0.6"
+geo = "0.12"
+geo-types = { version = "0.4", features = ["rstar"] }
+serde = {version = "1", features = ["rc"]}
+serde_derive = "1"
+serde_json = "1"
+geojson = "0.15"
+failure = "0.1"
+failure_derive = "0.1"
+flate2 = "1.0"
+osmpbfreader = "0.13"

cosmogony/Cargo.toml

@@ -0,0 +1,3 @@
+# Object model for [Cosmogony](https://github.com/osm-without-borders/cosmogony/)
+
+Provides some (de)serializable objects representing the cosmogony hierarchy

cosmogony/README.md

@@ -1,4 +1,5 @@
 use failure::Error;
+use std::path::Path;
 
 #[derive(PartialEq, Clone)]
 pub enum OutputFormat {
@@ -8,29 +9,36 @@ pub enum OutputFormat {
     JsonStreamGz,
 }
 
-static ALL_EXTENTIONS: [(&str, OutputFormat); 4] = [
+static ALL_EXTENSIONS: [(&str, OutputFormat); 4] = [
     (".json", OutputFormat::Json),
     (".jsonl", OutputFormat::JsonStream),
     (".json.gz", OutputFormat::JsonGz),
     (".jsonl.gz", OutputFormat::JsonStreamGz),
 ];
 
 impl OutputFormat {
-    pub fn from_filename(filename: &str) -> Result<OutputFormat, Error> {
-        ALL_EXTENTIONS
+    pub fn from_filename(filename: impl AsRef<Path>) -> Result<OutputFormat, Error> {
+        ALL_EXTENSIONS
             .iter()
-            .find(|&&(ref e, _)| filename.ends_with(e))
+            .find(|&&(ref e, _)| {
+                filename
+                    .as_ref()
+                    .file_name()
+                    .and_then(|f| f.to_str())
+                    .map_or(false, |f| f.ends_with(e))
+            })
             .map(|&(_, ref f)| f.clone())
             .ok_or_else(|| {
-                let extensions_str = ALL_EXTENTIONS
+                let extensions_str = ALL_EXTENSIONS
                     .into_iter()
                     .map(|(e, _)| *e)
                     .collect::<Vec<_>>()
                     .join(", ");
                 failure::err_msg(format!(
                     "Unable to detect the file format from filename '{}'. \
                      Accepted extensions are: {}",
-                    filename, extensions_str
+                    filename.as_ref().display(),
+                    extensions_str
                 ))
             })
     }

src/file_format.rs renamed to cosmogony/src/file_format.rs

@@ -0,0 +1,9 @@
+pub mod file_format;
+mod model;
+pub mod mutable_slice;
+mod read;
+mod zone;
+
+pub use model::{Cosmogony, CosmogonyMetadata, CosmogonyStats};
+pub use read::{load_cosmogony_from_file, read_zones_from_file};
+pub use zone::{Coord, Zone, ZoneIndex, ZoneType};