minor fixup

src/Swarm/Game/Scenario/Topography/Navigation/Portal.hs

@@ -68,13 +68,13 @@ failUponDuplication message binnedMap =
 -- * portals can have multiple entrances but only a single exit
 -- * no two portals share the same entrance location
 -- * global waypoint uniqueness when the "unique" flag is specified
-validateLandmarks ::
+validateNavigation ::
   (MonadFail m, Traversable t) =>
   V2 Int32 ->
   [Originated Waypoint] ->
   t Portal ->
   m Navigation
-validateLandmarks upperLeft unmergedWaypoints portalDefs = do
+validateNavigation upperLeft unmergedWaypoints portalDefs = do
   failUponDuplication "is required to be unique, but is duplicated in:" waypointsWithUniqueFlag
 
   -- TODO(#144) Currently ignores subworld references

src/Swarm/Game/Scenario/Topography/WorldDescription.hs

@@ -52,7 +52,7 @@ instance FromJSONE (EntityMap, RobotMap) WorldDescription where
     let struc = Structure.Structure initialArea structureDefs placementDefs $ waypointDefs <> mapWaypoints
         Structure.MergedStructure mergedArea unmergedWaypoints = Structure.mergeStructures mempty Nothing struc
 
-    validatedLandmarks <- validateLandmarks (coerce upperLeft) unmergedWaypoints portalDefs
+    validatedLandmarks <- validateNavigation (coerce upperLeft) unmergedWaypoints portalDefs
 
     WorldDescription
       <$> v ..:? "default"

src/Swarm/Game/Value.hs

@@ -45,7 +45,7 @@ instance (Valuable a, Valuable b) => Valuable (a, b) where
   asValue (x, y) = VPair (asValue x) (asValue y)
 
 instance Valuable Location where
-  asValue (Location x y) = VPair (asValue x) (asValue y)
+  asValue (Location x y) = asValue (x, y)
 
 instance Valuable Entity where
   asValue = VText . view entityName