Skip to content

Commit c42dc77

Browse files
committed
Use consistent alias for potential OSM addresses
1 parent 9134e54 commit c42dc77

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

metrics/no_match_in_caclr.sql

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
-- include osm_potential_addresses_street.sql
44

55
SELECT
6-
osm.osm_id,
7-
osm.osm_type,
8-
osm.osm_timestamp,
9-
osm.url,
10-
osm.josmuid,
11-
osm.osm_user,
12-
osm."addr:housenumber" AS numero,
13-
osm."addr:street" AS rue,
14-
osm."addr:postcode" AS codepostal,
15-
osm."addr:city" AS localite,
16-
osm."ref:caclr",
17-
osm."note:caclr"
18-
FROM osm_potential_addresses AS osm
6+
opa.osm_id,
7+
opa.osm_type,
8+
opa.osm_timestamp,
9+
opa.url,
10+
opa.josmuid,
11+
opa.osm_user,
12+
opa."addr:housenumber" AS numero,
13+
opa."addr:street" AS rue,
14+
opa."addr:postcode" AS codepostal,
15+
opa."addr:city" AS localite,
16+
opa."ref:caclr",
17+
opa."note:caclr"
18+
FROM osm_potential_addresses AS opa
1919
LEFT JOIN
2020
addresses AS a
2121
ON
22-
osm."addr:housenumber" = a.numero
23-
AND osm."addr:city" = a.localite
24-
AND osm."addr:street" = a.rue
22+
opa."addr:housenumber" = a.numero
23+
AND opa."addr:city" = a.localite
24+
AND opa."addr:street" = a.rue
2525
WHERE
2626
a.localite IS NULL
27-
AND osm."ref:caclr" IS NULL
28-
AND osm."addr:housenumber" NOT LIKE '%-%'
27+
AND opa."ref:caclr" IS NULL
28+
AND opa."addr:housenumber" NOT LIKE '%-%'
2929
ORDER BY localite, rue, numero;

metrics/ref_missing_wrong.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
-- 8< cut here >8 --
66

77
SELECT
8-
osm.osm_id,
9-
osm.osm_timestamp,
10-
osm.url,
11-
osm.josmuid,
12-
osm."addr:housenumber",
8+
opa.osm_id,
9+
opa.osm_timestamp,
10+
opa.url,
11+
opa.josmuid,
12+
opa."addr:housenumber",
1313
caclr.numero,
14-
osm."addr:street",
14+
opa."addr:street",
1515
caclr.rue,
16-
osm."addr:city",
16+
opa."addr:city",
1717
caclr.localite,
18-
osm."note:caclr",
19-
osm.note,
20-
osm."ref:caclr",
18+
opa."note:caclr",
19+
opa.note,
20+
opa."ref:caclr",
2121
caclr.id_caclr_bat,
2222
i.ds_timestamp_modif
23-
FROM osm_potential_addresses AS osm
23+
FROM osm_potential_addresses AS opa
2424
INNER JOIN addresses AS caclr
2525
ON (
26-
osm.way && caclr.geom_3857
27-
AND st_intersects(osm.way, caclr.geom_3857)
26+
opa.way && caclr.geom_3857
27+
AND st_intersects(opa.way, caclr.geom_3857)
2828
)
2929
LEFT JOIN immeuble AS i
3030
ON caclr.id_caclr_bat = i.numero_interne::text
3131
WHERE
32-
osm."ref:caclr" LIKE 'missing'
32+
opa."ref:caclr" LIKE 'missing'
3333
ORDER BY
3434
caclr.localite,
3535
caclr.rue,

metrics/ref_missing_wrong_most_probably.sql

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@
55
-- 8< cut here >8 --
66

77
SELECT
8-
osm.osm_id,
9-
osm.osm_timestamp,
10-
osm.url,
11-
osm.josmuid,
12-
osm."addr:housenumber",
8+
opa.osm_id,
9+
opa.osm_timestamp,
10+
opa.url,
11+
opa.josmuid,
12+
opa."addr:housenumber",
1313
caclr.numero,
14-
osm."addr:street",
14+
opa."addr:street",
1515
caclr.rue,
16-
osm."addr:city",
16+
opa."addr:city",
1717
caclr.localite,
18-
osm."note:caclr",
19-
osm.note,
20-
osm."ref:caclr",
18+
opa."note:caclr",
19+
opa.note,
20+
opa."ref:caclr",
2121
caclr.id_caclr_bat,
2222
i.ds_timestamp_modif
23-
FROM osm_potential_addresses AS osm
23+
FROM osm_potential_addresses AS opa
2424
INNER JOIN addresses AS caclr
2525
ON (
26-
osm.way && caclr.geom_3857
27-
AND st_intersects(osm.way, caclr.geom_3857)
26+
opa.way && caclr.geom_3857
27+
AND st_intersects(opa.way, caclr.geom_3857)
2828
)
2929
LEFT JOIN immeuble AS i
3030
ON caclr.id_caclr_bat = i.numero_interne::text
3131
WHERE
32-
osm."ref:caclr" LIKE 'missing'
33-
AND osm."addr:housenumber" = caclr.numero::text
34-
AND osm."addr:street" = caclr.rue
32+
opa."ref:caclr" LIKE 'missing'
33+
AND opa."addr:housenumber" = caclr.numero::text
34+
AND opa."addr:street" = caclr.rue
3535
ORDER BY
3636
caclr.localite,
3737
caclr.rue,

0 commit comments

Comments
 (0)