v0.2.54..v0.2.55 changeset waterway.json

diff --git a/conf/schema/waterway.json b/conf/schema/waterway.json
index a614a09..71cbf98 100644
--- a/conf/schema/waterway.json
+++ b/conf/schema/waterway.json
@@ -1,11 +1,6 @@
 [
     {
         "dataType": "enumeration",
-        "geometries": [
-            "node",
-            "linestring",
-            "area"
-        ],
         "influence": 1,
         "name": "waterway",
         "objectType": "tag"
@@ -14,13 +9,9 @@
         "categories": [
             "poi"
         ],
-        "isA": "waterway=watercourse",
-        "name": "waterway=anabranch",
-        "objectType": "tag"
-    },
-    {
-        "categories": [
-            "poi"
+        "geometries": [
+            "node",
+            "area"
         ],
         "isA": "waterway",
         "name": "waterway=boatyard",
@@ -30,6 +21,9 @@
         "categories": [
             "poi"
         ],
+        "geometries": [
+            "linestring"
+        ],
         "isA": "waterway",
         "name": "waterway=canal",
         "objectType": "tag"
@@ -38,11 +32,18 @@
         "categories": [
             "poi"
         ],
+        "geometries": [
+            "linestring",
+            "area"
+        ],
         "isA": "waterway",
         "name": "waterway=dam",
         "objectType": "tag"
     },
     {
+        "geometries": [
+            "linestring"
+        ],
         "isA": "waterway",
         "name": "waterway=ditch",
         "objectType": "tag"
@@ -51,6 +52,10 @@
         "categories": [
             "poi"
         ],
+        "geometries": [
+            "node",
+            "area"
+        ],
         "isA": "waterway",
         "name": "waterway=dock",
         "objectType": "tag"
@@ -67,7 +72,16 @@
         "categories": [
             "poi"
         ],
-        "isA": "waterway=watercourse",
+        "aliases": [
+            "type=river",
+            "river_type=*",
+            "river_flow=*",
+            "FlowDir=*"  
+        ],
+        "geometries": [
+            "linestring"
+        ],
+        "isA": "waterway",
         "name": "waterway=river",
         "objectType": "tag"
     },
@@ -83,21 +97,47 @@
         "categories": [
             "poi"
         ],
-        "isA": "waterway=watercourse",
+        "geometries": [
+            "linestring"
+        ],
+        "aliases": [
+            "type=stream" 
+        ],
+        "isA": "waterway",
         "name": "waterway=stream",
         "objectType": "tag"
     },
     {
+        "geometries": [
+            "linestring"
+        ],
         "isA": "waterway",
         "name": "waterway=wadi",
         "objectType": "tag"
     },
     {
-        "categories": [
-            "poi"
+        "geometries": [
+            "linestring"
+        ],
+        "isA": "waterway",
+        "name": "waterway=tidal_channel",
+        "objectType": "tag"
+    },
+    {
+        "geometries": [
+            "linestring"
+        ],
+        "isA": "waterway",
+        "name": "waterway=drain",
+        "objectType": "tag"
+    },
+    {
+        "geometries": [
+            "node",
+            "linestring"
         ],
         "isA": "waterway",
-        "name": "waterway=watercourse",
+        "name": "waterway=weir",
         "objectType": "tag"
     }
 ]