From 13a21629013595546ab1ea5dbd14013d519ae9f0 Mon Sep 17 00:00:00 2001 From: Abhineet Tamrakar Date: Wed, 29 Jul 2020 15:02:32 +0530 Subject: [PATCH 1/3] Fix Markdown syntax, remove trailing/extra space Signed-off-by: Abhineet Tamrakar --- README.md | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index f573e87..2eca83b 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ ## What is `FLINT`? -The Full Lands Integration Tool (FLINT) is a C++ framework that combines satellite and ground data in ways that meet policy needs. It is based on over 20 years of experience building and operating integration tools in Australia and Canada. It's an Open-source Library maintained under [**moja.global**](https://github.com/moja-global/About-moja-global/blob/master/README.md), a project under the Linux Foundation +The Full Lands Integration Tool (FLINT) is a C++ framework that combines satellite and ground data in ways that meet policy needs. It is based on over 20 years of experience building and operating integration tools in Australia and Canada. It's an Open-source Library maintained under [**moja.global**](https://github.com/moja-global/About-moja-global/blob/master/README.md), a project under the Linux Foundation ## Why FLINT? -The FLINT makes developing and operating advanced systems achievable by all countries. It is a generic platform with a modular structure, allowing countries to attach any variety of models or data to build country-specific systems. The platform handles complex computer science tasks, such as the storage and processing of large data sets, leaving users to focus on monitoring, reporting and scenario analyses. +The FLINT makes developing and operating advanced systems achievable by all countries. It is a generic platform with a modular structure, allowing countries to attach any variety of models or data to build country-specific systems. The platform handles complex computer science tasks, such as the storage and processing of large data sets, leaving users to focus on monitoring, reporting and scenario analyses. ## How is FLINT different from earlier integrating tools? @@ -19,12 +19,11 @@ The FLINT is using the lessons learned from first generation tools, to build a n + scenario analysis systems to allow the development of projections + the potential to be used for multiple other purposes, including economics, water and biodiversity + development managed using a true open source approach under [moja global](http://moja.global), which will allow users (countries, companies and organizations) to direct strategy and control the budget. -+ software that allows data processing on local desktops or cloud-based systems ++ software that allows data processing on local desktops or cloud-based systems +## How to use FLINT? -## How to use FLINT? - -Below are the quick install instructions. [Step-by-step instructions guides](https://github.com/moja-global/FLINT/tree/master/How_to_use_FLINT) are available if you would like to have more detailed information. Please provide us with feedback on how we can improve these guides. You can leave your comments in the [versions under development](https://github.com/moja-global/FLINT/blob/master/How_to_use_FLINT/How_to_use_FLINT.md). +Below are the quick install instructions. [Step-by-step instructions guides](https://github.com/moja-global/FLINT/tree/master/How_to_use_FLINT) are available if you would like to have more detailed information. Please provide us with feedback on how we can improve these guides. You can leave your comments in the [versions under development](https://github.com/moja-global/FLINT/blob/master/How_to_use_FLINT/How_to_use_FLINT.md). ### Development Environment How-To for Windows @@ -47,7 +46,7 @@ A fork of a *Vcpkg* repository has been created for the FLINT required libraries ```powershell # bootstrap bootstrap-vcpkg.bat - + # install packages vcpkg.exe install boost-test:x64-windows boost-program-options:x64-windows boost-log:x64-windows turtle:x64-windows zipper:x64-windows poco:x64-windows libpq:x64-windows gdal:x64-windows sqlite3:x64-windows boost-ublas:x64-windows ``` @@ -59,23 +58,23 @@ A fork of a *Vcpkg* repository has been created for the FLINT required libraries cd Source mkdir build cd build - + # now create the Visual Studio Solution (2019) cmake -G "Visual Studio 16 2019" -DCMAKE_INSTALL_PREFIX=C:/Development/Software/moja -DVCPKG_TARGET_TRIPLET=x64-windows -DENABLE_TESTS=OFF -DENABLE_MOJA.MODULES.ZIPPER=OFF -DCMAKE_TOOLCHAIN_FILE=c:\Development\moja-global\vcpkg\scripts\buildsystems\vcpkg.cmake .. - + # OR Visual Studio Solution (2017) cmake -G "Visual Studio 15 2017" -DCMAKE_INSTALL_PREFIX=C:/Development/Software/moja -DVCPKG_TARGET_TRIPLET=x64-windows -DENABLE_TESTS=OFF -DENABLE_MOJA.MODULES.ZIPPER=OFF -DCMAKE_TOOLCHAIN_FILE=c:\Development\moja-global\vcpkg\scripts\buildsystems\vcpkg.cmake .. ``` #### Install Moja Libraries -It is possible to use the Visual Studio moja solution to install built versions of the Moja libraries. To do this you need to set the CMAKE variable '***CMAKE_INSTALL_PREFIX***' to your install path (i.e. "*C:/Development/Software/moja*"). +It is possible to use the Visual Studio moja solution to install built versions of the Moja libraries. To do this you need to set the CMAKE variable '***CMAKE_INSTALL_PREFIX***' to your install path (i.e. "*C:/Development/Software/moja*"). #### Make edits to the Visual Studio Solution using CMake 1. Launch the CMake GUI -2. In the '*Where to build the binaries*' field click “Browse Build…” and select the folder you created above (i.e. `C:\Development\moja-global\FLINT\Source\build`)`. The '*Where is the source code:*' field should update, if not, set it correctly. -4. You should be able to edit any CMake setting now (i.e. ENABLE flags like `ENABLE_TESTS`), then click “***Configure***” – assuming all libraries and required software has been installed you should have no errors. Now click ***"Generate"*** and the Solution with adjustments should be ready to load into Visual Studio. +1. In the '*Where to build the binaries*' field click “Browse Build…” and select the folder you created above (i.e. `C:\Development\moja-global\FLINT\Source\build`). The '*Where is the source code:*' field should update, if not, set it correctly. +1. You should be able to edit any CMake setting now (i.e. ENABLE flags like `ENABLE_TESTS`), then click “***Configure***” – assuming all libraries and required software has been installed you should have no errors. Now click ***"Generate"*** and the Solution with adjustments should be ready to load into Visual Studio. #### Other Useful Tools @@ -142,21 +141,18 @@ Configuration file options: --config_provider arg path to Moja project config files for data providers ``` +## How to Get Involved? -## How to Get Involved? - -moja global welcomes a wide range of contributions as explained in [Contributing document](https://github.com/moja-global/About-moja-global/blob/master/CONTRIBUTING.md) and in the [About moja-global Wiki](https://github.com/moja-global/.github/wiki). - +moja global welcomes a wide range of contributions as explained in [Contributing document](https://github.com/moja-global/About-moja-global/blob/master/CONTRIBUTING.md) and in the [About moja-global Wiki](https://github.com/moja-global/.github/wiki). -## FAQ and Other Questions +## FAQ and Other Questions -* You can find FAQs on the [Wiki](https://github.com/moja.global/.github/wiki). -* If you have a question about the code, submit [user feedback](https://github.com/moja-global/About-moja-global/blob/master/Contributing/How-to-Provide-User-Feedback.md) in the relevant repository -* If you have a general question about a project or repository or moja global, [join moja global](https://github.com/moja-global/About-moja-global/blob/master/Contributing/How-to-Join-moja-global.md) and +* You can find FAQs on the [Wiki](https://github.com/moja.global/.github/wiki). +* If you have a question about the code, submit [user feedback](https://github.com/moja-global/About-moja-global/blob/master/Contributing/How-to-Provide-User-Feedback.md) in the relevant repository +* If you have a general question about a project or repository or moja global, [join moja global](https://github.com/moja-global/About-moja-global/blob/master/Contributing/How-to-Join-moja-global.md) and * [submit a discussion](https://help.github.com/en/articles/about-team-discussions) to the project, repository or moja global [team](https://github.com/orgs/moja-global/teams) - * [submit a message](https://get.slack.help/hc/en-us/categories/200111606#send-messages) to the relevant channel on [moja global's Slack workspace](mojaglobal.slack.com). -* If you have other questions, please write to info@moja.global - + * [submit a message](https://get.slack.help/hc/en-us/categories/200111606#send-messages) to the relevant channel on [moja global's Slack workspace](mojaglobal.slack.com). +* If you have other questions, please write to info@moja.global ## Contributors @@ -167,15 +163,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Rob de Ligt
Rob de Ligt
📖 🚧		Mal
Mal
💻		James Leitch
James Leitch
💻		Max Fellows
Max Fellows
💻
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! ## Maintainers Reviewers Ambassadors Coaches The following people are Maintainers of this repository
Mal
Mal
💻		James Leitch
James Leitch
💻		Max Fellows
Max Fellows
💻
-**Maintainers** review and accept proposed changes -**Reviewers** check proposed changes before they go to the Maintainers -**Ambassadors** are available to provide training related to this repository -**Coaches** are available to provide information to new contributors to this repository +**Maintainers** review and accept proposed changes\ +**Reviewers** check proposed changes before they go to the Maintainers\ +**Ambassadors** are available to provide training related to this repository\ +**Coaches** are available to provide information to new contributors to this repository From 9b4c7cd8f02a8503fb9f52f5fe25087e035c550f Mon Sep 17 00:00:00 2001 From: Abhineet Tamrakar Date: Wed, 29 Jul 2020 16:24:18 +0530 Subject: [PATCH 2/3] Improve headings, simplify text, use active voice Signed-off-by: Abhineet Tamrakar --- README.md | 58 +++++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 2eca83b..ed68232 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,30 @@ -# FLINT Open-source Library +# FLINT [![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors) -## What is `FLINT`? - -The Full Lands Integration Tool (FLINT) is a C++ framework that combines satellite and ground data in ways that meet policy needs. It is based on over 20 years of experience building and operating integration tools in Australia and Canada. It's an Open-source Library maintained under [**moja.global**](https://github.com/moja-global/About-moja-global/blob/master/README.md), a project under the Linux Foundation +The Full Lands Integration Tool (FLINT) is a C++ framework that combines satellite and ground data in ways that meet policy needs. Its based on over 20 years of experience building and operating integration tools in Australia and Canada. It's an Open-source Library maintained under [**moja global**](https://github.com/moja-global/About-moja-global/blob/master/README.md), a project under the Linux Foundation. ## Why FLINT? -The FLINT makes developing and operating advanced systems achievable by all countries. It is a generic platform with a modular structure, allowing countries to attach any variety of models or data to build country-specific systems. The platform handles complex computer science tasks, such as the storage and processing of large data sets, leaving users to focus on monitoring, reporting and scenario analyses. +FLINT makes developing and operating advanced systems achievable by all countries. Its a generic platform with a modular structure, allowing countries to attach any variety of models or data to build country-specific systems. The platform handles complex computer science tasks, such as the storage and processing of large data sets, leaving users to focus on monitoring, reporting and scenario analyses. ## How is FLINT different from earlier integrating tools? -The FLINT is using the lessons learned from first generation tools, to build a new framework that meets present and future needs. The key improvements compared to the first generation tools include: -+ a flexible, modular approach, allowing for country specific implementations from [IPCC Tier 1 to 3 ](https://www.reddcompass.org/mgd-content-v1/dita-webhelp/en/Box1.html) -+ support for [wall-to-wall, sample based, jurisdictional, and supply chain approaches](https://static1.squarespace.com/static/5896200f414fb57d26f3d600/t/59362b028419c2db8f57e747/1496722191543/REDD_nested_projects.pdf) -+ the ability to cover all [land uses and land use changes, and activity-based reporting such as REDD+](https://theredddesk.org/what-redd) -+ scenario analysis systems to allow the development of projections -+ the potential to be used for multiple other purposes, including economics, water and biodiversity +FLINT uses the lessons learned from previous tools to meet present and future needs. The key improvements compared to earlier tools include: + ++ a flexible, modular approach, allowing for country specific implementations from [IPCC Tier 1 to 3 ](https://www.reddcompass.org/mgd-content-v1/dita-webhelp/en/Box1.html). ++ support for [wall-to-wall, sample based, jurisdictional, and supply chain approaches](https://static1.squarespace.com/static/5896200f414fb57d26f3d600/t/59362b028419c2db8f57e747/1496722191543/REDD_nested_projects.pdf). ++ the ability to cover all [land uses and land use changes, and activity-based reporting such as REDD+](https://theredddesk.org/what-redd). ++ scenario analysis systems to allow the development of projections. ++ the potential for use in other purposes, like economics, water and biodiversity. + development managed using a true open source approach under [moja global](http://moja.global), which will allow users (countries, companies and organizations) to direct strategy and control the budget. -+ software that allows data processing on local desktops or cloud-based systems ++ software that allows data processing on local desktops or cloud-based systems. -## How to use FLINT? +## Installation -Below are the quick install instructions. [Step-by-step instructions guides](https://github.com/moja-global/FLINT/tree/master/How_to_use_FLINT) are available if you would like to have more detailed information. Please provide us with feedback on how we can improve these guides. You can leave your comments in the [versions under development](https://github.com/moja-global/FLINT/blob/master/How_to_use_FLINT/How_to_use_FLINT.md). +[Step-by-step instruction guides](https://github.com/moja-global/FLINT/tree/master/How_to_use_FLINT) are available if you would like to have more detailed information. Below are some quick installation instructions: -### Development Environment How-To for Windows +### Windows These instructions are for building the FLINT on Windows using Visual Studio 2017, or Visual Studio 2019. @@ -37,11 +36,11 @@ These instructions are for building the FLINT on Windows using Visual Studio 201 #### Using vcpkg to install required libraries -A fork of a *Vcpkg* repository has been created for the FLINT required libraries. To build these libraries you can use the following process: +A fork of vcpkg repository is present for building FLINT's required libraries. To use it follow the instructions below: -+ Clone the Vcpkg repository: https://github.com/moja-global/vcpkg ++ Clone the vcpkg repository: https://github.com/moja-global/vcpkg -+ Start a command shell in the Vcpkg repository folder and use the following commands: ++ Start a command shell in the vcpkg repository folder and use the following commands: ```powershell # bootstrap @@ -68,32 +67,27 @@ A fork of a *Vcpkg* repository has been created for the FLINT required libraries #### Install Moja Libraries -It is possible to use the Visual Studio moja solution to install built versions of the Moja libraries. To do this you need to set the CMAKE variable '***CMAKE_INSTALL_PREFIX***' to your install path (i.e. "*C:/Development/Software/moja*"). +It's possible to use the Visual Studio moja solution to install built versions of the Moja libraries. To do this you need to set the CMake variable `CMAKE_INSTALL_PREFIX` to your install path (i.e. `C:/Development/Software/moja`). #### Make edits to the Visual Studio Solution using CMake 1. Launch the CMake GUI -1. In the '*Where to build the binaries*' field click “Browse Build…” and select the folder you created above (i.e. `C:\Development\moja-global\FLINT\Source\build`). The '*Where is the source code:*' field should update, if not, set it correctly. -1. You should be able to edit any CMake setting now (i.e. ENABLE flags like `ENABLE_TESTS`), then click “***Configure***” – assuming all libraries and required software has been installed you should have no errors. Now click ***"Generate"*** and the Solution with adjustments should be ready to load into Visual Studio. +1. In the **Where to build the binaries** box click **Browse Build…** and select the folder you created above (i.e. `C:\Development\moja-global\FLINT\Source\build`). The **Where is the source code:** field should update, if not, set it manually. +1. You should be able to edit any CMake setting now (i.e. `ENABLE` flags like `ENABLE_TESTS`), then click **Configure** – assuming all libraries and required software is already installed, no errors should occur. Now click **Generate** and the Solution with adjustments should be ready to load into Visual Studio. #### Other Useful Tools -##### SQLIte Studio - -a simple windows SQLite database manager (http://sqlitestudio.pl/) -[sqlitestudio-3.1.0.zip](http://sqlitestudio.pl/files/sqlitestudio3/complete/win32/sqlitestudio-3.1.0.zip) - -##### TortoiseGit +[SQLite Studio](https://sqlitestudio.pl/): a SQLite database manager. -[TortoiseGit](https://code.google.com/p/tortoisegit/wiki/Download) +[TortoiseGit](https://tortoisegit.org/): Windows shell integration for Git. -### Docker for Ubuntu 18:04 +### Docker on Ubuntu 18.04 -Containers are a simple way to build FLINT and all required dependencies. Examples of how this can be done are provided for Ubuntu 18.04. See the [Examples docker directory.](https://github.com/moja-global/flint/tree/master/Examples/docker) +It's possible to use Containers to build FLINT and all its required dependencies. An example on how to do this on Ubuntu 18.04 is as follows. See also the [`docker` directory.](https://github.com/moja-global/flint/tree/master/Examples/docker) #### Building the containers -The build has been split into two Dockerfiles, the first to get and build required libraries. The second to get and build the moja FLINT libraries and CLI program. +This example uses two `Dockerfile`s; the first to download and build the required libraries, and the second to download and build the moja FLINT libraries and CLI program. ```bash # working from the examples folder "flint/tree/master/Examples/docker" @@ -107,7 +101,7 @@ docker build -f Dockerfile.flint.ubuntu.18.04 --build-arg NUM_CPU=4 --build-arg docker build -f Dockerfile.flint.ubuntu.18.04 --build-arg NUM_CPU=4 --build-arg GITHUB_AT=XXXX --build-arg FLINT_BRANCH=master -t moja/flint:ubuntu-18.04 . ``` -How to use the final container depends on the task. However, the following command will bash into the flint container and allow you to use the CLI program. +How to use the final container depends on the task. The following command will bash into the flint container and allow you to use the CLI program. ```bash # run bash on the flint container From c1c917a85ce34c9ad4a40a257a4d075b7e8a23cc Mon Sep 17 00:00:00 2001 From: Abhineet Tamrakar Date: Wed, 29 Jul 2020 16:38:05 +0530 Subject: [PATCH 3/3] Add license info Signed-off-by: Abhineet Tamrakar --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index ed68232..883d1ff 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,10 @@ moja global welcomes a wide range of contributions as explained in [Contributing * [submit a message](https://get.slack.help/hc/en-us/categories/200111606#send-messages) to the relevant channel on [moja global's Slack workspace](mojaglobal.slack.com). * If you have other questions, please write to info@moja.global +## License + +This project is licensed under the [Mozilla Public License 2.0](LICENSE) + ## Contributors Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):