From f1211df8efc2abff85b1648da9863484bc6d4510 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Thu, 26 Nov 2020 10:32:31 +0100
Subject: [PATCH] maj mcd
---
mcd/vmap_2021.dbm | 706 ++++++++++++++++++++++++++++++++++------------
1 file changed, 524 insertions(+), 182 deletions(-)
diff --git a/mcd/vmap_2021.dbm b/mcd/vmap_2021.dbm
index c7e56ccb..d4ef081d 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="0.75" max-obj-count="20"
+<dbmodel pgmodeler-ver="0.9.2" last-position="0,0" last-zoom="1" max-obj-count="39"
default-owner="postgres">
<database name="new_database" is-template="false" allow-conns="true">
</database>
@@ -79,7 +79,7 @@ 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="20">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
<position x="440" y="60"/>
@@ -111,23 +111,39 @@ flux_osm]]></comment>
<column name="active">
<type name="smallint" length="0"/>
</column>
- <column name="flayer_id">
+ <column name="is_background_layer">
+ <type name="boolean" length="0"/>
+ </column>
+ <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"/>
- <comment><![CDATA[Flux de type externe]]></comment>
</column>
- <column name="vlayer_id">
+ <column name="layerfile_id">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="layerpostgres_id">
<type name="integer" length="0"/>
- <comment><![CDATA[Couche interne]]></comment>
</column>
<constraint name="pk_layer_id" type="pk-constr" table="s_vmap_2021.layer">
<columns names="layer_id" ref-type="src-columns"/>
</constraint>
</table>
-<table name="map" layer="0" collapse-mode="2" max-obj-count="31">
+<table name="map" layer="0" collapse-mode="2" max-obj-count="9">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1440" y="100"/>
+ <position x="1400" y="60"/>
<column name="map_id" not-null="true">
<type name="smallint" length="0"/>
</column>
@@ -146,65 +162,11 @@ flux_osm]]></comment>
<column name="thumbnail">
<type name="smallint" length="0"/>
</column>
- <column name="enable_mapname_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_coordsys_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_zoom_slider_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_zoom_btn_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_overview_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_graphic_scale_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_numeric_scale_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_mouse_position_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_sources_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_prev_next_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_GPS_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_xy_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_initial_position_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_search_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_location_max_extent_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_compare_map_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_refresh_layers_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_map_url_tool">
- <type name="boolean" length="0"/>
- </column>
- <column name="enable_measure_tool">
- <type name="boolean" length="0"/>
+ <column name="theme_id">
+ <type name="integer" length="0"/>
</column>
- <column name="enable_print_tool">
- <type name="boolean" length="0"/>
+ <column name="maptools">
+ <type name="json" length="0"/>
</column>
<constraint name="map_pk" type="pk-constr" table="s_vmap_2021.map">
<columns names="map_id" ref-type="src-columns"/>
@@ -214,7 +176,7 @@ flux_osm]]></comment>
<table name="source" layer="0" collapse-mode="2" max-obj-count="2">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="880" y="400"/>
+ <position x="1040" y="60"/>
<column name="source_id" not-null="true">
<type name="serial" length="0"/>
</column>
@@ -229,7 +191,7 @@ flux_osm]]></comment>
<table name="coordsys" layer="0" collapse-mode="2" max-obj-count="6">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="880" y="980"/>
+ <position x="1040" y="680"/>
<column name="coordsys_id" not-null="true">
<type name="serial" length="0"/>
</column>
@@ -250,28 +212,25 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="ms_geomtype" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="ms_geomtype" layer="0" collapse-mode="2" max-obj-count="2">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="880" y="840"/>
+ <position x="1040" y="920"/>
<column name="ms_geomtype_id" not-null="true">
<type name="serial" length="0"/>
</column>
<column name="label">
<type name="varchar" length="255"/>
</column>
- <column name="key">
- <type name="varchar" length="255"/>
- </column>
<constraint name="ms_geomtype_pk" type="pk-constr" table="s_vmap_2021.ms_geomtype">
<columns names="ms_geomtype_id" ref-type="src-columns"/>
</constraint>
</table>
-<table name="layer_map" layer="0" collapse-mode="2" max-obj-count="8">
+<table name="layer_map" layer="0" collapse-mode="2" max-obj-count="12">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1080" y="100"/>
+ <position x="1000" y="300"/>
<column name="layer_map_id" not-null="true">
<type name="serial" length="0"/>
</column>
@@ -281,17 +240,29 @@ flux_osm]]></comment>
<column name="map_id">
<type name="integer" length="0"/>
</column>
- <column name="definition_json">
+ <column name="definition_sym_json">
+ <type name="text" length="0"/>
+ </column>
+ <column name="definition_sym_mapserver">
<type name="text" length="0"/>
</column>
<column name="layer_index">
<type name="integer" length="0"/>
</column>
- <column name="layer_visible">
+ <column name="is_visible">
+ <type name="boolean" length="0"/>
+ </column>
+ <column name="is_location">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[uniquement pour couches de type postgres]]></comment>
+ </column>
+ <column name="is_map_selection">
<type name="boolean" length="0"/>
+ <comment><![CDATA[uniquement pour couches de type postgres]]></comment>
</column>
- <column name="layer_queriable">
+ <column name="is_data_grid">
<type name="boolean" length="0"/>
+ <comment><![CDATA[uniquement pour couches de type postgres]]></comment>
</column>
<constraint name="layer_map_pk" type="pk-constr" table="s_vmap_2021.layer_map">
<columns names="layer_map_id" ref-type="src-columns"/>
@@ -301,7 +272,7 @@ flux_osm]]></comment>
<table name="msservice" layer="0" collapse-mode="2" max-obj-count="8">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1460" y="700"/>
+ <position x="2100" y="520"/>
<column name="msservice_id" not-null="true">
<type name="serial" length="0"/>
</column>
@@ -328,20 +299,20 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="msservice_layer" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="publication_msservice" layer="0" collapse-mode="2" max-obj-count="3">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1100" y="520"/>
+ <position x="2100" y="340"/>
<column name="msservice_layer_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="msservice_id">
+ <column name="publication_id">
<type name="integer" length="0"/>
</column>
- <column name="layer_id">
+ <column name="msservice_id">
<type name="integer" length="0"/>
</column>
- <constraint name="pk_msservice_layer_id" type="pk-constr" table="s_vmap_2021.msservice_layer">
+ <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>
</table>
@@ -349,7 +320,7 @@ flux_osm]]></comment>
<table name="msdebuglevel" layer="0" collapse-mode="2" max-obj-count="2">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1820" y="740"/>
+ <position x="2440" y="580"/>
<column name="msdebuglevel_id" not-null="true">
<type name="serial" length="0"/>
</column>
@@ -361,35 +332,33 @@ flux_osm]]></comment>
</constraint>
</table>
-<table name="datasourcetype" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="datasourcetype" layer="0" collapse-mode="2" max-obj-count="2">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
+ <comment><![CDATA[Type de source de données (postgres public, postgres privée, WMS, fichier local ...)]]></comment>
<position x="20" y="400"/>
<column name="datasourcetype_id">
<type name="serial" length="0"/>
</column>
- <column name="key">
- <type name="varchar" length="255"/>
- </column>
<column name="label">
<type name="varchar" length="255"/>
</column>
</table>
-<table name="vlayer" layer="0" collapse-mode="2" max-obj-count="46">
+<table name="layerpostgres" layer="0" collapse-mode="2" max-obj-count="43">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="420" y="560"/>
- <column name="vlayer_id" not-null="true">
+ <position x="460" y="720"/>
+ <column name="layerpostgres_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="definition_json">
- <type name="text" length="0"/>
+ <column name="definition_sym_json">
+ <type name="json" length="0"/>
</column>
- <column name="definition_mapserver">
+ <column name="definition_sym_mapserver">
<type name="text" length="0"/>
</column>
- <column name="is_definition_json">
+ <column name="is_sym_definition_json">
<type name="boolean" length="0"/>
<comment><![CDATA[Si c'est Oui : on utilise le studio
Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></comment>
@@ -403,9 +372,6 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<column name="table">
<type name="varchar" length="100"/>
</column>
- <column name="filepath">
- <type name="text" length="0"/>
- </column>
<column name="idfield">
<type name="varchar" length="100"/>
</column>
@@ -418,10 +384,11 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<column name="ms_geomtype_id">
<type name="integer" length="0"/>
</column>
- <column name="is_queriable">
- <type name="boolean" length="0"/>
+ <column name="json_columns">
+ <type name="text" length="0"/>
+ <comment><![CDATA[Mappage entre les colonnes, les libéllés, si elles sont disponibles en recherche etc.]]></comment>
</column>
- <column name="enable_location">
+ <column name="is_location">
<type name="boolean" length="0"/>
</column>
<column name="location_search_field">
@@ -437,19 +404,15 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<type name="varchar" length="100"/>
<comment><![CDATA[Type de recherche (début, milieu, fin de chaîne ou "texte plain" de postgresql)]]></comment>
</column>
- <column name="enable_map_selection">
+ <column name="is_map_selection">
<type name="boolean" length="0"/>
</column>
<column name="map_selection_buffer">
<type name="float8" length="0"/>
</column>
- <column name="enable_data_grid">
+ <column name="is_data_grid">
<type name="boolean" length="0"/>
</column>
- <column name="data_grid_json_columns">
- <type name="text" length="0"/>
- <comment><![CDATA[Mappage entre les colonnes, les libéllés, si elles sont disponibles en recherche etc.]]></comment>
- </column>
<column name="min_edition_scale">
<type name="numeric" length="0"/>
</column>
@@ -468,13 +431,13 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<column name="form_update_size_id">
<type name="integer" length="0"/>
</column>
- <column name="enable_clone">
+ <column name="is_clone">
<type name="boolean" length="0"/>
</column>
- <column name="enable_automatically_edit">
+ <column name="is_automatically_edit">
<type name="boolean" length="0"/>
</column>
- <column name="enable_multi_edit">
+ <column name="is_multi_edit">
<type name="boolean" length="0"/>
</column>
<column name="multi_select_field">
@@ -498,95 +461,298 @@ 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_background_layer">
+ <constraint name="pk_layerpostgres_id" type="pk-constr" table="s_vmap_2021.layerpostgres">
+ <columns names="layerpostgres_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="searchmode" layer="0" collapse-mode="2" max-obj-count="2">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="1040" y="1020"/>
+ <column name="searchmode_id" not-null="true">
+ <type name="serial" length="0"/>
+ </column>
+ <column name="label">
+ <type name="varchar" length="100"/>
+ </column>
+ <constraint name="locationsearchmode_pk" type="pk-constr" table="s_vmap_2021.searchmode">
+ <columns names="searchmode_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="formsize" layer="0" collapse-mode="2" max-obj-count="2">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="1040" y="820"/>
+ <column name="formsize_id" not-null="true">
+ <type name="serial" length="0"/>
+ </column>
+ <column name="label">
+ <type name="varchar" length="100"/>
+ </column>
+ <constraint name="formsize_pk" type="pk-constr" table="s_vmap_2021.formsize">
+ <columns names="formsize_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="map_group" layer="0" collapse-mode="2" max-obj-count="3">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="1760" y="60"/>
+ <column name="map_group_id" not-null="true">
+ <type name="serial" length="0"/>
+ </column>
+ <column name="map_id">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="group_id">
+ <type name="integer" length="0"/>
+ </column>
+ <constraint name="map_group_pk" type="pk-constr" table="s_vmap_2021.map_group">
+ <columns names="map_group_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<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"/>
+ </column>
+ <column name="layer_list">
+ <type name="varchar" length="255"/>
+ <comment><![CDATA[noms sans accents, espaces séparés par une virgule]]></comment>
+ </column>
+ <column name="crs_list">
+ <type name="varchar" length="255"/>
+ <comment><![CDATA[Séparés par un pipe
+]]></comment>
+ </column>
+ <column name="layer_style">
+ <type name="varchar" length="255"/>
+ </column>
+ <column name="layer_format">
+ <type name="varchar" length="255"/>
+ </column>
+ <column name="layer_options">
+ <type name="json" length="255"/>
+ <comment><![CDATA[Contient les infos du GetCapabilities]]></comment>
+ </column>
+ <column name="is_tiled">
<type name="boolean" length="0"/>
</column>
- <constraint name="pk_vlayer_id" type="pk-constr" table="s_vmap_2021.vlayer">
- <columns names="vlayer_id" ref-type="src-columns"/>
+ <constraint name="layerwms_pk" type="pk-constr" table="s_vmap_2021.layerwms">
+ <columns names="layerwms_id" ref-type="src-columns"/>
</constraint>
</table>
-<table name="flayer" layer="0" collapse-mode="2" max-obj-count="7">
+<table name="layerwmts" layer="0" collapse-mode="2" max-obj-count="7">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="180" y="560"/>
- <column name="flayer_id" not-null="true">
+ <position x="160" y="760"/>
+ <column name="layerwmts_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="name">
+ <column name="layer_name">
<type name="varchar" length="255"/>
- <comment><![CDATA[Nom à utiliser dans le flux (sans accents, espaces etc.)]]></comment>
</column>
<column name="matrix_set">
<type name="varchar" length="255"/>
</column>
- <column name="style">
+ <column name="layer_style">
<type name="varchar" length="255"/>
</column>
- <column name="format">
+ <column name="layer_format">
<type name="varchar" length="255"/>
</column>
- <column name="options">
+ <column name="layer_options">
+ <type name="json" length="255"/>
+ <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"/>
+ </constraint>
+</table>
+
+<table name="layerxyz" layer="0" collapse-mode="2" max-obj-count="1">
+ <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"/>
+ </column>
+ <constraint name="layerxyz_pk" type="pk-constr" table="s_vmap_2021.layerxyz">
+ <columns names="layerxyz_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="layerosm" layer="0" collapse-mode="2" max-obj-count="1">
+ <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"/>
+ </column>
+ <constraint name="layerosm_pk" type="pk-constr" table="s_vmap_2021.layerosm">
+ <columns names="layerosm_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"/>
+ </column>
+ <column name="file_path">
<type name="text" length="0"/>
- <comment><![CDATA[Options complémentaires en JSON]]></comment>
+ <comment><![CDATA[Chemin depuis ce qui est déclaré dans la datasource]]></comment>
+ </column>
+ <column name="fileformat_id">
+ <type name="integer" length="0"/>
</column>
- <constraint name="flayer_pk" type="pk-constr" table="s_vmap_2021.flayer">
- <columns names="flayer_id" ref-type="src-columns"/>
+ <column name="coordsys_id">
+ <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"/>
</constraint>
</table>
-<table name="searchmode" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="fileformat" layer="0" collapse-mode="2" max-obj-count="2">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="880" y="1160"/>
- <column name="searchmode_id" not-null="true">
+ <position x="1040" y="580"/>
+ <column name="fileformat_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="key">
+ <column name="label">
<type name="varchar" length="100"/>
- <comment><![CDATA[start, end, middle, plain]]></comment>
+ </column>
+ <constraint name="fileformat_pk" type="pk-constr" table="s_vmap_2021.fileformat">
+ <columns names="fileformat_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="theme" 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">
+ <type name="serial" length="0"/>
</column>
<column name="label">
- <type name="varchar" length="100"/>
+ <type name="varchar" length="255"/>
</column>
- <constraint name="locationsearchmode_pk" type="pk-constr" table="s_vmap_2021.searchmode">
- <columns names="searchmode_id" ref-type="src-columns"/>
+ <constraint name="theme_pk" type="pk-constr" table="s_vmap_2021.theme">
+ <columns names="theme_id" ref-type="src-columns"/>
</constraint>
</table>
-<table name="formsize" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="publicationpostgres" layer="0" collapse-mode="2" max-obj-count="13">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="880" y="700"/>
- <column name="formsize_id" not-null="true">
+ <position x="1660" y="780"/>
+ <column name="publicationpostgres_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="key">
- <type name="varchar" length="30"/>
+ <column name="definition_sym_json">
+ <type name="json" length="0"/>
</column>
- <column name="label">
+ <column name="definition_sym_mapserver">
+ <type name="text" length="0"/>
+ </column>
+ <column name="is_sym_definition_json">
+ <type name="boolean" length="0"/>
+ <comment><![CDATA[Si c'est Oui : on utilise le studio
+Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></comment>
+ </column>
+ <column name="database">
<type name="varchar" length="100"/>
</column>
- <constraint name="formsize_pk" type="pk-constr" table="s_vmap_2021.formsize">
- <columns names="formsize_id" ref-type="src-columns"/>
+ <column name="schema">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="table">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="idfield">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="geomfield">
+ <type name="varchar" length="100"/>
+ </column>
+ <column name="coordsys_id">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="ms_geomtype_id">
+ <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"/>
</constraint>
</table>
-<table name="map_group" layer="0" collapse-mode="2" max-obj-count="3">
+<table name="publicationfile" layer="0" collapse-mode="2" max-obj-count="4">
<schema name="s_vmap_2021"/>
<role name="postgres"/>
- <position x="1880" y="100"/>
- <column name="map_group_id" not-null="true">
+ <position x="1660" y="620"/>
+ <column name="publicationfile_id" not-null="true">
<type name="serial" length="0"/>
</column>
- <column name="map_id">
+ <column name="file_path">
+ <type name="text" length="0"/>
+ <comment><![CDATA[Chemin depuis ce qui est déclaré dans la datasource]]></comment>
+ </column>
+ <column name="fileformat_id">
<type name="integer" length="0"/>
</column>
- <column name="group_id">
+ <column name="coordsys_id">
<type name="integer" length="0"/>
</column>
- <constraint name="map_group_pk" type="pk-constr" table="s_vmap_2021.map_group">
- <columns names="map_group_id" ref-type="src-columns"/>
+ <constraint name="publicationfile_pk" type="pk-constr" table="s_vmap_2021.publicationfile">
+ <columns names="publicationfile_id" ref-type="src-columns"/>
+ </constraint>
+</table>
+
+<table name="publication" layer="0" collapse-mode="2" max-obj-count="10">
+ <schema name="s_vmap_2021"/>
+ <role name="postgres"/>
+ <position x="1660" y="340"/>
+ <column name="publication_id" not-null="true">
+ <type name="serial" length="0"/>
+ </column>
+ <column name="title">
+ <type name="varchar" length="255"/>
+ <comment><![CDATA[Avec accents, espaces etc.]]></comment>
+ </column>
+ <column name="name">
+ <type name="varchar" length="255"/>
+ <comment><![CDATA[Sans accents, espaces...]]></comment>
+ </column>
+ <column name="datasource_id">
+ <type name="smallint" length="0"/>
+ </column>
+ <column name="datemaj">
+ <type name="smallint" length="0"/>
+ </column>
+ <column name="extent">
+ <type name="text" length="0"/>
+ </column>
+ <column name="active">
+ <type name="smallint" length="0"/>
+ </column>
+ <column name="publicationfile_id">
+ <type name="integer" length="0"/>
+ </column>
+ <column name="publicationpostgres_id">
+ <type name="integer" length="0"/>
+ </column>
+ <constraint name="pk_publication_id" type="pk-constr" table="s_vmap_2021.publication">
+ <columns names="publication_id" ref-type="src-columns"/>
</constraint>
</table>
@@ -608,16 +774,52 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<columns names="source_id" ref-type="dst-columns"/>
</constraint>
-<constraint name="fk_flayer_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.flayer" table="s_vmap_2021.layer">
- <columns names="flayer_id" ref-type="src-columns"/>
- <columns names="flayer_id" ref-type="dst-columns"/>
+<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">
+ <columns names="theme_id" ref-type="src-columns"/>
+ <columns names="theme_id" ref-type="dst-columns"/>
</constraint>
-<constraint name="fk_vlayer_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.vlayer" table="s_vmap_2021.layer">
- <columns names="vlayer_id" ref-type="src-columns"/>
- <columns names="vlayer_id" ref-type="dst-columns"/>
+<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"/>
+</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">
+ <columns names="theme_id" ref-type="src-columns"/>
+ <columns names="theme_id" ref-type="dst-columns"/>
</constraint>
<constraint name="fk_layer_id" type="fk-constr" comparison-type="MATCH FULL"
@@ -645,43 +847,49 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
</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.msservice_layer">
+ 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"/>
</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">
+ <columns names="publication_id" ref-type="src-columns"/>
+ <columns names="publication_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.vlayer">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.coordsys" table="s_vmap_2021.layerpostgres">
<columns names="coordsys_id" ref-type="src-columns"/>
<columns names="coordsys_id" ref-type="dst-columns"/>
</constraint>
<constraint name="fk_geomtype_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.ms_geomtype" table="s_vmap_2021.vlayer">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.ms_geomtype" table="s_vmap_2021.layerpostgres">
<columns names="ms_geomtype_id" ref-type="src-columns"/>
<columns names="ms_geomtype_id" ref-type="dst-columns"/>
</constraint>
<constraint name="location_search_mode_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.searchmode" table="s_vmap_2021.vlayer">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.searchmode" table="s_vmap_2021.layerpostgres">
<columns names="location_search_mode_id" ref-type="src-columns"/>
<columns names="searchmode_id" ref-type="dst-columns"/>
</constraint>
-<constraint name="fk_forn_display_size" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.vlayer">
+<constraint name="fk_form_display_size" type="fk-constr" comparison-type="MATCH FULL"
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.layerpostgres">
<columns names="form_display_size_id" ref-type="src-columns"/>
<columns names="formsize_id" ref-type="dst-columns"/>
</constraint>
<constraint name="fk_form_insert_size_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.vlayer">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.layerpostgres">
<columns names="form_insert_size_id" ref-type="src-columns"/>
<columns names="formsize_id" ref-type="dst-columns"/>
</constraint>
<constraint name="fk_form_update_size_id" type="fk-constr" comparison-type="MATCH FULL"
- upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.vlayer">
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.formsize" table="s_vmap_2021.layerpostgres">
<columns names="form_update_size_id" ref-type="src-columns"/>
<columns names="formsize_id" ref-type="dst-columns"/>
</constraint>
@@ -692,6 +900,60 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
<columns names="map_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"/>
+ <columns names="fileformat_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.layerfile">
+ <columns names="coordsys_id" ref-type="src-columns"/>
+ <columns names="coordsys_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"/>
+ <columns names="coordsys_id" ref-type="dst-columns"/>
+</constraint>
+
+<constraint name="fk_geomtype_id" type="fk-constr" comparison-type="MATCH FULL"
+ upd-action="NO ACTION" del-action="NO ACTION" ref-table="s_vmap_2021.ms_geomtype" table="s_vmap_2021.publicationpostgres">
+ <columns names="ms_geomtype_id" ref-type="src-columns"/>
+ <columns names="ms_geomtype_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"/>
+ <columns names="fileformat_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.publicationfile">
+ <columns names="coordsys_id" ref-type="src-columns"/>
+ <columns names="coordsys_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"
@@ -713,7 +975,7 @@ 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.msservice_layer"
+ src-table="s_vmap_2021.publication_msservice"
dst-table="s_vmap_2021.msservice" reference-fk="fk_msservice_id"
src-required="false" dst-required="false"/>
@@ -733,42 +995,32 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
src-required="false" dst-required="false"/>
<relationship name="rel_layer_cp_coordsys" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
+ src-table="s_vmap_2021.layerpostgres"
dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
src-required="false" dst-required="false"/>
<relationship name="rel_layer_cp_ms_geomtype" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
+ src-table="s_vmap_2021.layerpostgres"
dst-table="s_vmap_2021.ms_geomtype" reference-fk="fk_geomtype_id"
src-required="false" dst-required="false"/>
-<relationship name="rel_layer_vlayer" type="relfk" layer="0"
- src-table="s_vmap_2021.layer"
- dst-table="s_vmap_2021.vlayer" reference-fk="fk_vlayer_id"
- src-required="false" dst-required="false"/>
-
-<relationship name="rel_layer_flayer" type="relfk" layer="0"
- src-table="s_vmap_2021.layer"
- dst-table="s_vmap_2021.flayer" reference-fk="fk_flayer_id"
- src-required="false" dst-required="false"/>
-
<relationship name="rel_vlayer_searchmode" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
+ src-table="s_vmap_2021.layerpostgres"
dst-table="s_vmap_2021.searchmode" reference-fk="location_search_mode_id"
src-required="false" dst-required="false"/>
<relationship name="rel_vlayer_formsize" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
- dst-table="s_vmap_2021.formsize" reference-fk="fk_forn_display_size"
+ src-table="s_vmap_2021.layerpostgres"
+ dst-table="s_vmap_2021.formsize" reference-fk="fk_form_display_size"
src-required="false" dst-required="false"/>
<relationship name="rel_vlayer_formsize1" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
+ src-table="s_vmap_2021.layerpostgres"
dst-table="s_vmap_2021.formsize" reference-fk="fk_form_insert_size_id"
src-required="false" dst-required="false"/>
<relationship name="rel_vlayer_formsize2" type="relfk" layer="0"
- src-table="s_vmap_2021.vlayer"
+ src-table="s_vmap_2021.layerpostgres"
dst-table="s_vmap_2021.formsize" reference-fk="fk_form_update_size_id"
src-required="false" dst-required="false"/>
@@ -777,4 +1029,94 @@ Si c'est Non : l'utilisateur a basculé sur l'édition manuelle du mapfile]]></c
dst-table="s_vmap_2021.map" reference-fk="fk_map_id"
src-required="false" dst-required="false"/>
+<relationship name="rel_layerfile_fileformat" type="relfk" layer="0"
+ src-table="s_vmap_2021.layerfile"
+ dst-table="s_vmap_2021.fileformat" reference-fk="fk_fileformat_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerfile_coordsys" type="relfk" layer="0"
+ src-table="s_vmap_2021.layerfile"
+ 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"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerpostgres_cp_coordsys" type="relfk" layer="0"
+ src-table="s_vmap_2021.publicationpostgres"
+ dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerpostgres_cp_ms_geomtype" type="relfk" layer="0"
+ src-table="s_vmap_2021.publicationpostgres"
+ dst-table="s_vmap_2021.ms_geomtype" reference-fk="fk_geomtype_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerfile_cp_fileformat" type="relfk" layer="0"
+ src-table="s_vmap_2021.publicationfile"
+ dst-table="s_vmap_2021.fileformat" reference-fk="fk_fileformat_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layerfile_cp_coordsys" type="relfk" layer="0"
+ src-table="s_vmap_2021.publicationfile"
+ dst-table="s_vmap_2021.coordsys" reference-fk="fk_coordsys_id"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_layer_cp_datasource" type="relfk" layer="0"
+ src-table="s_vmap_2021.publication"
+ 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"
+ 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"
+ src-required="false" dst-required="false"/>
+
+<relationship name="rel_msservice_layer_publication" type="relfk" layer="0"
+ src-table="s_vmap_2021.publication_msservice"
+ dst-table="s_vmap_2021.publication" reference-fk="fk_publication_id"
+ src-required="false" dst-required="false"/>
+
</dbmodel>
--
GitLab