MGCP and some TDS translation fixes (#5808)

* some translation updates

* a couple more translation fixes

---------

Co-authored-by: Tim OLeary <[email protected]>

Author: ejlanemaxar

translations/mgcp.js

@@ -1377,6 +1377,11 @@ mgcp = {
       tags.natural = 'wetland';
       tags.intermittent = 'yes';
       break;
+    case 'BI050':
+      tags.man_made = 'tower';
+      tags['tower:type'] = 'intake';
+      delete tags.tower;
+      break;
     case 'BJ040': // Ice cliff
       tags.natural = 'cliff';
       tags.surface = 'ice';
@@ -1903,6 +1908,7 @@ mgcp = {
       ["t.public_transport == 'station'", "a.F_CODE = 'AL010'; a.FFN = '480'"],
       ["t.tourism == 'hotel'", "a.F_CODE = 'AL010'; a.FFN = '550'"],
       ["t.landuse == 'basin' && t.basin == 'settling'","a.F_CODE = 'AC030'"],
+      ["t.landuse == 'basin' && t.basin == 'aeration'","a.F_CODE = 'BH040'"],
       ["t.leisure == 'garden' || t.tourism == 'zoo'", "a.F_CODE = 'AL010'; a.FFN = '907'"],
       ["t.leisure == 'sports_centre'", "a.F_CODE = 'AL010'; a.FFN = '912'"],
       ["t.natural == 'cliff' && t.surface == 'ice'", "a.F_CODE = 'BJ040'"],
@@ -1913,7 +1919,10 @@ mgcp = {
       ["t.railway == 'rail' && t.service == 'spur'", "a.F_CODE = 'AN050', a.RSA = '1'"],
       ["t.railway == 'rail' && t.service == 'siding'", "a.F_CODE = 'AN050', a.RSA = '2'"],
       ["t.railway == 'light_rail'", "a.F_CODE = 'AN010', a.RRC = '2'"],
-      ["t.wall == 'seawall' && t.barrier == 'wall'", "a.F_CODE = 'BB230'"]
+      ["t.wall == 'seawall' && t.barrier == 'wall'", "a.F_CODE = 'BB230'"],
+      ["t.aeroway == 'aerodrome' && t['aerodrome:type'] == 'seaplane'", "a.F_CODE = 'GB065'"],
+      ["(t['seamark:type'] == 'gate' && t['seamark:gate:category'] == 'flood_barrage') || t.man_made == 'basin_gate'", "a.F_CODE = 'BI041'"],
+      ["t.man_made == 'tower' && t['tower:type'] == 'intake'", "a.F_CODE = 'BI050'"]
       ];
 
       mgcp.mgcpPreRules = translate.buildComplexRules(rulesList);

translations/mgcp_rules.js

@@ -80,14 +80,15 @@ mgcp.rules = {
     ['F_CODE','BH060','water:race','flume'], // Flume - NFDD BH065
     ['F_CODE','BH080','water','lake'], // Lake - NFDD BH082
     ['F_CODE','BH130','water','reservoir'], // Reservoir - NFDD BH082
-    ['F_CODE','BI041','man_made','basin_gate'], // Water Gate - NFDD BI045
+    ['F_CODE','BI041','waterway','floodgate'], // Water Gate - NFDD BI045
     ['F_CODE','CA035','geological','water_elevation'], // Inland Water Elevation
     ['F_CODE','DB160','geological','out_crop'],
     ['F_CODE','DB200','natural','gully'], // Gully - FCODE Retired
     ['F_CODE','EC030','landuse','forest'], // Wood - NFDD EC015
     ['F_CODE','ED030','wetland','mangrove'], // Mangrove Swamp - NFDD ED020
     ['F_CODE','FA090','man_made','geophysical_prospecting_grid'], // Geophysical Prospecting Grid - No replacement code
     ['F_CODE','GA034','airmark','beacon'], // Aeronautical Radio Navigation Service - TDS GA033
+    ['F_CODE','GB065','seamark:type','seaplane_landing_area'],
     ['F_CODE','GB220','aeroway','obstacle'], // Aeronautical Obstacle - No replacement code
     ['F_CODE','GB485','aeroway','navigationaid'], // Approach Lighting System - Not in TDS
     ['F_CODE','AI030','amenity','refugee_site'],

translations/tds71.js

@@ -1648,6 +1648,7 @@ tds71 = {
         // ['t.amenity == "marketplace"  && !(t.building)','t.facility = "yes"'],
         ['t.barrier == "tank_trap" && t.tank_trap == "dragons_teeth"','t.barrier = "dragons_teeth"; delete t.tank_trap'],
         ['t.boundary == "hazard" && t.hazard','delete t.boundary'],
+        ['t.building == "ship"','delete t.building'], // TDS does not define floating buildings
         ['t.communication == "line"','t["cable:type"] = "communication"'],
         ['t.content && !(t.product)','t.product = t.content; delete t.content'],
         ['t.control_tower && t.man_made == "tower"','delete t.man_made'],
@@ -2865,6 +2866,15 @@ tds71 = {
         if (!attrs.WCC) attrs.WCC = '7'; // Normal Channel
         if (!attrs.TID) attrs.TID = '1000'; // Not tidal
         break;
+      
+      case 'AL013':
+        if (tags.building == 'apartments')
+        {
+          attrs.FFN = '550';
+          attrs.FFN2 = '549';
+          attrs.FFN3 = '563';
+        }
+        break;
     } // End switch F_CODE
 
     // Fix HGT and LMC to keep GAIT happy