From 456a4b64118198ba57e6ae746dbf8d114984fb5d Mon Sep 17 00:00:00 2001 From: faselm Date: Fri, 21 Jun 2024 15:01:49 +0200 Subject: [PATCH 1/3] BGDIDIC-2841: add tektonische_karte index --- conf/stopo.conf.part | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/conf/stopo.conf.part b/conf/stopo.conf.part index 1d1a1c5..3358147 100644 --- a/conf/stopo.conf.part +++ b/conf/stopo.conf.part @@ -968,6 +968,42 @@ source src_ch_swisstopo_geologie_hartsteinabbau : def_searchable_features from data } +source src_ch_swisstopo_geologie_tektonische_karte_line : def_searchable_features +{ + sql_db = stopo_${DBSTAGING} + sql_query = \ + SELECT bgdi_id as id \ + , sphinx_index 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 \ + , bgdi_id::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 bgdi_id as id \ + , sphinx_index 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 \ + , bgdi_id::text as feature_id \ + from geol.tektonische_karte_units +} + ## INDICES index ch_swisstopo_verschiebungsvektoren_tsp1 @@ -1291,3 +1327,15 @@ index ch_swisstopo_geologie_hartsteinabbau : ch_swisstopo_verschiebungsvektoren_ 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 +} From 284dcc02e0c0eb69b2cc1cbe93d8ab09bacfd618 Mon Sep 17 00:00:00 2001 From: faselm Date: Fri, 21 Jun 2024 15:12:01 +0200 Subject: [PATCH 2/3] BGDIDIC-2841: add tektonische_karte index --- conf/stopo.conf.part | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/stopo.conf.part b/conf/stopo.conf.part index 3358147..0ba1864 100644 --- a/conf/stopo.conf.part +++ b/conf/stopo.conf.part @@ -973,7 +973,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_line : def_searchable_feature sql_db = stopo_${DBSTAGING} sql_query = \ SELECT bgdi_id as id \ - , sphinx_index as label \ + , 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 \ @@ -991,7 +991,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_unit : def_searchable_feature sql_db = stopo_${DBSTAGING} sql_query = \ SELECT bgdi_id as id \ - , sphinx_index as label \ + , 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 \ From ba1ab4f619df4d305a352273f2fbee1269cc5a4f Mon Sep 17 00:00:00 2001 From: faselm Date: Mon, 24 Jun 2024 07:43:45 +0200 Subject: [PATCH 3/3] BGDIDIC-2841: fix id field --- conf/stopo.conf.part | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/stopo.conf.part b/conf/stopo.conf.part index 0ba1864..7300f4e 100644 --- a/conf/stopo.conf.part +++ b/conf/stopo.conf.part @@ -972,7 +972,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_line : def_searchable_feature { sql_db = stopo_${DBSTAGING} sql_query = \ - SELECT bgdi_id as id \ + 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 \ @@ -982,7 +982,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_line : def_searchable_feature , 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 \ + , fid::text as feature_id \ from geol.tektonische_karte_line } @@ -990,7 +990,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_unit : def_searchable_feature { sql_db = stopo_${DBSTAGING} sql_query = \ - SELECT bgdi_id as id \ + 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 \ @@ -1000,7 +1000,7 @@ source src_ch_swisstopo_geologie_tektonische_karte_unit : def_searchable_feature , 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 \ + , fid::text as feature_id \ from geol.tektonische_karte_units }