Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Release 2024-05-15-rc1 #616

Merged
merged 4 commits into from
May 13, 2024
Merged

New Release 2024-05-15-rc1 #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b42e52a
fix ortschaften query in swisssearch
ltclm Apr 23, 2024
b524cf6
Merge pull request #614 from geoadmin/fix_swisssearch_plz
ltclm Apr 24, 2024
476052d
BGDIDIC-685: delete search index
faselm Apr 29, 2024
7abc009
Merge pull request #615 from geoadmin/feat-BGDIDIC-685-generalisierte…
faselm Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions conf/edi.conf.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions conf/search.conf.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading