Skip to content

Commit

Permalink
Merge pull request #625 from geoadmin/develop-2024-07-03
Browse files Browse the repository at this point in the history 
New Release 2024-07-03-rc1
  • Loading branch information
@rebert
rebert authored Jul 1, 2024
2 parents 8f8d329 + 3864598 commit c91301d
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 30 deletions.
83 changes: 83 additions & 0 deletions conf/stopo.conf.part
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,64 @@ source src_ch_swisstopo_geologie_reflexionsseismik : def_searchable_features
from geol.view_geologie_reflexionsseismik_sphinx
}

source src_ch_swisstopo_geologie_hartsteinabbau : def_searchable_features
{
sql_db = stopo_${DBSTAGING}
sql_query = \
WITH data as ( \
SELECT bgdi_hartstein_id, obname, cpkind, the_geom from geol.hartstein_production UNION ALL \
SELECT bgdi_hartstein_id, obname, cpkind, the_geom from geol.hartstein_mining \
) \
SELECT bgdi_hartstein_id as id \
, obname as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', obname, cpkind)) as detail \
, 'ch.swisstopo.geologie-hartsteinabbau' 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_hartstein_id as feature_id \
from data
}

source src_ch_swisstopo_geologie_tektonische_karte_line : def_searchable_features
{
sql_db = stopo_${DBSTAGING}
sql_query = \
SELECT fid as id \
, name_de as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', name_de, name_fr, name_it, name_en)) as detail \
, 'ch.swisstopo.geologie-tektonische_karte' 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 \
, fid::text as feature_id \
from geol.tektonische_karte_line
}

source src_ch_swisstopo_geologie_tektonische_karte_unit : def_searchable_features
{
sql_db = stopo_${DBSTAGING}
sql_query = \
SELECT fid as id \
, tecto_3_de as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', tecto_3_de, tecto_3_fr, tecto_3_it, tecto_3_en, tecto_4_de, tecto_4_fr, tecto_4_it, tecto_4_en)) as detail \
, 'ch.swisstopo.geologie-tektonische_karte' 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 \
, fid::text as feature_id \
from geol.tektonische_karte_units
}

## INDICES

index ch_swisstopo_verschiebungsvektoren_tsp1
Expand Down Expand Up @@ -1263,3 +1321,28 @@ index ch_swisstopo_geologie_reflexionsseismik : ch_swisstopo_verschiebungsvektor
source = src_ch_swisstopo_geologie_reflexionsseismik
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_reflexionsseismik
}

index ch_swisstopo_geologie_hartsteinabbau : ch_swisstopo_verschiebungsvektoren_tsp1
{
source = src_ch_swisstopo_geologie_hartsteinabbau
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_hartsteinabbau
}

index ch_swisstopo_geologie_tektonische_karte_line : ch_swisstopo_verschiebungsvektoren_tsp1
{
source = src_ch_swisstopo_geologie_tektonische_karte_line
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_tektonische_karte_line
}

index ch_swisstopo_geologie_tektonische_karte_unit : ch_swisstopo_verschiebungsvektoren_tsp1
{
source = src_ch_swisstopo_geologie_tektonische_karte_unit
path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_tektonische_karte_unit
}

index ch_swisstopo_geologie_tektonische_karte
{
type = distributed
local = ch_swisstopo_geologie_tektonische_karte_line
local = ch_swisstopo_geologie_tektonische_karte_unit
}
60 changes: 30 additions & 30 deletions conf/uvek.conf.part
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,15 @@ source src_ch_bakom_notruf_112_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_112, fn_addresse_112)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-112_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_112_tooltip
}


Expand All @@ -309,15 +309,15 @@ source src_ch_bakom_notruf_117_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_117, fn_addresse_117)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-117_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_117_tooltip
}


Expand All @@ -328,15 +328,15 @@ source src_ch_bakom_notruf_118_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_118, fn_addresse_118)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-118_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_118_tooltip
}


Expand All @@ -347,15 +347,15 @@ source src_ch_bakom_notruf_143_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_143, fn_addresse_143)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-143_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_143_tooltip
}


Expand All @@ -366,15 +366,15 @@ source src_ch_bakom_notruf_144_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_144, fn_addresse_144)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-144_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_144_tooltip
}


Expand All @@ -385,15 +385,15 @@ source src_ch_bakom_notruf_145_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_145, fn_addresse_145)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-145_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_145_tooltip
}


Expand All @@ -404,15 +404,15 @@ source src_ch_bakom_notruf_147_festnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', festnetz_147, fn_addresse_147)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-147_festnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.fn_147_tooltip
}


Expand All @@ -423,15 +423,15 @@ source src_ch_bakom_notruf_112_satellit : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', satellit_112, sa_addresse_112)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-112_satellit' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.sa_112_tooltip
}


Expand All @@ -442,15 +442,15 @@ source src_ch_bakom_notruf_112_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_112, mo_addresse_112)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-112_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_112_tooltip
}


Expand All @@ -461,15 +461,15 @@ source src_ch_bakom_notruf_117_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_117, mo_addresse_117)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-117_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_117_tooltip
}


Expand All @@ -480,15 +480,15 @@ source src_ch_bakom_notruf_118_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_118, mo_addresse_118)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-118_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_118_tooltip
}


Expand All @@ -499,15 +499,15 @@ source src_ch_bakom_notruf_143_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_143, mo_addresse_143)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-143_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_143_tooltip
}


Expand All @@ -518,15 +518,15 @@ source src_ch_bakom_notruf_144_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_144, mo_addresse_144)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-144_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_144_tooltip
}


Expand All @@ -537,15 +537,15 @@ source src_ch_bakom_notruf_145_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_145, mo_addresse_145)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-145_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_145_tooltip
}


Expand All @@ -556,15 +556,15 @@ source src_ch_bakom_notruf_147_mobilnetz : def_searchable_features
SELECT bfs_nummer::bigint as id \
, name as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', mobile_147, mo_addresse_147)) as detail \
, remove_accents(concat_ws(' ', phone_number, address)) as detail \
, 'ch.bakom.notruf-147_mobilnetz' as layer \
, quadindex(the_geom) as geom_quadindex \
, st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \
, st_x(st_transform(st_ClosestPoint(the_geom,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 \
, bfs_nummer::text as feature_id \
from bakom.notruf
from bakom.mo_147_tooltip
}


Expand Down
25 changes: 25 additions & 0 deletions conf/vbs.conf.part
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,25 @@ source src_ch_vbs_armee_kriegsdenkmaeler : def_searchable_features
from militaer.armee_kriegsdenkmaeler
}


source src_ch_vbs_ladestationen : def_searchable_features
{
sql_db = vbs_${DBSTAGING}
sql_query = \
SELECT bgdi_id as id \
, standort as label \
, 'feature' as origin \
, remove_accents(standort) as detail \
, 'ch.vbs.ladestationen' 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 militaer.elektrotankstellen
}

## INDICES

index ch_babs_kulturgueter
Expand Down Expand Up @@ -223,3 +242,9 @@ index ch_vbs_armee_kriegsdenkmaeler : ch_babs_kulturgueter
source = src_ch_vbs_armee_kriegsdenkmaeler
path = /var/lib/sphinxsearch/data/index/ch_vbs_armee_kriegsdenkmaeler
}

index ch_vbs_ladestationen : ch_babs_kulturgueter
{
source = src_ch_vbs_ladestationen
path = /var/lib/sphinxsearch/data/index/ch_vbs_ladestationen
}

0 comments on commit c91301d

Please sign in to comment.