Landuse Fixes (#5680)

* Landcover fixes

refs: #5652

* More fixes

refs: #5652

Author: mattjdnv

translations/fcode_common.js

@@ -187,7 +187,7 @@ fcodeCommon = {
       ['F_CODE','AP050','highway','path'], // Trail
       ['F_CODE','AP055','highway','tank_trail'], // Tank Trail
       ['F_CODE','AP056','crossing','tank'], // Tank Crossing
-      ['F_CODE','AQ035','sidewalk','yes'], // Sidewalk
+      ['F_CODE','AQ035','footway','sidewalk'], // Sidewalk
       ['F_CODE','AQ040','bridge','yes'], // Bridge
       ['F_CODE','AQ045','bridge:span','yes'], // Bridge Span
       ['F_CODE','AQ050','bridge:superstructure','yes'], // Bridge Superstructure
@@ -305,7 +305,7 @@ fcodeCommon = {
       ['F_CODE','BH110','pipeline:type','penstock'], // Penstock
       ['F_CODE','BH116','natural','aquifer'], // Aquifer
       ['F_CODE','BH120','waterway','rapids'], // Rapids
-      ['F_CODE','BH135','landuse','rice_field'], // Rice Field
+      ['F_CODE','BH135','crop','rice'], // Rice Field
       ['F_CODE','BH140','waterway','river'], // River - See custom rules
       ['F_CODE','BH145','waterway','vanishing_point'], // Vanishing point
       ['F_CODE','BH150','natural','salt_flat'], // Salt Flat, Salt Pan
@@ -367,7 +367,7 @@ fcodeCommon = {
       ['F_CODE','EA031','garden:type','botanical'], // Botanical Garden
       ['F_CODE','EA040','landuse','orchard'], // Orchard/Plantation
       ['F_CODE','EA050','landuse','vineyard'], // Vineyard
-      ['F_CODE','EA055','landuse','hop_garden'], // Hop Field
+      ['F_CODE','EA055','crop','hop'], // Hop Field
       ['F_CODE','EB010','natural','grassland'], // Grassland
       ['F_CODE','EB020','natural','scrub'], // Thicket (was FACC Scrub/Brush/Bush)
       ['F_CODE','EB070','natural','brush'], // Brush - possibly "heath"

translations/ggdm30.js

@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. Maxar
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2014 Maxar (http://www.maxar.com/)
+ * @copyright Copyright (C) 2014 2023 Maxar (http://www.maxar.com/)
  */
 
 /*
@@ -31,8 +31,6 @@
         OSM+ -> GGDM30
 
     Also, this will import GGDM2.1
-
-    Based on mgcp/__init__.js script
 */
 
 ggdm30 = {
@@ -1104,6 +1102,11 @@ ggdm30 = {
       if (tags.highway == 'pedestrian') delete tags.landuse;
       break;
 
+    case 'AL270': // Industrial Farm
+      if (tags.trees == 'coffea_plants') tags.landuse = 'orchard';
+      if (tags.trees == 'tea_plants') tags.landuse = 'orchard';
+      break;
+
     case 'AN010': // Railway
       if (tags['railway:track'] == 'monorail')
       {
@@ -1140,6 +1143,10 @@ ggdm30 = {
       }
       break;
 
+    case 'BH135': // Ricefield
+      tags.landuse = 'farmland';
+      break;
+
     case 'BH140': // River
       if (tags['channel:type'] == 'normal') delete tags['channel:type']; // Default value
       if (tags.tidal == 'no') delete tags.tidal; // Default value
@@ -1182,15 +1189,39 @@ ggdm30 = {
       }
       break;
 
+    case 'EA010': // Crop Land
+      // Coffee is an orchard according to OSM. Tea is as well but GGDM calls it Crop Land
+      // Or, Industrial Farm
+      if (tags.trees == 'tea_plants') tags.landuse = 'orchard';
+      if (tags.trees == 'coffea_plants') tags.landuse = 'orchard';
+      if (tags.crop == 'other' && tags.trees) delete tags.crop;
+      break;
+
     case 'EA031': // Botanic Garden
       if (! tags.leisure) tags.leisure = 'garden';
       break;
 
+    case 'EA040': // Orchard
+      // Crop vs Trees
+      if (tags.crop == 'other' && tags.trees) delete tags.crop;
+      break;
+
     case 'EA050': // Vineyard
       // Landuse = vineyard implies crop=grape
       if (tags.crop == 'grape') delete tags.crop;
       break;
 
+    case 'EA055': // Hop Field
+      tags.landuse = 'farmland';
+
+      // Cropland vs Orchard
+      if (tags.trees == 'hop_plants' && tags.crop)
+      {
+        delete tags.crop;
+        tags.landuse = 'orchard';
+      }
+      break;
+
     case 'EC015': // Forest
       if (geometryType == 'Line')
       {
@@ -1629,7 +1660,37 @@ ggdm30 = {
 
       case 'farm':
       case 'allotments':
-        tags.landuse = 'farmland';
+      case 'farmland':
+        tags.landuse = 'farmland'; // For Farm and Allotments
+        switch (tags.crop)
+        {
+          case undefined: // Break early
+            break;
+
+          case 'rice':
+            delete tags.landuse; // Ricefield is a different F_CODE
+            break;
+
+          case 'tea': // Depreciated tag
+            tags.trees = 'tea_plants';
+            attrs.F_CODE = 'AL270'; // Industrial Farm
+            // tags.landuse = 'plantation'; // Industrial Farm
+            delete tags.crop;
+            break;
+
+          case 'coffee': // Depreciated Tag
+            tags.trees = 'coffea_plants';
+            delete tags.crop;
+            break;
+
+          case 'fruit_tree':
+            tags.landuse = 'orchard';
+            break;
+
+          case 'hop':
+            attrs.F_CODE = 'EA055'; // Hop Field
+            break;
+        }
         break;
 
       case 'farmyard': // NOTE: This is different to farm
@@ -1638,10 +1699,6 @@ ggdm30 = {
         delete tags.landuse;
         break;
 
-      case 'farmland':
-        if (tags.crop == 'fruit_tree') tags.landuse = 'orchard';
-        break;
-
       case 'grass':
       case 'meadow':
         tags.natural = 'grassland';
@@ -1684,6 +1741,46 @@ ggdm30 = {
         delete tags.landuse;
         break;
 
+      case 'orchard':
+        switch (tags.crop)
+        {
+          case undefined: // Break early
+            break;
+
+          case 'tea': // Depreciated tag
+            tags.trees = 'tea_plants';
+            delete tags.crop;
+            break;
+
+          case 'coffee': // Depreciated Tag
+            tags.trees = 'coffea_plants';
+            delete tags.crop;
+            break;
+
+          case 'hop':
+            attrs.F_CODE = 'EA055'; // Hop Field
+            break;
+        }
+
+        switch (tags.trees)
+        {
+          case undefined: // Break early
+            break;
+
+          case 'tea_plants':
+            attrs.F_CODE = 'AL270'; // Industrial Farm
+            break;
+
+          case 'coffea_plants':
+            attrs.F_CODE = 'EA010'; // Cropland
+            break;
+
+          case 'hop_plants':
+            attrs.F_CODE = 'EA055'; // Hop Field
+            break;
+        }
+        break;
+
       case 'railway':
         if (tags['railway:yard'] == 'marshalling_yard') attrs.F_CODE = 'AN060';
         break;
@@ -1698,12 +1795,15 @@ ggdm30 = {
         tags.landuse = 'built_up_area';
         break;
 
-
       case 'retail':
         tags.use = 'commercial';
         tags.landuse = 'built_up_area';
         break;
 
+      case 'rice_field': // Old translation
+        if (! tags.crop) tags.crop = 'rice';
+        break;
+
       case 'scrub':
         tags.natural = 'scrub';
         delete tags.landuse;