add match rule 7

db/data-matching-rules/rule-6.sql

@@ -5,5 +5,4 @@ insert into matches
 select '6', repd.master_repd_id, NULL, mv_repd_neighbours.mv_id
   from mv_repd_neighbours, repd
   where repd.repd_id = mv_repd_neighbours.repd_id
-  and mv_repd_neighbours.distance_meters < 1000
-order by distance_meters;
+  and mv_repd_neighbours.distance_meters < 1000;

db/data-matching-rules/rule-7.sql

@@ -0,0 +1,8 @@
+-- Match rule 7 (see doc/matching.md)
+\echo -n Performing match rule 7...
+
+insert into matches
+select '7', NULL, osm.master_osm_id, osm_mv_neighbours.mv_id
+  from osm_mv_neighbours, osm
+  where osm.osm_id = osm_mv_neighbours.osm_id
+  and osm_mv_neighbours.distance_meters < 1000;

db/data-matching.sql

@@ -32,3 +32,6 @@ select * into repd_non_operational from repd where dev_status != 'Operational';
 
 -- REPD-MV matching
 \include data-matching-rules/rule-6.sql
+
+-- OSM-MV matching
+\include data-matching-rules/rule-7.sql

doc/matching.md

@@ -23,7 +23,7 @@ Repeat matching rules 1-5 for non-operational REPD entries. Label these match ru
 First, proximity match to get the nearest neighbouring OSM way/relation for every single Machine Vision object and separately, the nearest REPD for each Machine Vision Object.
 
 6. Nearest neighbour REPD to each Machine Vision object, below a 1000m distance threshold.
-7. Nearest neighbour OSM way/relation to each Machine Vision object, but only those that didn't already find a match with REPD (bear in mind that REPD already linked to OSM at this point).
+7. Nearest neighbour OSM way/relation to each Machine Vision object, below a 1000m distance threshold.
 
 # Matches
 
@@ -39,6 +39,9 @@ First, proximity match to get the nearest neighbouring OSM way/relation for ever
 |  3a  |  46   |  2,221|
 |  4a  |  893  |  3,114|
 |  5a  |  0    |  3,114|
+| ---- | ----- | ----- |
+|  6   |  1,759|       |
+|  7   |  1,851|       |
 
 # Notes
 

explorations/final_round/match-rule-7.sql

@@ -0,0 +1,20 @@
+
+select
+  osm_mv_neighbours.osm_id,
+  osm.master_osm_id,
+  machine_vision.mv_id,
+  osm_mv_neighbours.osm_date,
+  osm_mv_neighbours.mv_date,
+  osm_mv_neighbours.osm_area,
+  osm_mv_neighbours.mv_area,
+  osm_mv_neighbours.distance_meters,
+  osm.latitude as osm_lat,
+  osm.longitude as osm_lon,
+  machine_vision.latitude as mv_lat,
+  machine_vision.longitude as mv_lon,
+  osm.objtype,
+  osm.located
+from osm_mv_neighbours, osm, machine_vision
+where osm.osm_id = osm_mv_neighbours.osm_id
+and machine_vision.mv_id = osm_mv_neighbours.mv_id
+order by distance_meters;