Merge pull request #616 from geoadmin/develop-2024-05-15

New Release 2024-05-15-rc1
geoadmin · May 13, 2024 · d4bd29b · d4bd29b
2 parents a1cf84f + 7abc009
commit d4bd29b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 34 deletions.
diff --git a/conf/edi.conf.part b/conf/edi.conf.part
@@ -19,25 +19,6 @@ source src_ch_bfs_generalisierte_grenzen_agglomerationen_g1 : def_searchable_fea
 }
 
 
-source src_ch_bfs_generalisierte_grenzen_agglomerationen_g2 : def_searchable_features
-{
-    sql_db = edi_${DBSTAGING}
-    sql_query = \
-        SELECT bgdi_id::bigint as id \
-            , gmd_name as label \
-            , 'feature' as origin \
-            , remove_accents(concat_ws(' ',gmd_name,gmd_nr::text,aname,acode::text)) as detail \
-            , 'ch.bfs.generalisierte-grenzen_agglomerationen_g2' 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 bfs.gen_grenzen_agglo_g2
-}
-
-
 source src_ch_bfs_landschaftswandel : def_searchable_features
 {
     sql_db = edi_${DBSTAGING}
@@ -168,12 +149,6 @@ index ch_bfs_generalisierte_grenzen_agglomerationen_g1
     expand_keywords = 1
 }
 
-index ch_bfs_generalisierte_grenzen_agglomerationen_g2 : ch_bfs_generalisierte_grenzen_agglomerationen_g1
-{
-    source = src_ch_bfs_generalisierte_grenzen_agglomerationen_g2
-    path = /var/lib/sphinxsearch/data/index/ch_bfs_generalisierte_grenzen_agglomerationen_g2
-}
-
 index ch_bfs_landschaftswandel : ch_bfs_generalisierte_grenzen_agglomerationen_g1
 {
     source = src_ch_bfs_landschaftswandel

diff --git a/conf/search.conf.part b/conf/search.conf.part
@@ -288,25 +288,25 @@ source src_zipcode : src_swisssearch
     sql_db=stopo_${DBSTAGING}
     sql_query = \
         SELECT \
-        gid as id \
+        os_uuid::int as id \
         , os_uuid::text as feature_id \
         , plz::text as detail \
         , concat('<b>', plz, ' - ', trim(langtext), '</b>') as label \
         , NULL as objectclass \
         , 'zipcode' as origin \
         , quadindex(the_geom) as geom_quadindex \
         , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
-        , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
+        , box2d(the_geom) as geom_st_box2d_lv95 \
         , 1::integer as rank \
-        , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as x \
-        , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as y \
-        , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as x_lv95 \
-        , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as y_lv95 \
-        , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lat \
-        , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lon \
+        , st_y(st_transform(ST_PointOnSurface(the_geom),21781)) as x \
+        , st_x(st_transform(ST_PointOnSurface(the_geom),21781)) as y \
+        , st_y(ST_PointOnSurface(the_geom)) as x_lv95 \
+        , st_x(ST_PointOnSurface(the_geom)) as y_lv95 \
+        , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat \
+        , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \
         , -1 as zoomlevel \
         , 1 as num \
-        FROM vd.gabmo_plz p
+        FROM vd.amtovz_ortschaften p
 }
 
 source src_haltestellen : src_swisssearch