Merge pull request #548 from geoadmin/develop-2022-12-14

New Release 2022-12-14-rc1

Author: rebert

conf/bafu.conf.part

@@ -1155,6 +1155,42 @@ source src_ch_bafu_gefahren_gefaehrdungszonen : def_searchable_features
         from gefahren.gefaehrdungszonen
 }
 
+source src_ch_bafu_gewaesser_uferbestockung : def_searchable_features
+{
+    sql_db = bafu_${DBSTAGING}
+    sql_query = \
+        SELECT bgdi_id as id \
+            , name as label \
+            , 'feature' as origin \
+            , remove_accents(concat_ws(' ', name, gwl_nr)) as  detail \
+            , 'ch.bafu.gewaesser-uferbestockung' as layer \
+            , quadindex(the_geom) as geom_quadindex \
+            , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
+            , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
+            , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
+            , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+            , bgdi_id::text as feature_id  \
+        from wasser.gewaesser_uferbestockung
+}
+
+source src_bafu_lebensraumkarte_schweiz : def_searchable_features
+{
+    sql_db = bafu_${DBSTAGING}
+    sql_query = \
+        SELECT bgdi_id as id \
+            , polyid as label \
+            , 'feature' as origin \
+            , remove_accents(concat_ws(' ', polyid)) as  detail \
+            , 'ch.bafu.lebensraumkarte-schweiz' as layer \
+            , quadindex(the_geom) as geom_quadindex \
+            , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
+            , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
+            , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
+            , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+            , bgdi_id::text as feature_id  \
+        from lebensraumkarte.lebensraumkarte_schweiz
+}
+
 ## INDICES
 
 index ch_bafu_hydrologie_wassertemperaturmessstationen
@@ -1543,3 +1579,15 @@ index ch_bafu_gefahren_gefaehrdungszonen : ch_bafu_hydrologie_wassertemperaturme
     source = src_ch_bafu_gefahren_gefaehrdungszonen
     path = /var/lib/sphinxsearch/data/index/ch_bafu_gefahren_gefaehrdungszonen
 }
+
+index ch_bafu_gewaesser_uferbestockung : ch_bafu_hydrologie_wassertemperaturmessstationen
+{
+    source = src_ch_bafu_gewaesser_uferbestockung
+    path = /var/lib/sphinxsearch/data/index/ch_bafu_gewaesser_uferbestockung
+}
+
+index ch_bafu_lebensraumkarte_schweiz : ch_bafu_hydrologie_wassertemperaturmessstationen
+{
+    source = src_bafu_lebensraumkarte_schweiz
+    path = /var/lib/sphinxsearch/data/index/ch_bafu_lebensraumkarte_schweiz
+}

conf/bak.conf.part

@@ -0,0 +1,34 @@
+## SOURCES
+
+source src_ch_bak_halteplaetze_jenische_sinti_roma : def_searchable_features
+{
+    sql_db = bak_${DBSTAGING}
+    sql_query = \
+        SELECT bgdi_id::bigint as id \
+            , standort as label \
+            , 'feature' as origin \
+            , remove_accents(standort) as detail \
+            , 'ch.bak.halteplaetze-jenische_sinti_roma' as layer \
+            , quadindex(the_geom) as geom_quadindex \
+            , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
+            , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
+            , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
+            , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+            , bgdi_id::text as feature_id \
+        from public.halteplaetze_jenische_sinti_roma
+}
+
+
+## INDICES
+
+index ch_bak_halteplaetze_jenische_sinti_roma
+{
+    type = plain
+    dict=crc
+    min_infix_len = 2
+    expand_keywords = 1
+    source = src_ch_bak_halteplaetze_jenische_sinti_roma
+    path = /var/lib/sphinxsearch/data/index/ch_bak_halteplaetze_jenische_sinti_roma
+}
+
+

conf/uvek.conf.part

@@ -1164,7 +1164,25 @@ source src_ch_bazl_luftfahrthindernis : def_searchable_features
             , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
             , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
             , bgdi_id::text as feature_id \
-        FROM bazl.view_obstacles
+        FROM bazl.view_obstacles_big
+}
+
+source src_ch_bazl_luftfahrthindernis_klein : def_searchable_features
+{
+    sql_db = uvek_${DBSTAGING}
+    sql_query = \
+        SELECT bgdi_id as id \
+            , registrationnumber::text as label \
+            , 'feature' as origin \
+            , remove_accents(concat_ws(' ', registrationnumber)) as detail \
+            , 'ch.bazl.luftfahrthindernis-klein' as layer \
+            , quadindex(the_geom) as geom_quadindex \
+            , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
+            , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
+            , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
+            , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+            , bgdi_id::text as feature_id \
+        FROM bazl.view_obstacles_small
 }
 
 source src_ch_bazl_luftfahrthindernis_aenderungen : def_searchable_features
@@ -1707,23 +1725,23 @@ source src_ch_bfe_waermepotential_gewaesser : def_searchable_features
          from bfe.waermepotential_gewaesser
  }
 
-source src_ch_bazl_gebietsbeschraenkungen_drohnen : def_searchable_features
- {
-     sql_db = uvek_dev
-     sql_query = \
-         SELECT bgdi_id as id \
-             , zone_name_de as label \
-             , 'feature' as origin \
-             , remove_accents(zone_name_de) as  detail \
-             , 'ch.bazl.gebietsbeschraenkungen-drohnen' as layer \
-             , quadindex(the_geom) as geom_quadindex \
-             , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
-             , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
-             , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
-             , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
-             , bgdi_id::text as feature_id \
-         from bazl.gebietsbeschraenkungen_drohnen
- }
+source src_ch_bazl_einschraenkungen_drohnen : def_searchable_features
+{
+    sql_db = uvek_dev
+    sql_query = \
+        SELECT bgdi_id as id \
+            , zone_name_de as label \
+            , 'feature' as origin \
+            , remove_accents(concat_ws(' ', zone_name_de, zone_name_fr, zone_name_it, zone_name_en)) as  detail \
+            , 'ch.bazl.einschraenkungen-drohnen' as layer \
+            , quadindex(the_geom) as geom_quadindex \
+            , st_y(st_transform(st_centroid(the_geom),4326)) as lat \
+            , st_x(st_transform(st_centroid(the_geom),4326)) as lon \
+            , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
+            , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+            , bgdi_id::text as feature_id \
+        from bazl.gebietsbeschraenkungen_drohnen
+}
 
 ## INDICES
 
@@ -2085,6 +2103,12 @@ index ch_bazl_luftfahrthindernis : ch_astra_ivs_nat
     path = /var/lib/sphinxsearch/data/index/ch_bazl_luftfahrthindernis
 }
 
+index ch_bazl_luftfahrthindernis_klein : ch_astra_ivs_nat
+{
+    source = src_ch_bazl_luftfahrthindernis_klein
+    path = /var/lib/sphinxsearch/data/index/ch_bazl_luftfahrthindernis_klein
+}
+
 index ch_bazl_luftfahrthindernis_aenderungen : ch_astra_ivs_nat
 {
     source = src_ch_bazl_luftfahrthindernis_aenderungen
@@ -2345,8 +2369,8 @@ index ch_bfe_waermepotential_gewaesser : ch_astra_ivs_nat
     path = /var/lib/sphinxsearch/data/index/ch_bfe_waermepotential_gewaesser
 }
 
-index ch_bazl_gebietsbeschraenkungen_drohnen : ch_astra_ivs_nat
+index ch_bazl_einschraenkungen_drohnen : ch_astra_ivs_nat
 {
-    source = src_ch_bazl_gebietsbeschraenkungen_drohnen
-    path = /var/lib/sphinxsearch/data/index/ch_bazl_gebietsbeschraenkungen_drohnen
+    source = src_ch_bazl_einschraenkungen_drohnen
+    path = /var/lib/sphinxsearch/data/index/ch_bazl_einschraenkungen_drohnen
 }