diff --git a/mcd/vmap_2021.dbm b/mcd/vmap_2021.dbm
index d4ef081da2c6bba42690c4a980a84ca852c0f4e2..3179b1803504ba3eaac695100ccb5c3739a8c49e 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="0,0" last-zoom="1" max-obj-count="39"
+<dbmodel pgmodeler-ver="0.9.2" last-position="0,0" last-zoom="0.95" max-obj-count="40"
 	 default-owner="postgres">
 <database name="new_database" is-template="false" allow-conns="true">
 </database>
@@ -28,7 +28,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<column name="description">
 		<type name="text" length="0"/>
 	</column>
-	<column name="datasourcetype_id">
+	<column name="datasourcetype_id" not-null="true">
 		<type name="integer" length="0"/>
 		<comment><![CDATA[postgres_interne
 postgres_publique
@@ -79,10 +79,10 @@ flux_osm]]></comment>
 	</constraint>
 </table>
 
-<table name="layer" layer="0" collapse-mode="2" max-obj-count="20">
+<table name="layer" layer="0" collapse-mode="2" max-obj-count="13">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="440" y="60"/>
+	<position x="460" y="260"/>
 	<column name="layer_id" not-null="true">
 		<type name="serial" length="0"/>
 	</column>
@@ -117,24 +117,6 @@ flux_osm]]></comment>
 	<column name="theme_id">
 		<type name="integer" length="0"/>
 	</column>
-	<column name="layerwms_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="layerwmts_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="layerxyz_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="layerosm_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="layerfile_id">
-		<type name="integer" length="0"/>
-	</column>
-	<column name="layerpostgres_id">
-		<type name="integer" length="0"/>
-	</column>
 	<constraint name="pk_layer_id" type="pk-constr" table="s_vmap_2021.layer">
 		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
@@ -181,7 +163,7 @@ flux_osm]]></comment>
 		<type name="serial" length="0"/>
 	</column>
 	<column name="name">
-		<type name="smallint" length="0"/>
+		<type name="varchar" length="255"/>
 	</column>
 	<constraint name="source_pk" type="pk-constr" table="s_vmap_2021.source">
 		<columns names="source_id" ref-type="src-columns"/>
@@ -269,11 +251,11 @@ flux_osm]]></comment>
 	</constraint>
 </table>
 
-<table name="msservice" layer="0" collapse-mode="2" max-obj-count="8">
+<table name="flux" layer="0" collapse-mode="2" max-obj-count="9">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
 	<position x="2100" y="520"/>
-	<column name="msservice_id" not-null="true">
+	<column name="flux_id" not-null="true">
 		<type name="serial" length="0"/>
 	</column>
 	<column name="name">
@@ -294,41 +276,44 @@ flux_osm]]></comment>
 	<column name="coordsys_id">
 		<type name="integer" length="0"/>
 	</column>
-	<constraint name="pk_msservice_id" type="pk-constr" table="s_vmap_2021.msservice">
-		<columns names="msservice_id" ref-type="src-columns"/>
+	<column name="fluxtype_id">
+		<type name="smallint" length="0"/>
+	</column>
+	<constraint name="pk_msservice_id" type="pk-constr" table="s_vmap_2021.flux">
+		<columns names="flux_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
-<table name="publication_msservice" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="publication_flux" layer="0" collapse-mode="2" max-obj-count="3">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
 	<position x="2100" y="340"/>
-	<column name="msservice_layer_id" not-null="true">
+	<column name="flux_layer_id" not-null="true">
 		<type name="serial" length="0"/>
 	</column>
 	<column name="publication_id">
 		<type name="integer" length="0"/>
 	</column>
-	<column name="msservice_id">
+	<column name="flux_id">
 		<type name="integer" length="0"/>
 	</column>
-	<constraint name="pk_msservice_layer_id" type="pk-constr" table="s_vmap_2021.publication_msservice">
-		<columns names="msservice_layer_id" ref-type="src-columns"/>
+	<constraint name="pk_msservice_layer_id" type="pk-constr" table="s_vmap_2021.publication_flux">
+		<columns names="flux_layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
-<table name="msdebuglevel" layer="0" collapse-mode="2" max-obj-count="2">
+<table name="fluxdebuglevel" layer="0" collapse-mode="2" max-obj-count="2">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="2440" y="580"/>
-	<column name="msdebuglevel_id" not-null="true">
+	<position x="2440" y="520"/>
+	<column name="fluxdebuglevel_id" not-null="true">
 		<type name="serial" length="0"/>
 	</column>
 	<column name="label">
 		<type name="varchar" length="255"/>
 	</column>
-	<constraint name="pk_msdebuglevel_id" type="pk-constr" table="s_vmap_2021.msdebuglevel">
-		<columns names="msdebuglevel_id" ref-type="src-columns"/>
+	<constraint name="pk_fluxdebuglevel_id" type="pk-constr" table="s_vmap_2021.fluxdebuglevel">
+		<columns names="fluxdebuglevel_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
@@ -349,8 +334,8 @@ flux_osm]]></comment>
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
 	<position x="460" y="720"/>
-	<column name="layerpostgres_id" not-null="true">
-		<type name="serial" length="0"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<column name="definition_sym_json">
 		<type name="json" length="0"/>
@@ -462,7 +447,7 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="text" length="0"/>
 	</column>
 	<constraint name="pk_layerpostgres_id" type="pk-constr" table="s_vmap_2021.layerpostgres">
-		<columns names="layerpostgres_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
@@ -517,11 +502,11 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 <table name="layerwms" layer="0" collapse-mode="2" max-obj-count="8">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="160" y="560"/>
-	<column name="layerwms_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="160" y="540"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
-	<column name="layer_list">
+	<column name="layer_name">
 		<type name="varchar" length="255"/>
 		<comment><![CDATA[noms sans accents, espaces séparés par une virgule]]></comment>
 	</column>
@@ -544,16 +529,16 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="boolean" length="0"/>
 	</column>
 	<constraint name="layerwms_pk" type="pk-constr" table="s_vmap_2021.layerwms">
-		<columns names="layerwms_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
 <table name="layerwmts" layer="0" collapse-mode="2" max-obj-count="7">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="160" y="760"/>
-	<column name="layerwmts_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="160" y="740"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<column name="layer_name">
 		<type name="varchar" length="255"/>
@@ -572,40 +557,40 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<comment><![CDATA[Contient les infos du GetCapabilities]]></comment>
 	</column>
 	<constraint name="layerwmts_pk" type="pk-constr" table="s_vmap_2021.layerwmts">
-		<columns names="layerwmts_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
-<table name="layerxyz" layer="0" collapse-mode="2" max-obj-count="1">
+<table name="layerxyz" layer="0" collapse-mode="2" max-obj-count="2">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="160" y="940"/>
-	<column name="layerxyz_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="160" y="920"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<constraint name="layerxyz_pk" type="pk-constr" table="s_vmap_2021.layerxyz">
-		<columns names="layerxyz_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
-<table name="layerosm" layer="0" collapse-mode="2" max-obj-count="1">
+<table name="layerosm" layer="0" collapse-mode="2" max-obj-count="2">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="160" y="1040"/>
-	<column name="layerosm_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="160" y="1020"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<constraint name="layerosm_pk" type="pk-constr" table="s_vmap_2021.layerosm">
-		<columns names="layerosm_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
 <table name="layerfile" layer="0" collapse-mode="2" max-obj-count="4">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="480" y="560"/>
-	<column name="layerfile_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="480" y="540"/>
+	<column name="layer_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<column name="file_path">
 		<type name="text" length="0"/>
@@ -618,7 +603,7 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="integer" length="0"/>
 	</column>
 	<constraint name="layerfile_pk" type="pk-constr" table="s_vmap_2021.layerfile">
-		<columns names="layerfile_id" ref-type="src-columns"/>
+		<columns names="layer_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
@@ -637,27 +622,27 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	</constraint>
 </table>
 
-<table name="theme" layer="0" collapse-mode="2" max-obj-count="2">
+<table name="thememap" layer="0" collapse-mode="2" max-obj-count="2">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="1040" y="180"/>
-	<column name="theme_id" not-null="true">
+	<position x="1100" y="180"/>
+	<column name="thememap_id" not-null="true">
 		<type name="serial" length="0"/>
 	</column>
 	<column name="label">
 		<type name="varchar" length="255"/>
 	</column>
-	<constraint name="theme_pk" type="pk-constr" table="s_vmap_2021.theme">
-		<columns names="theme_id" ref-type="src-columns"/>
+	<constraint name="thememap_pk" type="pk-constr" table="s_vmap_2021.thememap">
+		<columns names="thememap_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
 <table name="publicationpostgres" layer="0" collapse-mode="2" max-obj-count="13">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="1660" y="780"/>
-	<column name="publicationpostgres_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="1660" y="740"/>
+	<column name="publication_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<column name="definition_sym_json">
 		<type name="json" length="0"/>
@@ -692,16 +677,16 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="integer" length="0"/>
 	</column>
 	<constraint name="pk_publicationfile_id" type="pk-constr" table="s_vmap_2021.publicationpostgres">
-		<columns names="publicationpostgres_id" ref-type="src-columns"/>
+		<columns names="publication_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
 <table name="publicationfile" layer="0" collapse-mode="2" max-obj-count="4">
 	<schema name="s_vmap_2021"/>
 	<role name="postgres"/>
-	<position x="1660" y="620"/>
-	<column name="publicationfile_id" not-null="true">
-		<type name="serial" length="0"/>
+	<position x="1660" y="560"/>
+	<column name="publication_id" not-null="true">
+		<type name="integer" length="0"/>
 	</column>
 	<column name="file_path">
 		<type name="text" length="0"/>
@@ -714,7 +699,7 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="integer" length="0"/>
 	</column>
 	<constraint name="publicationfile_pk" type="pk-constr" table="s_vmap_2021.publicationfile">
-		<columns names="publicationfile_id" ref-type="src-columns"/>
+		<columns names="publication_id" ref-type="src-columns"/>
 	</constraint>
 </table>
 
@@ -737,18 +722,18 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 		<type name="smallint" length="0"/>
 	</column>
 	<column name="datemaj">
-		<type name="smallint" length="0"/>
+		<type name="date" length="0"/>
 	</column>
 	<column name="extent">
 		<type name="text" length="0"/>
 	</column>
 	<column name="active">
-		<type name="smallint" length="0"/>
+		<type name="bool" length="0"/>
 	</column>
-	<column name="publicationfile_id">
+	<column name="min_layer_scale">
 		<type name="integer" length="0"/>
 	</column>
-	<column name="publicationpostgres_id">
+	<column name="max_layer_scale">
 		<type name="integer" length="0"/>
 	</column>
 	<constraint name="pk_publication_id" type="pk-constr" table="s_vmap_2021.publication">
@@ -756,6 +741,36 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	</constraint>
 </table>
 
+<table name="themelayer" layer="0" collapse-mode="2" max-obj-count="2">
+	<schema name="s_vmap_2021"/>
+	<role name="postgres"/>
+	<position x="780" y="140"/>
+	<column name="themelayer_id" not-null="true">
+		<type name="serial" length="0"/>
+	</column>
+	<column name="label">
+		<type name="varchar" length="255"/>
+	</column>
+	<constraint name="themelayer_pk" type="pk-constr" table="s_vmap_2021.themelayer">
+		<columns names="themelayer_id" ref-type="src-columns"/>
+	</constraint>
+</table>
+
+<table name="fluxtype" layer="0" collapse-mode="2" max-obj-count="2">
+	<schema name="s_vmap_2021"/>
+	<role name="postgres"/>
+	<position x="2440" y="640"/>
+	<column name="fluxtype_id" not-null="true">
+		<type name="serial" length="0"/>
+	</column>
+	<column name="label">
+		<type name="varchar" length="255"/>
+	</column>
+	<constraint name="pk_fluxtype_id" type="pk-constr" table="s_vmap_2021.fluxtype">
+		<columns names="fluxtype_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"/>
@@ -775,51 +790,15 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 </constraint>
 
 <constraint name="fk_theme_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.theme" table="s_vmap_2021.layer">
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.themelayer" table="s_vmap_2021.layer">
 	<columns names="theme_id" ref-type="src-columns"/>
-	<columns names="theme_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerwms_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerwms" table="s_vmap_2021.layer">
-	<columns names="layerwms_id" ref-type="src-columns"/>
-	<columns names="layerwms_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerwmts_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerwmts" table="s_vmap_2021.layer">
-	<columns names="layerwmts_id" ref-type="src-columns"/>
-	<columns names="layerwmts_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerxyz_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerxyz" table="s_vmap_2021.layer">
-	<columns names="layerxyz_id" ref-type="src-columns"/>
-	<columns names="layerxyz_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerosm_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerosm" table="s_vmap_2021.layer">
-	<columns names="layerosm_id" ref-type="src-columns"/>
-	<columns names="layerosm_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerfile_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerfile" table="s_vmap_2021.layer">
-	<columns names="layerfile_id" ref-type="src-columns"/>
-	<columns names="layerfile_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_layerpostgres_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.layerpostgres" table="s_vmap_2021.layer">
-	<columns names="layerpostgres_id" ref-type="src-columns"/>
-	<columns names="layerpostgres_id" ref-type="dst-columns"/>
+	<columns names="themelayer_id" ref-type="dst-columns"/>
 </constraint>
 
 <constraint name="fk_theme_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.theme" table="s_vmap_2021.map">
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.thememap" table="s_vmap_2021.map">
 	<columns names="theme_id" ref-type="src-columns"/>
-	<columns names="theme_id" ref-type="dst-columns"/>
+	<columns names="thememap_id" ref-type="dst-columns"/>
 </constraint>
 
 <constraint name="fk_layer_id" type="fk-constr" comparison-type="MATCH FULL"
@@ -835,25 +814,31 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 </constraint>
 
 <constraint name="fk_msdebuglevel_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.msdebuglevel" table="s_vmap_2021.msservice">
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.fluxdebuglevel" table="s_vmap_2021.flux">
 	<columns names="msdebuglevel_id" ref-type="src-columns"/>
-	<columns names="msdebuglevel_id" ref-type="dst-columns"/>
+	<columns names="fluxdebuglevel_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.msservice">
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.coordsys" table="s_vmap_2021.flux">
 	<columns names="coordsys_id" ref-type="src-columns"/>
 	<columns names="coordsys_id" ref-type="dst-columns"/>
 </constraint>
 
+<constraint name="fk_flyxtype_id" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.fluxtype" table="s_vmap_2021.flux">
+	<columns names="fluxtype_id" ref-type="src-columns"/>
+	<columns names="fluxtype_id" ref-type="dst-columns"/>
+</constraint>
+
 <constraint name="fk_msservice_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.msservice" table="s_vmap_2021.publication_msservice">
-	<columns names="msservice_id" ref-type="src-columns"/>
-	<columns names="msservice_id" ref-type="dst-columns"/>
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.flux" table="s_vmap_2021.publication_flux">
+	<columns names="flux_id" ref-type="src-columns"/>
+	<columns names="flux_id" ref-type="dst-columns"/>
 </constraint>
 
 <constraint name="fk_publication_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publication" table="s_vmap_2021.publication_msservice">
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publication" table="s_vmap_2021.publication_flux">
 	<columns names="publication_id" ref-type="src-columns"/>
 	<columns names="publication_id" ref-type="dst-columns"/>
 </constraint>
@@ -894,12 +879,42 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	<columns names="formsize_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.layerpostgres">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_id" ref-type="dst-columns"/>
+</constraint>
+
 <constraint name="fk_map_id" 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.map_group">
 	<columns names="map_id" ref-type="src-columns"/>
 	<columns names="map_id" ref-type="dst-columns"/>
 </constraint>
 
+<constraint name="fk_layer_id" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="CASCADE" ref-table="s_vmap_2021.layer" table="s_vmap_2021.layerwms">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_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.layerwmts">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_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.layerxyz">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_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.layerosm">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_id" ref-type="dst-columns"/>
+</constraint>
+
 <constraint name="fk_fileformat_id" type="fk-constr" comparison-type="MATCH FULL"
 	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.fileformat" table="s_vmap_2021.layerfile">
 	<columns names="fileformat_id" ref-type="src-columns"/>
@@ -912,6 +927,12 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	<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.layerfile">
+	<columns names="layer_id" ref-type="src-columns"/>
+	<columns names="layer_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.publicationpostgres">
 	<columns names="coordsys_id" ref-type="src-columns"/>
@@ -924,6 +945,12 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	<columns names="ms_geomtype_id" ref-type="dst-columns"/>
 </constraint>
 
+<constraint name="fk_publication_id" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publication" table="s_vmap_2021.publicationpostgres">
+	<columns names="publication_id" ref-type="src-columns"/>
+	<columns names="publication_id" ref-type="dst-columns"/>
+</constraint>
+
 <constraint name="fk_fileformat_id" type="fk-constr" comparison-type="MATCH FULL"
 	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.fileformat" table="s_vmap_2021.publicationfile">
 	<columns names="fileformat_id" ref-type="src-columns"/>
@@ -936,24 +963,18 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	<columns names="coordsys_id" ref-type="dst-columns"/>
 </constraint>
 
+<constraint name="fk_publication_id" type="fk-constr" comparison-type="MATCH FULL"
+	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publication" table="s_vmap_2021.publicationfile">
+	<columns names="publication_id" ref-type="src-columns"/>
+	<columns names="publication_id" ref-type="dst-columns"/>
+</constraint>
+
 <constraint name="fk_datasource_id" type="fk-constr" comparison-type="MATCH FULL"
 	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.datasource" table="s_vmap_2021.publication">
 	<columns names="datasource_id" ref-type="src-columns"/>
 	<columns names="datasource_id" ref-type="dst-columns"/>
 </constraint>
 
-<constraint name="fk_publicationfile_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publicationfile" table="s_vmap_2021.publication">
-	<columns names="publicationfile_id" ref-type="src-columns"/>
-	<columns names="publicationfile_id" ref-type="dst-columns"/>
-</constraint>
-
-<constraint name="fk_publicationpostgres_id" type="fk-constr" comparison-type="MATCH FULL"
-	 upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.publicationpostgres" table="s_vmap_2021.publication">
-	<columns names="publicationpostgres_id" ref-type="src-columns"/>
-	<columns names="publicationpostgres_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"
@@ -975,17 +996,17 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_msservice_layer_msservice" type="relfk" layer="0"
-	 src-table="s_vmap_2021.publication_msservice"
-	 dst-table="s_vmap_2021.msservice" reference-fk="fk_msservice_id"
+	 src-table="s_vmap_2021.publication_flux"
+	 dst-table="s_vmap_2021.flux" reference-fk="fk_msservice_id"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_msservice_msdebuglevel" type="relfk" layer="0"
-	 src-table="s_vmap_2021.msservice"
-	 dst-table="s_vmap_2021.msdebuglevel" reference-fk="fk_msdebuglevel_id"
+	 src-table="s_vmap_2021.flux"
+	 dst-table="s_vmap_2021.fluxdebuglevel" reference-fk="fk_msdebuglevel_id"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_msservice_coordsys" type="relfk" layer="0"
-	 src-table="s_vmap_2021.msservice"
+	 src-table="s_vmap_2021.flux"
 	 dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
 	 src-required="false" dst-required="false"/>
 
@@ -1039,44 +1060,9 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	 dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
 	 src-required="false" dst-required="false"/>
 
-<relationship name="rel_layer_theme" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.theme" reference-fk="fk_theme_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerwms" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerwms" reference-fk="fk_layerwms_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerwmts" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerwmts" reference-fk="fk_layerwmts_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerxyz" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerxyz" reference-fk="fk_layerxyz_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerosm" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerosm" reference-fk="fk_layerosm_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerfile" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerfile" reference-fk="fk_layerfile_id"
-	 src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_layerpostgres" type="relfk" layer="0"
-	 src-table="s_vmap_2021.layer"
-	 dst-table="s_vmap_2021.layerpostgres" reference-fk="fk_layerpostgres_id"
-	 src-required="false" dst-required="false"/>
-
 <relationship name="rel_map_theme" type="relfk" layer="0"
 	 src-table="s_vmap_2021.map"
-	 dst-table="s_vmap_2021.theme" reference-fk="fk_theme_id"
+	 dst-table="s_vmap_2021.thememap" reference-fk="fk_theme_id"
 	 src-required="false" dst-required="false"/>
 
 <relationship name="rel_layerpostgres_cp_coordsys" type="relfk" layer="0"
@@ -1104,19 +1090,59 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
 	 dst-table="s_vmap_2021.datasource" reference-fk="fk_datasource_id"
 	 src-required="false" dst-required="false"/>
 
-<relationship name="rel_layer_cp_publicationfile" type="relfk" layer="0"
-	 src-table="s_vmap_2021.publication"
-	 dst-table="s_vmap_2021.publicationfile" reference-fk="fk_publicationfile_id"
+<relationship name="rel_msservice_layer_publication" type="relfk" layer="0"
+	 src-table="s_vmap_2021.publication_flux"
+	 dst-table="s_vmap_2021.publication" reference-fk="fk_publication_id"
 	 src-required="false" dst-required="false"/>
 
-<relationship name="rel_layer_cp_publicationpostgres" type="relfk" layer="0"
-	 src-table="s_vmap_2021.publication"
-	 dst-table="s_vmap_2021.publicationpostgres" reference-fk="fk_publicationpostgres_id"
+<relationship name="rel_layerwms_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerwms"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
 	 src-required="false" dst-required="false"/>
 
-<relationship name="rel_msservice_layer_publication" type="relfk" layer="0"
-	 src-table="s_vmap_2021.publication_msservice"
+<relationship name="rel_layerfile_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerfile"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerwmts_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerwmts"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerxyz_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerxyz"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerosm_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerosm"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerpostgres_layer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layerpostgres"
+	 dst-table="s_vmap_2021.layer" reference-fk="fk_layer_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_layer_themelayer" type="relfk" layer="0"
+	 src-table="s_vmap_2021.layer"
+	 dst-table="s_vmap_2021.themelayer" reference-fk="fk_theme_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_publicationfile_publication" type="relfk" layer="0"
+	 src-table="s_vmap_2021.publicationfile"
 	 dst-table="s_vmap_2021.publication" reference-fk="fk_publication_id"
 	 src-required="false" dst-required="false"/>
 
+<relationship name="rel_publicationpostgres_publication" type="relfk" layer="0"
+	 src-table="s_vmap_2021.publicationpostgres"
+	 dst-table="s_vmap_2021.publication" reference-fk="fk_publication_id"
+	 src-required="false" dst-required="false"/>
+
+<relationship name="rel_flux_fluxtype" type="relfk" layer="0"
+	 src-table="s_vmap_2021.flux"
+	 dst-table="s_vmap_2021.fluxtype" reference-fk="fk_flyxtype_id"
+	 src-required="false" dst-required="false"/>
+
 </dbmodel>