[WIP] Fusion databases

config_db.yaml

@@ -37,17 +37,89 @@ db_config:
       att_id: idcnlo
       att_local_name: nomloc
 
+    land_use_plans_primary_use:
+      tablename: v_r73_affectations_primaires
+      schema: land_use_plans
+    land_use_plans_overlay_zones:
+      tablename: v_r73_zones_superposees
+      schema: land_use_plans
+    land_use_plans_overlay_perimeters:
+      tablename: v_r73_perimetres_superposes
+      schema: land_use_plans
+    land_use_plans_linear_constraints:
+      tablename: v_r73_contenus_lineaires
+      schema: land_use_plans
+    land_use_plans_point_constraints:
+      tablename: v_r73_contenus_ponctuels
+      schema: land_use_plans
+    motorways_project_planing_zones:
+      tablename: v_r87_astra_projektierungszonen_nationalstrassen
+      schema: motorways_project_planing_zones
+    motorways_building_lines:
+      tablename: v_r88_astra_baulinien_nationalstrassen
+      schema: motorways_building_lines
+    railways_project_planning_zones:
+      tablename: v_r96_bav_projektierungszonen_eisenbahnanlagen
+      schema: railways_project_planning_zones
+    railways_building_lines:
+      tablename: v_r97_bav_baulinien_eisenbahnanlagen
+      schema: railways_building_lines
+    airports_project_planning_zones:
+      tablename: v_r103_bazl_projektierungszonen_flughafenanlagen
+      schema: airports_project_planning_zones
+    airports_building_lines:
+      tablename: v_r104_bazl_baulinien_flughafenanlagen
+      schema: airports_building_lines
+    airports_security_zone_plans:
+      tablename: v_r108_bazl_sicherheitszonenplan
+      schema: airports_security_zone_plans
+    contaminated_sites:
+      tablename: v_r116_sites_pollues
+      schema: contaminated_sites
+    contaminated_military_sites:
+      tablename: v_r117_vbs_belastete_standorte_militaer
+      schema: contaminated_military_sites
+    contaminated_civil_aviation_sites:
+      tablename: v_r118_bazl_belastete_standorte_zivilflugplaetze
+      schema: contaminated_civil_aviation_sites
+    contaminated_public_transport_sites:
+      tablename: v_r119_bav_belastete_standorte_oev
+      schema: contaminated_public_transport_sites
+    groundwater_protection_zones:
+      tablename: v_r131_zone_prot_eau
+      schema: groundwater_protection_zones
+    groundwater_protection_sites:
+      tablename: v_r132_perimetre_prot_eau
+      schema: groundwater_protection_sites
+    noise_sensitivity_levels:
+      tablename: v_r145_sens_bruit
+      schema: noise_sensitivity_levels
+    forest_perimeters:
+      tablename: v_r157_lim_foret
+      schema: forest_perimeters
+    forest_distance_lines:
+      tablename: v_r159_dist_foret
+      schema: forest_distance_lines
+
   restrictions:
-      railways_project_zones
-      railways_construction_limits
-      highways_project_zones
-      highways_construction_limits
-      airport_security_zones
-      airport_project_zones
-      airport_construction_limits
-      military_polluted_sites
-      airport_polluted_sites
-      transportation_polluted_sites
-      road_noise
-      forest_limits
-      forest_distances
+    land_use_plans_primary_use
+    land_use_plans_overlay_zones
+    land_use_plans_overlay_perimeters
+    land_use_plans_linear_constraints
+    land_use_plans_point_constraints
+    airports_building_lines
+    airports_project_planning_zones
+    airports_security_zone_plans
+    railways_project_planning_zones
+    railways_building_lines
+    motorways_project_planing_zones
+    motorways_building_lines
+    contaminated_military_sites
+    contaminated_civil_aviation_sites
+    contaminated_public_transport_sites
+    contaminated_sites
+    groundwater_protection_sites
+    groundwater_protection_zones
+    road_noise
+    forest_perimeters
+    forest_distance_lines

config_pdf.yaml.mako

@@ -9,7 +9,14 @@ wmts_openlayers:
     ]
 
 app_config:
-  # defaultfontfamily: Arial
+  # default language
+  lang: fr
+
+  # Address figuring on the first page of the PDF extract
+  competentauthority: Service de la geomatique et du registre foncier;Rue de Tivoli 22 / CP;2002 Neuchatel
+
+  doctypes: legalbase,legalprovision,reference
+
   # topics provided by the confederation
   ch_topics: ['R087','R088','R096','R097','R103','R104','R108','R117','R118','R119']
   # federal topics with certificate but empty no content/layers
@@ -81,22 +88,6 @@ pdf_config:
   footermargin: 20
   # Default text font
   fontfamily: Arial
-  # text formats : b = bold, n= normal, i=italic ; size in pt
-  textstyles:
-    title1: [B, 22]
-    title2: [B, 18]
-    title3: [B, 16]
-    normal: [N, 10]
-    bold: [B,10]
-    url: [N,10]
-    small: [N, 7]
-    tocbold: [B, 11]
-    tocurl: [N, 9]
-    tocnormal: [N, 11]
-  # color for links - default is standard blue
-  urlcolor: [0, 0, 255]
-  # default color for text - black
-  defaultcolor: [0, 0, 0]
   # Max ratio property bbox/map bbox - to insure that the property occupies at most 90% of the map and leaves 10% space around it
   fitratio: 0.9
   # path to the logo of the confederation
@@ -115,9 +106,6 @@ pdf_config:
   # Default base name for the PDF extract
   pdfbasename: _ExtraitCRDPPF
 
-  # Default prefix/suffix for all the basemap files to distinguish them from topic files
-  siteplanbasename: _siteplan
-
   # Activates (true) or not cantonal and other optional topics (to be specified in crdppfportal/models.py)
   optionaltopics: false
 

crdppfportal/table2model_match.py

@@ -4,11 +4,11 @@
 from crdppf.models.models import LandUsePointConstraints, PollutedSites
 from crdppf.models.models import CHHighwaysProjectZones, CHHighwaysConstructionLimits
 from crdppf.models.models import CHRailwaysProjectZones, CHRailwaysConstructionLimits
-from crdppf.models.models import CHAirportSecurityZones, CHAirportSecurityZonesPDF
-from crdppf.models.models import CHAirportProjectZones, CHAirportProjectZonesPDF, ContaminatedMilitarySites
-from crdppf.models.models import CHAirportConstructionLimits, CHAirportConstructionLimitsPDF
-from crdppf.models.models import CHPollutedSitesCivilAirports, CHPollutedSitesCivilAirportsPDF
-from crdppf.models.models import CHPollutedSitesPublicTransports, CHPollutedSitesPublicTransportsPDF
+from crdppf.models.models import CHAirportSecurityZones
+from crdppf.models.models import CHAirportProjectZones, ContaminatedMilitarySites
+from crdppf.models.models import CHAirportConstructionLimits
+from crdppf.models.models import CHPollutedSitesCivilAirports
+from crdppf.models.models import CHPollutedSitesPublicTransports
 from crdppf.models.models import WaterProtectionZones, WaterProtectionPerimeters
 from crdppf.models.models import RoadNoise, ForestLimits, ForestDistances
 
@@ -24,17 +24,12 @@
     'r97_bav_baulinien_eisenbahnanlagen': CHRailwaysConstructionLimits,
     'r96_bav_projektierungszonen_eisenbahnanlagen': CHRailwaysProjectZones,
     'r103_bazl_projektierungszonen_flughafenanlagen': CHAirportProjectZones,
-    'r103_bazl_projektierungszonen_flughafenanlagen_pdf': CHAirportProjectZonesPDF,
     'r104_bazl_baulinien_flughafenanlagen': CHAirportConstructionLimits,
-    'r104_bazl_baulinien_flughafenanlagen_pdf': CHAirportConstructionLimitsPDF,
     'r108_bazl_sicherheitszonenplan': CHAirportSecurityZones,
-    'r108_bazl_sicherheitszonenplan_pdf': CHAirportSecurityZonesPDF,
     'r116_sites_pollues': PollutedSites,
-    'r117_vbs_belastete_standorte_militaer': ContaminatedMilitarySites,
+    'v_r117_vbs_belastete_standorte_militaer': ContaminatedMilitarySites,
     'r118_bazl_belastete_standorte_zivilflugplaetze': CHPollutedSitesCivilAirports,
-    'r118_bazl_belastete_standorte_zivilflugplaetze_pdf': CHPollutedSitesCivilAirportsPDF,
     'r119_bav_belastete_standorte_oev': CHPollutedSitesPublicTransports,
-    'r119_bav_belastete_standorte_oev_pdf': CHPollutedSitesPublicTransportsPDF,
     'r131_zone_prot_eau': WaterProtectionZones,
     'r132_perimetre_prot_eau': WaterProtectionPerimeters,
     'r145_sens_bruit': RoadNoise,

mapserver/crdppf.map.mako

@@ -1290,7 +1290,7 @@ LAYER
   CONNECTIONTYPE POSTGIS
   CONNECTION "user=${dbuser} password=${dbpassword} dbname=${db} host=${dbhost} port=${dbport}"
   PROCESSING "CLOSE_CONNECTION=DEFER"
-  DATA "geom from crdppf.r88_astra_baulinien_nationalstrassen using unique idobj using srid=2056"
+  DATA "geom from motorways_building_lines.v_r88_astra_baulinien_nationalstrassen using unique idobj using srid=2056"
   TYPE LINE
   TEMPLATE "ttt"
   OPACITY 60
@@ -1479,7 +1479,7 @@ END
 LAYER
   STATUS ON
   NAME "r117_vbs_belastete_standorte_militaer_pts"
-  GROUP "r117_vbs_belastete_standorte_militaer"
+  GROUP "v_r117_vbs_belastete_standorte_militaer"
   METADATA
        "ows_title"                   "r117_vbs_belastete_standorte_militaer_pts"
        "wms_srs"                    "EPSG:2056"
@@ -1491,8 +1491,8 @@ LAYER
   PROCESSING "CLOSE_CONNECTION=DEFER"
   DATA "geom from (
     select *
-    from crdppf.r117_vbs_belastete_standorte_militaer
-    WHERE  st_geometrytype(geom) like 'ST_Point'
+    from contaminated_military_sites.v_r117_vbs_belastete_standorte_militaer
+    WHERE  st_geometrytype(geom) in ('ST_Point','ST_MultiPoint')
     ) as foo using unique idobj using srid=2056"
   TYPE POINT
   TEMPLATE "ttt"
@@ -1552,7 +1552,7 @@ END
 LAYER
   STATUS ON
   NAME "r117_vbs_belastete_standorte_militaer_poly"
-  GROUP "r117_vbs_belastete_standorte_militaer"
+  GROUP "v_r117_vbs_belastete_standorte_militaer"
   METADATA
        "ows_title"                   "r117_vbs_belastete_standorte_militaer_poly"
        "wms_srs"                    "EPSG:2056"
@@ -1562,7 +1562,7 @@ LAYER
   CONNECTIONTYPE POSTGIS
   CONNECTION "user=${dbuser} password=${dbpassword} dbname=${db} host=${dbhost} port=${dbport}"
   PROCESSING "CLOSE_CONNECTION=DEFER"
-  DATA "geom from crdppf.r117_vbs_belastete_standorte_militaer using unique idobj using srid=2056"
+  DATA "geom from contaminated_military_sites.v_r117_vbs_belastete_standorte_militaer using unique idobj using srid=2056"
   TYPE POLYGON
   TEMPLATE "ttt"
   OPACITY 60
@@ -1908,7 +1908,7 @@ LAYER
   CONNECTIONTYPE POSTGIS
   CONNECTION "user=${dbuser} password=${dbpassword} dbname=${db} host=${dbhost} port=${dbport}"
   PROCESSING "CLOSE_CONNECTION=DEFER"
-  DATA "geom from crdppf.r145_sens_bruit using unique idobj using srid=2056"
+  DATA "geom from noise_sensitivity_levels.v_r145_sens_bruit using unique idobj using srid=2056"
   STATUS ON
   CLASSITEM "codegenre"
   OPACITY 50
@@ -1996,6 +1996,78 @@ LAYER
   END
 END
 
+LAYER
+    NAME "r078ne_alignements"
+    TYPE LINE
+    METADATA
+       "ows_title" "r078ne_alignements"
+       "wms_srs""EPSG:2056"
+       "wms_title"                      "${instanceid} WMS Server"
+       "wms_onlineresource"     "http://${host}/${instanceid}/wmscrdppf"
+    END
+    CONNECTIONTYPE POSTGIS
+    CONNECTION "user=${dbuser} password=${dbpassword} dbname=${db} host=${dbhost} port=${dbport}"
+    PROCESSING "CLOSE_CONNECTION=DEFER"
+    DATA "geom from crdppf.r078ne_alignements using unique idobj using srid=2056"
+    STATUS ON
+    TEMPLATE "ttt"
+    TOLERANCE 5
+    TOLERANCEUNITS pixels
+    CLASSITEM "codegenre"
+    CLASS
+        NAME "alignement primaire"
+        EXPRESSION /ali_prim/
+        STYLE
+            WIDTH 3
+            COLOR 25 60 116
+        END
+    END
+    CLASS
+        NAME "alignement secondaire"
+        EXPRESSION /ali_sec/
+        STYLE
+            WIDTH 2
+            COLOR 25 60 116
+        END
+    END
+    CLASS
+        NAME "front d'implantation obligatoire"
+        EXPRESSION /fio/
+        STYLE
+            PATTERN 6 6 END
+            WIDTH 3
+            COLOR 31 120 180
+        END
+    END
+    CLASS
+        NAME "bande d'implantation obligatoire"
+        EXPRESSION /bio/
+        STYLE
+            WIDTH 4
+            COLOR 31 120 180
+        END
+    END
+    CLASS
+        NAME "alignement de rez-de-chaussée"
+        EXPRESSION /ali_rez/
+        STYLE
+            WIDTH 2
+            COLOR 14 88 162
+        END
+    END
+    CLASS
+        NAME "alignement en cas de reconstruction"
+        EXPRESSION /ali_rec/
+        STYLE
+            PATTERN 6 6 END
+            WIDTH 2
+            COLOR 31 120 180
+        END
+    END
+    MINSCALEDENOM 50
+END
+
+
 #####################
 # RESTRICTIONS CRDPPF - fin
 #####################

pyramid_oereb_standard.yml.mako

@@ -783,8 +783,8 @@ pyramid_oereb:
         get_symbol: pyramid_oereb.standard.hook_methods.get_symbol
         get_symbol_ref: pyramid_oereb.standard.hook_methods.get_symbol_ref
       law_status:
-        in_force: inForce
-        running_modifications: runningModifications
+        in_force: inKraft
+        running_modifications: laufendeAenderungen
 
     - name: plr118
       code: ContaminatedCivilAviationSites