From 832eb3b8457c6ea1b463bffc0fe89b29feb3ec72 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:45:21 +0200
Subject: [PATCH 1/5] Change dependencies model
---
{web_service/_install => _install}/apache.conf | 0
{web_service/_install => _install}/dependency.xml | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {web_service/_install => _install}/apache.conf (100%)
rename {web_service/_install => _install}/dependency.xml (100%)
diff --git a/web_service/_install/apache.conf b/_install/apache.conf
similarity index 100%
rename from web_service/_install/apache.conf
rename to _install/apache.conf
diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 100%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
--
GitLab
From ce4f3cc54f6834a8f4b50f8ef83bfe131f3fdc80 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:45:32 +0200
Subject: [PATCH 2/5] Change dependencies model
---
_install/dependency.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 7c49bafb..03274003 100644
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,13 +3,11 @@
<installer>
<schema>
<name>s_cadastre</name>
- <version>2018.02.01</version>
<dependenciesCollection>
<dependency>
<nature>schema</nature>
<name>s_vmap</name>
- <version>2018.03.00</version>
- <object>vmap</object>
+ <object>module_vmap</object>
</dependency>
<dependency>
<name>postgis</name>
@@ -20,13 +18,11 @@
</schema>
<dependenciesCollection>
<dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
+ <nature>framework</nature>
</dependency>
<dependency>
<nature>web_services</nature>
- <name>vmap</name>
- <version>2018.03.00</version>
+ <name>module_vmap</name>
</dependency>
<dependency>
<name>jre</name>
--
GitLab
From ecf80b3c6a8a9e58f81757ae13198ade9f3071ff Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 14:57:58 +0000
Subject: [PATCH 3/5] Update dependency.xml
---
_install/dependency.xml | 76 ++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 03274003..2864d574 100644
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS cadastreV2 -->
-<installer>
- <schema>
- <name>s_cadastre</name>
- <dependenciesCollection>
- <dependency>
- <nature>schema</nature>
- <name>s_vmap</name>
- <object>module_vmap</object>
- </dependency>
- <dependency>
- <name>postgis</name>
- <version>2.0</version>
- <nature>extern-pre</nature>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <nature>framework</nature>
- </dependency>
- <dependency>
- <nature>web_services</nature>
- <name>module_vmap</name>
- </dependency>
- <dependency>
- <name>jre</name>
- <nature>extern-post</nature>
- <location>jre-8u101</location>
- </dependency>
- <dependency>
- <name>fop</name>
- <nature>extern-post</nature>
- <location>fop-2.0</location>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS cadastreV2 -->
+<installer>
+ <schema>
+ <name>s_cadastre</name>
+ <dependenciesCollection>
+ <dependency>
+ <nature>schema</nature>
+ <name>s_vmap</name>
+ <object>module_vmap</object>
+ </dependency>
+ <dependency>
+ <name>postgis</name>
+ <version>2.0</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <nature>framework</nature>
+ </dependency>
+ <dependency>
+ <nature>modules</nature>
+ <name>module_vmap</name>
+ </dependency>
+ <dependency>
+ <name>jre</name>
+ <nature>extern-post</nature>
+ <location>jre-8u101</location>
+ </dependency>
+ <dependency>
+ <name>fop</name>
+ <nature>extern-post</nature>
+ <location>fop-2.0</location>
+ </dependency>
+ </dependenciesCollection>
+</installer>
--
GitLab
From 3bf002c4ce9a7a640a2cef7d8e0279a1018a7811 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 15:13:55 +0000
Subject: [PATCH 4/5] Update dependency.xml
---
_install/dependency.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 2864d574..d19305d0 100644
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -19,6 +19,7 @@
<dependenciesCollection>
<dependency>
<nature>framework</nature>
+ <name>vitis</name>
</dependency>
<dependency>
<nature>modules</nature>
--
GitLab
From 1f0d403897a2d8e15130e2eab00eae5b3f9c2aa8 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 14:47:51 +0200
Subject: [PATCH 5/5] Update from SVN
---
web_service/CHANGE_LOG.txt | 28 -----
.../class/majic_libV2/Mj_Emprises.class.inc | 20 +--
web_service/sql/sqlQueries.xml | 119 ++++++++++--------
3 files changed, 83 insertions(+), 84 deletions(-)
delete mode 100755 web_service/CHANGE_LOG.txt
mode change 100755 => 100644 web_service/class/majic_libV2/Mj_Emprises.class.inc
diff --git a/web_service/CHANGE_LOG.txt b/web_service/CHANGE_LOG.txt
deleted file mode 100755
index 5f03f57c..00000000
--- a/web_service/CHANGE_LOG.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-b23201|RELEASE |cadastreV2| Version 2017.01.01
-b23201|BUG |cadastreV2| UPDATE pb vue v_vmap_objet_surfacique_divers
-b22780|BUG |cadastreV2| guillemets
-b22774|BUG |cadastreV2| Bug fiche invariant
-b22727|BUG |cadastreV2| Bug privilèges
-b22647|EVOLUTION |cadastreV2| Tous les constructeurs des classes PHP ont été renommé en __construct
-b22501|BUG |cadastreV2| Accès à la documentation du web service cadastreV2
-b22452|EVOLUTION |cadastreV2| properties_selected -> selected_properties
-b22354|BUG |cadastreV2| Affichage des properties définies dans les fichiers properties_selected.inc
-b22137|RELEASE |cadastreV2| Version 2017.01.00
-b21826|BUG |cadastreV2| Ajout de restriction communale pour des vues du schéma s_cadastre
-b21360|BUG |cadastreV2| Modif sur la table pdl_20_assise_pdl pour passer l'attribut kass à 14 caractères (et faire la liaison avec les parcelles)
-b21249|BUG |cadastreV2| Ajout des restrictions communales sur les vues relatives aux objets surfacique et aux cours d'eau
-b21185|BUG |cadastreV2| projections cadastre
-b20815|BUG |cadastreV2| maj pour supprimer le not null sur certains champs de s_majic et convertir des char en varchar
-b20685|BUG |cadastreV2| fiche urb map_id
-b20564|BUG |cadastreV2| Correction erreur code SQL
-b20498|EVOLUTION |cadastreV2| Ajout de l'adresse de la parcelle dans la fiche d'urbanisme
-b20497|EVOLUTION |cadastreV2| Ajout Adresse de la parcelle fiche urbanisme
-b20494|EVOLUTION |cadastreV2| Ajout de l'adresse de la parcelle dans la fiche d'urbanisme
-b20274|BUG |cadastreV2| Template Fiche Urb
-b20269|EVOLUTION |cadastreV2| Impressions PhantomJS
-b19740|BUG |cadastreV2| Ajout de clefs primaires dans les schémas s_cadastre et s_majic
-b19732|BUG |cadastreV2| Correction pb génération rapports
-b19624|BUG |cadastreV2| Suppression de l'insertion du template fiche urbanisme
-b18525|BUG |cadastreV2| passage owner de postgres à u_vitis
-b18366|BUG |cadastreV2| st_area -> public.st_area
-b18243|BUG |cadastreV2| Utilisation EWKT
diff --git a/web_service/class/majic_libV2/Mj_Emprises.class.inc b/web_service/class/majic_libV2/Mj_Emprises.class.inc
old mode 100755
new mode 100644
index 4816d871..3719c772
--- a/web_service/class/majic_libV2/Mj_Emprises.class.inc
+++ b/web_service/class/majic_libV2/Mj_Emprises.class.inc
@@ -26,7 +26,7 @@ require_once ("Mj_Emprise.class.inc");
class Mj_Emprises extends Mj {
/**
- * Cette méthode métier permet de récupérer les informations sur les couches intersectées par la surface de la parcelle intérrogée.
+ * Cette méthode métier permet de récupérer les informations sur les couches intersectées par la surface de la parcelle interrogée.
* \param $oCadastre Objet classe Cadastre.
* \param $sIdPar Identifiant de la parcelle sélectionnée.
* \param $sView Vue Postgis à interroger.
@@ -63,14 +63,20 @@ class Mj_Emprises extends Mj {
}
($sLayerType == "polygon") ? $sPrcTable = "s_cadastre.v_vmap_parcelle" : $sPrcTable = "s_cadastre.v_vmap_parcelle_point";
- $sSameSRIDSql = "SELECT st_srid(".$sPrcTable.".geom) = st_srid(".$sView.".geom) as issamesrid FROM ".$sPrcTable.", ".$sView." LIMIT 1";
- $iSameSRIDResult=$oBD->execute($sSameSRIDSql);
- $aSameSRIDResult=$oBD->getResultTableAssoc($iSameSRIDResult);
+ $sPrcTableSRIDSql = "SELECT st_srid(".$sPrcTable.".geom) as prcsrid FROM ".$sPrcTable." LIMIT 1";
+ $iPrcTableSRIDResult=$oBD->execute($sPrcTableSRIDSql);
+ $aPrcTableSRIDResult=$oBD->getResultTableAssoc($iPrcTableSRIDResult);
+
+ $sViewTableSRIDSql = "SELECT st_srid(".$sView.".geom) as viewsrid FROM ".$sView." LIMIT 1";
+ $iViewTableSRIDResult=$oBD->execute($sViewTableSRIDSql);
+ $aViewTableSRIDResult=$oBD->getResultTableAssoc($iViewTableSRIDResult);
$bIsSameSRID = false;
- if (!empty($aSameSRIDResult[0])) {
- if ($aSameSRIDResult[0]['issamesrid'] == true) {
- $bIsSameSRID = true;
+ if (!empty($aPrcTableSRIDResult[0])) {
+ if (!empty($aViewTableSRIDResult[0])) {
+ if ($aPrcTableSRIDResult[0]['prcsrid'] == $aViewTableSRIDResult[0]['viewsrid']) {
+ $bIsSameSRID = true;
+ }
}
}
diff --git a/web_service/sql/sqlQueries.xml b/web_service/sql/sqlQueries.xml
index 471af1a5..a61dcbb2 100644
--- a/web_service/sql/sqlQueries.xml
+++ b/web_service/sql/sqlQueries.xml
@@ -3050,66 +3050,87 @@
<version>2018.02.01</version>
<code>
<![CDATA[
- -- Romain 25/06/2018 Ajout attribut "tex" dans s_cadastre.subdivision_fiscale
- ALTER TABLE s_cadastre.subdivision_fiscale ADD COLUMN tex character(1);
- UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Fond à forme sociétale à conseil d’administration' WHERE dforme in ('5520');
- UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Fond à forme sociétale à directoire' WHERE dforme in ('5620');
- UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Autorité administrative ou publique indépendante' WHERE dforme in ('7112');
- COMMENT ON COLUMN s_majic.tc_dforme_forme_juridique."dforme" IS 'Modification 2018 des valeurs 5520, 5620 et 7112';
- COMMENT ON COLUMN s_majic.nb_10_parcelle.dsrpar IS 'deprecated. Juin 2018.';
- COMMENT ON COLUMN s_majic.bati_0010_local.dsrpar IS 'deprecated. Juin 2018.';
- INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") VALUES ('ES', 'équipements souterrains indissociables des casiers des installations de stockage de déchets non dangereux');
- INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") VALUES ('BS', 'abattement de 30 % pour des logements faisant l’objet d’un bail réel et solidaire');
- INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") VALUES ('MA', 'minoration de 60 % de la valeur locative des locaux d’habitation situés à Mayotte');
- COMMENT ON COLUMN s_majic.tc_gnextl_exoneration_temporaire."gnextl" IS 'Ajout 2018 des valeurs ES, BS et MA';
- INSERT INTO "s_majic"."tc_ccolloc_collectivite" ("ccolloc", "l_ccolloc") VALUES ('TS', 'Taxe spéciale d’équipement (TSE)');
- INSERT INTO "s_majic"."tc_ccolloc_collectivite" ("ccolloc", "l_ccolloc") VALUES ('OM', 'Taxe sur l enlèvement des ordures ménagères (TEOM)');
- COMMENT ON COLUMN s_majic.tc_ccolloc_collectivite."ccolloc" IS 'Ajout 2018 des valeurs TS et OM';
- ALTER TABLE s_majic.bati_30_pev_exo ADD COLUMN valplaf character(10);
- COMMENT ON COLUMN s_majic.bati_30_pev_exo.valplaf IS 'Ajout juin 2018.';
- CREATE TABLE "s_majic"."bati_52_descr_qp" ("id_pev" character varying(15) NOT NULL,"ccodep" character varying(2),"ccodir" character varying(1),"ccocom" character varying(3),"invar" character varying(10),"dnupev" character varying(3),"cenr" character varying(2),"mlbcom" character varying(11),"mlbsyn" character varying(11),"mlbcu" character varying(11),"mlbdep" character varying(11),"mlbts1" character varying(11),"mlbts2" character varying(11),"mlbtas" character varying(11),"mlbgem" character varying(11),"mlbtom" character varying(11),"tbfpas" character varying(11),"id_com" character varying(5) NOT NULL,"id_local" character varying(12) NOT NULL, CONSTRAINT bati_52_descr_qp_pkey PRIMARY KEY (id_pev));
- ALTER TABLE "s_majic"."bati_52_descr_qp" OWNER TO u_vitis;
- -- Armand 13/07/2018 08:21 Ne pas afficher de page blanche pour le modèle d'impression standard de la fiche urba
+ ]]>
+ </code>
+ </query>
+ <query>
+ <type>update</type>
+ <version>2018.02.02</version>
+ <code>
+ <![CDATA[
+ ]]>
+ </code>
+ </query>
+ <query>
+ <type>update</type>
+ <version>2018.02.03</version>
+ <code>
+ <![CDATA[
+ ]]>
+ </code>
+ </query>
+ <query>
+ <type>update</type>
+ <version>2018.02.04</version>
+ <code>
+ <![CDATA[
+ ]]>
+ </code>
+ </query>
+ <query>
+ <type>update</type>
+ <version>2018.03.00</version>
+ <code>
+ <![CDATA[
+ -- Armand le 25/08/2018 15:53 Rendre le SQL de 2018.02.01 rejouable
+ DO $$ BEGIN BEGIN ALTER TABLE s_cadastre.subdivision_fiscale ADD COLUMN tex character(1); EXCEPTION WHEN duplicate_column THEN RAISE NOTICE 'column already exists.'; END; END; $$;
+ UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Fond à forme sociétale à conseil d’administration' WHERE dforme in ('5520');
+ UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Fond à forme sociétale à directoire' WHERE dforme in ('5620');
+ UPDATE "s_majic"."tc_dforme_forme_juridique" SET l_dforme = 'Autorité administrative ou publique indépendante' WHERE dforme in ('7112');
+ COMMENT ON COLUMN s_majic.tc_dforme_forme_juridique."dforme" IS 'Modification 2018 des valeurs 5520, 5620 et 7112';
+ COMMENT ON COLUMN s_majic.nb_10_parcelle.dsrpar IS 'deprecated. Juin 2018.';
+ COMMENT ON COLUMN s_majic.bati_0010_local.dsrpar IS 'deprecated. Juin 2018.';
+ INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") SELECT 'ES', 'équipements souterrains indissociables des casiers des installations de stockage de déchets non dangereux' WHERE NOT EXISTS (SELECT "gnextl" FROM "s_majic"."tc_gnextl_exoneration_temporaire" WHERE "gnextl" = 'ES');
+ INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") SELECT 'BS', 'abattement de 30 % pour des logements faisant l’objet d’un bail réel et solidaire' WHERE NOT EXISTS (SELECT "gnextl" FROM "s_majic"."tc_gnextl_exoneration_temporaire" WHERE "gnextl" = 'BS');
+ INSERT INTO "s_majic"."tc_gnextl_exoneration_temporaire" ("gnextl", "l_gnextl") SELECT 'MA', 'minoration de 60 % de la valeur locative des locaux d’habitation situés à Mayotte' WHERE NOT EXISTS (SELECT "gnextl" FROM "s_majic"."tc_gnextl_exoneration_temporaire" WHERE "gnextl" = 'MA');
+ COMMENT ON COLUMN s_majic.tc_gnextl_exoneration_temporaire."gnextl" IS 'Ajout 2018 des valeurs ES, BS et MA';
+ INSERT INTO "s_majic"."tc_ccolloc_collectivite" ("ccolloc", "l_ccolloc") SELECT 'TS', 'Taxe spéciale d’équipement (TSE)' WHERE NOT EXISTS (SELECT "ccolloc" FROM "s_majic"."tc_ccolloc_collectivite" WHERE "ccolloc" = 'TS');
+ INSERT INTO "s_majic"."tc_ccolloc_collectivite" ("ccolloc", "l_ccolloc") SELECT 'OM', 'Taxe sur l enlèvement des ordures ménagères (TEOM)' WHERE NOT EXISTS (SELECT "ccolloc" FROM "s_majic"."tc_ccolloc_collectivite" WHERE "ccolloc" = 'OM');
+ COMMENT ON COLUMN s_majic.tc_ccolloc_collectivite."ccolloc" IS 'Ajout 2018 des valeurs TS et OM';
+ DO $$ BEGIN BEGIN ALTER TABLE s_majic.bati_30_pev_exo ADD COLUMN valplaf character(10); EXCEPTION WHEN duplicate_column THEN RAISE NOTICE 'column already exists.'; END; END; $$;
+ COMMENT ON COLUMN s_majic.bati_30_pev_exo.valplaf IS 'Ajout juin 2018.';
+ CREATE TABLE IF NOT EXISTS "s_majic"."bati_52_descr_qp" ("id_pev" character varying(15) NOT NULL,"ccodep" character varying(2),"ccodir" character varying(1),"ccocom" character varying(3),"invar" character varying(10),"dnupev" character varying(3),"cenr" character varying(2),"mlbcom" character varying(11),"mlbsyn" character varying(11),"mlbcu" character varying(11),"mlbdep" character varying(11),"mlbts1" character varying(11),"mlbts2" character varying(11),"mlbtas" character varying(11),"mlbgem" character varying(11),"mlbtom" character varying(11),"tbfpas" character varying(11),"id_com" character varying(5) NOT NULL,"id_local" character varying(12) NOT NULL, CONSTRAINT bati_52_descr_qp_pkey PRIMARY KEY (id_pev));
+ ALTER TABLE "s_majic"."bati_52_descr_qp" OWNER TO u_vitis;
UPDATE s_vmap.printtemplate SET definition='<!--Style-->' || chr(13) || '<style>' || chr(13) || ' .A4_landscape_page {' || chr(13) || ' width: 29.7cm;' || chr(13) || ' height: 20.9cm;' || chr(13) || ' padding: 40px;' || chr(13) || ' }' || chr(13) || ' #map_legend {' || chr(13) || ' margin-left: 25px;' || chr(13) || ' text-align: left;' || chr(13) || ' }' || chr(13) || ' #map_image {' || chr(13) || ' background-color: #DFDFDF;' || chr(13) || ' width: 100%;' || chr(13) || ' height: 100%;' || chr(13) || ' }' || chr(13) || ' #map_overview {' || chr(13) || ' background-color: #DFDFDF;' || chr(13) || ' height: 4cm;' || chr(13) || ' width: 4cm;' || chr(13) || ' }' || chr(13) || ' .infos_column {' || chr(13) || ' height: 100%;' || chr(13) || ' border: 1px solid black;' || chr(13) || ' }' || chr(13) || ' .border_container {' || chr(13) || ' border: 1px solid black;' || chr(13) || ' }' || chr(13) || ' .description_box {' || chr(13) || ' text-align: left;' || chr(13) || ' padding: 5px;' || chr(13) || ' margin-bottom: 10px;' || chr(13) || ' }' || chr(13) || ' .fiche_urb_label {' || chr(13) || ' font-size: 10px;' || chr(13) || ' width: 100%;' || chr(13) || ' margin-bottom: 0px;' || chr(13) || ' }' || chr(13) || ' #img1 {' || chr(13) || ' height: 1cm;' || chr(13) || ' margin-top: 10px;' || chr(13) || ' margin-bottom: -10px;' || chr(13) || ' }' || chr(13) || ' table,' || chr(13) || ' th,' || chr(13) || ' td {' || chr(13) || ' border: 1px solid black;' || chr(13) || ' border-collapse: collapse;' || chr(13) || ' } ' || chr(13) || ' th,' || chr(13) || ' td {' || chr(13) || ' font-size: 10px;' || chr(13) || ' padding: 5px;' || chr(13) || ' text-align: left;' || chr(13) || ' }' || chr(13) || '' || chr(13) || '</style>' || chr(13) || '' || chr(13) || '<!-- A4 print Template -->' || chr(13) || '<div id="A4_landscape_template" class="A4_landscape_page" style="text-align: center">' || chr(13) || ' <div class="row" style="padding-left: 10px; height:100%">' || chr(13) || ' <div class="infos_column col-xs-4">' || chr(13) || ' <img ng-if="logo !== ''''" id="img1" src="{{logo}}">' || chr(13) || ' <h4 ng-if="company !== ''''" style="margin-top: 25px">{{company}}</h4>' || chr(13) || ' <hr>' || chr(13) || ' <h4>Fiche de renseignement d''urbanisme</h4>' || chr(13) || ' <hr>' || chr(13) || '' || chr(13) || ' <!--Description de la commune-->' || chr(13) || ' <div class="description_box border_container">' || chr(13) || ' <label class="fiche_urb_label">Département: {{departement}}</label>' || chr(13) || ' <label class="fiche_urb_label">Commune: {{commune}}</label>' || chr(13) || ' </div>' || chr(13) || '' || chr(13) || ' <!--Description de la parcelle-->' || chr(13) || ' <div class="description_box border_container">' || chr(13) || ' <label class="fiche_urb_label">Parcelle: {{parcelle}}</label>' || chr(13) || ' <label class="fiche_urb_label">Section: {{section}}</label>' || chr(13) || ' <label class="fiche_urb_label">Contenance en m²: {{contenance}}</label>' || chr(13) || ' <label class="fiche_urb_label">Adresse: {{adresse}}</label>' || chr(13) || ' <label class="fiche_urb_label">Echelle d''édition: {{map_scale}}</label>' || chr(13) || ' <label class="fiche_urb_label">Date d''édition: {{date}}</label>' || chr(13) || ' </div>' || chr(13) || '' || chr(13) || ' <!--Description des propriétairtes-->' || chr(13) || ' <div class="description_box border_container">' || chr(13) || ' <label class="fiche_urb_label">Liste des propriétaires:' || chr(13) || ' <div ng-repeat="proprietaire in proprietaires">' || chr(13) || ' <div style="width: 100%">{{proprietaire.nom}}</div>' || chr(13) || ' <div class="row">' || chr(13) || ' <div class="col-xs-6">{{proprietaire.adresse}}</div>' || chr(13) || ' <div class="col-xs-6">{{proprietaire.ville}}</div>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' </label>' || chr(13) || ' </div>' || chr(13) || '' || chr(13) || ' <!--Zone paramétrable-->' || chr(13) || ' <div class="description_box border_container" style="" ng-if="aIntersections.length > 0">' || chr(13) || ' <div ng-repeat="node in aIntersections" class="parent_description_box" ng-if="node.data.length > 0">' || chr(13) || ' <div ng-if="node.data.length > 0" style="margin-bottom:15px">' || chr(13) || ' <label>{{node.title}}</label>' || chr(13) || ' <div class="fiche_urb_label child_description_box" ng-repeat="intersection in node.data" style="margin-bottom:15px">' || chr(13) || ' <div class="fiche_urb_label" ng-repeat="attribut in node.attributs">' || chr(13) || ' <label class="fiche_urb_label" ng-if="node[attribut] && intersection[attribut]">{{node[attribut]}}: {{intersection[attribut]}}</label>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || '' || chr(13) || ' <div class="" style="" ng-if="aIntersectionsArray.length > 0">' || chr(13) || ' <table style="width:100%">' || chr(13) || ' <tr>' || chr(13) || ' <td ng-if="key !== ''intersect''" ng-repeat="(key, value) in aIntersectionsArray[0].data[0]">' || chr(13) || ' {{aIntersectionsArray[0][key]}}' || chr(13) || ' </td>' || chr(13) || ' <td>Intersect</td>' || chr(13) || ' </tr>' || chr(13) || ' <tr ng-repeat="intersection in aIntersectionsArray">' || chr(13) || ' <td ng-if="key !== ''intersect''" ng-repeat="(key, value) in intersection.data[0]">' || chr(13) || ' {{value}}' || chr(13) || ' </td>' || chr(13) || ' <td>{{intersection.data[0].intersect}}</td>' || chr(13) || ' </tr>' || chr(13) || ' </table>' || chr(13) || ' <br>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' <div class="col-xs-8" style="height: 710px">' || chr(13) || ' <div style="height: 100%; border: 1px solid black;">' || chr(13) || ' <img id="map_image" src="images/transparent.png">' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || ' </div>' || chr(13) || '</div>' || chr(13) || '' || chr(13) || '<script>' || chr(13) || 'setTimeout(function () {' || chr(13) || '' || chr(13) || '' || chr(13) || 'var aPages = [$(''#A4_landscape_template'')];' || chr(13) || 'var currentPage = 0;' || chr(13) || 'var aBottom = [];' || chr(13) || 'var iTotalHeight = 0;' || chr(13) || '' || chr(13) || 'var createPage = function() {' || chr(13) || ' // Page' || chr(13) || ' var newPage = document.createElement("div");' || chr(13) || ' $(newPage).addClass(''A4_landscape_page'');' || chr(13) || ' // Zone d''informations' || chr(13) || ' var newInfosColumn = document.createElement("div");' || chr(13) || ' $(newInfosColumn).addClass(''infos_column'');' || chr(13) || ' $(newInfosColumn).css({' || chr(13) || ' "padding": "15px"' || chr(13) || ' });' || chr(13) || ' // Ajout des éléments' || chr(13) || ' $(newPage).append(newInfosColumn);' || chr(13) || ' $(''#A4_landscape_template'').parent().append(newPage);' || chr(13) || ' // Sauvegarde de la page' || chr(13) || ' aPages.push($(newPage));' || chr(13) || ' currentPage++;' || chr(13) || ' // Mise à jour de iTotalHeight' || chr(13) || ' iTotalHeight = getPagesHeight();' || chr(13) || ' return newPage;' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var getBottomPositions = function(aElems) {' || chr(13) || ' var aBottoms = [];' || chr(13) || ' for (var i = 0; i < aElems.length; i++) {' || chr(13) || ' var iTop = $(aElems[i]).position().top;' || chr(13) || ' var iHeight = $(aElems[i]).height();' || chr(13) || ' var iBottom = iTop + iHeight;' || chr(13) || ' aBottoms.push(iBottom);' || chr(13) || ' }' || chr(13) || ' return aBottoms;' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var getTopPosition = function(oElem){' || chr(13) || ' return $(oElem).position().top;' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var getPagesHeight = function() {' || chr(13) || ' var aPagesBotomPositions = getBottomPositions(aPages);' || chr(13) || ' return aPagesBotomPositions[aPagesBotomPositions.length - 1];' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var moveElements = function(aElemsToMove, iPage) {' || chr(13) || ' for (var i = 0; i < aElemsToMove.length; i++) {' || chr(13) || ' $(aElemsToMove[i]).appendTo($(aPages[iPage]).find(''.infos_column''));' || chr(13) || ' }' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var pagineElements = function(){' || chr(13) || '' || chr(13) || ' var aParents = $(''.parent_description_box'');' || chr(13) || ' var aElems, aRestantParents, iParentTop;' || chr(13) || ' iTotalHeight = getPagesHeight();' || chr(13) || '' || chr(13) || ' for (var i = 0; i < aParents.length; i++) {' || chr(13) || '' || chr(13) || ' // Positionne le parent' || chr(13) || ' iParentTop = getTopPosition(aParents[i]);' || chr(13) || ' if (iParentTop > iTotalHeight - 40) {' || chr(13) || '' || chr(13) || ' // Crée une nouvelle page' || chr(13) || ' var newPage = createPage();' || chr(13) || '' || chr(13) || ' // Bouge les parents suivants sur la prochaine page' || chr(13) || ' moveElements(aParents.slice(i), aPages.length - 1);' || chr(13) || ' }' || chr(13) || '' || chr(13) || ' // Positionne les enfants' || chr(13) || ' aElems = $(aParents[i]).find(''.child_description_box'');' || chr(13) || ' aRestantParents = aParents.slice(i+1);' || chr(13) || ' pagineChilds(aElems, aRestantParents);' || chr(13) || ' }' || chr(13) || '}' || chr(13) || '' || chr(13) || 'var pagineChilds = function(aElems, aRestantParents) {' || chr(13) || '' || chr(13) || ' aBottom = getBottomPositions(aElems);' || chr(13) || ' iTotalHeight = getPagesHeight();' || chr(13) || '' || chr(13) || ' for (var i = 0; i < aElems.length; i++) {' || chr(13) || '' || chr(13) || ' // Quand un élément est plus bas que la dernière page' || chr(13) || ' if (aBottom[i] > iTotalHeight - 20) {' || chr(13) || '' || chr(13) || ' // Crée une nouvelle page' || chr(13) || ' var newPage = createPage();' || chr(13) || '' || chr(13) || ' // Déplace les éléments qui suivent sur la nouvelle page' || chr(13) || ' var aElemsToMove = [];' || chr(13) || ' for (var ii = i; ii < aElems.length; ii++) {' || chr(13) || ' aElemsToMove.push(aElems[ii]);' || chr(13) || ' }' || chr(13) || ' moveElements(aElemsToMove, aPages.length - 1);' || chr(13) || '' || chr(13) || ' // Déplace les parents suivants sur la nouvelle page' || chr(13) || ' moveElements(aRestantParents, aPages.length - 1);' || chr(13) || '' || chr(13) || ' // Relance la fonction' || chr(13) || ' pagineChilds(aElems, aRestantParents);' || chr(13) || ' return 0;' || chr(13) || ' }' || chr(13) || ' }' || chr(13) || '}' || chr(13) || '' || chr(13) || 'pagineElements(); ' || chr(13) || '' || chr(13) || '});' || chr(13) || '</script>' WHERE printtemplate_id=-1;
- --Romain le 23/07/2018 Ã 10:57
CREATE OR REPLACE VIEW s_cadastre.v_vmap_subdivision_fiscale AS SELECT subdivision_fiscale.id, subdivision_fiscale.id_com, subdivision_fiscale.section, subdivision_fiscale.geom, subdivision_fiscale.pre, subdivision_fiscale.tex FROM s_cadastre.subdivision_fiscale WHERE subdivision_fiscale.id_com ~ similar_escape( (SELECT "user".restriction FROM s_vitis."user" WHERE "user".login::name = "current_user"()), NULL::text);
- --Romain le 06/08/2018 Ã 15:51
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('71', 'point géodésique borné');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('72', 'point géodésique non borné');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('73', 'point borné de canevas cadastral ordinaire ou préalable à AFAF ou d appui d une prise de vues permettant la confection d un plan de classe de précision [20 cm]');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('74', 'point borné de canevas pérenne ou de précision');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('75', 'point borné de canevas d appui d une prise de vues permettant la confection d un plan de classe de précision [10 cm]');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('76', 'point borné d appui de géoréférencement');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('77', 'repère NGF');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('78', 'borne du NGF');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('79', 'nivellement MRL');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('80', 'autre repère de nivellement');
- INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") VALUES ('81', 'borne limite de commune');
- ALTER TABLE s_cadastre.batiment ADD COLUMN tex character varying(255);
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '71', 'point géodésique borné' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '71');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '72', 'point géodésique non borné' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '72');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '73', 'point borné de canevas cadastral ordinaire ou préalable à AFAF ou d appui d une prise de vues permettant la confection d un plan de classe de précision [20 cm]' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '73');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '74', 'point borné de canevas pérenne ou de précision' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '74');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '75', 'point borné de canevas d appui d une prise de vues permettant la confection d un plan de classe de précision [10 cm]' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '75');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '76', 'point borné d appui de géoréférencement' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '76');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '77', 'repère NGF' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '77');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '78', 'borne du NGF' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '78');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '79', 'nivellement MRL' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '79');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '80', 'autre repère de nivellement' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '80');
+ INSERT INTO "s_cadastre"."tc_sym" ("sym_code", "sym_lib") SELECT '81', 'borne limite de commune' WHERE NOT EXISTS (SELECT "sym_code" FROM "s_cadastre"."tc_sym" WHERE "sym_code" = '81');
+ DO $$ BEGIN BEGIN ALTER TABLE s_cadastre.batiment ADD COLUMN tex character varying(255); EXCEPTION WHEN duplicate_column THEN RAISE NOTICE 'column already exists.'; END; END; $$;
COMMENT ON COLUMN s_cadastre.batiment.tex IS 'Ajout aout 2018.';
- --Romain le 17/09/2018 Ã 09:01
- CREATE TABLE s_cadastre.texte_subdivision_fiscale (id BIGSERIAL NOT NULL, id_com character(5) NOT NULL, SECTION character(2), fon character(255), hei real, tyu character(10), cef real, csp real, di1 real, di2 real, di3 real, di4 real, tpa character(10), hta character(10), vta character(10), texte CHARACTER varying(255), rotation real, taille double precision, geom geometry(MultiPoint), pre character(3), CONSTRAINT pk_texte_subdivision_fiscale PRIMARY KEY (id), CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 2154)) WITH (OIDS=FALSE);
+ CREATE TABLE IF NOT EXISTS s_cadastre.texte_subdivision_fiscale (id BIGSERIAL NOT NULL, id_com character(5) NOT NULL, SECTION character(2), fon character(255), hei real, tyu character(10), cef real, csp real, di1 real, di2 real, di3 real, di4 real, tpa character(10), hta character(10), vta character(10), texte CHARACTER varying(255), rotation real, taille double precision, geom geometry(MultiPoint), pre character(3), CONSTRAINT pk_texte_subdivision_fiscale PRIMARY KEY (id), CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 2154)) WITH (OIDS=FALSE);
ALTER TABLE s_cadastre.texte_subdivision_fiscale OWNER TO u_vitis;
- -- Index: s_cadastre.texte_subdivision_fiscale_geom -- DROP INDEX s_cadastre.texte_subdivision_fiscale_geom;
- CREATE INDEX texte_subdivision_fiscale_geom ON s_cadastre.texte_subdivision_fiscale USING gist (geom);
- -- Index: s_cadastre.texte_subdivision_fiscale_id_com
- -- DROP INDEX s_cadastre.texte_subdivision_fiscale_id_com;
- CREATE INDEX texte_subdivision_fiscale_id_com ON s_cadastre.texte_subdivision_fiscale USING btree (id_com COLLATE pg_catalog."default");
- CREATE TABLE s_cadastre.texte_batiment (id BIGSERIAL NOT NULL, id_com character(5) NOT NULL, SECTION character(2), fon character(255), hei real, tyu character(10), cef real, csp real, di1 real, di2 real, di3 real, di4 real, tpa character(10), hta character(10), vta character(10), texte CHARACTER varying(255), rotation real, taille double precision, geom geometry(MultiPoint), pre character(3), CONSTRAINT pk_texte_batiment PRIMARY KEY (id), CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 2154)) WITH (OIDS=FALSE);
+ DO $$ BEGIN BEGIN CREATE INDEX texte_subdivision_fiscale_geom ON s_cadastre.texte_subdivision_fiscale USING gist (geom); EXCEPTION WHEN duplicate_table THEN RAISE NOTICE 'index already exists.'; END; END; $$;
+ DO $$ BEGIN BEGIN CREATE INDEX texte_subdivision_fiscale_id_com ON s_cadastre.texte_subdivision_fiscale USING btree (id_com COLLATE pg_catalog."default"); EXCEPTION WHEN duplicate_table THEN RAISE NOTICE 'index already exists.'; END; END; $$;
+ CREATE TABLE IF NOT EXISTS s_cadastre.texte_batiment (id BIGSERIAL NOT NULL, id_com character(5) NOT NULL, SECTION character(2), fon character(255), hei real, tyu character(10), cef real, csp real, di1 real, di2 real, di3 real, di4 real, tpa character(10), hta character(10), vta character(10), texte CHARACTER varying(255), rotation real, taille double precision, geom geometry(MultiPoint), pre character(3), CONSTRAINT pk_texte_batiment PRIMARY KEY (id), CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 2154)) WITH (OIDS=FALSE);
ALTER TABLE s_cadastre.texte_batiment OWNER TO u_vitis;
- -- Index: s_cadastre.texte_batiment_geom
- -- DROP INDEX s_cadastre.texte_batiment_geom;
- CREATE INDEX texte_batiment_geom ON s_cadastre.texte_batiment USING gist (geom);
- -- Index: s_cadastre.texte_batiment_id_com
- -- DROP INDEX s_cadastre.texte_batiment_id_com;
- CREATE INDEX texte_batiment_id_com ON s_cadastre.texte_batiment USING btree (id_com COLLATE pg_catalog."default");
+ DO $$ BEGIN BEGIN CREATE INDEX texte_batiment_geom ON s_cadastre.texte_batiment USING gist (geom); EXCEPTION WHEN duplicate_table THEN RAISE NOTICE 'index already exists.'; END; END; $$;
+ DO $$ BEGIN BEGIN CREATE INDEX texte_batiment_id_com ON s_cadastre.texte_batiment USING btree (id_com COLLATE pg_catalog."default"); EXCEPTION WHEN duplicate_table THEN RAISE NOTICE 'index already exists.'; END; END; $$;
CREATE OR REPLACE VIEW s_cadastre.v_vmap_batiment AS SELECT batiment.id, batiment.id_com, batiment.pre, batiment.section, batiment.geom, tc_dur.dur_lib, batiment.dur_code, batiment.tex FROM s_cadastre.batiment JOIN s_cadastre.tc_dur ON batiment.dur_code = tc_dur.dur_code::bpchar WHERE batiment.id_com ~ similar_escape( (SELECT "user".restriction FROM s_vitis."user" WHERE "user".login::name = "current_user"()), NULL::text);
]]>
</code>
</query>
<query>
<type>update</type>
- <version>2018.02.02</version>
+ <version>2018.03.01</version>
<code>
<![CDATA[
]]>
--
GitLab