Refactor wall zoning, remove streaming

src/Dodge/Wall/Zone.hs

@@ -1,9 +1,12 @@
 module Dodge.Wall.Zone
     where
+import Dodge.Zoning.Wall
 import Dodge.Data
 import Dodge.Zone
-
 import qualified IntMapHelp as IM
+
+import Data.Foldable
+import qualified Data.IntSet as IS
 import Control.Lens
 --import Data.Foldable
 --import Streaming
@@ -12,12 +15,14 @@ import Control.Lens
 -- need to verify that this not only inserts but also overwrites (updates) any
 -- already existing walls
 insertWallInZones :: Wall -> World -> World
-insertWallInZones wl = wlZoning %~ updateZoning (IM.insert (_wlID wl)) wl
+insertWallInZones wl = wlZoning %~ zoneWall wl
+
+--insertWallInZones wl = wlZoning %~ updateZoning (IM.insert (_wlID wl)) wl
 --insertWallInZones wl = wlZoning .updatets
 --    %~ (runIdentity . (\wlzns -> S.fold_ doinsert wlzns id (zoneOfWall wl)))
 --  where
 --    doinsert wlzns (V2 x y) = insertIMInZone x y (_wlID wl) wl wlzns
 
 deleteWallFromZones :: Wall -> World -> World
-deleteWallFromZones wl = wlZoning %~ updateZoning (const $ IM.delete (_wlID wl)) wl
+deleteWallFromZones wl = wlZoning %~ deZoneWall wl
 --    %~ flip (foldl' (flip $ \(a,b) updateeIMInZone a b (_wlID wl))) (zoneOfWall wl)