diff --git a/_install/dependencies.json b/_install/dependencies.json
index f0293c170ad3351b72f42fb3f36bbafd1c411cb6..91218608d82c297ed8d61f08c86784cd82a6f0a5 100644
--- a/_install/dependencies.json
+++ b/_install/dependencies.json
@@ -1,6 +1,7 @@
{
"API_ALIAS": "/rest",
"APP_ALIAS": "/vmap",
+ "WMS_ALIAS": "/wms",
"APP_ENV": "prod",
"HTTPSERVER_CONF_FILE": "vm_app_vmap.conf",
"HTTPSERVER_PATH": "/etc/apache2",
@@ -36,12 +37,12 @@
}
},
"framework": {
- "branch": "master",
+ "branch": "next_app_vmap",
"name": "vitis",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/vitis.git"
},
"modules": [{
- "branch": "master",
+ "branch": "next_version",
"name": "module_vmap",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git"
}]
diff --git a/_install/templates/vm_app_vmap.conf b/_install/templates/vm_app_vmap.conf
index a338ee5c9b6181e126bd3729cdc9d04e90aa9142..35bbc4c211711df00f521e8775172605ec31fc17 100644
--- a/_install/templates/vm_app_vmap.conf
+++ b/_install/templates/vm_app_vmap.conf
@@ -2,4 +2,6 @@
{% include "vitis/vm_vas.conf" with context %}
+{% include "module_vmap/vm_wms.conf" with context %}
+
{% include "vitis/vm_client.conf" with context %}
diff --git a/bin/buildengines.sh b/bin/buildengines.sh
index 40b80f01823ea015595dc597de5a83a860f2a335..234b756d198bb07d888412af84fbfad723d2eca1 100755
--- a/bin/buildengines.sh
+++ b/bin/buildengines.sh
@@ -25,5 +25,5 @@ then
exit 1
fi
-$app_path/src/vitis/_install/build_jobsrunner.sh --app_path=$app_path
+$app_path/src/vitis/_install/build_engines.sh --app_path=$app_path
diff --git a/bin/clone_deps.bat b/bin/clone_deps.bat
new file mode 100755
index 0000000000000000000000000000000000000000..6bf5ac734008f0133ca7fb870ba10633d38b2903
--- /dev/null
+++ b/bin/clone_deps.bat
@@ -0,0 +1,33 @@
+@echo off
+
+ @REM Script à lancer pour l'installation d'une application Vitis
+
+ @REM Paramètres obligatoires :
+ @REM --app_path : chemin vers le répertoire d'installation d'application
+
+set /p app_path="app path: "
+
+if not exist %app_path% (
+ @echo %app_path% n'existe pas
+ exit /b 1
+)
+
+cd %app_path%
+
+where git.exe >nul 2>nul
+IF NOT ERRORLEVEL 0 (
+ @echo git not found in path.
+ exit /b 1
+)
+
+echo "---- Clone Repos ----"
+
+if not exist "src" (
+ mkdir src
+)
+
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/vitis.git src/vitis
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git src/module_vmap
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module-cadastre-2020.git src/module_cadastre
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_anc.git src/module_anc
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_eclairage_public.git src/module_eclairage_public
\ No newline at end of file
diff --git a/bin/clone_deps.sh b/bin/clone_deps.sh
index 609ca0f5753df683ecffd949701efdc68956e647..ace1cc161c82a4c558fd4207d287ea96075499fe 100755
--- a/bin/clone_deps.sh
+++ b/bin/clone_deps.sh
@@ -33,4 +33,7 @@ if [ -d src ]; then
fi
git clone git@gitlab.veremes.net:Development/vitis-2020/sources/vitis.git src/vitis
-git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git src/module_vmap
\ No newline at end of file
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git src/module_vmap
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module-cadastre-2020.git src/module_cadastre
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_anc.git src/module_anc
+git clone git@gitlab.veremes.net:Development/vitis-2020/sources/module_eclairage_public.git src/module_eclairage_public
\ No newline at end of file
diff --git a/bin/mount_project.bat b/bin/mount_project.bat
new file mode 100755
index 0000000000000000000000000000000000000000..11a0b066da5cf9f3ba48e150e5b0122c4db975a7
--- /dev/null
+++ b/bin/mount_project.bat
@@ -0,0 +1,84 @@
+@echo off
+
+REM Script à lancer pour l'installation d'une application Vitis
+
+REM Paramètres obligatoires :
+REM --app_path : chemin vers le répertoire d'installation d'application
+
+set /p app_path="app path: "
+
+if not exist %app_path% (
+ echo %app_path% "n'existe pas"
+ exit /b 1
+)
+
+cd %app_path%
+echo ---- Generate Client ----
+
+if exist "client" (
+ echo client déjà existant, supprimez le dossier pour réinstaller
+) else (
+ echo ---- mklink module's assets folder ----
+ mklink /j client "src/vitis/client"
+ if not exist "client/src/modules" (
+ mkdir "client/src/modules"
+ )
+ if not exist "client/src/app/modules" (
+ mkdir "client/src/app/modules"
+ )
+ mklink /j "client/src/modules/vmap" "src/module_vmap/module"
+ mklink /j "client/src/modules/anc" "src/module_anc/module"
+ mklink /j "client/src/modules/eclairage_public" "src/module_eclairage_public/module"
+ mklink /j "client/src/conf" "conf"
+ REM Montage des modules Angular
+ if exist "conf/modules-components.ts" (
+ echo copy module-component de l'application
+ copy /y "conf/modules-components.ts" "src/vitis/client/src/app/modules/modules-components.ts"
+ ) else (
+ if exist "src/vitis/client/src/app/modules/modules-components.sample.ts" (
+ echo copy module-component de vitis
+ copy /y "src/vitis/client/src/app/modules/modules-components.sample.ts" "src/vitis/client/src/app/modules/modules-components.ts"
+ ) else (
+ echo module-component introuvable
+ )
+ )
+
+ if exist "src/module_vmap/module/components" (
+ mklink /j "client/src/app/modules/vmap" "src/module_vmap/module/components"
+ ) else (
+ echo module_vmap/module/components n'existe pas
+ )
+ if exist "src/module_anc/module/components" (
+ mklink /j "client/src/app/modules/anc" "src/module_anc/module/components"
+ ) else (
+ echo module_anc/module/components n'existe pas
+ )
+ if exist "src/module_eclairage_public/module/components" (
+ mklink /j "client/src/app/modules/eclairage_public" "src/module_eclairage_public/module/components"
+ ) else (
+ echo module_eclairage_public/module/components n'existe pas
+ )
+ echo "installation de node/npm à faire (node v12.16.2)"
+ echo "installation de node_module à faire (npm install)"
+)
+
+
+echo ---- Generate Vas ----
+if exist "vas" (
+ echo vas déjà existant, supprimez le dossier pour réinstaller
+) else (
+ echo ---- mklink module's assets folder ----
+ mklink /j vas "src/vitis/vas"
+ mklink /j "vas/src/Module/Vmap" "src/module_vmap/web_services"
+ mklink /j "vas/src/Module/Cadastre" "src/module_cadastre/web_services"
+ mklink /j "vas/src/Module/EclairagePublic" "src/module_eclairage_public/web_services"
+ mklink /j "vas/src/Module/Anc" "src/module_anc/web_services"
+ if not exist "vas/engine" (
+ mkdir "vas/engine"
+ )
+ mklink /j "vas/engine/vitis" "src/vitis/engine/vitis"
+
+ echo "installation de php/composer/symfony à faire"
+ echo "installation de vendor à faire (composer install)"
+ echo "configuration du vas à faire"
+)
\ No newline at end of file
diff --git a/bin/mount_project.sh b/bin/mount_project.sh
index 0dcfc79df0e6ffe525ef724546c5387fea31119a..a16e7b8b5424909af44ef5e7f4742d9d076f1209 100755
--- a/bin/mount_project.sh
+++ b/bin/mount_project.sh
@@ -61,6 +61,8 @@ then
sudo mount --bind src/vitis/vas vas
mkdir -p vas/src/Module/Vmap
sudo mount --bind src/module_vmap/web_services vas/src/Module/Vmap
+ #mkdir -p vas/src/Module/Cadastre
+ #sudo mount --bind src/module_cadastre/web_services vas/src/Module/Cadastre
mkdir -p vas/engine/vitis
sudo mount --bind src/vitis/engine/vitis vas/engine/vitis
fi
\ No newline at end of file
diff --git a/conf/app.struct.ts b/conf/app.struct.ts
index 6d9d1b65b828c0a4d24ab812a683ff85b6efac7a..e4659c998c6a1a347e21f8a891bb6dfb9648c94e 100755
--- a/conf/app.struct.ts
+++ b/conf/app.struct.ts
@@ -15,6 +15,13 @@ import {
vmapConfigVmapObject,
vmapTranslateConfig,
vmapAPIVmapWebService,
+ vmapAdminDatasourceObject,
+ vmapAdminCartoObject,
+ vmapMapsLayersMode,
+ vmapSymbolsFontsMode,
+ vmapCartoWidget,
+ vmapPrintWidget,
+ vmapMapPrintingsMode,
} from '../modules/vmap/struct/vmap.struct';
export const appStruct: AppConfig = {
@@ -27,20 +34,31 @@ export const appStruct: AppConfig = {
'favicon': 'conf/images/Veremes-Leaf-Frame-W.png',
'modes': [{
'type': 'separator',
- 'label': 'vMap',
+ 'label': 'TITLE_SEPARATOR_MAP',
'privilege': 'vmap_user'
},
+ vmapAdminCartoObject,
{
'type': 'separator',
- 'label': 'TITLE_SEPARATOR_VMAP_MAP_MANAGEMENT',
+ 'label': 'TITLE_MODE_VMAP_ADMIN',
'privilege': 'vmap_admin'
},
+ vmapAdminDatasourceObject,
+ vmapMapsLayersMode,
+ vmapSymbolsFontsMode,
+ {
+ 'type': 'separator',
+ 'label': 'Administration des impressions',
+ 'privilege': 'vitis_admin'
+ },
+ vmapMapPrintingsMode,
{
'type': 'separator',
'label': 'TITLE_MODE_VMAP_ADMINISTRATION',
'privilege': 'vitis_admin'
},
vitisUsersMode,
+ vitisConfigSharedDirObject,
{
'name': 'vitis_config',
'label': 'TITLE_MODE_CONFIGURATION',
@@ -50,7 +68,6 @@ export const appStruct: AppConfig = {
'objects': [
vitisConfigVitisObject,
vmapConfigVmapObject,
- vitisConfigSharedDirObject,
vitisConfigEmailTemplatesObject,
vitisConfigInterfaceObject]
}, {
@@ -66,38 +83,41 @@ export const appStruct: AppConfig = {
}
}, vitisLogsMode],
'headers': [vitisUserHeader, vitisHelpHeader],
- 'widgets': [],
+ 'widgets': [vmapCartoWidget, vmapPrintWidget],
'documentation': [
{
- "name": "vMap",
- "url": "http://documentation.veremes.net/vmap/fr/index.html"
+ 'name': 'vMap',
+ 'url': 'http://documentation.veremes.net/vmap/fr/index.html'
}
],
'credits': {
- "authors": [
- "Alexandre Miromenkov",
- "Anthony Borghi",
- "Armand Bahi",
- "Frederic Carretero",
- "Olivier Gayte",
- "Laurent Panabières",
- "Ludivine Premont",
- "Sofian Pujo"
+ 'authors': [
+ 'Alexandre Miromenkov',
+ 'Anthony Borghi',
+ 'Armand Bahi',
+ 'Frederic Carretero',
+ 'Laurent Panabières',
+ 'Laurie Ambroise',
+ 'Ludivine Premont',
+ 'Mickael Fernandez',
+ 'Olivier Gayte',
+ 'Sofian Pujo',
],
- "graphics": [
- "Alexandre Roy"
+ 'graphics': [
+ 'Alexandre Roy'
],
- "libs": [
- "Apache",
- "Angular",
- "Bootstrap",
- "Postgres",
- "Symfony",
- "OpenLayers",
- "Open Street Maps",
- "jQuery"
+ 'libs': [
+ 'Apache',
+ 'Angular',
+ 'Bootstrap',
+ 'Postgres',
+ 'PostGIS',
+ 'Mapserver',
+ 'Symfony',
+ 'OpenLayers',
+ 'Open Street Maps'
],
- "contact": "www.veremes.com",
- "licence": "© Veremes"
+ 'contact': 'www.veremes.com',
+ 'licence': '© Veremes'
}
};
\ No newline at end of file
diff --git a/conf/images/carte_toulouse.png b/conf/images/carte_toulouse.png
new file mode 100644
index 0000000000000000000000000000000000000000..719a73108d228b6b76c464c58cb445437af0a93d
Binary files /dev/null and b/conf/images/carte_toulouse.png differ
diff --git a/conf/images/ign.svg b/conf/images/ign.svg
new file mode 100644
index 0000000000000000000000000000000000000000..102532f0f12e85dac7493383f2e08a68f8a2b2a2
--- /dev/null
+++ b/conf/images/ign.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.104" height="7.089" viewBox="0 0 15.104 7.089"><defs><style>.a{fill:#676c70;}.b{fill:#80cc28;}</style></defs><g transform="translate(-4773.625 902.412)"><g transform="translate(4773.625 -902.412)"><path class="a" d="M4773.625-886.967h1.3v-6.645h-1.3Z" transform="translate(-4773.625 893.834)"/><path class="a" d="M5171.31-902.19v3.981l-3.783-4.2h-.2v6.867h1.2v-3.927l3.774,4.148h.207v-6.867Z" transform="translate(-5157.411 902.412)"/><g transform="translate(2.314 0)"><path class="a" d="M4870.329-897.465l-.069,0v.691a3.05,3.05,0,0,1-1.162.229,2.229,2.229,0,0,1-2.334-2.421,2.1,2.1,0,0,1,2.251-2.264,2.429,2.429,0,0,1,1.926.865l.107.125.1-1.514-.029-.022a2.443,2.443,0,0,0-.557-.312,3.541,3.541,0,0,0-1.523-.32,3.605,3.605,0,0,0-2.566.989,3.518,3.518,0,0,0-1,2.537,3.412,3.412,0,0,0,3.494,3.563,5.451,5.451,0,0,0,1.571-.243,5.557,5.557,0,0,0,.979-.4l.038-.018v-1.681l-.089.032a3.071,3.071,0,0,1-1.13.169" transform="translate(-4865.466 902.411)"/><path class="b" d="M4959.548-794.9l-.009,0a2.861,2.861,0,0,0-2.287.318,2.869,2.869,0,0,0,1.841,1.384l.006,0a2.862,2.862,0,0,0,2.286-.317,2.858,2.858,0,0,0-1.838-1.383" transform="translate(-4954.94 797.712)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/conf/images/openstreetmap.svg b/conf/images/openstreetmap.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2ef7a8b5245487494a12d94dbd82ea5fcc05d3ad
--- /dev/null
+++ b/conf/images/openstreetmap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.215" height="15.145" viewBox="0 0 15.215 15.145"><defs><style>.a{fill:#ceeeab;}.b{fill:url(#a);}.ad,.c{opacity:0.039;}.c{fill:url(#b);}.d{opacity:0.5;fill:url(#c);}.e{clip-path:url(#d);}.f{fill:#a6dd8b;}.g{fill:#aac3e7;}.h,.i,.j{fill:none;}.h,.i{stroke:#6d7f42;opacity:0.387;}.h,.j{stroke-linecap:round;}.h{stroke-linejoin:round;}.j{stroke:#d38484;stroke-width:2px;}.k{opacity:0.27;}.l{fill:url(#g);}.m{fill:url(#h);}.n{fill:url(#i);}.o{fill:url(#j);}.p{fill:url(#k);}.q{fill:url(#l);}.r{fill:url(#m);}.s{fill:url(#n);}.t{opacity:0.043;}.u{fill:url(#o);}.v{fill:url(#p);}.w{fill:url(#q);}.x{fill:url(#r);}.y{fill:url(#s);}.z{fill:url(#t);}.aa{fill:url(#u);}.ab{clip-path:url(#v);}.ac{clip-path:url(#w);}.ad{fill:url(#z);}.ae{fill:url(#am);}.af{clip-path:url(#aq);}.ag{fill:#2d3335;}.ah{fill:url(#ar);}.ai{fill:#9eaaac;}.aj{fill:rgba(208,233,242,0.47);}.ak{fill:url(#as);}.al{fill:url(#at);}.am{fill:url(#au);}.an{fill:url(#av);}.ao{fill:url(#aw);}.ap{opacity:0.596;fill:url(#ax);}.aq{opacity:0.604;fill:url(#ay);}.ar{font-size:1px;font-family:SegoeUI-Bold, Segoe UI;font-weight:700;opacity:0.461;}.as{opacity:0.765;fill:url(#az);}</style><radialGradient id="a" cx="0.5" cy="0.5" r="0.493" gradientTransform="matrix(0.717, 0.697, 0.717, -0.738, -0.196, 0.473)" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#d0e9f2" stop-opacity="0"/><stop offset="0.839" stop-color="#d0e9f2" stop-opacity="0"/><stop offset="0.943" stop-color="#d0e9f2" stop-opacity="0.282"/><stop offset="1" stop-color="#d0e9f2"/></radialGradient><linearGradient id="b" x1="0.862" y1="0.297" x2="0" y2="-0.936" gradientUnits="objectBoundingBox"><stop offset="0"/><stop offset="1" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="0.5" y1="1.049" x2="0.5" y2="-0.049" xlink:href="#b"/><clipPath id="d"><path class="a" d="M9,10.145a9.127,9.127,0,0,1,.758,1.79c.274.951.4,1.645.4,1.645a10.828,10.828,0,0,0-.532,1.6c-.177.774-.371,1.484-.371,1.484s.371,1.032.6,1.935a7.943,7.943,0,0,1,.242,1.564,14.32,14.32,0,0,0-.484,1.564,15.227,15.227,0,0,0-.323,1.983,5.441,5.441,0,0,1,1.838.081c1.242.21,2.08.387,2.08.387s.822-.177,1.548-.4a5.315,5.315,0,0,0,1.048-.419,7.942,7.942,0,0,1,1.451.4c1.1.371,1.887.548,1.887.548s.839-.177,1.677-.371a16.207,16.207,0,0,0,1.709-.516,5.328,5.328,0,0,1,.274-1.58,13.063,13.063,0,0,1,.564-1.806s-.032-.29-.242-1.274a10.307,10.307,0,0,0-.645-1.919,9.033,9.033,0,0,1,.435-1.532c.323-.855.661-1.725.661-1.725s-.306-.984-.484-1.919A7.3,7.3,0,0,0,22.562,10s-1.564.581-2.048.677-1.355.339-1.355.339-.629-.274-1.419-.548a9.092,9.092,0,0,0-1.919-.355,3.428,3.428,0,0,1-1.419.516c-1.209.29-1.774.371-1.774.371a10.511,10.511,0,0,0-2.032-.742A6.082,6.082,0,0,0,9,10.145Z" transform="translate(-9 -10)"/></clipPath><linearGradient id="g" x1="0.697" y1="0.302" x2="0" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="h" x1="0.606" y1="0" x2="0.672" xlink:href="#g"/><linearGradient id="i" x1="0.418" y1="0.5" x2="1" y2="0.118" xlink:href="#g"/><linearGradient id="j" x1="0.58" y1="0.305" x2="0.317" xlink:href="#g"/><linearGradient id="k" x1="0.871" y1="0" xlink:href="#g"/><linearGradient id="l" x1="1" y1="0" x2="0.259" xlink:href="#g"/><linearGradient id="m" x1="0.872" y1="0" x2="0.244" y2="0.899" xlink:href="#g"/><linearGradient id="n" x1="0.707" y1="0" x2="0.197" xlink:href="#g"/><linearGradient id="o" x1="1.209" y1="1.456" y2="0" xlink:href="#b"/><linearGradient id="p" x1="0.602" y1="-0.557" x2="0.363" y2="0.753" xlink:href="#b"/><linearGradient id="q" x1="0.213" y1="-0.599" x2="0.787" y2="0.806" xlink:href="#b"/><linearGradient id="r" x1="-0.345" y1="-0.437" x2="1" y2="0.5" xlink:href="#b"/><linearGradient id="s" x1="-0.984" y1="-0.862" x2="1" y2="0.5" xlink:href="#b"/><linearGradient id="t" x1="-0.156" y1="0" x2="0.641" y2="1" xlink:href="#b"/><linearGradient id="u" x1="-0.408" y1="-0.649" x2="1" y2="0.747" xlink:href="#b"/><clipPath id="v"><path class="b" d="M108.718,26.01a4.31,4.31,0,1,0,0-6.095A4.31,4.31,0,0,0,108.718,26.01Z" transform="translate(-107.456 -18.653)"/></clipPath><clipPath id="w"><path class="a" d="M-16.536-32.82a11.791,11.791,0,0,1,.949,2.269c.343,1.2.5,2.074.5,2.074a13.212,13.212,0,0,0-.667,1.981c-.222.963-.465,1.845-.465,1.845s.465,1.306.747,2.445a10.064,10.064,0,0,1,.3,1.968,17.5,17.5,0,0,0-.606,1.942,18.828,18.828,0,0,0-.4,2.473,6.832,6.832,0,0,1,2.3.166c1.555.307,2.605.558,2.605.558s1.03-.193,1.939-.45a6.464,6.464,0,0,0,1.313-.488,10.163,10.163,0,0,1,1.818.556c1.373.5,2.363.754,2.363.754s1.05-.192,2.1-.405a19.838,19.838,0,0,0,2.141-.586,6.6,6.6,0,0,1,.343-1.97A15.957,15.957,0,0,1,1.46-19.93s-.04-.365-.3-1.6a13.252,13.252,0,0,0-.808-2.426,11.074,11.074,0,0,1,.545-1.9C1.3-26.923,1.722-28,1.722-28s-.384-1.243-.606-2.421a9.381,9.381,0,0,0-.667-2.1s-1.959.672-2.565.776-1.7.376-1.7.376-.788-.366-1.777-.737a11.563,11.563,0,0,0-2.4-.512s-.263.275-1.777.6-2.222.4-2.222.4a13.547,13.547,0,0,0-2.545-1A7.662,7.662,0,0,0-16.536-32.82Z" transform="translate(16.536 32.829)"/></clipPath><linearGradient id="z" x1="0.89" y1="0.28" y2="-1.007" xlink:href="#b"/><linearGradient id="am" x1="-1.208" y1="0.253" x2="1" y2="0.5" xlink:href="#b"/><clipPath id="aq"><path class="c" d="M9,4.562a8.34,8.34,0,0,1,.758,1.729c.274.929.4,1.612.4,1.612a11.655,11.655,0,0,0-.532,1.639c-.177.788-.371,1.513-.371,1.513s.371,1,.6,1.887a7.683,7.683,0,0,1,.242,1.545,15.35,15.35,0,0,0-.484,1.6A15.791,15.791,0,0,0,9.29,18.1a5.474,5.474,0,0,1,1.838-.068c1.242.109,2.08.219,2.08.219s.822-.244,1.548-.528a5.827,5.827,0,0,0,1.048-.5,7.554,7.554,0,0,1,1.451.286c1.1.282,1.887.4,1.887.4s.839-.245,1.677-.507a17.478,17.478,0,0,0,1.709-.654,5.509,5.509,0,0,1,.274-1.6,14.022,14.022,0,0,1,.564-1.852s-.033-.287-.242-1.254c-.113-.523-.145-.262-.145-.262a7.587,7.587,0,0,0,1.064-2.6,8.551,8.551,0,0,0-.468-2.349,18.923,18.923,0,0,1-.484-1.88,6.779,6.779,0,0,0-.532-1.618s-1.564.707-2.048.843-1.355.448-1.355.448-.629-.223-1.419-.434a8.81,8.81,0,0,0-1.919-.2,3.751,3.751,0,0,1-1.419.631c-1.209.388-1.774.514-1.774.514A9.772,9.772,0,0,0,10.6,4.546,6.062,6.062,0,0,0,9,4.562Z" transform="translate(-9 -3.32)"/></clipPath><linearGradient id="ar" x1="4.62" y1="-1.253" x2="5.424" y2="-1.253" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#f9e295"/><stop offset="0.125" stop-color="#f7dd84"/><stop offset="0.206" stop-color="#fff"/><stop offset="0.301" stop-color="#f4ce51"/><stop offset="0.341" stop-color="#f9e7aa"/><stop offset="1" stop-color="#efbb0e"/></linearGradient><radialGradient id="as" cx="0.5" cy="0.5" r="0.5" gradientTransform="matrix(0.707, 0.707, 0.707, -0.707, -0.311, 0.752)" xlink:href="#a"/><linearGradient id="at" x1="0.518" y1="0.558" x2="0.602" y2="0.822" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#2d3335"/><stop offset="0.5" stop-color="#4c464a"/><stop offset="1" stop-color="#384042"/></linearGradient><linearGradient id="au" x1="0.835" y1="0.543" x2="1.113" y2="0.543" xlink:href="#at"/><linearGradient id="av" x1="1.046" y1="0.526" x2="1.241" y2="0.526" xlink:href="#ar"/><linearGradient id="aw" x1="1.104" y1="0.059" x2="1.223" y2="0.059" xlink:href="#at"/><linearGradient id="ax" x1="0.925" y1="0.266" x2="1.223" y2="0.059" xlink:href="#b"/><linearGradient id="ay" x1="0.121" y1="0.112" x2="0.69" y2="1.32" xlink:href="#g"/><linearGradient id="az" x1="-0.966" y1="-1.398" x2="-0.015" y2="0.793" xlink:href="#g"/></defs><g transform="translate(-9)"><g transform="translate(9 2.603)"><path class="d" d="M9,12.821a5.137,5.137,0,0,1,.758,1.406,14.378,14.378,0,0,1,.4,1.392,8.254,8.254,0,0,0-.532,1.352c-.177.655-.371,1.365-.371,1.365s.371.874.6,1.638A5.474,5.474,0,0,1,10.1,21.19a10.83,10.83,0,0,0-.484,1.324,11.069,11.069,0,0,0-.323,1.679,6.412,6.412,0,0,1,1.838.068c1.242.177,2.08.328,2.08.328s.822-.15,1.548-.341a5.878,5.878,0,0,0,1.048-.355,9.127,9.127,0,0,1,1.451.341c1.1.314,1.887.464,1.887.464s.839-.15,1.677-.314,1.709-.437,1.709-.437A3.872,3.872,0,0,1,22.8,22.61a9.9,9.9,0,0,1,.564-1.529s-.032-.137-.242-.969a7.874,7.874,0,0,0-.645-1.625,6.469,6.469,0,0,1,.435-1.406c.323-.724.661-1.461.661-1.461A14.929,14.929,0,0,1,23.094,14a3.958,3.958,0,0,0-.532-1.3s-1.564.491-2.048.573-1.355.287-1.355.287-.629-.232-1.419-.464a10.6,10.6,0,0,0-1.919-.3,3.787,3.787,0,0,1-1.419.437c-1.209.246-1.774.314-1.774.314a11.759,11.759,0,0,0-2.032-.628A7.167,7.167,0,0,0,9,12.821Z" transform="translate(-9 -12.699)"/></g><g transform="translate(9)"><path class="a" d="M9,.145a9.127,9.127,0,0,1,.758,1.79c.274.951.4,1.645.4,1.645a10.828,10.828,0,0,0-.532,1.6c-.177.774-.371,1.484-.371,1.484s.371,1.032.6,1.935a7.943,7.943,0,0,1,.242,1.564,14.32,14.32,0,0,0-.484,1.564,15.227,15.227,0,0,0-.323,1.983,5.441,5.441,0,0,1,1.838.081c1.242.21,2.08.387,2.08.387s.822-.177,1.548-.4a5.315,5.315,0,0,0,1.048-.419,7.942,7.942,0,0,1,1.451.4c1.1.371,1.887.548,1.887.548s.839-.177,1.677-.371a16.207,16.207,0,0,0,1.709-.516,5.328,5.328,0,0,1,.274-1.58,13.063,13.063,0,0,1,.564-1.806s-.032-.29-.242-1.274a10.307,10.307,0,0,0-.645-1.919,9.033,9.033,0,0,1,.435-1.532c.323-.855.661-1.725.661-1.725s-.306-.984-.484-1.919A7.3,7.3,0,0,0,22.562,0S21,.581,20.514.677s-1.355.339-1.355.339S18.53.742,17.74.468A9.092,9.092,0,0,0,15.821.113,3.428,3.428,0,0,1,14.4.629C13.193.919,12.628,1,12.628,1A10.511,10.511,0,0,0,10.6.258,6.082,6.082,0,0,0,9,.145Z" transform="translate(-9)"/><g class="e"><path class="f" d="M5.976,5.5,5.7,5.952c-.048.581-.145.887-.548,1.064s-.79.226-.71.484.839.6.919.839.532.113.71.452S6.2,9.773,5.831,9.9s-1.129.032-1.306.613-.306.677-.581.822A.811.811,0,0,0,3.719,12.4c.242.387.79-.081.968-.419a1.943,1.943,0,0,1,.468-.564H6.686l3.806-.113.21-.242a.859.859,0,0,1,.177.564c-.032.306-.242.951.016,1.113a1.978,1.978,0,0,0,1.548-.452c.29-.323-.306-1.822-.677-1.9s-1.193-.113-1.1-.452.758.29,1.113.21,1.08-1.355.774-1.629S10.991,8.177,10.895,8s1.355-.516,1.435-.71-.161-.468-.4-.548-.9,1.048-1.355,1.016-1.29.371-1.113.742-.387.71-.935.419-1.6-.839-1.4-1.548S8.508,6.161,8.508,6.161ZM5.1,12.416c-.1.01-.288.3-.319.453a3.2,3.2,0,0,0-.226.79c-.016.355.306.435.564.419s.177-.435.129-.968c-.016,0-.032-.661-.129-.693A.052.052,0,0,0,5.1,12.416Zm5.981,3.332c-.409.019-.428.481-.478.572-.081.145.145.887.129,1.161s-.306.339-.613.629.032,1.032.726,2l2.887.081-.065-2.258s.306-.274-1.338-1.564A2.183,2.183,0,0,0,11.082,15.748ZM1.409,16.815c-.26-.007-.534.368-.625.49a3.088,3.088,0,0,1-1.1.613l-.935,2.209,3.419.274s.113-.71-.274-1.016S.784,19.013.719,18.53s.6-.645.887-.919a.472.472,0,0,0-.145-.79A.241.241,0,0,0,1.409,16.815Z" transform="translate(0.587 -5.79)"/></g><path class="g" d="M27.182,75.344a1.151,1.151,0,0,0-.744.2c-.516.452-2.258.048-3.128.452s-.855,2.451-.951,2.87-1.129,1.338-1.29,1.516a3.387,3.387,0,0,1-1.258.548,1.955,1.955,0,0,0-1,.71,3.041,3.041,0,0,1-.653.53l-.008.034c-.009.034-.016.07-.024.105a3.713,3.713,0,0,0,1.072-.879c.4-.4,1.29-.5,1.79-.742s.919-1.274,1.709-1.532,1.371.758,1.564,1.193.113.822.242,1.1.71.758.742.871-.323.419-.4.548-.677.452-.758.564a2.338,2.338,0,0,0-.149.595l.072-.03a1.41,1.41,0,0,1,.19-.548c.129-.129.726-.29.806-.548s.452-.419.452-.419a5.368,5.368,0,0,0,1.032.9,2.709,2.709,0,0,1,.929,1.337l.131.034a4.294,4.294,0,0,0-.577-1.338c-.323-.355-1.193-.693-1.467-1.419s-1.58-2.209-1.129-2.6,1.064-.258,1.838.484,2.983.371,3.725.242c.642-.112,1.344.96,1.542,1.679.038-.135.072-.258.106-.371a1.99,1.99,0,0,1-.343-.534,2.073,2.073,0,0,0-.774-.855s.564-.323.951-.5a1.212,1.212,0,0,0,.27-.172l-.028-.135-.006-.028a4.609,4.609,0,0,1-1.4.706,13.776,13.776,0,0,1-2.306.29,2.609,2.609,0,0,1-2.209-.951c-.484-.468-.839-2.322-.194-2.451s1.29.887,1.935,1.1,1.387-1.016,1.274-1.742C28.683,75.661,27.857,75.346,27.182,75.344Zm-3.441.857a1.139,1.139,0,0,1,.423.153c.145.161.129.468,0,.516s-.822.516-.677.919.113,1.161-.226,1.161-.516,0-.645-.161a2.066,2.066,0,0,1,0-1.274,2.106,2.106,0,0,1,.516-1.177A.972.972,0,0,1,23.741,76.2Zm.877,4.715c.013,0,.123.226.3.453a1.037,1.037,0,0,1,.21.532,3.624,3.624,0,0,1-.387-.516,1.3,1.3,0,0,1-.129-.468S24.617,80.915,24.618,80.915Z" transform="translate(-17.536 -70.484)"/><path class="h" d="M120.291,51.439c.4.032.79-.145.693-.419s-.806-.468-.855-.194S120.259,51.5,120.291,51.439Z" transform="translate(-112.954 -47.424)"/><path class="h" d="M101.494,39.2c-.548-.355-.548-.468-.452-.516s.661.323.822.516S101.72,39.333,101.494,39.2Z" transform="translate(-95.06 -36.188)"/><g class="e"><path class="h" d="M6.863,114.3c2.129-.161,2.467-.226,2.338-.661s-.564-1.516-1.484-1.451a2.07,2.07,0,0,1-1.467-.435" transform="translate(-6.427 -105.187)"/><path class="i" d="M17.5,27.571a9.32,9.32,0,0,1,2.258-.742,2.815,2.815,0,0,0,1.016-.613,2.412,2.412,0,0,0,.371-1.161c0-.419-.226-2.322.21-2.806s1.113-1.677,1.677-1.5.79.629,1.419.613,1.4-.258,1.564-.79S25,19.54,24.982,19.088s.355-.919,1.306-1.1A3.106,3.106,0,0,0,27.8,17.25" transform="translate(-16.952 -16.782)"/><path class="h" d="M14.5,25.041c.984-.1,1.435.226,2.032.113a3.041,3.041,0,0,0,1.145-.371c.29-.177.387-.242.4-.419a3.065,3.065,0,0,0-.194-1.419c-.258-.613-.806-2.032-.532-2.5s.339-1.387,1.016-1.58,1.355-.4,1.79-.081.822.919,1.29.935a1.143,1.143,0,0,0,.935-.29.815.815,0,0,0,.113-.887c-.177-.226-1-.355-1.113-.613s-.693-1.1-.016-1.725a3.98,3.98,0,0,1,2.338-.532" transform="translate(-14.145 -15.301)"/><path class="h" d="M21.25,19.611a4.243,4.243,0,0,0,2.161-.032c.774-.306.871-.339.887-.564a3.108,3.108,0,0,0-.194-1.29,5.226,5.226,0,0,1-1.016-1.564c-.177-.677.016-2.645.548-3.112s2.064-.468,2.419-.677.339-1.08.839-1.58A4.625,4.625,0,0,1,28.636,10" transform="translate(-20.46 -10)"/><path class="h" d="M190,18.5c.758.323,2.516.629,3.048,2.6" transform="translate(-178.325 -17.952)"/><path class="h" d="M9.75,135.418c1.226-.806,2.322-.081,3.161-.258s2.467-2.4,2.967-2.387.355-.758.548-.855.355.387.758.516,1.58-.177,1.516-.371-.452-.5-.355-.548.548.323.822.226,2.822-.065,3.128-.871S23.683,130,23.683,130" transform="translate(-9.702 -122.26)"/><path class="h" d="M77.5,159.83c.871-.742,1.5-1.613,1.838-1.742s.822-.242,1.016-.516.161-.693.339-.774.242.371.564.387a6.582,6.582,0,0,0,2.758-.758c.387-.435,2.08-.806,2.1-.935s-.064-.306.016-.355,1.6-.387,1.6-.387" transform="translate(-73.082 -145.413)"/><path class="h" d="M168.75,192.319c.581-.887,1.322-2.645,1.9-2.709s.661-.161.806-.274,1.1.145,1.1.145" transform="translate(-158.446 -177.741)"/></g><g class="e"><path class="j" d="M49.8,20l-.548,1.822,1.161.4.5,2.338L49.556,26l.581.677-.774.742.032.29,1.306,1.58.9-.435,1.322,1.193-.677,1.822.661.548-.177.839" transform="translate(-46.654 -19.355)"/><path class="j" d="M105.75,133.2l.806-1.79.71-.452,1.774,1.016,1.322-.242-.016-1.016-.661-.387.822-1.693.371-.242,2.5-.645" transform="translate(-99.509 -120.155)"/></g></g><g transform="translate(9)"><g class="k" transform="translate(0.258)"><path class="l" d="M169.9-182s-1.564.581-2.048.677-1.355.339-1.355.339c.317-.088.738,2.928.919,3.37l0,.018c.762-.263,3.3-.308,3.5-.824,0,0-.306-.984-.484-1.919A7.3,7.3,0,0,0,169.9-182Z" transform="translate(-156.599 182)"/><path class="m" d="M13.9-126.5a10.827,10.827,0,0,0-.532,1.6c-.177.774-.371,1.484-.371,1.484l3.265,1.05,1.018-3.8Z" transform="translate(-13 130.08)"/><path class="n" d="M14.306-24.5a14.32,14.32,0,0,0-.484,1.564,15.227,15.227,0,0,0-.323,1.983l.028-.006a5.818,5.818,0,0,1,1.81.087c1.242.21,2.08.387,2.08.387l.095-3.386-.048.008Z" transform="translate(-13.468 34.659)"/><path class="o" d="M68.443-180.25a3.428,3.428,0,0,1-1.419.516c-1.209.29-1.774.371-1.774.371a15.54,15.54,0,0,1,.919,2.887l-.006.02,3.1-.254.072.017C69.117-177.554,68.831-180.216,68.443-180.25Z" transform="translate(-61.88 180.363)"/><path class="p" d="M66.989-78.094,63.53-77.08l-.022-.006-.008.03.79,3,0,.048,3.191-.572.034.012,0,0-.532-3.5Z" transform="translate(-60.243 84.796)"/><path class="q" d="M118.3-125.12c.015.059.03.112.045.153l-.752,2.88.006,0,3.342,1.121.722-3.417c-.023.008-.045.016-.064.025Z" transform="translate(-110.844 128.789)"/><path class="r" d="M115.211-23.5l-.711,3.128a7.942,7.942,0,0,1,1.451.4c.137.046.268.091.395.131s.249.076.363.111c.685.206,1.129.306,1.129.306l.82-2.929-.1.036L115.211-23.5Z" transform="translate(-107.953 33.724)"/><path class="s" d="M172.628-76a25.551,25.551,0,0,1-3.1.994l-.028-.01.613,3.548,0,.006c1.151-.41,2.282-.864,3.4-1.345,0,0-.032-.29-.242-1.274A10.306,10.306,0,0,0,172.628-76Z" transform="translate(-159.405 82.838)"/></g><g class="t" transform="translate(0 0.131)"><path class="u" d="M9.3-179.97c-.071,0-.127,0-.175,0l-.075,0H9.048a.308.308,0,0,0-.048.006,9.127,9.127,0,0,1,.758,1.79c.274.951.4,1.645.4,1.645l3.32.33.06,0,.006-.02a15.54,15.54,0,0,0-.919-2.887,10.512,10.512,0,0,0-2.032-.742c-.066-.013-.13-.024-.194-.034l-.113-.018-.044-.006c-.084-.012-.167-.022-.246-.03l-.135-.012-.129-.01c-.064,0-.122-.008-.179-.01C9.462-179.968,9.378-179.97,9.3-179.97Z" transform="translate(-9 179.97)"/><path class="v" d="M13-78.75s.371,1.032.6,1.935a7.943,7.943,0,0,1,.242,1.564L17-74.614l.048-.008,0-.048-.79-3,.008-.03Z" transform="translate(-12.742 85.279)"/><path class="w" d="M67.741-125.38l-3.094.258h0l-1.018,3.8.022.006,3.459-1.014.752-2.88c-.014-.041-.029-.094-.045-.153Z" transform="translate(-60.102 128.901)"/><path class="x" d="M77.536-23.625l-3.191.572-.095,3.386s.822-.177,1.548-.4a5.315,5.315,0,0,0,1.048-.419l.724-3.124Z" transform="translate(-70.041 33.71)"/><path class="y" d="M117.512-78.125l-.006,0-.006.022.532,3.435-.014.065,3.348,1.187.1-.036,0-.006L120.854-77Z" transform="translate(-110.501 84.694)"/><path class="z" d="M170.475-26.5c-1.122.481-2.254.934-3.4,1.345l-.82,2.929s.839-.177,1.677-.371a16.207,16.207,0,0,0,1.709-.516,5.328,5.328,0,0,1,.274-1.58A13.064,13.064,0,0,1,170.475-26.5Z" transform="translate(-156.107 36.399)"/><path class="aa" d="M173.725-126.5c-.2.517-2.741.562-3.5.824l-.722,3.417.028.01a25.549,25.549,0,0,0,3.1-.994,9.032,9.032,0,0,1,.435-1.532C173.386-125.629,173.725-126.5,173.725-126.5Z" transform="translate(-159.147 129.949)"/></g></g><g transform="translate(14.964 1.848)"><g class="ab" transform="translate(0 0)"><path class="a" d="M-16.536-32.82a11.791,11.791,0,0,1,.949,2.269c.343,1.2.5,2.074.5,2.074a13.212,13.212,0,0,0-.667,1.981c-.222.963-.465,1.845-.465,1.845s.465,1.306.747,2.445a10.064,10.064,0,0,1,.3,1.968,17.5,17.5,0,0,0-.606,1.942,18.828,18.828,0,0,0-.4,2.473,6.832,6.832,0,0,1,2.3.166c1.555.307,2.605.558,2.605.558s1.03-.193,1.939-.45a6.464,6.464,0,0,0,1.313-.488,10.163,10.163,0,0,1,1.818.556c1.373.5,2.363.754,2.363.754s1.05-.192,2.1-.405a19.838,19.838,0,0,0,2.141-.586,6.6,6.6,0,0,1,.343-1.97A15.957,15.957,0,0,1,1.46-19.93s-.04-.365-.3-1.6a13.252,13.252,0,0,0-.808-2.426,11.074,11.074,0,0,1,.545-1.9C1.3-26.923,1.722-28,1.722-28s-.384-1.243-.606-2.421a9.381,9.381,0,0,0-.667-2.1s-1.959.672-2.565.776-1.7.376-1.7.376-.788-.366-1.777-.737a11.563,11.563,0,0,0-2.4-.512s-.263.275-1.777.6-2.222.4-2.222.4a13.547,13.547,0,0,0-2.545-1A7.662,7.662,0,0,0-16.536-32.82Z" transform="translate(8.539 29.509)"/><g class="ac" transform="translate(-7.998 -3.321)"><path class="f" d="M-20.324-37.535l-.343.556c-.061.725-.182,1.106-.687,1.314s-.99.255-.889.581,1.05.777,1.151,1.083.667.16.889.591.162,1.237-.3,1.385-1.414,0-1.636.721-.384.837-.727,1.01a1,1,0,0,0-.283,1.325c.3.493.99-.073,1.212-.491a2.335,2.335,0,0,1,.586-.69l1.919.054,4.767-.007.263-.3a1.1,1.1,0,0,1,.222.713c-.04.383-.3,1.183.02,1.394a2.429,2.429,0,0,0,1.939-.511c.364-.394-.384-2.293-.848-2.407s-1.495-.184-1.373-.6.949.39,1.394.3,1.353-1.658.969-2.013-1.959-.48-2.08-.705,1.7-.6,1.8-.838-.2-.591-.5-.7-1.131,1.281-1.7,1.224-1.616.419-1.394.89-.485.875-1.171.492-2-1.107-1.757-1.989,1.737-1.466,1.737-1.466Zm-1.1,8.631c-.129.008-.361.369-.4.557a3.92,3.92,0,0,0-.283.982c-.02.444.384.556.707.545s.222-.539.162-1.207c-.02,0-.04-.829-.162-.873A.066.066,0,0,0-21.419-28.9Zm7.491,4.385c-.512.009-.536.588-.6.7-.1.179.182,1.116.162,1.459s-.384.413-.768.766.04,1.294.909,2.53l3.615.2-.081-2.83s.384-.333-1.676-2.007A2.822,2.822,0,0,0-13.928-24.518Zm-12.116.993c-.326-.018-.669.442-.783.591a3.73,3.73,0,0,1-1.373.729l-1.171,2.734,4.282.464s.141-.885-.343-1.282-1.394-.5-1.474-1.112.747-.787,1.111-1.12a.6.6,0,0,0-.182-.995A.3.3,0,0,0-26.045-23.525Z" transform="translate(28.544 37.231)"/></g><path class="g" d="M6.236,64.142a1.412,1.412,0,0,0-.932.229c-.646.547-2.828-.019-3.918.455S.316,67.865.194,68.387s-1.414,1.636-1.616,1.853A4.116,4.116,0,0,1-3,70.882a2.356,2.356,0,0,0-1.252.853,3.655,3.655,0,0,1-.818.641c0,.014-.006.028-.01.043-.011.043-.02.087-.03.131a4.464,4.464,0,0,0,1.343-1.063c.5-.491,1.616-.58,2.242-.866S-.371,69.058.619,68.762s1.717,1,1.959,1.55.141,1.034.3,1.382.889.974.929,1.117-.4.514-.5.672-.848.542-.949.68a2.87,2.87,0,0,0-.187.74l.09-.035a1.721,1.721,0,0,1,.238-.68c.162-.157.909-.338,1.01-.658s.566-.509.566-.509a7.012,7.012,0,0,0,1.293,1.168A3.524,3.524,0,0,1,6.529,75.9l.164.047a5.544,5.544,0,0,0-.722-1.7c-.4-.456-1.495-.911-1.838-1.829s-1.979-2.823-1.414-3.292,1.333-.285,2.3.671,3.737.57,4.666.435c.8-.117,1.683,1.25,1.932,2.158.048-.168.09-.321.133-.461a2.589,2.589,0,0,1-.429-.681,2.706,2.706,0,0,0-.969-1.1s.707-.384,1.192-.592a1.461,1.461,0,0,0,.339-.205c-.013-.063-.021-.1-.036-.17l-.007-.036a5.586,5.586,0,0,1-1.75.834,17.081,17.081,0,0,1-2.888.282,3.367,3.367,0,0,1-2.767-1.27c-.606-.6-1.05-2.938-.242-3.077s1.616,1.157,2.424,1.442,1.737-1.223,1.6-2.136C8.116,64.593,7.082,64.168,6.236,64.142Zm-4.309.951a1.468,1.468,0,0,1,.53.207c.182.207.162.59,0,.646s-1.03.617-.848,1.127.141,1.458-.283,1.446S.679,68.5.518,68.3a2.591,2.591,0,0,1,0-1.6c.162-.622.283-1.2.646-1.456A1.2,1.2,0,0,1,1.927,65.093Zm1.1,5.936c.016,0,.154.288.381.579a1.332,1.332,0,0,1,.263.674,4.728,4.728,0,0,1-.485-.66,1.662,1.662,0,0,1-.162-.59S3.024,71.03,3.025,71.03Z" transform="translate(-2.153 -61.207)"/><path class="h" d="M122.855,32.985c.5.055.99-.154.868-.5s-1.01-.614-1.07-.273S122.815,33.065,122.855,32.985Z" transform="translate(-121.663 -31.189)"/><path class="h" d="M99.312,16.912c-.687-.464-.687-.605-.566-.662s.828.427,1.03.675S99.6,17.082,99.312,16.912Z" transform="translate(-99.251 -16.401)"/><g class="ac" transform="translate(-7.998 -3.321)"><path class="h" d="M-19.213,95.057c2.666-.127,3.09-.2,2.929-.745s-.707-1.919-1.858-1.87a2.661,2.661,0,0,1-1.838-.6" transform="translate(19.759 -83.802)"/><path class="i" d="M-5.89-7.9a11.4,11.4,0,0,1,2.828-.849A3.4,3.4,0,0,0-1.79-9.483a2.948,2.948,0,0,0,.465-1.441c0-.525-.283-2.916.263-3.507s1.394-2.061,2.1-1.819.99.816,1.777.818,1.757-.273,1.959-.934S3.5-17.695,3.481-18.261s.444-1.139,1.636-1.327a3.76,3.76,0,0,0,1.9-.875" transform="translate(6.577 21.261)"/><path class="h" d="M-9.648-11.91c1.232-.086,1.8.334,2.545.213a3.717,3.717,0,0,0,1.434-.424c.364-.212.485-.289.5-.511a3.875,3.875,0,0,0-.242-1.784c-.323-.777-1.01-2.573-.667-3.149s.424-1.725,1.272-1.943,1.7-.457,2.242-.038,1.03,1.18,1.616,1.217a1.4,1.4,0,0,0,1.171-.33A1.011,1.011,0,0,0,.37-19.766c-.222-.289-1.252-.48-1.394-.807s-.868-1.4-.02-2.162,2.929-.584,2.929-.584" transform="translate(10.092 23.949)"/><path class="h" d="M-1.193-19.237c1.111.112,1.737.392,2.706.036s1.091-.393,1.111-.676A3.94,3.94,0,0,0,2.382-21.5a6.8,6.8,0,0,1-1.272-2c-.222-.855.02-3.312.687-3.879s2.585-.513,3.03-.763.424-1.341,1.05-1.95a5.624,5.624,0,0,1,2.181-.928" transform="translate(2.183 31.131)"/><path class="h" d="M210.166-18.447c.949.431,3.151.877,3.817,3.36" transform="translate(-195.543 19.374)"/><path class="h" d="M-15.6,128.766c1.535-.966,2.908-.019,3.959-.211s3.09-2.922,3.716-2.884.444-.937.687-1.051.444.5.949.673,1.979-.166,1.9-.411-.566-.642-.444-.7.687.423,1.03.312,3.535.019,3.918-.98,1.737-1.042,1.737-1.042" transform="translate(15.658 -112.455)"/><path class="h" d="M69.26,159.835a30.7,30.7,0,0,1,2.3-2.116c.424-.15,1.03-.274,1.272-.61s.2-.863.424-.957.3.473.707.5,2.969-.32,3.454-.852,2.605-.936,2.626-1.1-.081-.386.02-.444,2-.428,2-.428" transform="translate(-63.726 -141.794)"/><path class="h" d="M183.55,199.969c.727-1.09,1.656-3.266,2.383-3.326s.828-.179,1.01-.315,1.373.221,1.373.221" transform="translate(-170.644 -181.518)"/></g><g class="ac" transform="translate(-7.998 -3.321)"><path class="j" d="M34.563-21.25l-.687,2.263,1.454.546.626,2.946-1.7,1.75.727.869-.969.9.04.365,1.636,2.026,1.131-.513,1.656,1.541L37.633-6.3l.828.71-.222,1.044" transform="translate(-30.625 21.997)"/><path class="j" d="M104.643,126.149l1.01-2.213.889-.54,2.222,1.335,1.656-.256-.02-1.273-.828-.508,1.03-2.092.465-.29,3.131-.719" transform="translate(-96.826 -109.761)"/></g><path class="ad" d="M-16.536-32.82a11.791,11.791,0,0,1,.949,2.269c.343,1.2.5,2.074.5,2.074a13.212,13.212,0,0,0-.667,1.981c-.222.963-.465,1.845-.465,1.845s.465,1.306.747,2.445a10.064,10.064,0,0,1,.3,1.968,17.5,17.5,0,0,0-.606,1.942,18.828,18.828,0,0,0-.4,2.473,6.832,6.832,0,0,1,2.3.166c1.555.307,2.605.558,2.605.558s1.03-.193,1.939-.45a6.464,6.464,0,0,0,1.313-.488,10.163,10.163,0,0,1,1.818.556c1.373.5,2.363.754,2.363.754s1.05-.192,2.1-.405a19.838,19.838,0,0,0,2.141-.586,6.6,6.6,0,0,1,.343-1.97A15.957,15.957,0,0,1,1.46-19.93s-.04-.365-.3-1.6a13.252,13.252,0,0,0-.808-2.426,11.074,11.074,0,0,1,.545-1.9C1.3-26.923,1.722-28,1.722-28s-.384-1.243-.606-2.421a9.381,9.381,0,0,0-.667-2.1s-1.959.672-2.565.776-1.7.376-1.7.376-.788-.366-1.777-.737a11.563,11.563,0,0,0-2.4-.512s-.263.275-1.777.6-2.222.4-2.222.4a13.547,13.547,0,0,0-2.545-1A7.662,7.662,0,0,0-16.536-32.82Z" transform="translate(8.539 29.509)"/><g class="k" transform="translate(-7.675 -3.11)"><path class="l" d="M184.994-28.058s-1.959.672-2.565.776-1.7.376-1.7.376c.4-.1.924,3.693,1.151,4.254l0,.022c.954-.3,4.137-.268,4.388-.908,0,0-.384-1.243-.606-2.421A9.381,9.381,0,0,0,184.994-28.058Z" transform="translate(-168.331 28.155)"/><path class="m" d="M-10.4,34.651a13.212,13.212,0,0,0-.667,1.981c-.222.963-.465,1.845-.465,1.845l4.09,1.431,1.275-4.723Z" transform="translate(11.526 -30.508)"/><path class="n" d="M-9.89,162.37a17.5,17.5,0,0,0-.606,1.942,18.828,18.828,0,0,0-.4,2.473.3.3,0,0,1,.035-.007,7.313,7.313,0,0,1,2.267.173c1.555.307,2.605.558,2.605.558l.119-4.238-.061.008Z" transform="translate(10.941 -149.99)"/><path class="o" d="M57.916-29.565s-.263.275-1.777.6-2.222.4-2.222.4a19.943,19.943,0,0,1,1.151,3.648l-.008.025,3.881-.209.09.024C58.76-26.164,58.4-29.508,57.916-29.565Z" transform="translate(-49.695 29.565)"/><path class="p" d="M56.095,98.486l-4.332,1.147-.028-.008-.01.038.99,3.785,0,.061,4-.6.043.016,0,0-.667-4.4Z" transform="translate(-47.645 -90.226)"/><path class="q" d="M120.359,39.974c.019.075.038.142.056.193l-.942,3.581.008,0,4.186,1.522.9-4.254c-.029.009-.057.019-.081.028Z" transform="translate(-111.023 -35.489)"/><path class="r" d="M116.493,167.146l-.891,3.893a10.163,10.163,0,0,1,1.818.556c.171.063.336.123.494.178s.312.1.455.152c.858.283,1.414.424,1.414.424l1.028-3.639-.124.042-4.194-1.606Z" transform="translate(-107.402 -154.458)"/><path class="s" d="M188.408,104.663a31.251,31.251,0,0,1-3.883,1.135l-.036-.014.768,4.465,0,.007c1.441-.473,2.858-1,4.264-1.563,0,0-.04-.365-.3-1.6a13.252,13.252,0,0,0-.808-2.426Z" transform="translate(-171.846 -96.005)"/></g><g class="t" transform="translate(-7.998 -3.32)"><path class="u" d="M-16.155-32.819c-.089,0-.159,0-.22,0l-.093,0h-.008a.384.384,0,0,0-.061.006,11.791,11.791,0,0,1,.949,2.269c.343,1.2.5,2.074.5,2.074l4.158.531.076,0,.008-.025a19.943,19.943,0,0,0-1.151-3.648,13.547,13.547,0,0,0-2.545-1c-.082-.018-.162-.034-.242-.05-.048-.009-.094-.019-.141-.027l-.056-.01c-.106-.018-.209-.033-.308-.046-.059-.008-.113-.014-.169-.02l-.162-.017c-.08-.008-.153-.014-.225-.018-.118-.009-.224-.014-.316-.017Z" transform="translate(16.536 32.821)"/><path class="v" d="M-11.526,93.962s.465,1.306.747,2.445a10.064,10.064,0,0,1,.3,1.968l3.956.91.061-.008,0-.061-.99-3.785.01-.038Z" transform="translate(11.85 -85.784)"/><path class="w" d="M57.037,39.609l-3.876.214h-.005l-1.275,4.723.028.008,4.332-1.148.942-3.581c-.018-.051-.036-.118-.056-.193Z" transform="translate(-47.468 -34.937)"/><path class="x" d="M69.3,166.977l-4,.6-.119,4.238s1.03-.193,1.939-.45a6.464,6.464,0,0,0,1.313-.488l.906-3.888Z" transform="translate(-59.918 -154.09)"/><path class="ae" d="M115.915-29.565c.486.057.844,3.4,1.116,4.486l4.131,1.068c.024-.01.052-.02.081-.028l0-.022c-.227-.561-.754-4.352-1.151-4.254l-.139-.062c-.268-.12-.9-.4-1.638-.675A11.563,11.563,0,0,0,115.915-29.565Z" transform="translate(-107.372 29.775)"/><path class="y" d="M119.375,98.451l-.008,0-.007.028.667,4.321-.018.08,4.194,1.606.124-.042,0-.008-.768-4.465Z" transform="translate(-110.594 -89.983)"/><path class="z" d="M185.711,167.149c-1.406.563-2.823,1.09-4.264,1.563l-1.028,3.639s1.05-.192,2.1-.405a19.836,19.836,0,0,0,2.141-.586,6.6,6.6,0,0,1,.343-1.97A15.957,15.957,0,0,1,185.711,167.149Z" transform="translate(-167.715 -154.25)"/><path class="aa" d="M189.782,42.014c-.25.64-3.434.607-4.388.908l-.9,4.254.036.014a31.25,31.25,0,0,0,3.883-1.135,11.075,11.075,0,0,1,.545-1.9C189.357,43.092,189.782,42.014,189.782,42.014Z" transform="translate(-171.523 -37.187)"/></g></g></g><g transform="translate(9 0.214)"><g class="af"><path class="ag" d="M38.868,28.7a4.155,4.155,0,0,0-3.143,1.03l-.032.028a4.354,4.354,0,0,0-.8,5.192l-.147.093a5.2,5.2,0,0,0,.522.824l-.859.791a1.473,1.473,0,0,0-.294-.112l-.183.168a.663.663,0,0,0-.2-.072l-4.136,3.8a.553.553,0,0,0,.042.215l-.034.032-.071.065a1.285,1.285,0,0,0,.353.692,1.318,1.318,0,0,0,.663.406l.071-.065.046-.042a.672.672,0,0,0,.2.07L35,38.015a1.373,1.373,0,0,0-.066-.192l.194-.178a1.154,1.154,0,0,0-.084-.3l.857-.787a5.191,5.191,0,0,0,.782.586l.1-.139a4.39,4.39,0,0,0,5.257-.379l.03-.03a4.491,4.491,0,0,0-.03-6.32A4.88,4.88,0,0,0,38.868,28.7Zm-.032.209.02,0c.061.006.123.014.184.023s.124.02.185.031l.018,0,.019,0,.028.006c.058.012.116.024.174.038l.119.032.067.017.139.043.061.019.014.005c.061.021.122.043.183.067l.014.005c.061.024.123.05.183.077l.01,0c.061.028.123.057.183.087l.01,0c.061.031.121.064.181.1l.008,0c.06.034.12.068.179.105l.006,0c.06.037.119.075.177.115l.006,0c.058.04.116.082.173.125.035.027.07.055.105.083l.07.056,0,0c.057.047.113.1.168.147q.168.152.326.323t.294.348l0,0c.046.059.091.118.134.178.018.026.035.053.052.079s.048.071.07.107l0,0c.038.06.075.121.11.182l0,.006c.035.061.068.124.1.186l0,.006c.032.062.062.124.091.187l0,.008c.029.062.057.125.083.188l0,.01c.026.062.05.126.073.189l0,.01c.023.063.043.125.063.189l0,.014c.019.062.036.125.053.188l0,.014c.005.02.009.041.014.062.011.047.023.094.032.142,0,.022.008.045.012.067.008.04.016.08.023.121.01.058.017.117.024.175,0,.009,0,.019,0,.029l0,.018,0,.018c.006.062.012.124.016.187s.007.123.008.184c0,.007,0,.013,0,.02q0,.1,0,.2c0,.06-.005.12-.01.179,0,.008,0,.016,0,.024,0,.059-.01.118-.018.176s-.017.123-.028.184c0,.005,0,.01,0,.016s0,.016,0,.024c-.01.058-.023.116-.036.173l-.006.026c-.014.056-.029.112-.045.167-.011.037-.023.074-.034.11s-.022.071-.034.106c-.019.054-.039.107-.061.16l-.012.029-.008.021c-.023.055-.047.108-.073.162s-.05.1-.077.151c-.005.009-.01.019-.016.028-.026.049-.054.1-.083.147-.006.01-.012.021-.018.031s-.027.04-.04.061c-.024.036-.048.072-.073.107,0,0,0,0,0,0q-.047.069-.1.135c-.03.039-.061.076-.093.113-.012.016-.023.032-.036.048l-.026.03-.032.035c-.035.04-.073.079-.111.118s-.079.081-.121.119l-.03.03a4.1,4.1,0,0,1-4.979.317l.008-.011a4.751,4.751,0,0,1-.686-.493c-.035-.031-.068-.062-.1-.093s-.066-.061-.1-.092l-.018-.018c-.053-.053-.1-.106-.155-.162s-.1-.111-.149-.168l-.016-.019c-.029-.035-.057-.07-.084-.106s-.057-.072-.085-.109a4.732,4.732,0,0,1-.437-.721l-.012.007a4.07,4.07,0,0,1,.72-4.921l.032-.028c.042-.038.086-.075.129-.111s.084-.068.127-.1l.052-.04c.023-.016.046-.029.068-.045.041-.028.08-.057.121-.083s.1-.059.145-.087.075-.043.113-.063l.086-.045c.045-.022.088-.042.134-.062l.034-.015c.061-.027.121-.053.183-.076s.111-.041.167-.059l.03-.008c.063-.02.124-.039.188-.055.036-.009.072-.017.109-.025l.113-.025c.057-.011.114-.022.171-.03h.014l.081-.012.131-.016h.016c.061-.006.124-.01.186-.013q.19-.009.381,0c.068,0,.136.008.2.014Z" transform="translate(-28.207 -27.05)"/></g></g><g transform="translate(10.233 1.742)"><path class="ah" d="M29.406,212.819l-.31.293c-.323-.343-.661-.69-.973-1.04l.29-.263C28.853,212.231,28.985,212.36,29.406,212.819Z" transform="translate(-28.123 -199.889)"/><path class="ag" d="M105.993,23.538a4.489,4.489,0,1,1,6.349,0A4.49,4.49,0,0,1,105.993,23.538Zm.191-.191a4.221,4.221,0,1,0-.064-6.031A4.233,4.233,0,0,0,106.184,23.347Z" transform="translate(-99.675 -15.818)"/><path class="ai" d="M105.993,25.675a4.49,4.49,0,0,1,0-6.349l.032-.032a4.489,4.489,0,0,0,6.348,6.349l-.032.032A4.49,4.49,0,0,1,105.993,25.675Zm.159-6.254.032-.032a4.311,4.311,0,0,1,6.095,6.095l-.032.032a4.312,4.312,0,0,0-6.095-6.1Z" transform="translate(-99.546 -18.148)"/><path class="aj" d="M108.725,26.015a4.31,4.31,0,1,0,0-6.1A4.31,4.31,0,0,0,108.725,26.015Z" transform="translate(-102.471 -18.657)"/><path class="ak" d="M108.725,26.015a4.31,4.31,0,1,0,0-6.1A4.31,4.31,0,0,0,108.725,26.015Z" transform="translate(-102.471 -18.657)"/><path class="al" d="M110.671,115.28l-.371.264a4.708,4.708,0,0,0,1.94,1.94l.264-.371a4.214,4.214,0,0,1-1.833-1.833Z" transform="translate(-104.999 -108.941)"/><path class="am" d="M94.951,131.076a1.439,1.439,0,0,1,.266.369l-1.691,1.691a1.418,1.418,0,0,1-.635-.635l1.691-1.691A1.439,1.439,0,0,1,94.951,131.076Z" transform="translate(-88.713 -124.114)"/><path class="an" d="M39.728,144.5l-4.262,4.262a2.063,2.063,0,0,1-1.016-1.016l4.262-4.262a5,5,0,0,1,1.016,1.016Z" transform="translate(-34.042 -135.967)"/><path class="ao" d="M35.368,146.009a1.747,1.747,0,0,1,.55.711l-4.135,4.135a7.567,7.567,0,0,1-1.27-1.27l4.135-4.135c.225.015.494.333.717.556Z" transform="translate(-30.359 -137.81)"/><path class="ap" d="M35.352,146.025c.223.223.5.414.566.7l-4.135,4.135a11.021,11.021,0,0,1-1.27-1.27l4.135-4.135c.225.015.478.352.7.575Z" transform="translate(-30.359 -137.81)"/><path class="aq" d="M116.351,20.927c2.623-2.075,5.04-.821,5.017.342s-3.649,4.538-4.926,4.265S114.8,22.09,116.351,20.927Z" transform="translate(-109.898 -19.44)"/><text class="ar" transform="matrix(0.988, -0.155, 0.155, 0.988, 6.178, 3.315)"><tspan x="0" y="0">01011001</tspan><tspan x="0" y="1">00110101</tspan><tspan x="0" y="2">10010011</tspan></text><path class="as" d="M183.316,100.313c-1.728,1.418-2.7,1.355-2.456.848a12.507,12.507,0,0,1,3.319-2.822C184.767,98.2,184.325,99.5,183.316,100.313Z" transform="translate(-170.974 -93.728)"/></g></g></svg>
\ No newline at end of file
diff --git a/conf/properties.json b/conf/properties.json
index f79b6448060952d59753f1a33c4539d0d4423fdc..fae13415281d62ede80ffb60e6bb7dc84bc5a320 100644
--- a/conf/properties.json
+++ b/conf/properties.json
@@ -1,12 +1,13 @@
{
"app_api_url": "https://[hostname]:8000/v2",
- "proxy_url": "https://[hostname]:8000/proxy/proxy.php",
- "version": "2020.01.01",
+ "proxy_url": "https://[hostname]:8000/v2/proxy/proxy",
+ "version": "2022.00.01",
"build": "29192",
"status": "stable",
- "month_year": "03_2018",
+ "month_year": "01_2022",
"application": "vMap",
"default_show_sidenav": true,
+ "widget_public_connect_available": true,
"map": {
"default_feature_zoom": 15,
"draw_style": {
diff --git a/conf/style.scss b/conf/style.scss
index 559cd4f6a47b0f53255306edaea6638f836e8335..aaf756be58c237e942ea7e8c1ca982a444b37c49 100644
--- a/conf/style.scss
+++ b/conf/style.scss
@@ -21,3 +21,8 @@ $icomoon-font-family: "font-awesome";
$icomoon-font-path: "src/assets/icons/vitis/fonts";
$icomoon-font-family: "vitis";
@import 'src/assets/icons/vitis/style.scss';
+
+// Icones Vmap
+$icomoon-font-path: "src/modules/vmap/icons/vmap/fonts";
+$icomoon-font-family: "vmap";
+@import 'src/modules/vmap/icons/vmap/style.scss';
\ No newline at end of file
diff --git a/conf/variables.scss b/conf/variables.scss
index 81f36b57fdf9b2e45c85dc1cba33584955f6e9e5..343bcb32d81b91be4ee35e2e83e312e9cf95d1fb 100644
--- a/conf/variables.scss
+++ b/conf/variables.scss
@@ -26,6 +26,11 @@
--application-color-background-dark5: #e8e8e8;
--application-color-background-dark15: #d0d0d0;
--application-color-background-text: #666;
+
+ --application-color-map-btn: #666666;
+ --application-color-map-btn-light: #5b5b5b;
+ --application-color-map-btn-dark: #343434;
+ --application-color-map-btn-text: #fff;
}
// Extend Bootstrap theme-colors
@@ -55,6 +60,12 @@ $application-color-background-dark5: var(--application-color-background-dark5);
$application-color-background-dark15: var(--application-color-background-dark15);
$application-color-background-text: var(--application-color-background-text);
+// Couleurs boutons de carte
+$application-color-map-btn: var(--application-color-map-btn);
+$application-color-map-btn-light: var(--application-color-map-btn-light);
+$application-color-map-btn-dark: var(--application-color-map-btn-dark);
+$application-color-map-btn-text: var(--application-color-map-btn-text);
+
// Couleurs des boutons
$btn-color-primary: $application-color-primary-light;
$btn-color-primary-text: $application-color-primary-text;
diff --git a/doc/cahier_de_recette_2022.00.ods b/doc/cahier_de_recette_2022.00.ods
new file mode 100644
index 0000000000000000000000000000000000000000..214acd57f70a9540e18204fbe3b884ec29fc9a58
Binary files /dev/null and b/doc/cahier_de_recette_2022.00.ods differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-36-42.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-36-42.png
new file mode 100644
index 0000000000000000000000000000000000000000..640da4d7e7b940df33f967c6ecce2ae954b42269
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-36-42.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-36-54.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-36-54.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2748f50b36ba8251fdf8676f3da8aa586fa17c7
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-36-54.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-37-08.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-08.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5bce2d32dcb4fd5f6238d8b102facd0d4d6fedb
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-08.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-37-16.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe12a15dd93f7ddc49214e7bc3c09273093ea4d8
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-16.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-37-31.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-31.png
new file mode 100644
index 0000000000000000000000000000000000000000..49a0dda252fb58525a1f64643f6d2470cf859091
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-37-31.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-38-25.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-25.png
new file mode 100644
index 0000000000000000000000000000000000000000..3023c1f8f5aed89bea16276350a184acb9d6d31d
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-25.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-38-42.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-42.png
new file mode 100644
index 0000000000000000000000000000000000000000..b69ab3c7aea44540f6f10024883b15ad019dc23d
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-42.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-38-55.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-55.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f115ff2ace08f7b2fffd34b3d56cf953881c4a5
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-38-55.png differ
diff --git a/doc/maquette/symbologie/scrnli_16_09_2021_14-39-07.png b/doc/maquette/symbologie/scrnli_16_09_2021_14-39-07.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbbd30a4f516b8d10a93b2e5b7f6ac419f49dfed
Binary files /dev/null and b/doc/maquette/symbologie/scrnli_16_09_2021_14-39-07.png differ
diff --git a/mcd/vmap_2021.dbm b/mcd/vmap_2021.dbm
index eb35c55174a6ec4544b8d125591b5c89295b8ef4..9f700a6e9df1bff30b6fdfceabe3cf11fdd76829 100644
--- a/mcd/vmap_2021.dbm
+++ b/mcd/vmap_2021.dbm
@@ -3,7 +3,7 @@
CAUTION: Do not modify this file unless you know what you are doing.
Unexpected results may occur if the code is changed deliberately.
-->
-<dbmodel pgmodeler-ver="0.9.2" last-position="906,229" last-zoom="0.95" max-obj-count="40"
+<dbmodel pgmodeler-ver="0.9.2" last-position="0,246" last-zoom="0.85" max-obj-count="44"
default-owner="postgres">
<database name="new_database" is-template="false" allow-conns="true">
</database>
@@ -15,7 +15,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
<role name="postgres"/>
</schema>
-<table name="datasource" layer="0" collapse-mode="2" max-obj-count="18">
+<table name="datasource" layer="0" collapse-mode="2" max-obj-count="19">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
<position x="20" y="60"/>
@@ -60,7 +60,10 @@ flux_osm]]></comment>
<column name="flux_url">
<type name="varchar" length="255"/>
</column>
- <column name="flux_type_version">
+ <column name="flux_type">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="flux_version">
<type name="varchar" length="100"/>
</column>
<column name="flux_options">
@@ -79,13 +82,17 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="layer" layer="0" collapse-mode="2" max-obj-count="13">
+<table name="layer" layer="0" collapse-mode="2" max-obj-count="14">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="460" y="260"/>
+ <position x="460" y="240"/>
<column name="layer_id" not-null="true">
<type name="serial" length="0"/>
</column>
+ <column name="layertype" not-null="true">
+ <type name="varchar" length="100"/>
+ <comment><![CDATA["postgres", "wms", "file", "wmts", "xyz", "osm"]]></comment>
+ </column>
<column name="name">
<type name="varchar" length="100"/>
<comment><![CDATA[Avec accents, espaces...]]></comment>
@@ -122,7 +129,7 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="map" layer="0" collapse-mode="2" max-obj-count="9">
+<table name="map" layer="0" collapse-mode="2" max-obj-count="10">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
<position x="1400" y="60"/>
@@ -150,6 +157,9 @@ flux_osm]]></comment>
<column name="maptools">
<type name="json" length="0"/>
</column>
+ <column name="coordsys_id" not-null="true">
+ <type name="integer" length="0"/>
+ </column>
<constraint name="map_pk" type="pk-constr" table="s_vmap_2021.map">
<columns names="map_id" ref-type="src-columns"/>
</constraint>
@@ -333,10 +343,10 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="layerpostgres" layer="0" collapse-mode="2" max-obj-count="43">
+<table name="layerpostgres" layer="0" collapse-mode="2" max-obj-count="55">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="460" y="720"/>
+ <position x="460" y="740"/>
<column name="layer_id" not-null="true">
<type name="integer" length="0"/>
</column>
@@ -449,6 +459,42 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<column name="custom_form_js_def">
<type name="text" length="0"/>
</column>
+ <column name="is_geom_selection" default-value="true">
+ <type name="bool" length="0"/>
+ <comment><![CDATA[Si la géométrie peut être saisie en insertion]]></comment>
+ </column>
+ <column name="is_geom_updatable" default-value="true">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Si la géométrie peut être saisie en édition]]></comment>
+ </column>
+ <column name="is_geometry_layer">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Utilisé pour afficher/caché la liste des colonnes utile dans le cas d'une couche géométrique]]></comment>
+ </column>
+ <column name="is_requestor_layer">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Utilisé pour afficher/caché la liste des colonnes utile dans le cas d'une couche interrogeable]]></comment>
+ </column>
+ <column name="is_specific_table_form" default-value="false">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Si une table spécifique est utilisé pour les formulaires]]></comment>
+ </column>
+ <column name="schema_form">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="table_form">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="is_specific_table_requestor" default-value="false">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Si une table spécifique est utilisé pour le requêteur]]></comment>
+ </column>
+ <column name="schema_requestor">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="table_requestor">
+ <type name="varchar" length="100"/>
+ </column>
<constraint name="pk_layerpostgres_id" type="pk-constr" table="s_vmap_2021.layerpostgres">
<columns names="layer_id" ref-type="src-columns"/>
</constraint>
@@ -774,6 +820,39 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
</constraint>
</table>
+<table name="user_defaultmap" layer="0" collapse-mode="2" max-obj-count="3">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="1760" y="200"/>
+ <column name="user_id" not-null="true">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="map_id" not-null="true">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="extent">
+ <type name="text" length="0"/>
+ </column>
+ <constraint name="user_defaultmap_pk" type="pk-constr" table="s_vmap_2021.user_defaultmap">
+ <columns names="user_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="layervectortiles" layer="0" collapse-mode="2" max-obj-count="2">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="160" y="1120"/>
+ <column name="layer_id" not-null="true">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="mapbox_gl_style">
+ <type name="json" length="0"/>
+ </column>
+ <constraint name="layervectortiles_pk" type="pk-constr" table="s_vmap_2021.layervectortiles">
+ <columns names="layer_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
<constraint name="fk_datasourcetype_id" type="fk-constr" comparison-type="MATCH FULL"
upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.datasourcetype" table="s_vmap_2021.datasource">
<columns names="datasourcetype_id" ref-type="src-columns"/>
@@ -804,6 +883,12 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<columns names="thememap_id" ref-type="dst-columns"/>
</constraint>
+<constraint name="fk_coordsys_id" type="fk-constr" comparison-type="MATCH FULL"
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.coordsys" table="s_vmap_2021.map">
+ <columns names="coordsys_id" ref-type="src-columns"/>
+ <columns names="coordsys_id" ref-type="dst-columns"/>
+</constraint>
+
<constraint name="fk_layer_id" type="fk-constr" comparison-type="MATCH FULL"
upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layer" table="s_vmap_2021.layer_map">
<columns names="layer_id" ref-type="src-columns"/>
@@ -978,6 +1063,18 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<columns names="datasource_id" ref-type="dst-columns"/>
</constraint>
+<constraint name="fk_user_defaultmap_map" type="fk-constr" comparison-type="MATCH FULL"
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.map" table="s_vmap_2021.user_defaultmap">
+ <columns names="map_id" ref-type="src-columns"/>
+ <columns names="map_id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="fk_layer_id_cp" type="fk-constr" comparison-type="MATCH FULL"
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layer" table="s_vmap_2021.layervectortiles">
+ <columns names="layer_id" ref-type="src-columns"/>
+ <columns names="layer_id" ref-type="dst-columns"/>
+</constraint>
+
<relationship name="rel_layer_datasource" type="relfk" layer="0"
src-table="s_vmap_2021.layer"
dst-table="s_vmap_2021.datasource" reference-fk="fk_datasource_id"
@@ -1148,4 +1245,19 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
dst-table="s_vmap_2021.fluxtype" reference-fk="fk_flyxtype_id"
src-required="false" dst-required="false"/>
+<relationship name="rel_map_coordsys" type="relfk" layer="0"
+ src-table="s_vmap_2021.map"
+ dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_user_defaultmap_map" type="relfk" layer="0"
+ src-table="s_vmap_2021.user_defaultmap"
+ dst-table="s_vmap_2021.map" reference-fk="fk_user_defaultmap_map"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerosm_cp_layer" type="relfk" layer="0"
+ src-table="s_vmap_2021.layervectortiles"
+ dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id_cp"
+ src-required="false" dst-required="false"/>
+
</dbmodel>
diff --git a/mcd/vmap_2021.png b/mcd/vmap_2021.png
index 9bcea287f31848af036a0780153627768c380ad6..9fb0386545fdd2454d4e92e10515178dce7b500b 100644
Binary files a/mcd/vmap_2021.png and b/mcd/vmap_2021.png differ
diff --git a/retour_experience_utilisateur/retour_experience_utilisateurs.xlsx b/retour_experience_utilisateur/retour_experience_utilisateurs.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..58cc1eecd825600e1fc623bd7cd0be1aa2ceec9f
Binary files /dev/null and b/retour_experience_utilisateur/retour_experience_utilisateurs.xlsx differ