diff --git a/bano.yml b/bano.yml index 0c25ea5..66794f7 100644 --- a/bano.yml +++ b/bano.yml @@ -118,6 +118,14 @@ tables: - {name: 'member_index', type: member_index} - {key: 'ref:FR:FANTOIR', name: 'ref:FR:FANTOIR', type: string} - {key: 'name', name: 'name', type: string} + - {key: 'name:fr', name: 'name_fr', type: string} + - {key: 'name:eu', name: 'name_eu', type: string} + - {key: 'name:br', name: 'name_br', type: string} + - {key: 'name:oc', name: 'name_oc', type: string} + - {key: 'name:de', name: 'name_de', type: string} + - {key: 'name:ca', name: 'name_ca', type: string} + - {key: 'name:gsw', name: 'name_gsw', type: string} + - {key: 'name:co', name: 'name_co', type: string} - {key: 'alt_name', name: 'alt_name', type: string} - {key: 'old_name', name: 'old_name', type: string} - {key: 'type', name: 'type', type: string} diff --git a/bano/sql/charge_noms_voies_lieux-dits_OSM.sql b/bano/sql/charge_noms_voies_lieux-dits_OSM.sql index 437dd06..17056cf 100644 --- a/bano/sql/charge_noms_voies_lieux-dits_OSM.sql +++ b/bano/sql/charge_noms_voies_lieux-dits_OSM.sql @@ -7,7 +7,7 @@ SELECT DISTINCT provenance, nature FROM (SELECT 1::integer AS provenance, pt.way, - UNNEST(ARRAY[pt.name,pt.alt_name,pt.old_name]) as name, + UNNEST(ARRAY[pt.name,pt.alt_name,pt.old_name,pt.name_fr,pt.name_eu,pt.name_br,pt.name_oc,pt.name_de,pt.name_ca,pt.name_gsw,pt.name_co]) as name, tags, CASE WHEN pt.place='' THEN 'voie'::text @@ -20,7 +20,7 @@ FROM (SELECT 1::integer AS provenance, UNION ALL SELECT 2, l.way, - UNNEST(ARRAY[l.name,l.alt_name,l.old_name]) as name, + UNNEST(ARRAY[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) as name, tags, 'voie' FROM (SELECT way FROM planet_osm_polygon WHERE "ref:INSEE" = '__code_insee__') p @@ -29,7 +29,7 @@ FROM (SELECT 1::integer AS provenance, UNION ALL SELECT 3, pl.way, - UNNEST(ARRAY[pl.name,pl.alt_name,pl.old_name]) as name, + UNNEST(ARRAY[pl.name,pl.alt_name,pl.old_name,pl.name_fr,pl.name_eu,pl.name_br,pl.name_oc,pl.name_de,pl.name_ca,pl.name_gsw,pl.name_co]) as name, tags, 'voie' FROM (SELECT way FROM planet_osm_polygon WHERE "ref:INSEE" = '__code_insee__') p diff --git a/bano/sql/charge_noms_voies_relation_OSM.sql b/bano/sql/charge_noms_voies_relation_OSM.sql index 229f6e8..dc95b6b 100644 --- a/bano/sql/charge_noms_voies_relation_OSM.sql +++ b/bano/sql/charge_noms_voies_relation_OSM.sql @@ -6,21 +6,21 @@ SELECT DISTINCT provenance, a9.nom, 'voie'::text FROM (SELECT 4::integer AS provenance, - UNNEST(ARRAY[l.name,l.alt_name,l.old_name]) as name, + UNNEST(ARRAY[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) as name, l.way, r.tags FROM (SELECT way FROM planet_osm_polygon WHERE "ref:INSEE" = '__code_insee__') p - JOIN (SELECT name,alt_name,old_name,tags,osm_id,way FROM planet_osm_line WHERE highway != '' AND name != '') l + JOIN (SELECT name,alt_name,old_name,name_fr,name_eu,name_br,name_oc,name_de,name_ca,name_gsw,name_co,tags,osm_id,way FROM planet_osm_line WHERE highway != '' AND name != '') l ON p.way && l.way AND ST_Contains(p.way, l.way) JOIN planet_osm_rels r ON r.osm_id = l.osm_id UNION ALL SELECT 5, - UNNEST(ARRAY[l.name,l.alt_name,l.old_name]) as name, + UNNEST(ARRAY[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) as name, l.way, r.tags FROM (SELECT way FROM planet_osm_polygon WHERE "ref:INSEE" = '__code_insee__') p - JOIN (SELECT name,alt_name,old_name,tags,osm_id,way FROM planet_osm_polygon WHERE highway != '' AND name != '') l + JOIN (SELECT name,alt_name,old_name,name_fr,name_eu,name_br,name_oc,name_de,name_ca,name_gsw,name_co,tags,osm_id,way FROM planet_osm_polygon WHERE highway != '' AND name != '') l ON p.way && l.way AND ST_Contains(p.way, l.way) JOIN planet_osm_rels r ON r.osm_id = l.osm_id) l diff --git a/bano/sql/charge_points_nommes_centroides_OSM.sql b/bano/sql/charge_points_nommes_centroides_OSM.sql index a8e661e..b98a07c 100644 --- a/bano/sql/charge_points_nommes_centroides_OSM.sql +++ b/bano/sql/charge_points_nommes_centroides_OSM.sql @@ -2,7 +2,7 @@ WITH lignes_brutes AS (SELECT l.way, - unnest(array[l.name,l.alt_name,l.old_name]) AS name, + unnest(array[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) AS name, COALESCE(a9.code_insee,'xxxxx') as insee_jointure, a9.code_insee insee_ac, unnest(array["ref:FR:FANTOIR","ref:FR:FANTOIR:left","ref:FR:FANTOIR:right"]) AS fantoir, @@ -19,7 +19,7 @@ WHERE (l.highway != '' OR l.name != '' UNION ALL SELECT ST_PointOnSurface(l.way), - unnest(array[l.name,l.alt_name,l.old_name]) AS name, + unnest(array[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) AS name, COALESCE(a9.code_insee,'xxxxx') as insee_jointure, a9.code_insee insee_ac, "ref:FR:FANTOIR" AS fantoir, @@ -35,7 +35,7 @@ WHERE (l.highway||"ref:FR:FANTOIR" != '' OR l.landuse = 'residential' OR l.ame l.name != '' UNION ALL SELECT l.way, - unnest(array[l.name,l.alt_name,l.old_name]) AS name, + unnest(array[l.name,l.alt_name,l.old_name,l.name_fr,l.name_eu,l.name_br,l.name_oc,l.name_de,l.name_ca,l.name_gsw,l.name_co]) AS name, COALESCE(a9.code_insee,'xxxxx') as insee_jointure, a9.code_insee insee_ac, "ref:FR:FANTOIR" AS fantoir, diff --git a/bano/sql/charge_points_nommes_places_OSM.sql b/bano/sql/charge_points_nommes_places_OSM.sql index c0c7e35..d92bd82 100644 --- a/bano/sql/charge_points_nommes_places_OSM.sql +++ b/bano/sql/charge_points_nommes_places_OSM.sql @@ -2,7 +2,7 @@ WITH pts AS (SELECT pt.way, - UNNEST(ARRAY[pt.name,pt.alt_name,pt.old_name]) as name, + UNNEST(ARRAY[pt.name,pt.alt_name,pt.old_name,pt.name_fr,pt.name_eu,pt.name_br,pt.name_oc,pt.name_de,pt.name_ca,pt.name_gsw,pt.name_co]) as name, tags, place, a9.code_insee AS insee_ac,