Skip to content

Commit c7f6430

Browse files
authored
Merge pull request #643 from geoadmin/develop-2024-11-13
New Release 2024-11-13-rc1
2 parents 0b63267 + 31ff036 commit c7f6430

File tree

2 files changed

+97
-1
lines changed

2 files changed

+97
-1
lines changed

.github/workflows/create-milestone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
uses: geoadmin/.github/.github/workflows/create-milestone.yml@master
99
secrets: inherit
1010
with:
11-
ci_status_check_name: 'service-search-sphinx-pr'
11+
ci_status_check_name: 'AWS CodeBuild eu-central-1 (service-search-sphinx-pr)'

conf/stopo.conf.part

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,42 @@ source src_ch_swisstopo_vec25_gewaessernetz_referenz : def_searchable_features
127127
FROM public.v25_gewaessernetz_ref
128128
}
129129

130+
source src_ch_swisstopo_karto_skitouren : def_searchable_features
131+
{
132+
sql_db = stopo_${DBSTAGING}
133+
sql_query = \
134+
SELECT bgdi_id as id \
135+
, coalesce(target_name, '') as label \
136+
, 'feature' as origin \
137+
, remove_accents(coalesce(target_name, '')) as detail \
138+
, 'ch.swisstopo-karto.skitouren' as layer \
139+
, quadindex(the_geom) as geom_quadindex \
140+
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
141+
, st_x(st_transform(st_centroid(the_geom),4326)) as lon \
142+
, box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
143+
, box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
144+
, route_uuid::text as feature_id \
145+
FROM karto.ski_routes
146+
}
147+
148+
source src_ch_swisstopo_karto_schneeschuhrouten : def_searchable_features
149+
{
150+
sql_db = stopo_${DBSTAGING}
151+
sql_query = \
152+
SELECT bgdi_id as id \
153+
, coalesce(target_name, '') as label \
154+
, 'feature' as origin \
155+
, remove_accents(coalesce(target_name, '')) as detail \
156+
, 'ch.swisstopo-karto.schneeschuhrouten' as layer \
157+
, quadindex(the_geom) as geom_quadindex \
158+
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
159+
, st_x(st_transform(st_centroid(the_geom),4326)) as lon \
160+
, box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
161+
, box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
162+
, route_uuid::text as feature_id \
163+
FROM karto.snowshoe_routes
164+
}
165+
130166
source src_ch_swisstopo_geologie_gravimetrischer_atlas_messpunkte : def_searchable_features
131167
{
132168
sql_db = stopo_${DBSTAGING}
@@ -1004,6 +1040,42 @@ source src_ch_swisstopo_geologie_tektonische_karte_unit : def_searchable_feature
10041040
from geol.tektonische_karte_units
10051041
}
10061042

1043+
source src_ch_swisstopo_geologie_thermale_waesser : def_searchable_features
1044+
{
1045+
sql_db = stopo_${DBSTAGING}
1046+
sql_query = \
1047+
SELECT primary_key as id \
1048+
, name as label \
1049+
, 'feature' as origin \
1050+
, remove_accents(concat_ws(' ', name, source1)) as detail \
1051+
, 'ch.swisstopo.geologie-thermale_waesser' as layer \
1052+
, quadindex(the_geom) as geom_quadindex \
1053+
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
1054+
, st_x(st_transform(st_centroid(the_geom),4326)) as lon \
1055+
, box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
1056+
, box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
1057+
, primary_key::text as feature_id \
1058+
from geol.thermal_waters
1059+
}
1060+
1061+
source src_ch_swisstopo_unterkuenfte_winter : def_searchable_features
1062+
{
1063+
sql_db = stopo_${DBSTAGING}
1064+
sql_query = \
1065+
SELECT bgdi_id as id \
1066+
, name as label \
1067+
, 'feature' as origin \
1068+
, remove_accents(name) as detail \
1069+
, 'ch.swisstopo.unterkuenfte-winter' as layer \
1070+
, quadindex(the_geom) as geom_quadindex \
1071+
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
1072+
, st_x(st_transform(st_centroid(the_geom),4326)) as lon \
1073+
, box2d(st_transform(the_geom, 21781)) as geom_st_box2d \
1074+
, box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \
1075+
, bgdi_id::text as feature_id \
1076+
from karto.unterkuenfte_winter
1077+
}
1078+
10071079
## INDICES
10081080

10091081
index ch_swisstopo_verschiebungsvektoren_tsp1
@@ -1022,6 +1094,18 @@ index ch_swisstopo_landesschwerenetz : ch_swisstopo_verschiebungsvektoren_tsp1
10221094
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_landesschwerenetz
10231095
}
10241096

1097+
index ch_swisstopo_karto_skitouren : ch_swisstopo_verschiebungsvektoren_tsp1
1098+
{
1099+
source = src_ch_swisstopo_karto_skitouren
1100+
path = /var/lib/sphinxsearch/data/index/swisstopo_karto_skitouren
1101+
}
1102+
1103+
index ch_swisstopo_karto_schneeschuhrouten : ch_swisstopo_verschiebungsvektoren_tsp1
1104+
{
1105+
source = src_ch_swisstopo_karto_schneeschuhrouten
1106+
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_karto_schneeschuhrouten
1107+
}
1108+
10251109
index ch_swisstopo_verschiebungsvektoren_tsp2 : ch_swisstopo_verschiebungsvektoren_tsp1
10261110
{
10271111
source = src_ch_swisstopo_verschiebungsvektoren_tsp2
@@ -1346,3 +1430,15 @@ index ch_swisstopo_geologie_tektonische_karte
13461430
local = ch_swisstopo_geologie_tektonische_karte_line
13471431
local = ch_swisstopo_geologie_tektonische_karte_unit
13481432
}
1433+
1434+
index ch_swisstopo_geologie_thermale_waesser : ch_swisstopo_verschiebungsvektoren_tsp1
1435+
{
1436+
source = src_ch_swisstopo_geologie_thermale_waesser
1437+
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_thermale_waesser
1438+
}
1439+
1440+
index ch_swisstopo_unterkuenfte_winter : ch_swisstopo_verschiebungsvektoren_tsp1
1441+
{
1442+
source = src_ch_swisstopo_unterkuenfte_winter
1443+
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_unterkuenfte_winter
1444+
}

0 commit comments

Comments
 (0)