Merge pull request #705 from geoadmin/develop-2026-02-04

New Release 2026-02-04-rc1

Author: faselm

README.md

@@ -84,3 +84,37 @@ The swisssearch index (zipcodes) has to be computed after a wordforms update.
 cd test
 python test.py -h localhost -p 9312 -i swisssearch "birgmattenweg 5"
 ```
+
+### Command line debugging with MYSQL interface
+You can access the Sphinx indexes using the MySQL client from inside the Sphinx pods.
+First, open a bash terminal inside a Sphinx container.
+```bash
+$ kubectx bgdi/dev
+$ kubectl -n service-search exec -it service-search-0 -c sphinx -- bash
+$ mysql -h 127.0.0.1 -P 9306
+
+$ MySQL [(none)]> select count(*) FROM ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill;
++----------+
+| count(*) |
++----------+
+|   546474 |
++----------+
+1 row in set (0.009 sec)
+
+# expanded output for better readability
+MySQL [(none)]> select * FROM ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill limit 1\G
+*************************** 1. row ***************************
+                id: 1
+            origin: feature
+            detail: aeugst am albis 1
+             layer: ch.swisstopo.swissboundaries3d-gemeinde-flaeche.fill
+    geom_quadindex: 0300210
+               lat: 47.274960
+               lon: 8.490504
+     geom_st_box2d: BOX(678109.8793882465 234561.19507542154,681154.069340285 238543.8333016288)
+geom_st_box2d_lv95: BOX(2678110.6950000003 1234561.039999999,2681154.916000001 1238543.664999999)
+             label: Aeugst am Albis 2026
+              year: 2026
+        feature_id: 1
+1 row in set (0.008 sec)
+```

conf/search.conf.part

@@ -5,12 +5,14 @@ source src_swisssearch : def_pqsql
     sql_attr_uint = num
     sql_attr_uint = rank
     sql_attr_uint = zoomlevel
+    sql_attr_uint = egaid
     sql_attr_string = label
     sql_attr_string = objectclass
     sql_attr_string = feature_id
     sql_attr_string = origin
     sql_attr_string = geom_st_box2d
     sql_attr_string = geom_st_box2d_lv95
+    sql_attr_string = egid_edid
     sql_attr_float = x
     sql_attr_float = y
     sql_attr_float = x_lv95
@@ -43,6 +45,8 @@ source src_address : src_swisssearch
         , st_x(st_transform(the_geom,4326)) as lon \
         , NULLIF(regexp_replace(adr_number::text, '[^0-9]'::text, ''::text, 'g'::text), ''::text)::integer AS num \
         , 10 as zoomlevel \
+        , adr_egaid as egaid \
+        , legacy_id as egid_edid \
         FROM vd.addressverzeichnis
 }
 
@@ -68,6 +72,8 @@ source src_parcel : src_swisssearch
         , st_x(st_transform(the_geom_point,4326)) as lon \
         , num \
         , 10 as zoomlevel \
+        , NULL as egaid \
+        , NULL as egid_edid \
         from vd.parzellen_sphinx
 }
 
@@ -178,7 +184,9 @@ source src_swissnames3d : src_swisssearch
         coalesce(b.lat,s.lat) as lat, \
         coalesce(b.lon,s.lon) as lon, \
         1 as num, \
-        coalesce(b.zoomlevel,s.zoomlevel) as zoomlevel \
+        coalesce(b.zoomlevel,s.zoomlevel) as zoomlevel, \
+        NULL as egaid,  \
+        NULL as egid_edid \
     FROM swissnames_search s \
     left outer join tlm.dkm_search b ON s.feature_id = b.feature_id \
     UNION ALL \
@@ -199,7 +207,9 @@ source src_swissnames3d : src_swisssearch
         b.lat as lat, \
         b.lon as lon, \
         1 as num, \
-        b.zoomlevel as zoomlevel \
+        b.zoomlevel as zoomlevel, \
+        NULL as egaid,  \
+        NULL as egid_edid \
     FROM swissnames_search s \
     inner join tlm.dkm_search b on s.name = b.name and s.objectclass = 'TLM_GEBAEUDE' and s.feature_id <> b.feature_id \
     ) s
@@ -228,6 +238,8 @@ source src_gg25 : src_swisssearch
         , st_x(st_transform(ST_PointOnSurface(g.the_geom),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
+        , NULL as egaid \
+        , NULL as egid_edid \
         FROM tlm.swissboundaries_gemeinden_uebersetzt g left join tlm.swissboundaries_kantone k on k.kantonsnr = g.kantonsnr
 }
 
@@ -254,6 +266,8 @@ source src_kantone : src_swisssearch
         , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
+        , NULL as egaid \
+        , NULL as egid_edid \
          FROM tlm.swissboundaries_kantone
 }
 
@@ -280,6 +294,8 @@ source src_district : src_swisssearch
         , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
+        , NULL as egaid \
+        , NULL as egid_edid \
         FROM tlm.swissboundaries_bezirke
 }
 
@@ -306,6 +322,8 @@ source src_zipcode : src_swisssearch
         , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
+        , NULL as egaid \
+        , NULL as egid_edid \
         FROM vd.amtovz_ortschaften p
 }
 
@@ -332,6 +350,8 @@ source src_haltestellen : src_swisssearch
         , st_x(st_transform(st_geometryn(the_geom,1),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
+        , NULL as egaid \
+        , NULL as egid_edid \
         FROM bav.oev_haltestellen
 }
 

conf/stopo.conf.part

@@ -684,7 +684,7 @@ source src_ch_swisstopo_amtliches_gebaeudeadressverzeichnis : def_searchable_fea
       SELECT adr_egaid as id \
           , concat_ws(' ', stn_label, adr_number, zip_label) as label \
           , 'feature' as origin  \
-          , remove_accents(concat_ws(' ', adr_egaid, bdg_egid, adr_edid, str_esid, stn_label, adr_number, com_name)) as detail  \
+          , remove_accents(concat_ws(' ', adr_egaid, bdg_egid, adr_edid, str_esid, stn_label, adr_number, com_name, legacy_id)) as detail  \
           , 'ch.swisstopo.amtliches-gebaeudeadressverzeichnis' as layer  \
           , geom_quadindex  \
           , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat  \

conf/vbs.conf.part

@@ -134,15 +134,15 @@ source src_ch_vbs_schiessanzeigen : def_searchable_features
         SELECT belplan_id as id \
             ,  bezeichnung as label \
             , 'feature' as origin \
-            , remove_accents(concat_ws(' ', bezeichnung, belplan_id)) as detail \
+            , remove_accents(concat_ws(' ', bezeichnung, belplan_id, belplan_ort_id, bezeichnung_ort)) as detail \
             , 'ch.vbs.schiessanzeigen' 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 \
             , belplan_id::text as feature_id \
-        from public.schiessanzeigen
+        from public.view_schiessanzeigen
 }