Safe CanalBuilder Simplified for structures (patch)

Index: mods/CanalBuilderMAV_2.0.3/prototypes/waterfill.lua
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/mods/CanalBuilderMAV_2.0.3/prototypes/waterfill.lua b/mods/CanalBuilderMAV_2.0.3/prototypes/waterfill.lua
--- a/mods/CanalBuilderMAV_2.0.3/prototypes/waterfill.lua   (revision 6030350b0a43902d5cf88fe29e449a632495ce7f)
+++ b/mods/CanalBuilderMAV_2.0.3/prototypes/waterfill.lua   (revision b553b92292eab96dd7c94769e6fc90b6ca4a5985)
@@ -90,18 +90,23 @@
     icon = "__CanalBuilderMAV__/graphics/icons/waterfill_small.png",
     icon_size = 32,
     picture = emptyPic(),
-    collision_mask = {},
-    collision_box = {{-0.2, -0.6}, {0.2, 0.3}},
+    collision_mask = { "object-layer", "train-layer" },
+    collision_box = {{-1.2, -0.3}, {1.2, 0.6}},
     center_collision_mask = {"water-tile", "object-layer", "player-layer"},
+    fluid_box_tile_collision_test = { "ground-tile" },
+    adjacent_tile_collision_test = { "water-tile" },
+    adjacent_tile_collision_mask = { "ground-tile" }, -- to prevent building on edge of map :(
+    adjacent_tile_collision_box = { { -1, -2 }, { 1, -1 } },
+    minable = nil,
     flags = {"placeable-neutral", "player-creation", "filter-directions"},
     fluid_box_tile_collision_test = {},
     fluid = "water",
     fluid_box = {
-        filter = "water",
+        filter = nil,
         pipe_connections = {
             {
-                position = {0, 1},
-                type = "output"
+                position = {0, -1},
+                type = "input"
             }
         },
         production_type = "none"