Upgraded to actix-web 4, rust 1.80

This prevents compilation issues with newer standard libraries.

.gitmodules

@@ -7,24 +7,6 @@
 [submodule "ironsea_index_sfc_dbc"]
 	path = ironsea_index_sfc_dbc
 	url = ../ironsea_index_sfc_dbc
-[submodule "ironsea_store"]
-	path = ironsea_store
-	url = ../ironsea_store
-[submodule "ironsea_store_buffered_file"]
-	path = ironsea_store_buffered_file
-	url = ../ironsea_store_buffered_file
-[submodule "ironsea_store_mapped_file"]
-	path = ironsea_store_mapped_file
-	url = ../ironsea_store_mapped_file
-[submodule "ironsea_store_file"]
-	path = ironsea_store_file
-	url = ../ironsea_store_file
-[submodule "ironsea_table"]
-	path = ironsea_table
-	url = ../ironsea_table
-[submodule "ironsea_table_vector"]
-	path = ironsea_table_vector
-	url = ../ironsea_table_vector
 [submodule "mercator_data_generator"]
 	path = mercator_data_generator
 	url = ../mercator_data_generator

Cargo.toml

@@ -10,29 +10,29 @@ members = [
 
     # Generic Interfaces
     "ironsea_index",
-    "ironsea_store",
+    #"ironsea_store",
-    "ironsea_table",
 
     # Specific implementations
     "ironsea_index_hashmap",
     "ironsea_index_sfc_dbc",
-    "ironsea_store_buffered_file",
+    #"ironsea_store_buffered_file",
-    "ironsea_store_file",
+    #"ironsea_store_file",
-    "ironsea_store_mapped_file",
+    #"ironsea_store_mapped_file",
-    "ironsea_table_vector",
 ]
 
+[profile.release]
+#lto = true
+#debug = true
+
 [patch.crates-io]
 mercator_db = { path = "mercator_db" }
 mercator_parser = { path = "mercator_parser" }
 
 ironsea_index = { path = "ironsea_index" }
-ironsea_store = { path = "ironsea_store" }
+#ironsea_store = { path = "ironsea_store" }
-ironsea_table = { path = "ironsea_table" }
 
 ironsea_index_hashmap = { path = "ironsea_index_hashmap" }
 ironsea_index_sfc_dbc = { path = "ironsea_index_sfc_dbc" }
-ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
+#ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
-ironsea_store_file = { path = "ironsea_store_file" }
+#ironsea_store_file = { path = "ironsea_store_file" }
-ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
+#ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
-ironsea_table_vector = { path = "ironsea_table_vector" }

README.md

@@ -27,7 +27,7 @@ This enables the index implementations to be agnostic from the underlying data s
  * Clone the workspace, which will take care of bringing all the repositories needed.
 
    ```sh
-   git clone --recurse git@gitlab.epfl.ch:DIAS/PROJECTS/HBP-SP5/mercator.git
+   git clone --recurse https://github.com/epfl-dias/mercator
    ```
 
    The following steps assume the working directory is the root of the mercator repository.
@@ -39,36 +39,57 @@ This enables the index implementations to be agnostic from the underlying data s
    cargo run --release -- 1 10 100
    ```
 
- * Index the data:
+ * Link the data in the indexer folder (It has to be in the current working directory when calling the indexer):
 
    ```sh
    cd mercator_indexer
    for f in ../mercator_data_generator/1*.json
    do
-   	    ln -s $f
+       ln -s $f
    done
-   cargo run --release -- 1k 10k 100k
    ```
-   
+
+ * Index the data (assuming the datasets generated above):
+
+   ```sh
+   cargo run --release -- 1k 10k 100k
+   mv *.index ../mercator_service
+   ```
+
  * Run the Spatial Index, while providing the path to the datasets.
 
    ```sh
    cd mercator_service
-   RUST_LOG="warn,actix_web=info,mercator_service=trace" \
+   cargo run --release
-     MERCATOR_DATA="../mercator_indexer/" \
-     MERCATOR_ALLOWED_ORIGINS="http://localhost:3200" \
-     cargo run --release
    ```
 
 ## Documentation
 
-For more information, please refer to the [documentation](https://epfl-dias.github.io/PROJECT_NAME/).
+For more information, please refer to each sub projects, as well as the on-line help for the tools & utilities.
 
-If you want to build the documentation and access it locally, you can use:
+### Tools
 
-```sh
+ * Mercator Service
-cargo doc --open
+   **[[src](https://github.com/epfl-dias/mercator_service), [doc](https://epfl-dias.github.io/mercator_service/)]**
-```
+ * Mercator Indexer
+   **[[src](https://github.com/epfl-dias/mercator_indexer)]**
+
+### Utilities
+
+ * Mercator Data Generator
+   **[[src](https://github.com/epfl-dias/mercator_data_generator/)]**
+
+### Libraries
+
+ * IronSea Index
+    **[[src](https://github.com/epfl-dias/ironsea_index/), [doc](https://epfl-dias.github.io/ironsea_index/)]**
+ * IronSea Index HashMap
+    **[[src](https://github.com/epfl-dias/ironsea_index_hashmap/), [doc](https://epfl-dias.github.io/ironsea_index_hashmap/)]**
+ * IronSea Index SFC-DBC
+   **[[src](https://github.com/epfl-dias/ironsea_index_sfc_dbc/), [doc](https://epfl-dias.github.io/ironsea_index_sfc_dbc/)]**
+ * Mercator DB
+   **[[src](https://github.com/epfl-dias/mercator_db/), [doc](https://epfl-dias.github.io/mercator_db/)]**
+ * Mercator Parser **[[src](https://github.com/epfl-dias/mercator_parser/), [doc](https://epfl-dias.github.io/mercator_parser/), [query language](https://epfl-dias.github.io/mercator_parser/book/)]**
 
 ## Acknowledgements
 

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.80.0"

upload_docs.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+: ${TRAVIS_REPO_SLUG="epfl-dias/${PROJECT}"}
+
+if [ -z ${GH_TOKEN+yes} ]; then
+    echo "GH_TOKEN unset, exiting..."
+    exit 1
+fi
+
+if [ -z ${PROJECT+yes} ]; then
+    echo "PROJECT unset, exiting..."
+    exit 1
+fi
+
+# Generate the documentation
+cargo doc --release --target-dir=target
+
+cat > target/doc/index.html <<EOT
+<meta http-equiv=refresh content=0;url=${PROJECT}/index.html>
+EOT
+
+# If a book folder exists, and mdbook is available, build it.
+if /usr/bin/which -s mdbook && test -d book; then
+    mdbook build --dest-dir ../target/doc/book book
+fi
+
+# Upload it to GitHub.
+MSG=$(git log -1 --pretty=format:'doc: %ci: %h - %s')
+[ -e ../ghp-import/ghp_import.py ] || git clone https://github.com/davisp/ghp-import.git ../ghp-import
+../ghp-import/ghp_import.py -n -p -f \
+    -m "${MSG}" \
+    -r "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git" \
+    target/doc