Improve duplicates, ignore retired, add "RDG" for Ridge

README.md

@@ -10,14 +10,16 @@ See [https://wiki.openstreetmap.org/wiki/The_Villages_Road_and_Address_Import](h
 * For addresses:
   * The Addresses shapefile is recorded in the ESRI:102659 CRS, you may need to convert or reproject to/from.
   * `ADD_NUM` becomes the virtual `addr:housenumber` (or `addr:house` temporarily, avoiding addr:house which is a real tag)
-  * `SADD` becomes the virtual `addr:street` (or `addr:stree` temporarily) via the `getformattedstreetnamefromaddress( "SADD")` custom expression
+  * `"UNIT"+"LOT"` becomes the virtual `addr:unit` (sometimes the LOT key is used for multiple units in a range)
+  * `SADD` becomes the virtual `addr:street` (or `addr:stree` temporarily) via the `getformattedstreetnamefromaddress("SADD")` custom expression
   * `POST_COMM` becomes the virual `addr:city` via the `title("POST_COMM")` expression (we care about postal community addresses not what municipality a place might be governed by)
   * `POST_CODE` becomes `addr:postcode` (or `addr:postc` temporarily)
 * For roads:
   * `NAME` becomes the virtual `name` via the `getformattedstreetname("NAME")`
   * `surface=asphalt` added manually in JOSM
   * `maxspeed=10 mph` added manually in JOSM
-* Export to Geojson, **selecting only the OSM-formatted fields we want** and deselecting the rest.
+* Use the Filter with Form function to Select all entries with `"LIFECYCLE"='Current'`
+* Export to Geojson, only exporting **selected** entries, **selecting only the OSM-formatted fields we want**.
 * Ensure the export file is in the `EPSG:4326 - WGS84` CRS.
 * Open in JSOM. It's suggested to begin with roads first, addresses second, so the addresses can be placed in context.
 * In the Roads dataset, select and remove all relations from the geojson/shapefile layer: the data often has one relation per road and this is improper for OSM import.
@@ -35,6 +37,29 @@ See [https://wiki.openstreetmap.org/wiki/The_Villages_Road_and_Address_Import](h
 * Check the import area to ensure no incorrect overlaps
 * Use the JOSM validator to ensure no errors in imported data. Warnings about existing data separate from the import can be ignored.
   * If there are duplicate house numbers in the data, investigate and remove the more-unlikely node or both nodes. For example `4650 Ramsell Road` is duplicated in the source data, but the easternmost copy is on the "odd" side of the street and between 4653 and 4663 so it's more likely to actually be 4651, 4655, 4657, 4659, or 4661. We have no way of knowing, so we can either delete it entirely or simply delete the housenumber tag and leave it as an address without a number for a future editor to review. (We may submit incomplete data, just not wrong data.) We then leave the westernmost copy alone since 4650 fits neatly in between 4640/4644 and 4654/4660.
+  * All known duplicates:
+    * 4886 C 472 (one is a daycare the other is a church)
+    * 5626 C THOMAS RD has unit numbers in the original data's Notes field
+    * 301 CURRY ST
+    * 401 HALL ST
+    * 340 HEALD WAY has many buildings and many units per building, in the notes
+    * 1908 LAUREL MANOR DR (one is a CELL TOWER)
+    * 1950 LAUREL MANOR DR (each one has multiple units in a range, in the notes)
+    * 6217 MEGGISON RD (one's note is "restroom/storage")
+    * 6221 MEGGISON RD (one's note is "pavilion")
+    * 6227 MEGGISON RD (one's note is "recreation center")
+    * 102 NE 4TH AVE (one is a cell tower, the other a water tower)
+    * 11750 NE 62ND TER (one's note is Pebble Springs retirement community building)
+    * 13813 NE 136TH LOOP UNIT 1306
+    * 8550 NE 138TH LN (each is a different building number)
+    * 4650 RAMSELL RD
+    * 400 RUTLAND ST (both say "church owned")
+    * 308 SHAWN AVE (one says Wildwood Acres, the other Progress Energy Pump 29)
+    * 413 S PINE ST
+    * 2605 TRILLIUM RDG (one says bldg 1, the other says meter)
+    * 2680 TRILLIUM RDG (bldg 3, meter, meter)
+    * 13940 US 441 (different building names in the notes)
+    * 702 WEBSTER ST (one is city of ww, the other retention pond)
 * Click upload
   * Make sure there are no erroneous Relations or other unwanted objects about to be uploaded.
   * Use a descriptive changeset message like "Roads/Addresses in The Villages #villagesimport"

qgis-functions.py

@@ -85,6 +85,8 @@ def formatstreetname(name):
         return "Place"
     if name == "RD":
         return "Road"
+    if name == "RDG":
+        return "Ridge"
     if name == "RUN":
         return "Run"
     if name == "ST":