upd geonature submodule

.dockerignore

@@ -0,0 +1 @@
+vendor/GeoNature-citizen/frontend/node_modules

.gitignore

@@ -0,0 +1,3 @@
+dist/
+db/data/
+node_modules/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vendor/GeoNature-citizen"]
 	path = vendor/GeoNature-citizen
 	url = https://github.com/Champs-Libres/GeoNature-citizen.git
+[submodule "vendor/TaxHub"]
+	path = vendor/TaxHub
+	url = https://github.com/PnX-SI/TaxHub

Dockerfile-back

@@ -0,0 +1,48 @@
+FROM debian:buster-slim
+# todo utiliser image python3 ?
+
+## install dependencies
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y sudo vim nano locales unzip && \
+    apt-get install -y python-dev python-pip libpq-dev libgeos-dev python3 python3-pip unzip && \
+    apt-get install -y python3-venv git npm wget postgresql-client && \
+    localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 && \
+    apt-get clean
+
+## set envs
+ENV LANG fr_FR.utf8
+ENV TERM xterm
+
+RUN adduser --uid 1000 --gecos ""  --disabled-password appuser
+RUN usermod -aG sudo appuser
+RUN echo "appuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+COPY vendor/GeoNature-citizen/ /home/appuser/citizen/
+
+# patches
+COPY patches/back/requirements.txt /home/appuser/citizen/backend/requirements.txt
+COPY patches/back/default_config.toml /home/appuser/citizen/config/default_config.toml
+COPY patches/settings.ini /home/appuser/citizen/config/settings.ini
+COPY patches/back/wsgi.py /home/appuser/citizen/backend/wsgi.py
+COPY patches/back/server.py /home/appuser/citizen/backend/server.py
+
+
+RUN chown -R appuser:appuser /home/appuser
+USER appuser
+
+WORKDIR /home/appuser/citizen/backend/
+
+ENV VIRTUAL_ENV=/home/appuser/citizen/backend/venv2/
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# RUN /bin/bash create_sys_dir.sh
+
+
+# Install dependencies:
+RUN pip install -r requirements.txt
+
+EXPOSE 5002
+
+CMD ["python", "server.py ", "runserver"]

Dockerfile-front

@@ -0,0 +1,29 @@
+from node:14
+
+COPY vendor/GeoNature-citizen/ /home/appuser/citizen/
+# todo avoir copy vendor/GeoNature-citizen/backend
+
+WORKDIR /home/appuser/citizen/
+
+ADD https://github.com/PnX-SI/TaxHub/archive/refs/tags/1.7.3.zip /home/appuser/citizen/taxhub.zip
+RUN unzip taxhub.zip
+RUN mv TaxHub-1.7.3 taxhub
+
+# PATCHES
+COPY patches/settings.ini /home/appuser/citizen/config/settings.ini
+COPY patches/frontend/src/conf /home/appuser/citizen/frontend/src/conf
+COPY patches/frontend/src/assets /home/appuser/citizen/frontend/src/assets
+COPY patches/frontend/server.ts /home/appuser/citizen/frontend/server.ts
+COPY patches/frontend/src/custom /home/appuser/citizen/frontend/src/custom
+
+WORKDIR /home/appuser/citizen/frontend
+
+# aoir google response
+ENV NG_CLI_ANALYTICS=false
+RUN npm install
+
+RUN npm run build:i18n-ssr
+
+EXPOSE 4000
+
+# npm run serve:ssr -> sur port 4000

Dockerfile-taxhub

@@ -0,0 +1,46 @@
+FROM debian:buster-slim
+
+## install dependencies
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y sudo vim nano locales unzip && \
+    apt-get install -y python-dev python-pip libpq-dev libgeos-dev python3 python3-pip unzip && \
+    apt-get install -y python3-venv git npm wget postgresql-client && \
+    localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 && \
+    apt-get clean
+
+## set envs
+ENV LANG fr_FR.utf8
+ENV TERM xterm
+
+RUN adduser --uid 1000 --gecos ""  --disabled-password appuser
+RUN usermod -aG sudo appuser
+RUN echo "appuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+COPY vendor/TaxHub/ /home/appuser/taxhub/
+
+#patches
+COPY patches/taxhub/config.py /home/appuser/taxhub/config.py
+COPY patches/taxhub/server.py /home/appuser/taxhub/server.py
+COPY patches/taxhub/install_db.sh /home/appuser/taxhub/install_db.sh
+COPY patches/taxhub/settings.ini /home/appuser/taxhub/settings.ini
+
+
+RUN chown -R appuser:appuser /home/appuser
+USER appuser
+
+WORKDIR /home/appuser/taxhub/
+
+ENV VIRTUAL_ENV=/home/appuser/taxhub/venv/
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+RUN /bin/bash create_sys_dir.sh
+
+
+# Install dependencies:
+RUN pip install -r requirements.txt
+
+EXPOSE 5000
+
+CMD ["python", "server.py ", "runserver"]

README

@@ -0,0 +1,104 @@
+TODO FUSION entre README & README.md
+
+# gl-geonature
+
+L'instance Geonature-Citizen de Champs-Libres.
+
+# Installation développeur (docker-compose )
+
+## Multiple containers
+
+Get the code (using git-submodule) for : citizen & taxhub.
+
+```
+ $ git submodule update --init --recursive
+```
+
+### DB init
+
+Creation of the table `referentielsdb` that will be used for storing data.
+
+```
+$ docker-compose up -d db
+$ docker-compose exec db createdb -U postgres referentielsdb
+$ docker-compose exec db psql -U postgres -d referentielsdb -c "CREATE SCHEMA taxonomie"
+$ docker-compose exec db psql -d -U postgres -d referentielsdb -c "CREATE EXTENSION postgis"
+```
+
+### Taxhub
+
+```
+$ docker-compose run taxhub bash install_db.sh
+$ docker-compose up -d taxhub
+```
+
+####  CREATION / Compiation du JS  de Taxhub
+
+##### Mise à jour de nppm.
+
+```
+       $ docker-compose exec -u root taxhub bash
+taxhub $ npm install npm@latest -g  # mise à jour de npm
+```
+
+#### Compilation du code
+
+```
+       $ docker-compose exec taxhub bash
+taxhub $ cd static
+taxhub $ cp app/constants.js.sample app/constants.js
+taxhub $ npm install
+```
+
+
+### Citizen-front
+
+```
+$ docker-compose run --rm citizen-front npm install
+$ docker-compose run --rm citizen-front npm run build:i18n-ssr
+$ docker-compose up -d citizen-front
+```
+
+
+### Citizen-back
+
+
+```
+docker-compose up -d citizen-front
+
+```
+
+### Apache
+
+Redigie de 8080 vers autres services :
+       - 4000 (citizen-front)
+       - 5002 (citizen-back)
+       - 5000 (taxon)
+
+
+
+## Single container (depreciated)
+
+### Creation DB (pour single container)
+
+docker-compose exec db createdb -U postgres citizen
+docker-compose exec db psql -U postgres -d citizen -c "CREATE SCHEMA taxonomie"
+ref_geo
+
+docker-compose exec db psql -d -U postgres -d citizen -c "CREATE EXTENSION postgis"
+
+
+ $ git submodule update --init --recursive
+ $ docker-compose up -d
+ $ docker-compose exec citizen install/install_app.sh
+
+note: les credentials pour accéder au backend se trouvent dans /home/appuser/citizen/config
+
+### Remise en route du service
+
+ $ docker-compose up -d
+ $ docker-compose exec citizen sh install/restart.sh
+
+# Documentation :
+
+ $ make doc

README.md

@@ -1,7 +1,143 @@
-# gl-geonature
+Geonature - Biommap
+===================
 
 L'instance Geonature-Citizen de Champs-Libres.
 
+# Multi-container instructions
+
+
+## Installation
+Clone this repo
+
+```
+ $ git clone git@gitea.champs-libres.be:champs-libres/biommap.git
+```
+
+Get the code (using git-submodule) for : citizen & taxhub.
+
+```
+ $ git submodule update --init --recursive
+```
+### DB init
+
+Creation of the table `referentielsdb` that will be used for storing data.
+
+```
+$ docker-compose up -d db
+$ docker-compose exec db createdb -U postgres referentielsdb
+$ docker-compose exec db psql -U postgres -d referentielsdb -c "CREATE SCHEMA taxonomie"
+$ docker-compose exec db psql -d -U postgres -d referentielsdb -c "CREATE EXTENSION postgis"
+```
+
+### Build the other containers
+
+
+```
+$ docker-compose up
+```
+### Compile the front
+
+```
+$ docker-compose run --rm citizen-front npm install
+$ docker-compose run --rm citizen-front npm run build:i18n-ssr
+```
+
+### Starting
+For starting the application again, you may start the db container first
+
+```
+$ docker-compose up -d db
+$ docker-compose up
+```
+
+
+## Misc.
+### Taxhub
+
+```
+$ docker-compose run taxhub bash install_db.sh
+$ docker-compose up -d taxhub
+```
+
+####  CREATION / Compiation du JS  de Taxhub
+
+##### Mise à jour de nppm.
+
+```
+       $ docker-compose exec -u root taxhub bash
+taxhub $ npm install npm@latest -g  # mise à jour de npm
+```
+
+#### Compilation du code
+
+```
+       $ docker-compose exec taxhub bash
+taxhub $ cd static
+taxhub $ cp app/constants.js.sample app/constants.js
+taxhub $ npm install
+```
+
+
+### Citizen-front
+
+```
+$ docker-compose run --rm citizen-front npm install
+$ docker-compose run --rm citizen-front npm run build:i18n-ssr
+$ docker-compose up -d citizen-front
+```
+
+
+### Citizen-back
+
+
+```
+docker-compose up -d citizen-front
+```
+
+### Apache
+
+Redirige de 8080 vers autres services :
+       - 4000 (citizen-front)
+       - 5002 (citizen-back)
+       - 5000 (taxon)
+
+
+
+## Deploiement sur un serveur distant
+
+
+### 0) Si on change le fichier app.config.ts
+
+```bash
+scp patches/frontend/src/conf/app.config.ts.dist user@domain.org:/path/to/app.config.ts
+```
+
+### 1) Reconstruire l'image front en local
+
+```bash
+docker-compose build citizen-front
+docker login registry.gitlab.com
+docker push registry.gitlab.com/champs-libres/geonature-citizen/front
+```
+Il est peut-être aussi nécessaire de faire de même pour l'image `media`.
+
+```bash
+docker-compose build media
+docker login registry.gitlab.com
+docker push registry.gitlab.com/champs-libres/geonature-citizen/media
+```
+### 2) Sur le serveur distant
+
+```bash
+docker pull registry.gitlab.com/champs-libres/geonature-citizen/front
+# Rebuild of the front
+docker-compose run --rm citizen-front npm run build:i18n-ssr
+# Restart the containers
+docker-compose up -d db
+docker-compose up -d
+```
+
+# Single-container instructions (deprecated)
 ## Installation
 
  $ git submodule update --init --recursive
@@ -26,9 +162,14 @@ $ git submodule foreach git pull git@github.com:Champs-Libres/GeoNature-citizen.
 
  $ make doc
 
-### Builder le front (pour production)
+### Builder le front (pour production) (avant de pouvoir faire le docker up)
 
 ```
+$ docker-compose run --rm citizen-front npm install
+$ docker-compose run --rm citizen-front npm run build:i18n-ssr
+$ docker-compose up -d citizen-front
+```
+
 $ docker-compose exec citizen bash
 appuser@ab136184159a:~/citizen/$ cd frontend
 appuser@ab136184159a:~/citizen/frontend$ npm run ng build -- --configuration=fr --prod

apache/Dockerfile

@@ -0,0 +1,2 @@
+FROM httpd:2.4
+COPY ./httpd-citizen.conf /usr/local/apache2/conf/httpd.conf

apache/httpd-citizen.conf

@@ -0,0 +1,574 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/usr/local/apache2"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule mpm_event_module modules/mod_mpm_event.so
+#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule isapi_module modules/mod_isapi.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule bucketeer_module modules/mod_bucketeer.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule example_hooks_module modules/mod_example_hooks.so
+#LoadModule case_filter_module modules/mod_case_filter.so
+#LoadModule case_filter_in_module modules/mod_case_filter_in.so
+#LoadModule example_ipc_module modules/mod_example_ipc.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+#LoadModule brotli_module modules/mod_brotli.so
+LoadModule mime_module modules/mod_mime.so
+#LoadModule ldap_module modules/mod_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+#LoadModule lua_module modules/mod_lua.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
+#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
+#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
+#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule http2_module modules/mod_http2.so
+#LoadModule proxy_http2_module modules/mod_proxy_http2.so
+#LoadModule md_module modules/mod_md.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+	#LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+	#LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/usr/local/apache2/htdocs"
+<Directory "/usr/local/apache2/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /proc/self/fd/2
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog /proc/self/fd/1 common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to
+    # exist in your server's namespace, but do not anymore. The client
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts.
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/usr/local/apache2/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig conf/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile conf/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+# SELON install_app.sh
+<VirtualHost *:80>
+	<Location />
+        ProxyPass  http://citizen-front:4000/ retry=0
+        ProxyPassReverse  http://citizen-front:4000/
+   	</Location>
+
+	# API Url
+	<Location /api>
+        ProxyPass  http://citizen-back:5002/api retry=0
+        ProxyPassReverse  http://citizen-back:5002/api
+    </Location>
+
+    # MEDIA
+	<Location /api/media>
+        ProxyPass  http://media/ retry=0
+        ProxyPassReverse  http://media/
+    </Location>
+
+	# Error logs
+	ErrorLog /var/log/apache2-citizen-error.log
+	CustomLog /var/log/apachecitizen.log combined
+</VirtualHost>

docker-compose.override.yml

@@ -1,6 +1,14 @@
 version: '3.3'
 
 services:
+  db:
+    image: postgis/postgis:12-3.1-alpine
+    ports:
+      - "5432:5432"
+    volumes:
+      - "pg-data:/var/lib/postgresql/data"
+    environment:
+      - "POSTGRES_PASSWORD=postgres"
   citizen:
     tty: true
     volumes:
@@ -9,3 +17,72 @@ services:
       - ./restart.sh:/home/appuser/citizen/install/restart.sh
       - ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
       - ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
+    ports:
+      - "8888:80"
+  citizen-front:
+    build:
+      dockerfile: ./Dockerfile-front
+      context: .
+    image: registry.gitlab.com/champs-libres/geonature-citizen/front
+    volumes:
+      - ./patches/settings.ini:/home/appuser/citizen/config/settings.ini
+      - ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
+      - ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
+      - ./patches/frontend/src/custom:/home/appuser/citizen/frontend/src/custom
+      - ./patches/frontend/server.ts:/home/appuser/citizen/frontend/server.ts
+      - ./dist:/home/appuser/citizen/frontend/dist
+      # re files installed by npm install
+      - ./node_modules:/home/appuser/citizen/frontend/node_modules
+    ports:
+      - "4000:4000"
+    command: npm run serve:ssr
+    environment:
+      # avoid goodle analytics question
+      - "NG_CLI_ANALYTICS=false"
+  citizen-back:
+    build:
+      dockerfile: ./Dockerfile-back
+      context: .
+    image: registry.gitlab.com/champs-libres/geonature-citizen/back
+    volumes:
+      - ./patches/settings.ini:/home/appuser/citizen/config/settings.ini
+      - ./patches/back/default_config.toml:/home/appuser/citizen/config/default_config.toml
+      - ./patches/back/wsgi.py:/home/appuser/citizen/backend/wsgi.py
+      - ./patches/back/server.py:/home/appuser/citizen/backend/server.py
+    ports:
+      - "5002:5002"
+    command:  python wsgi.py
+  taxhub:
+    build:
+      dockerfile: ./Dockerfile-taxhub
+      context: .
+    image: registry.gitlab.com/champs-libres/geonature-citizen/taxhub
+    ports:
+      - "5000:5000"
+    volumes:
+      - ./patches/taxhub/config.py:/home/appuser/taxhub/config.py
+      - ./patches/taxhub/server.py:/home/appuser/taxhub/server.py
+      - ./patches/taxhub/install_db.sh:/home/appuser/taxhub/install_db.sh
+      - ./patches/taxhub/settings.ini:/home/appuser/taxhub/settings.ini
+    command: python server.py
+
+  media:
+    build:
+      context: .
+      dockerfile: ./media/Dockerfile
+    image: registry.gitlab.com/champs-libres/geonature-citizen/media
+    ports:
+      - "8082:80"
+  apache:
+    build:
+      context: ./apache
+      dockerfile: ./Dockerfile
+    image: registry.gitlab.com/champs-libres/geonature-citizen/apache
+    ports:
+      - "8080:80"
+  pgweb:
+    image: sosedoff/pgweb
+    ports:
+      - 8081:8081
+volumes:
+  pg-data:

docker-compose.yml

@@ -3,4 +3,4 @@ services:
   citizen:
     build: .
     ports:
-      - "8080:80"
+      - "8888:80"

fixtures/forms/arbres.json

@@ -10,23 +10,28 @@
           "type": "string"
         },
         "hauteur": {
-          "title": "Hauteur",
-          "description": "Vous pouvez l’estimer ...",
+          "title": "Hauteur (en m)",
+          "description": "Vous pouvez l’estimer avec une méthode simple expliquée dans un tutoriel (voir section « à propos »)",
           "type": "integer"
         },
         "circonference": {
-          "title": "Circonférence",
-          "description": "A mesurer à hauteur de poitrine",
+          "title": "Circonférence (en cm)",
+          "description": "À mesurer à hauteur de poitrine",
           "type": "integer"
         },
+        "etatsanitaire": {
+          "title": "État sanitaire",
+          "description": "Dans la partie tuto, on vous explique comment reconnaitre un arbre/arbuste malade.",
+          "type": "string"
+        },
         "espece": {
             "title": "Espèce",
-            "description": "Nom de l'espèce d'arbre",
+            "description": "Nom de l'espèce d'arbre. À déterminer avec une appli tierce (PlantNet) ou en consultant le tuto dans la section « à propos »",
             "type": "integer"
-          },
+        },
         "remarques": {
           "title": "Remarques",
-          "description": "Vous pouvez renseigner ici le nom complet des espèces que vous avez identifié. C'est également ici que vous pouvez indiquer si des animaux autres que ceux proposés dans la liste étaient présents.",
+          "description": "Autres observations à propos du site visité, nom complet des espèces identifiées.",
           "type": "string"
         }
       }
@@ -41,12 +46,12 @@
             "titleMap": [
               { "name": "inconnu", "value": null },
               { "name": "Prairie", "value": "Prairie" },
-              { "name": "Champs cultivé", "value": "Champs cultivé" },
+              { "name": "Champ cultivé", "value": "Champ cultivé" },
               { "name": "Bois de feuillus", "value": "Bois de feuillus" },
               { "name": "Bois de résineux", "value": "Bois de résineux" },
               { "name": "Friche / lande", "value": "Friche / lande" },
               { "name": "Zone humide", "value": "Zone humide" },
-              { "name": "Zone urbanisé", "value": "Zone urbanisé" },
+              { "name": "Zone urbanisée", "value": "Zone urbanisée" },
               { "name": "Parc de loisirs / jardin", "value": "Parc de loisirs / jardin" }
             ]
           }
@@ -64,6 +69,21 @@
           }
         ]
       },
+      {
+        "title": "État sanitaire",
+        "description": "",
+        "layout": [
+          {
+            "key": "etatsanitaire",
+            "titleMap": [
+              { "name": "indéterminé", "value": null },
+              { "name": "bon", "value" : "bon" },
+              { "name": "moyen", "value" : "moyen" },
+              { "name": "mauvais", "value" : "mauvais" }
+            ]
+          }
+        ]
+      },
       {
         "title": "Type d'arbre",
         "description": "",
@@ -72,10 +92,25 @@
             "key": "espece",
             "titleMap": [
               { "name": "inconnu", "value": null },
-              { "name": "Tilleul", "value" : "tilleul" },
-              { "name": "Frêne", "value" : "frene" },
-              { "name": "Hêtre", "value" : "hetre" },
-              { "name": "Chêne pédonculé", "value" : "chene_pedoncule" }
+              { "name": "Aulne", "value": "Aulne" },
+              { "name": "Bouleau", "value": "Bouleau" },
+              { "name": "Cerisier", "value": "Cerisier" },
+              { "name": "Charme", "value": "Charme" },
+              { "name": "Châtaignier", "value": "Châtaignier" },
+              { "name": "Chêne", "value": "Chêne" },
+              { "name": "Conifère", "value": "Conifère" },
+              { "name": "Erable", "value": "Erable" },
+              { "name": "Frêne", "value": "Frêne" },
+              { "name": "Hêtre", "value": "Hêtre" },
+              { "name": "Marronnier", "value": "Marronnier" },
+              { "name": "Merisier", "value": "Merisier" },
+              { "name": "Orme", "value": "Orme" },
+              { "name": "Peuplier", "value": "Peuplier" },
+              { "name": "Platane", "value": "Platane" },
+              { "name": "Robinier Faux-acacia", "value": "Robinier Faux-acacia" },
+              { "name": "Saule", "value": "Saule" },
+              { "name": "Tilleul", "value": "Tilleul" },
+              { "name": "Autre", "value": "Autre" }
             ]
           }
         ]

media/Dockerfile

@@ -0,0 +1,6 @@
+FROM httpd:2.4
+# COPY media/httpd.conf /usr/local/apache2/conf/httpd.conf
+COPY vendor/GeoNature-citizen/frontend/src/assets/* /usr/local/apache2/htdocs/
+COPY patches/frontend/src/assets/* /usr/local/apache2/htdocs/
+
+EXPOSE 80

media/httpd.conf

@@ -0,0 +1,550 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/usr/local/apache2"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule mpm_event_module modules/mod_mpm_event.so
+#LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule isapi_module modules/mod_isapi.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule bucketeer_module modules/mod_bucketeer.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule example_hooks_module modules/mod_example_hooks.so
+#LoadModule case_filter_module modules/mod_case_filter.so
+#LoadModule case_filter_in_module modules/mod_case_filter_in.so
+#LoadModule example_ipc_module modules/mod_example_ipc.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+#LoadModule brotli_module modules/mod_brotli.so
+LoadModule mime_module modules/mod_mime.so
+#LoadModule ldap_module modules/mod_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+#LoadModule lua_module modules/mod_lua.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+# LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
+#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
+#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
+#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule http2_module modules/mod_http2.so
+#LoadModule proxy_http2_module modules/mod_proxy_http2.so
+#LoadModule md_module modules/mod_md.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+	#LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+	#LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/usr/local/apache2/htdocs"
+<Directory "/usr/local/apache2/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /proc/self/fd/2
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog /proc/self/fd/1 common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/usr/local/apache2/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig conf/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile conf/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be 
+# included to add extra features or to modify the default configuration of 
+# the server, or you may simply copy their contents here and change as 
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>

patches/back/default_config.toml

@@ -0,0 +1,62 @@
+# Database
+SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://postgres:postgres@db:5432/referentielsdb"
+SQLALCHEMY_TRACK_MODIFICATIONS = false
+
+# JWT Auth
+JWT_SECRET_KEY = 'jwt-secret-string'
+JWT_BLACKLIST_ENABLED = true
+JWT_BLACKLIST_TOKEN_CHECKS = ['access', 'refresh']
+
+# Application
+appName = 'GeoNature-citizen'                               # Application name in the home page
+DEFAULT_LANGUAGE = 'fr'
+
+# Debug
+DEBUG = false
+SQLALCHEMY_DEBUG_LEVEL = 'WARNING'
+
+# URL_APPLICATION = "http://mydomain.org"         # Replace mydomain.org by your domain
+URL_APPLICATION = "http://taxhub:5000"
+API_TAXHUB = "http://taxhub:5000/api/"
+# API_TAXHUB = "http://mytaxhub.org/api/"         # Replace mytaxhub.org by your TaxHub url
+
+
+
+SECRET_KEY = 'MyS3cr3tK3y'
+CONFIRM_MAIL_SALT = 'your-secret-salt' # secret salt for corfirm mail token
+
+MEDIA_FOLDER = 'media'
+
+
+[RESET_PASSWD]
+    SUBJECT = "Link"
+    FROM = 'contact@geonature-citizen.fr'
+    TEXT_TEMPLATE = '''
+    Bonjour,\r\nVoici votre nouveau mot de passe :\r\n{passwd}\r\n"{app_url}
+    '''
+    HTML_TEMPLATE = '''
+    Bonjour,<br /><br />Voici votre nouveau mot de passe :<br />
+    {passwd}
+    <br /><br />"
+    <a href="{app_url}">Connexion</a>'
+    '''
+
+[CONFIRM_EMAIL]
+    SUBJECT = "Activez votre compte"
+    FROM = 'contact@geonature-citizen.fr'
+    HTML_TEMPLATE = '''<p> Bonjour,</p><br /><p>Nous vous confirmons que votre compte a bien été créé.</p>
+     <p> Afin d'activer votre compte veuillez <a href="{activate_url}">cliquer ici.</a>
+     <p>Nous vous souhaitons la bienvenue sur notre site.</p><br />
+     <p>Bien à vous.</p>
+    '''
+
+[MAIL]
+    MAIL_USE_SSL = false
+    MAIL_STARTTLS = true
+    MAIL_HOST = 'smtpd host'
+    MAIL_PORT = 493   # mandatory SSL port
+    MAIL_AUTH_LOGIN = 'smtpd/relay host username'
+    MAIL_AUTH_PASSWD = 'smtpd/relay host password'
+
+
+# API flasgger main config

patches/back/requirements.txt

@@ -0,0 +1,35 @@
+certifi==2019.6.16
+chardet==3.0.4
+Click==7.0
+colorlog==4.0.2
+flasgger==0.9.3
+Flask==1.1.1
+Flask-Admin==1.5.3
+Flask-CKEditor==0.4.3
+Flask-Cors==3.0.8
+Flask-JWT-Extended==3.21.0
+Flask-SQLAlchemy==2.4.0
+GeoAlchemy2==0.6.3
+geojson==2.5.0
+gunicorn==20.0.4
+idna==2.8
+itsdangerous==1.1.0
+Jinja2==2.10.1
+jsonschema==2.6.0
+MarkupSafe==1.1.1
+mistune==0.8.4
+passlib==1.7.1
+psycopg2-binary==2.8.3
+PyJWT==1.7.1
+PyYAML==5.1.2
+requests==2.22.0
+Shapely==1.7.1
+six==1.12.0
+SQLAlchemy==1.3.7
+toml==0.10.0
+urllib3==1.25.3
+Werkzeug==0.15.5
+WTForms==2.2.1
+gunicorn==20.0.4
+httplib2==0.19.0
+xlwt==1.3.0

patches/back/server.py

@@ -0,0 +1,160 @@
+import sys
+import os
+import logging
+
+from flask import Flask, current_app
+from flask_cors import CORS
+
+from gncitizen.utils.env import (
+    db,
+    list_and_import_gnc_modules,
+    jwt,
+    swagger,
+    admin,
+    ckeditor,
+)
+from gncitizen.utils.init_data import create_schemas, populate_modules
+from gncitizen import __version__
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+
+class ReverseProxied(object):
+    def __init__(self, app, script_name=None, scheme=None, server=None):
+        self.app = app
+        self.script_name = script_name
+        self.scheme = scheme
+        self.server = server
+
+    def __call__(self, environ, start_response):
+        script_name = environ.get("HTTP_X_SCRIPT_NAME", "") or self.script_name
+        if script_name:
+            environ["SCRIPT_NAME"] = script_name
+            path_info = environ["PATH_INFO"]
+            if path_info.startswith(script_name):
+                environ["PATH_INFO"] = path_info[len(script_name) :]
+        scheme = environ.get("HTTP_X_SCHEME", "") or self.scheme
+        if scheme:
+            environ["wsgi.url_scheme"] = scheme
+        server = environ.get("HTTP_X_FORWARDED_SERVER", "") or self.server
+        if server:
+            environ["HTTP_HOST"] = server
+        return self.app(environ, start_response)
+
+
+def get_app(config, _app=None, with_external_mods=True, url_prefix="/api"):
+    # Make sure app is a singleton
+    if _app is not None:
+        return _app
+
+    app = Flask(__name__)
+    app.config.update(config)
+
+    if app.config["DEBUG"]:
+        from flask.logging import default_handler
+        import colorlog
+
+        handler = colorlog.StreamHandler()
+        handler.setFormatter(
+            colorlog.ColoredFormatter(
+                """%(log_color)s%(asctime)s %(levelname)s:%(name)s:%(message)s [in %(pathname)s:%(lineno)d]"""
+            )
+        )
+
+        logger = logging.getLogger("werkzeug")
+        logger.addHandler(handler)
+        app.logger.removeHandler(default_handler)
+
+        for l in logging.Logger.manager.loggerDict.values():
+            if hasattr(l, "handlers"):
+                l.handlers = [handler]
+
+    # else:
+    #     # TODO: sourced from app.config['LOGGING']
+    #     logging.basicConfig()
+    #     logger = logging.getLogger()
+    #     logger.setLevel(logging.INFO)
+    logging.getLogger("sqlalchemy.engine").setLevel(
+        getattr(sys.modules["logging"], app.config["SQLALCHEMY_DEBUG_LEVEL"])
+    )
+
+    CORS(app, supports_credentials=True)
+    # app.config['PROPAGATE_EXCEPTIONS'] = False
+    # ... brings back those cors headers on error response in debug mode
+    # to trace client-side error handling
+    # but drops the embedded debugger ¯\_(ツ)_/¯
+    # https://github.com/corydolphin/flask-cors/issues/67
+    # https://stackoverflow.com/questions/29825235/getting-cors-headers-in-a-flask-500-error
+
+    # Bind app to DB
+    db.init_app(app)
+
+    # JWT Auth
+    jwt.init_app(app)
+
+    swagger.init_app(app)
+
+    admin.init_app(app)
+
+    ckeditor.init_app(app)
+
+    with app.app_context():
+
+        from gncitizen.core.users.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.commons.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.observations.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.ref_geo.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.badges.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.taxonomy.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix)
+
+        from gncitizen.core.sites.routes import routes
+
+        app.register_blueprint(routes, url_prefix=url_prefix + "/sites")
+
+        CORS(app, supports_credentials=True)
+
+        # Chargement des mosdules tiers
+        if with_external_mods:
+            for conf, manifest, module in list_and_import_gnc_modules(app):
+                try:
+                    prefix = url_prefix + conf["api_url"]
+                except Exception as e:
+                    current_app.logger.debug(e)
+                    prefix = url_prefix
+                app.register_blueprint(
+                    module.backend.blueprint.blueprint, url_prefix=prefix
+                )
+                try:
+                    module.backend.models.create_schema(db)
+                except Exception as e:
+                    current_app.logger.debug(e)
+                # chargement de la configuration
+                # du module dans le blueprint.config
+                module.backend.blueprint.blueprint.config = conf
+                app.config[manifest["module_name"]] = conf
+
+        _app = app
+
+        create_schemas(db)
+        db.create_all()
+        populate_modules(db)
+
+
+    return app

patches/back/wsgi.py

@@ -0,0 +1,17 @@
+"""
+    Give a unique entry point for gunicorn
+"""
+
+from gncitizen.utils.env import load_config
+from server import get_app
+
+# get the app config file
+config = load_config()
+
+# give the app context from server.py in a app object
+app = get_app(config)
+port = app.config["API_PORT"] if app.config.get("API_PORT", False) else 5002
+
+if __name__ == "__main__":
+    app.debug = True
+    app.run(host="0.0.0.0", port=port)

patches/frontend/server.ts

@@ -0,0 +1,101 @@
+import 'zone.js/dist/zone-node';
+import { enableProdMode } from '@angular/core';
+// Express Engine
+import { ngExpressEngine } from '@nguniversal/express-engine';
+// Import module map for lazy loading
+import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
+
+import * as express from 'express';
+import { join } from 'path';
+import { readFileSync } from 'fs';
+
+// Faster server renders w/ Prod mode (dev mode never needed)
+enableProdMode();
+
+// Express server
+const app = express();
+
+const PORT = process.env.PORT || 4000;
+const DIST_FOLDER = join(process.cwd(), 'dist/browser');
+
+const supportedLocales = ['en', 'fr'];
+const DEFAULT_LOCALE = 'fr';
+const MockBrowser = require('mock-browser').mocks.MockBrowser;
+const mock = new MockBrowser();
+const domino = require('domino');
+const template = readFileSync(
+    join(DIST_FOLDER, DEFAULT_LOCALE, 'index.html')
+).toString();
+const win = domino.createWindow(template);
+win.Object = Object;
+win.Math = Math;
+win.screen = { deviceXDPI: 1 };
+global['window'] = win;
+global['document'] = win.document;
+global['navigator'] = mock.getNavigator();
+global['branch'] = null;
+global['object'] = win.object;
+global['HTMLElement'] = win.HTMLElement;
+global['HTMLAnchorElement'] = win.HTMLAnchorElement;
+global['DOMTokenList'] = win.DOMTokenList;
+global['Node'] = win.Node;
+global['Text'] = win.Text;
+global['localStorage'] = win.localStorage = mock.getLocalStorage();
+global['L'] = require('leaflet');
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const {
+    AppServerModuleNgFactory,
+    LAZY_MODULE_MAP,
+} = require('./dist/server/main');
+
+// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+app.engine(
+    'html',
+    ngExpressEngine({
+        bootstrap: AppServerModuleNgFactory,
+        providers: [provideModuleMap(LAZY_MODULE_MAP)],
+    })
+);
+
+app.set('view engine', 'html');
+app.set('views', DIST_FOLDER);
+
+// Example Express Rest API endpoints
+// app.get('/api/**', (req, res) => { });
+// Serve static files from /browser
+app.get(
+    '*.*',
+    express.static(DIST_FOLDER, {
+        maxAge: '1y',
+    })
+);
+
+// All regular routes use the Universal engine
+app.get('*', (req, res) => {
+    const matches = req.url.match(/^\/([a-z]{2}(?:-[A-Z]{2})?)\//);
+    // check if the requested url has a correct format '/locale' and matches any of the supportedLocales
+    const locale =
+        matches && supportedLocales.indexOf(matches[1]) !== -1
+            ? matches[1]
+            : DEFAULT_LOCALE;
+
+    let ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+    if (ip.substr(0, 7) === '::ffff:') {
+        ip = ip.substr(7);
+    }
+    // res.render("index", { req });
+    res.render(`${locale}/index`, {
+        req: req,
+        url: req.url.replace(`/${locale}/`, '/'),
+        providers: [
+            { provide: 'language', useFactory: () => locale, deps: [] },
+            { provide: 'ip', useFactory: () => ip, deps: [] },
+        ],
+    });
+});
+
+// Start up the Node server
+app.listen(PORT, '0.0.0.0', () => {
+    console.log(`BLOP Node Express server listening on http://localhost:${PORT}`);
+});

patches/frontend/src/conf/app.config.ts

@@ -1,7 +1,7 @@
 export const AppConfig = {
-    appName: "GeoNature-citizen",
+    appName: "BiomMap – la biodiversité à Wasseiges",
     API_ENDPOINT:"http://localhost:8080/api",
-    API_TAXHUB:"http://localhost/taxhub/api/",
+    API_TAXHUB:"http://localhost:8080/taxhub/api/",
     FRONTEND:{
         PROD_MOD:true,
         MULTILINGUAL:false,
@@ -25,11 +25,11 @@ export const AppConfig = {
     signup:true,
     email_contact:false,
     platform_intro: {
-      fr: "Bienvenue<br /> à BiomMap Wasseiges",
-      en: "Welcome<br /> on GeoNature Citizen"
+      fr: "La biodiversité<br /> à Wasseiges",
+      en: "Biodiversity<br /> in Wasseiges"
     },
     platform_teaser: {
-      fr: "Cartographie participative de notre environnement",
+      fr: "Aidez-nous à mieux connaitre la biodiversité de la commune en partageant ici vos observations. Débutant ou expérimenté, tout le monde peut participer !",
       en: "Hae duae provinciae bello quondam piratico catervis mixtae praedonum a Servilio pro consule missae sub iugum factae sunt vectigales. et hae quidem regiones velut in prominenti terrarum lingua positae ob orbe eoo monte Amano disparantur."
       },
     platform_participate: {

patches/frontend/src/conf/app.config.ts.dist

@@ -0,0 +1,72 @@
+export const AppConfig = {
+    appName: "BiomMap – la biodiversité à Wasseiges",
+    API_ENDPOINT:"http://liveche.champs-libres.be:8080/api",
+    API_TAXHUB:"http://liveche.champs-libres.be:8080/taxhub/api/",
+    FRONTEND:{
+        PROD_MOD:true,
+        MULTILINGUAL:false,
+        DISPLAY_FOOTER: true,
+        DISPLAY_TOPBAR: true,
+        DISPLAY_SIDEBAR: true,
+        DISPLAY_STATS: true,
+        DISPLAY_BADGES: true,
+        NEW_OBS_FORM_MODAL_VERSION: true
+    },
+    META: {
+      keywords: 'biodiversite enquetes participatif observations',
+    },
+    about: true,
+    URL_APPLICATION:"http://liveche.champs-libres.be:8080/",
+    REWARDS: true,
+    termsOfUse: {
+      fr: "assets/cgu.pdf",
+      en: "assets/termsOfUse.pdf"
+    },
+    signup:true,
+    email_contact:false,
+    platform_intro: {
+      fr: "La biodiversité<br /> à Wasseiges",
+      en: "Biodiversity<br /> in Wasseiges"
+    },
+    platform_teaser: {
+      fr: "Aidez-nous à mieux connaitre la biodiversité de la commune en partageant ici vos observations. Débutant ou expérimenté, tout le monde peut participer !",
+      en: "Hae duae provinciae bello quondam piratico catervis mixtae praedonum a Servilio pro consule missae sub iugum factae sunt vectigales. et hae quidem regiones velut in prominenti terrarum lingua positae ob orbe eoo monte Amano disparantur."
+      },
+    platform_participate: {
+      fr: "PARTICIPER AU PROGRAMME",
+      en: "PARTICIPATE"
+    },
+    programs_label: {
+      fr: "Programmes",
+      en: "Surveys"
+    },
+    program_label: {
+      fr: "Le programme",
+      en: "Survey"
+    },
+    program_share_an_observation: {
+      fr: "PARTAGER UNE OBSERVATION",
+      en: "SHARE AN OBSERVATION"
+    },
+    program_add_an_observation: {
+      fr: "AJOUTER UNE OBSERVATION",
+      en: "CONTRIBUTE AN OBSERVATION"
+    },
+    program_allow_email_contact: {
+      fr: "J'accepte que mon adresse e-mail puisse être utilisée pour recontacter à propos de mon observation",
+      en : "I agree that my e-mail address can be used to recontact about my observation"
+    },
+    taxonSelectInputThreshold: 7,
+    taxonAutocompleteInputThreshold: 12,
+    taxonAutocompleteFields: [
+      "nom_complet",
+      "nom_vern",
+      "nom_vern_eng",
+      "cd_nom"
+    ],
+    taxonDisplaySciName: true,
+    program_list_observers_names: true,
+    program_list_sort: "-timestamp_create",
+    details_espece_url: "<url_inpn_or_atlas>/cd_nom/", // !! gardez bien le cd_nom/ dans l'url
+    registration_message : "Vous inscrire vous permet de gérer vos observations"
+}

patches/frontend/src/conf/map.config.ts

@@ -9,54 +9,6 @@ export const MAP_CONFIG = {
       attribution:
         '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, Tiles style by <a href="https://www.hotosm.org/" target="_blank">Humanitarian OpenStreetMap Team</a> hosted by <a href="https://openstreetmap.fr/" target="_blank">OpenStreetMap France</a>'
     },
-    // {
-    //   name: "OpenStreetMapFRHot",
-    //   maxZoom: 19,
-    //   layer: "//{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png",
-    //   subdomains: "abc",
-    //   attribution:
-    //     '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, Tiles style by <a href="https://www.hotosm.org/" target="_blank">Humanitarian OpenStreetMap Team</a> hosted by <a href="https://openstreetmap.fr/" target="_blank">OpenStreetMap France</a>'
-    // },
-    // {
-    //   name: "OpenStreetMapCH",
-    //   maxZoom: 18,
-    //   layer: "//tile.osm.ch/switzerland/{z}/{x}/{y}.png",
-    //   subdomains: "abc",
-    //   attribution:
-    //     '&copy; <a href="&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-    //   bounds: [[45, 5], [48, 11]]
-    // },
-    // {
-    //   name: "OpenStreetMapDE",
-    //   maxZoom: 18,
-    //   layer: "//{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png",
-    //   subdomains: "abc",
-    //   attribution:
-    //     '&copy; <a href="&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-    // },
-    // {
-    //   name: "OpenStreetMapBZH",
-    //   maxZoom: 18,
-    //   layer: "//tile.openstreetmap.bzh/br/{z}/{x}/{y}.png",
-    //   subdomains: "",
-    //   attribution:
-    //     '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, Tiles courtesy of <a href="http://www.openstreetmap.bzh/" target="_blank">Breton OpenStreetMap Team</a>',
-    //   bounds: [[46.2, -5.5], [50, 0.7]]
-    // },
-    {
-      name: "OpenTopoMap",
-      maxZoom: 19,
-      layer: "//{s}.opentopomap.org/{z}/{x}/{y}.png",
-      subdomains: "abc",
-      attribution: "© OpenTopoMap"
-    },
-    {
-      name: "Cyclosm - Belgique",
-      maxZoom: 19,
-      layer: "//{s}.tiles.champs-libres.be/cyclosm/{z}/{x}/{y}.png",
-      subdomains: "abc",
-      attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors. Map style by Cyclosm. Tiles by Champs-Libres.'
-    },
     {
       name: "Imagerie aérienne Wallonie",
       maxZoom: 20,
@@ -65,6 +17,145 @@ export const MAP_CONFIG = {
       wms: true,
       attribution: '&copy; SPW'
     },
+    {
+      name: "Hydrographie",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/EAU/RHW/MapServer/WMSServer?",
+      layers: ['1', '2', '3', '4', '5','6'],
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "MNT (relief)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNT_2013_2014_HILLSHADE/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "MNS (hauteur de la végétation)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNS_2013_2014_HILLSHADE/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Pentes (relief)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNP_CLASSE_2013_2014/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte des principaux types de sols",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW__PRINC_TYPES_SOLS/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte des sols",
+      minZoom: 8,
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW/MapServer/WMSServer?",
+      layers: '1',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte d'occupation du sol",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_OCCUPATION_SOL/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte d'utilisation du sol",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_UTILISATION_SOL/MapServer/WMSServer?",
+      layers: ['1', '3', '4', '5', '6', '7', '8', '9'],
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Parcellaire agricole anonyme 2019",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/AGRICULTURE/SIGEC_PARC_AGRI_ANON__2019/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Natura 2000",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/FAUNE_FLORE/NATURA2000/MapServer/WMSServer?",
+      layers: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Masque forestier",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORET/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Ancienneté des forêts actuelles",
+      minZoom: 13,
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?",
+      layers: '1',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Couverture forestière approximative au 18ème siècle",
+      minZoom: 13,
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte Ferraris (1770-1778)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/FERRARIS/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte Vandermaelen (1846-1854)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/VDML/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "Carte du dépôt de la guerre (1865 - 1880)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/DEPOT_GUERRE_1865_1880/MapServer/WMSServer?",
+      layers: '0',
+      wms: true,
+      attribution: '&copy; SPW'
+    },
+    {
+      name: "PICC (topographie)",
+      maxZoom: 20,
+      layer: "//geoservices.wallonie.be/arcgis/services/TOPOGRAPHIE/PICC_VDIFF/MapServer/WMSServer?",
+      layers: ['1', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29'],
+      wms: true,
+      attribution: '&copy; SPW'
+    },
     {
       name: "Plan de secteur",
       minZoom: 12,
@@ -74,6 +165,14 @@ export const MAP_CONFIG = {
       wms: true,
       attribution: '&copy; SPW'
     },
+    {
+      name: "Limites administratives",
+      maxZoom: 20,
+      layer: "//ccff02.minfin.fgov.be/geoservices/arcgis/services/INSPIRE/AU_wms/MapServer/WMSServer?",
+      layers: ['1', '2', '3', '4'],
+      wms: true,
+      attribution: '&copy; CadGIS'
+    },
   ],
   CENTER: [46.52863469527167, 2.43896484375],
   ZOOM_LEVEL: 6,

patches/frontend/src/custom/about/about.html

@@ -0,0 +1,11 @@
+<h1>BiomMap</h1>
+<p>BiomMap est un projet collaboratif qui a pour objectif de rassembler un maximum de connaissances à propos du maillage écologique d’un territoire. L’ensemble des informations collectées permettra notamment de mettre en avant des enjeux de protection et de valorisation de la biodiversité locale afin de permettre une meilleure intégration de ce sujet dans les politiques communales d'aménagements du territoire.</p>
+<p>Il s’agit d’un prototype porté par la Commune de Wasseiges et le GAL Meuse@Campagnes et soutenu financièrement par La Wallonie, Digital Wallonia et l’Union Européenne via des fonds FEADER (mesure LEADER).</p>
+<p>Pour en savoir plus, consultez <a target='_blank' href='https://www.biommap.be/'>www.biommap.be</a>.</p>
+<h2>Le maillage écologique c’est quoi ?</h2>
+<p>Le maillage écologique constitue l’infrastructure écologique fine d’un territoire local. Les éléments du maillage sont les petits éléments du paysage, linéaires ou ponctuels, les biotopes de faible surface ou à structure linéaire. Il s’agit, par exemple, des arbres isolés, haies, bandes boisées, bosquets, cours d’eau, mares, talus, bords de routes, bords de terres cultivées, etc.
+Ces éléments du maillage constituent les couloirs de liaison entre les zones de grand intérêt biologique (sanctuaires, zones centrales, zones de développement). C’est leur densité, leur qualité et leur continuité qui déterminent leur intérêt pour jouer efficacement un rôle dans les liaisons écologiques.
+La reconnaissance du maillage écologique est importante car il s’agit de la présence de la nature dans l’ensemble de l’espace ; c’est la « nature ordinaire ».</p>
+<p>(D’après : E. Melin 1997 – La problématique du réseau écologique – Bases théoriques et perspectives d’une stratégie écologique d’occupation et de gestion de l’espace)</p>
+<h2>Comment utiliser BiomMap ?</h2>
+<p>La création d'un compte n'est pas obligatoire pour pouvoir partager ses observations mais celle-ci est vivement recommandée. En effet, il est important pour nous de pouvoir associer une donnée à un observateur et de pouvoir le contacter si besoin pour vérifier, analyser et ainsi valoriser sa donnée.</p>

patches/frontend/src/custom/custom.css

@@ -0,0 +1,22 @@
+/*************************************
+ *      Global css style overlay     *
+ * Uncomment and adapt or add styles *
+ *************************************/
+
+
+/* COLORS */
+
+:root {
+    --default-font-color: #5d6970;
+    --primary: #00a99d;
+    --dark-primary: #0a998f;
+    --secondary: #60b15c;
+    --secondary-gradient: #57a154;
+    --ternary: #45765c;
+    --list-toggler-width: 21px;
+    --list-obs-offset: 170px;
+    --router-outlet-offset: 113px;
+    --modal-header-bg-moz: moz-linear-gradient(top, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%);
+    --modal-header-bg-webkit: moz-linear-gradient(top, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%);
+    --modal-header-bg-linear: linear-gradient(to bottom, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%);
+}

patches/frontend/src/custom/footer/footer.css

@@ -0,0 +1,41 @@
+footer {
+  margin-top: 20px;
+  padding: 20px 0px;
+  text-align: center;
+  background: rgb(226, 226, 226);
+}
+
+footer p, footer div{
+  margin: 0 auto;
+  max-width: 80%;
+}
+
+footer div {
+  margin-bottom: 20px;
+}
+
+footer div a {
+  text-decoration: none;
+  color: var(--secondary) !important;
+}
+
+footer div a:hover {
+  border-bottom: solid 1px black;
+}
+
+footer div.logo {
+    display: flex;
+    justify-content: space-evenly;
+    @media screen and (max-width: 900px) {
+      flex-direction: column;
+    }
+
+}
+
+footer div.logo img {
+    height: 90px;
+    margin: 3px;
+    @media screen and (max-width: 900px) {
+      height: 60px;
+    }
+}

patches/frontend/src/custom/footer/footer.html

@@ -0,0 +1,15 @@
+<footer>
+  <div>
+    <a [routerLink]="[ '/home']">Accueil</a> | <a href="https://github.com/PnX-SI/GeoNature-citizen">GeoNature-citizen</a> | <a [routerLink]="[ '/about']" >A propos</a>
+  </div>
+
+  <div class='logo'>
+      <a target='_blank' href='https://www.wallonie.be'><img alt='logo' src='assets/logo_wallonie.png'></a>
+      <a target='_blank' href='https://www.digitalwallonia.be'><img alt='logo' src='assets/logo_dw.png'></a>
+      <a target='_blank' href='https://enrd.ec.europa.eu/leader-clld_fr'><img alt='logo' src='assets/logo_leader.png'></a>
+      <a target='_blank' href='https://www.wasseiges.be'><img alt='logo' src='assets/logo-commune-wasseiges.jpg'></a>
+      <a target='_blank' href='https://www.meusecampagnes.be'><img alt='logo' src='assets/logo_gal.png'></a>
+  </div>
+
+</footer>
+

patches/settings.ini

@@ -9,7 +9,7 @@ my_url=http://localhost:8080/
 url_application=http://localhost:8080/        # Url For the frontend
 api_endpoint=http://localhost:8080/api        # Url for the geonature api don't forget /api
 api_port=5002
-api_taxhub=http://localhost/taxhub/api/             # Url for the taxhub api
+api_taxhub=http://localhost:8080/taxhub/api/             # Url for the taxhub api
 
 install_taxhub=1
 taxhub_version=1.7.3
@@ -27,15 +27,15 @@ admin_password=MotDePasseAChanger
 
 # Localisation du server PostgreSQL. 
 # Les scripts d'installation automatique ne fonctionnent que si votre BDD est sur le même serveur (localhost)
-pg_host=localhost
+pg_host=db
 # Port sur lequel PostgreSQL ecoute
 pg_port=5432
 #Base de donnée Geonature
-pg_dbname=dbname
+pg_dbname=postgres
 # Nom de l'utilisateur propriétaire des bases UsersHub, GeoNature, TaxHub
-user_pg=dbuser
+user_pg=postgres
 # Pass de l'utilisateur propriétaire des bases UsersHub, GeoNature, TaxHub
-user_pg_pass=dbpwd
+user_pg_pass=postgres
 
 #########################
 ### Gunicorn settings ###

patches/taxhub/config.py

@@ -0,0 +1,29 @@
+
+'''
+TaxHub global settings file
+'''
+
+# Database settings
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@db/referentielsdb"
+SQLALCHEMY_TRACK_MODIFICATIONS = False
+
+
+DEBUG=True
+
+
+SESSION_TYPE = 'filesystem'
+SECRET_KEY = 'super secret key'
+COOKIE_EXPIRATION = 3600
+COOKIE_AUTORENEW = True
+
+# File
+import os
+BASE_DIR = os.path.abspath(os.path.dirname(__file__))
+UPLOAD_FOLDER = 'static/medias'
+
+# Authentification crypting method (hash or md5)
+PASS_METHOD='hash'
+
+# ID APPLICATION TaxHub
+# User in the authentification submodule to avoid token conflict between app on the same server
+ID_APP = 2

patches/taxhub/install_db.sh

@@ -0,0 +1,144 @@
+#!/bin/bash
+
+# Make sure only root can run our script
+if [ "$(id -u)" == 0 ]; then
+   echo "This script must not be run as root" 1>&2
+   exit 1
+fi
+
+
+#Création des répertoires systèmes
+. create_sys_dir.sh
+create_sys_dir
+
+if [ ! -f settings.ini ]; then
+  cp settings.ini.sample settings.ini
+fi
+
+# nano settings.ini
+
+#include user config = settings.ini
+. settings.ini
+
+#get app path
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+LOG_DIR=$DIR/var/log
+
+
+function database_exists () {
+    # /!\ Will return false if psql can't list database. Edit your pg_hba.conf
+    # as appropriate.
+    if [ -z $1 ]
+        then
+        # Argument is null
+        return 0
+    else
+        # Grep db name in the list of database
+        sudo -u postgres -s -- psql -tAl | grep -q "^$1|"
+        return $?
+    fi
+}
+
+
+if database_exists $db_name
+then
+        if $drop_apps_db
+            then
+            echo "Suppression de la base..."
+            sudo -u postgres -s dropdb $db_name
+        else
+            echo "La base de données existe et le fichier de settings indique de ne pas la supprimer."
+        fi
+fi
+if ! database_exists $db_name
+then
+    echo "Création de la base..."
+    sudo -u postgres -s createdb -O $user_pg $db_name
+
+    sudo -n -u postgres -s psql -d $db_name -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" &> $LOG_DIR/installdb/install_db.log
+
+    sudo -n -u postgres -s psql -d $db_name -c 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";' &>> $LOG_DIR/installdb/install_db.log
+
+    sudo -n -u postgres -s psql -d $db_name -c 'CREATE EXTENSION IF NOT EXISTS "pg_trgm";' &>> $LOG_DIR/installdb/install_db.log
+
+    # Mise en place de la structure de la base et des données permettant son fonctionnement avec l'application
+
+    echo "Création de la structure de la base..."
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/taxhubdb.sql  &> $LOG_DIR/installdb/install_db.log
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/generic_drop_and_restore_deps_views.sql  &> $LOG_DIR/installdb/install_db.log
+
+    echo "Décompression des fichiers du taxref..."
+
+    array=( TAXREF_INPN_v13.zip ESPECES_REGLEMENTEES_v11.zip LR_FRANCE_20160000.zip BDC_STATUTS_13.zip)
+    for i in "${array[@]}"
+    do
+        if [ ! -f '/tmp/taxhub/'$i ]
+        then
+                wget http://geonature.fr/data/inpn/taxonomie/$i -P /tmp/taxhub
+                unzip /tmp/taxhub/$i -d /tmp/taxhub
+        else
+            echo $i exists
+        fi
+    done
+
+    echo "Insertion  des données taxonomiques de l'inpn... (cette opération peut être longue)"
+    cd $DIR
+    sudo -u postgres -s psql -d $db_name  -f data/inpn/data_inpn_taxhub.sql &>> $LOG_DIR/installdb/install_db.log
+
+    echo "Création de la vue représentant la hierarchie taxonomique..."
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/materialized_views.sql  &>> $LOG_DIR/installdb/install_db.log
+
+    echo "Insertion de données de base"
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/taxhubdata.sql  &>> $LOG_DIR/installdb/install_db.log
+
+    echo "Insertion de fonctions génériques de détection de vues dépendantes"
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/generic_drop_and_restore_deps_views.sql  &>> $LOG_DIR/installdb/install_db.log
+
+    if $insert_geonatureatlas_data
+    then
+        echo "Insertion de données nécessaires à GeoNature-atlas"
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/taxhubdata_atlas.sql  &>> $LOG_DIR/installdb/install_db.log
+    fi
+
+	if $insert_attribut_example
+    then
+        echo "Insertion d'un exemple d'attribut"
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/taxhubdata_example.sql  &>> $LOG_DIR/installdb/install_db.log
+    fi
+
+	if $insert_taxons_example
+    then
+        echo "Insertion de 8 taxons exemple"
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/taxhubdata_taxons_example.sql  &>> $LOG_DIR/installdb/install_db.log
+    fi
+
+    if [ $users_schema = "local" ]
+    then
+        echo "Création du schéma Utilisateur..."
+        wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub.sql -P /tmp
+        wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-data.sql -P /tmp
+        wget https://raw.githubusercontent.com/PnX-SI/UsersHub/$usershub_release/data/usershub-dataset.sql -P /tmp
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f /tmp/usershub.sql &>> $LOG_DIR/installdb/install_db.log
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f /tmp/usershub-data.sql &>> $LOG_DIR/installdb/install_db.log
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f /tmp/usershub-dataset.sql &>> $LOG_DIR/installdb/install_db.log
+        export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f data/adds_for_usershub.sql &>> $LOG_DIR/installdb/install_db.log
+    else
+        echo "Connexion à la base Utilisateur..."
+        cp data/create_fdw_utilisateurs.sql /tmp/taxhub/create_fdw_utilisateurs.sql
+        cp data/grant.sql /tmp/taxhub/grant.sql
+        sed -i "s#\$user_pg#$user_pg#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_host#$usershub_host#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_db#$usershub_db#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_port#$usershub_port#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_user#$usershub_user#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_pass#$usershub_pass#g" /tmp/taxhub/create_fdw_utilisateurs.sql
+        sed -i "s#\$usershub_user#$usershub_user#g" /tmp/taxhub/grant.sql
+        sudo -u postgres -s psql -d $db_name -f /tmp/taxhub/create_fdw_utilisateurs.sql  &>> $LOG_DIR/installdb/install_db.log
+        sudo -u postgres -s psql -d $db_name -f /tmp/taxhub/grant.sql  &>> $LOG_DIR/installdb/install_db.log
+    fi
+
+    # Vaccum database
+    echo "Vaccum database ... (cette opération peut être longue)"
+    export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -c "VACUUM FULL VERBOSE;"  &>> $LOG_DIR/installdb/install_db.log
+
+fi

patches/taxhub/server.py

@@ -0,0 +1,65 @@
+# coding: utf8
+from flask import Flask
+from flask_cors import CORS
+
+from apptax.database import db
+
+db = db
+
+app_globals = {}
+
+
+def init_app():
+    if app_globals.get('app', False):
+        app = app_globals['app']
+    else:
+        app = Flask(__name__)
+
+    with app.app_context():
+        app.config.from_pyfile('config.py')
+        db.init_app(app)
+        db.app = app
+        app.config['DB'] = db
+
+        @app.teardown_request
+        def _manage_transaction(exception):
+            if exception:
+                db.session.rollback()
+            else:
+                db.session.commit()
+            db.session.remove()
+
+        from pypnusershub import routes
+        app.register_blueprint(routes.routes, url_prefix='/api/auth')
+
+        from apptax.index import routes
+        app.register_blueprint(routes, url_prefix='/')
+
+        from apptax.taxonomie.routesbibnoms import adresses
+        app.register_blueprint(adresses, url_prefix='/api/bibnoms')
+
+        from apptax.taxonomie.routestaxref import adresses
+        app.register_blueprint(adresses, url_prefix='/api/taxref')
+
+        from apptax.taxonomie.routesbibattributs import adresses
+        app.register_blueprint(adresses, url_prefix='/api/bibattributs')
+
+        from apptax.taxonomie.routesbiblistes import adresses
+        app.register_blueprint(adresses, url_prefix='/api/biblistes')
+
+        from apptax.taxonomie.routestmedias import adresses
+        app.register_blueprint(adresses, url_prefix='/api/tmedias')
+
+        from apptax.taxonomie.routesbibtypesmedia import adresses
+        app.register_blueprint(adresses, url_prefix='/api/bibtypesmedia')
+
+        from apptax.utils.routesconfig import adresses
+        app.register_blueprint(adresses, url_prefix='/api/config')
+
+
+    return app
+
+app = init_app()
+CORS(app, supports_credentials=True)
+if __name__ == '__main__':
+    app.run(host="0.0.0.0", debug=True)

patches/taxhub/settings.ini

@@ -0,0 +1,74 @@
+
+
+
+
+
+
+##########################################
+###### TAXHUB installation settings ######
+##########################################
+
+app_name=taxhub
+
+#######################
+### Python settings ###
+#######################
+
+venv_dir=venv
+python_path=/usr/bin/python3
+
+###########################
+### PostgreSQL settings ###
+###########################
+
+# Drop eventual existing database during installation
+drop_apps_db=false
+
+# DB host
+db_host=db
+
+# PostgreSQL port
+db_port=5432
+
+# Database name
+db_name=referentielsdb
+
+# Database owner username
+user_pg=postgres
+
+# Database owner password
+user_pg_pass=postgres
+
+### Users schema localisation
+# Possible values : 'local' or 'foreign'
+# 'local' means that the 'utilisateurs' schema has to be installed in TaxHub database.
+# 'foreign' means that the 'utilisateurs' schema is in another database. An FDW schema will be created on it.
+# Nota : foreign requires UsersHub to be already installed
+usershub_release=2.1.1
+users_schema=local
+
+### UsersHub relation settings - Required if users_schema=foreign
+usershub_host=db
+usershub_db=referentielsdb
+usershub_port=5432
+usershub_user=postgres
+usershub_pass=postgres
+
+###############
+### Options ###
+###############
+
+# Insert GeoNature-atlas data (theme & attributs)
+insert_geonatureatlas_data=true
+# Insert an example of attribute (Migrateur)
+insert_attribut_example=false
+# Insert 8 examples of taxons and add it to the Occtax list
+insert_taxons_example=true
+
+#########################
+### Gunicorn settings ###
+#########################
+
+gun_num_workers=4
+gun_host=0.0.0.0
+gun_port=5000

sandbox/wmts/index.html

@@ -41,9 +41,168 @@
             minZoom: 12
         }),
 
-        //https://wxs.ign.fr/{apiKey}/geoportail/wmts?&REQUEST=GetTile&SERVICE=WMTS
-        //&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM&FORMAT=image/jpeg
-        //&LAYER={layerName}&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}",
+        ALEA: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/EAU/ALEA_INOND/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['1', '2'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        ANC_FORET: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '1',
+            format: 'image/png',
+            transparent: true,
+            minZoom: 13
+        }),
+
+        COUV_FORET_ANC: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+            minZoom: 13
+        }),
+
+        SOLS: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '1',
+            format: 'image/png',
+            transparent: true,
+            minZoom: 8
+        }),
+
+        SOLS2: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW__PRINC_TYPES_SOLS/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        DEPOT_GUERRE: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/DEPOT_GUERRE_1865_1880/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        FERRARIS: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/FERRARIS/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        VDML: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/VDML/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        RHW: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/EAU/RHW/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['1', '2', '3', '4', '5','6'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        LIMITES_COMMUNALES: L.tileLayer.wms('http://ccff02.minfin.fgov.be/geoservices/arcgis/services/INSPIRE/AU_wms/MapServer/WMSServer?', {
+            attribution: '© CadGIS',
+            layers: ['1', '2', '3', '4'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        MASQUE_FORET: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/FORET/FORET/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        MNS: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNS_2013_2014_HILLSHADE/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        MNT: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNT_2013_2014_HILLSHADE/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        PENTE: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/RELIEF/WALLONIE_MNP_CLASSE_2013_2014/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        NATURA2000: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/FAUNE_FLORE/NATURA2000/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        PARC: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/AGRICULTURE/SIGEC_PARC_AGRI_ANON__2019/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['0', '1', '2'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        PICC: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/TOPOGRAPHIE/PICC_VDIFF/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['1', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        REGION_AGRI: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/LIMITES/LIMITES_REGIONSAGRICOLES/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        LIGNES_FER: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/MOBILITE/LIGNES_SNCB_SNCV_DESAFFECT/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        WALOUS: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_OCCUPATION_SOL/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        WALOUS_USE: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/WALOUS_UTILISATION_SOL/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: ['1', '3', '4', '5', '6', '7', '8', '9'],
+            format: 'image/png',
+            transparent: true,
+        }),
+
+        NITRATES: L.tileLayer.wms('https://geoservices.wallonie.be/arcgis/services/EAU/NITRATES/MapServer/WMSServer?', {
+            attribution: '© SPW',
+            layers: '0',
+            format: 'image/png',
+            transparent: true,
+        }),
+
+
+
+
+
+
 
 
         WMTS: L.tileLayer(