update content + add custom files in patch #7

This commit is contained in:
nobohan 2021-06-23 12:18:45 +02:00
parent b7a682d538
commit 6a711dbd99
18 changed files with 181 additions and 121 deletions

View File

@ -112,6 +112,13 @@ 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

View File

@ -28,6 +28,7 @@ services:
- ./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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -9,20 +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: "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,
@ -32,19 +18,90 @@ export const MAP_CONFIG = {
attribution: '&copy; SPW'
},
{
name: "Plan de secteur",
minZoom: 12,
name: "Hydrographie",
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer/WMSServer?",
layers: '2',
layer: "//geoservices.wallonie.be/arcgis/services/EAU/RHW/MapServer/WMSServer?",
layers: ['1', '2', '3', '4', '5','6'],
wms: true,
attribution: '&copy; SPW'
},
{
name: "Couverture forestière approximative au 18ème siècle",
minZoom: 13,
name: "MNT (relief)",
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?",
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'
@ -59,26 +116,10 @@ export const MAP_CONFIG = {
attribution: '&copy; SPW'
},
{
name: "Carte des sols",
minZoom: 8,
name: "Couverture forestière approximative au 18ème siècle",
minZoom: 13,
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/SOL_SOUS_SOL/CNSW/MapServer/WMSServer?",
layers: '1',
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 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?",
layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORETANC/MapServer/WMSServer?",
layers: '0',
wms: true,
attribution: '&copy; SPW'
@ -100,65 +141,9 @@ export const MAP_CONFIG = {
attribution: '&copy; SPW'
},
{
name: "Hydrographie",
name: "Carte du dépôt de la guerre (1865 - 1880)",
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: "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'
},
{
name: "Masque forestier",
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/FORET/FORET/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: "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: "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: "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: "Parcellaire agricole anonyme 2019",
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/AGRICULTURE/SIGEC_PARC_AGRI_ANON__2019/MapServer/WMSServer?",
layer: "//geoservices.wallonie.be/arcgis/services/CARTES_ANCIENNES/DEPOT_GUERRE_1865_1880/MapServer/WMSServer?",
layers: '0',
wms: true,
attribution: '&copy; SPW'
@ -172,36 +157,21 @@ export const MAP_CONFIG = {
attribution: '&copy; SPW'
},
{
name: "Régions agricoles",
name: "Plan de secteur",
minZoom: 12,
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/LIMITES/LIMITES_REGIONSAGRICOLES/MapServer/WMSServer?",
layers: '0',
layer: "//geoservices.wallonie.be/arcgis/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer/WMSServer?",
layers: '2',
wms: true,
attribution: '&copy; SPW'
},
{
name: "Voiries vicinales désaffectées (SNCB - SNCV)",
name: "Limites administratives",
maxZoom: 20,
layer: "//geoservices.wallonie.be/arcgis/services/MOBILITE/LIGNES_SNCB_SNCV_DESAFFECT/MapServer/WMSServer?",
layers: '0',
layer: "//ccff02.minfin.fgov.be/geoservices/arcgis/services/INSPIRE/AU_wms/MapServer/WMSServer?",
layers: ['1', '2', '3', '4'],
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'
attribution: '&copy; CadGIS'
},
],
CENTER: [46.52863469527167, 2.43896484375],

View File

@ -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 dun territoire. Lensemble 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 sagit dun prototype porté par la Commune de Wasseiges et le GAL Meuse@Campagnes et soutenu financièrement par La Wallonie, Digital Wallonia et lUnion 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 cest quoi ?</h2>
<p>Le maillage écologique constitue linfrastructure écologique fine dun 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 sagit, par exemple, des arbres isolés, haies, bandes boisées, bosquets, cours deau, 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). Cest 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 sagit de la présence de la nature dans lensemble de lespace ; cest la « nature ordinaire ».</p>
<p>(Daprès : E. Melin 1997 La problématique du réseau écologique Bases théoriques et perspectives dune stratégie écologique doccupation et de gestion de lespace)</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>

View File

@ -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%);
}

View File

@ -0,0 +1,34 @@
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;
}
footer div.logo img {
height: 90px;
margin: 3px;
}

View File

@ -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>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB