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

Use locale name fields #400

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Use locale name fields #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions bano/sql/charge_noms_voies_lieux-dits_OSM.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ FROM (SELECT 1::integer AS provenance,
ON pt.way && p.way AND
ST_Intersects(pt.way, p.way),
UNNEST(
ARRAY [pt.name,pt.alt_name,pt.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
UNION ALL
SELECT 2,
Expand All @@ -34,8 +34,8 @@ FROM (SELECT 1::integer AS provenance,
JOIN (SELECT * FROM planet_osm_line WHERE highway != '' AND name != '') l
ON p.way && l.way AND ST_Contains(p.way, l.way),
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
UNION ALL
SELECT 3,
Expand All @@ -49,8 +49,8 @@ FROM (SELECT 1::integer AS provenance,
ON pl.way && p.way AND
ST_Intersects(pl.way, p.way),
UNNEST(
ARRAY [pl.name,pl.alt_name,pl.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
) l
LEFT OUTER JOIN suffixe h
Expand Down
12 changes: 6 additions & 6 deletions bano/sql/charge_noms_voies_relation_OSM.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ FROM (SELECT 4::integer AS provenance,
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,
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
UNION ALL
SELECT 5,
Expand All @@ -27,13 +27,13 @@ FROM (SELECT 4::integer AS provenance,
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,
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
) l
LEFT OUTER JOIN (SELECT * FROM suffixe WHERE code_insee = '__code_insee__') h
Expand Down
12 changes: 6 additions & 6 deletions bano/sql/charge_points_nommes_centroides_OSM.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ ON ST_Intersects(l.way, p.way)
LEFT OUTER JOIN (SELECT * FROM polygones_insee_a9 WHERE insee_a8 = '__code_insee__') a9
ON ST_Intersects(l.way, a9.geometrie),
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
WHERE (l.highway != '' OR
l.waterway = 'dam') AND
Expand All @@ -37,8 +37,8 @@ ON ST_Intersects(l.way, p.geometrie)
LEFT OUTER JOIN (SELECT * FROM polygones_insee_a9 WHERE insee_a8 = '__code_insee__') a9
ON ST_Intersects(l.way, a9.geometrie),
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
WHERE (l.highway||"ref:FR:FANTOIR" != '' OR l.landuse = 'residential' OR l.amenity = 'parking') AND
l.highway NOT IN ('bus_stop','platform') AND
Expand All @@ -58,8 +58,8 @@ ON ST_Intersects(l.way, p.way)
LEFT OUTER JOIN (SELECT * FROM polygones_insee_a9 WHERE insee_a8 = '__code_insee__') a9
ON ST_Intersects(l.way, a9.geometrie),
UNNEST(
ARRAY [l.name,l.alt_name,l.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
WHERE l.member_role = 'street' AND
l.name != ''),
Expand Down
8 changes: 4 additions & 4 deletions bano/sql/charge_points_nommes_places_OSM.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ON pt.osm_id = admin_centre.osm_id
LEFT OUTER JOIN (SELECT * FROM polygones_insee_a9 WHERE insee_a8 = '__code_insee__') a9
ON ST_Intersects(pt.way, a9.geometrie),
UNNEST(
ARRAY [pt.name,pt.alt_name,pt.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
WHERE admin_centre.osm_id IS NULL),
pts_hors_commune
Expand All @@ -36,8 +36,8 @@ JOIN (SELECT * FROM planet_osm_point WHERE place != '' AND name != '' AND "re
ON pt.way && p.way AND
NOT ST_Within(p.way,pt.way),
UNNEST(
ARRAY [pt.name,pt.alt_name,pt.old_name],
ARRAY ['name','alt_name','old_name']
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],
ARRAY ['name','alt_name','old_name','name_fr','name_eu','name_br','name_oc','name_de','name_ca','name_gsw','name_co']
) AS name_osm(name,name_tag)
),
polys
Expand Down