OSM 0.4.0 → 0.4.1

raw patch · 40 files changed

+67/−67 lines, 40 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• Data/Geo/OSM/Accessor/Accessor.hs +2/−2
• Data/Geo/OSM/Accessor/AccountCreated.hs +1/−1
• Data/Geo/OSM/Accessor/Ar.hs +1/−1
• Data/Geo/OSM/Accessor/Box.hs +1/−1
• Data/Geo/OSM/Accessor/Changeset.hs +3/−3
• Data/Geo/OSM/Accessor/DisplayName.hs +1/−1
• Data/Geo/OSM/Accessor/Generator.hs +3/−3
• Data/Geo/OSM/Accessor/Hm.hs +3/−3
• Data/Geo/OSM/Accessor/Id.hs +1/−1
• Data/Geo/OSM/Accessor/K.hs +1/−1
• Data/Geo/OSM/Accessor/Lat.hs +1/−1
• Data/Geo/OSM/Accessor/Lon.hs +1/−1
• Data/Geo/OSM/Accessor/Maximum.hs +1/−1
• Data/Geo/OSM/Accessor/Maxlat.hs +1/−1
• Data/Geo/OSM/Accessor/Maxlon.hs +1/−1
• Data/Geo/OSM/Accessor/Members.hs +3/−3
• Data/Geo/OSM/Accessor/Minimum.hs +1/−1
• Data/Geo/OSM/Accessor/Minlat.hs +1/−1
• Data/Geo/OSM/Accessor/Minlon.hs +1/−1
• Data/Geo/OSM/Accessor/Mtype.hs +1/−1
• Data/Geo/OSM/Accessor/Name.hs +1/−1
• Data/Geo/OSM/Accessor/Nds.hs +3/−3
• Data/Geo/OSM/Accessor/NodeWayRelations.hs +9/−9
• Data/Geo/OSM/Accessor/Origin.hs +3/−3
• Data/Geo/OSM/Accessor/Pending.hs +1/−1
• Data/Geo/OSM/Accessor/PerPage.hs +1/−1
• Data/Geo/OSM/Accessor/Public.hs +1/−1
• Data/Geo/OSM/Accessor/Ref.hs +1/−1
• Data/Geo/OSM/Accessor/Role.hs +1/−1
• Data/Geo/OSM/Accessor/Tags.hs +5/−5
• Data/Geo/OSM/Accessor/Timestamp.hs +1/−1
• Data/Geo/OSM/Accessor/Tpoints.hs +1/−1
• Data/Geo/OSM/Accessor/Uid.hs +3/−3
• Data/Geo/OSM/Accessor/User.hs +1/−1
• Data/Geo/OSM/Accessor/V.hs +1/−1
• Data/Geo/OSM/Accessor/Version.hs +1/−1
• Data/Geo/OSM/Accessor/Visible.hs +1/−1
• Data/Geo/OSM/Accessor/Wnodes.hs +1/−1
• Data/Geo/OSM/Accessor/Zoom.hs +1/−1
• OSM.cabal +1/−1

@@ -4,5 +4,5 @@  import Control.Monad.Instances() -using :: (a -> d) -> (c -> a -> b) -> a -> (d -> c) -> b-using f g = flip =<< (g .) . flip id . f+using :: (a -> d) -> (c -> a -> b) -> (d -> c) -> a -> b+using f g = flip (flip =<< (g .) . flip id . f)

@@ -7,5 +7,5 @@   accountCreated :: a -> String   setAccountCreated :: String -> a -> a -  usingAccountCreated :: a -> (String -> String) -> a+  usingAccountCreated :: (String -> String) -> a -> a   usingAccountCreated = accountCreated `using` setAccountCreated

@@ -8,5 +8,5 @@   ar :: a -> Area   setAr :: Area -> a -> a -  usingArea :: a -> (Area -> Area) -> a+  usingArea :: (Area -> Area) -> a -> a   usingArea = ar `using` setAr

@@ -7,5 +7,5 @@   box :: a -> String   setBox :: String -> a -> a -  usingBox :: a -> (String -> String) -> a+  usingBox :: (String -> String) -> a -> a   usingBox = box `using` setBox

@@ -10,8 +10,8 @@   setChangeset' :: String -> a -> a   setChangeset' = setChangeset . return -  usingChangeset :: a -> (Maybe String -> Maybe String) -> a+  usingChangeset :: (Maybe String -> Maybe String) -> a -> a   usingChangeset = changeset `using` setChangeset -  usingChangeset' :: a -> (String -> String) -> a-  usingChangeset' = (. fmap) . usingChangeset+  usingChangeset' :: (String -> String) -> a -> a+  usingChangeset' = usingChangeset . fmap

@@ -7,5 +7,5 @@   displayName :: a -> String   setDisplayName :: String -> a -> a -  usingDisplayName :: a -> (String -> String) -> a+  usingDisplayName :: (String -> String) -> a -> a   usingDisplayName = displayName `using` setDisplayName

@@ -10,8 +10,8 @@   setGenerator' :: String -> a -> a   setGenerator' = setGenerator . return -  usingGenerator :: a -> (Maybe String -> Maybe String) -> a+  usingGenerator :: (Maybe String -> Maybe String) -> a -> a   usingGenerator = generator `using` setGenerator -  usingGenerator' :: a -> (String -> String) -> a-  usingGenerator' = (. fmap) . usingGenerator+  usingGenerator' :: (String -> String) -> a -> a+  usingGenerator' = usingGenerator . fmap

@@ -11,8 +11,8 @@   setHm' :: Home -> a -> a   setHm' = setHm . return -  usingHm :: a -> (Maybe Home -> Maybe Home) -> a+  usingHm :: (Maybe Home -> Maybe Home) -> a -> a   usingHm = hm `using` setHm -  usingHm' :: a -> (Home -> Home) -> a-  usingHm' = (. fmap) . usingHm+  usingHm' :: (Home -> Home) -> a -> a+  usingHm' = usingHm . fmap

@@ -8,5 +8,5 @@   id :: a -> String   setId :: String -> a -> a -  updateId :: a -> (String -> String) -> a+  updateId :: (String -> String) -> a -> a   updateId = id `using` setId

@@ -7,5 +7,5 @@   k :: a -> String   setK :: String -> a -> a -  usingK :: a -> (String -> String) -> a+  usingK :: (String -> String) -> a -> a   usingK = k `using` setK

@@ -7,5 +7,5 @@   lat :: a -> String   setLat :: String -> a -> a -  usingLat :: a -> (String -> String) -> a+  usingLat :: (String -> String) -> a -> a   usingLat = lat `using` setLat

@@ -7,5 +7,5 @@   lon :: a -> String   setLon :: String -> a -> a -  usingLon :: a -> (String -> String) -> a+  usingLon :: (String -> String) -> a -> a   usingLon = lon `using` setLon

@@ -8,5 +8,5 @@   maximum :: a -> String   setMaximum :: String -> a -> a -  usingMaximum :: a -> (String -> String) -> a+  usingMaximum :: (String -> String) -> a -> a   usingMaximum = maximum  `using` setMaximum

@@ -7,5 +7,5 @@   maxlat :: a -> String   setMaxlat :: String -> a -> a -  usingMaxlat :: a -> (String -> String) -> a+  usingMaxlat :: (String -> String) -> a -> a   usingMaxlat = maxlat  `using` setMaxlat

@@ -7,5 +7,5 @@   maxlon :: a -> String   setMaxlon :: String -> a -> a -  usingMaxlon :: a -> (String -> String) -> a+  usingMaxlon :: (String -> String) -> a -> a   usingMaxlon = maxlon `using` setMaxlon

@@ -11,8 +11,8 @@   setMember :: Member -> a -> a   setMember = setMembers . return -  usingMembers :: a -> ([Member] -> [Member]) -> a+  usingMembers :: ([Member] -> [Member]) -> a -> a   usingMembers = members `using` setMembers -  usingMember :: a -> (Member -> Member) -> a-  usingMember = (. map) . usingMembers+  usingMember :: (Member -> Member) -> a -> a+  usingMember = usingMembers . map

@@ -8,5 +8,5 @@   minimum :: a -> String   setMinimum :: String -> a -> a -  usingMinimum :: a -> (String -> String) -> a+  usingMinimum :: (String -> String) -> a -> a   usingMinimum = minimum  `using` setMinimum

@@ -7,5 +7,5 @@   minlat :: a -> String   setMinlat :: String -> a -> a -  usingMinlat :: a -> (String -> String) -> a+  usingMinlat :: (String -> String) -> a -> a   usingMinlat = minlat `using` setMinlat

@@ -7,5 +7,5 @@   minlon :: a -> String   setMinlon :: String -> a -> a -  usingMinlon :: a -> (String -> String) -> a+  usingMinlon :: (String -> String) -> a -> a   usingMinlon = minlon `using` setMinlon

@@ -8,5 +8,5 @@   mtype :: a -> MemberType   setMtype :: MemberType -> a -> a -  usingMtype :: a -> (MemberType -> MemberType) -> a+  usingMtype :: (MemberType -> MemberType) -> a -> a   usingMtype = mtype `using` setMtype

@@ -7,5 +7,5 @@   name :: a -> String   setName :: String -> a -> a -  usingName :: a -> (String -> String) -> a+  usingName :: (String -> String) -> a -> a   usingName = name `using` setName

@@ -11,8 +11,8 @@   setNd :: Nd -> a -> a   setNd = setNds . return -  usingNds :: a -> ([Nd] -> [Nd]) -> a+  usingNds :: ([Nd] -> [Nd]) -> a -> a   usingNds = nds `using` setNds -  usingNd :: a -> (Nd -> Nd) -> a-  usingNd = (. map) . usingNds+  usingNd :: (Nd -> Nd) -> a -> a+  usingNd = usingNds . map

@@ -14,20 +14,20 @@   setNwr :: NodeWayRelation -> a -> a   setNwr = setNwrs . return -  usingNwrs :: a -> ([NodeWayRelation] -> [NodeWayRelation]) -> a+  usingNwrs :: ([NodeWayRelation] -> [NodeWayRelation]) -> a -> a   usingNwrs = nwrs `using` setNwrs -  usingNwr :: a -> (NodeWayRelation -> NodeWayRelation) -> a-  usingNwr = (. map) . usingNwrs+  usingNwr :: (NodeWayRelation -> NodeWayRelation) -> a -> a+  usingNwr = usingNwrs . map -  usingNode :: a -> (Node -> Node) -> a-  usingNode a f = usingNwr a (\p -> foldNodeWayRelation p (node' . f) way' relation')+  usingNode :: (Node -> Node) -> a -> a+  usingNode f a = usingNwr (\p -> foldNodeWayRelation p (node' . f) way' relation') a -  usingWay :: a -> (Way -> Way) -> a-  usingWay a f = usingNwr a (\p -> foldNodeWayRelation p node' (way' . f) relation')+  usingWay :: (Way -> Way) -> a -> a+  usingWay f a = usingNwr (\p -> foldNodeWayRelation p node' (way' . f) relation') a -  usingRelation :: a -> (Relation -> Relation) -> a-  usingRelation a f = usingNwr a (\p -> foldNodeWayRelation p node' way' (relation' . f))+  usingRelation :: (Relation -> Relation) -> a -> a+  usingRelation f a = usingNwr (\p -> foldNodeWayRelation p node' way' (relation' . f)) a  nodes :: (NodeWayRelations a) => a -> [Node] nodes k = nwrs k >>= \t -> foldNodeWayRelation t return (const []) (const [])

@@ -10,8 +10,8 @@   setOrigin' :: String -> a -> a   setOrigin' = setOrigin . return -  usingOrigin :: a -> (Maybe String -> Maybe String) -> a+  usingOrigin :: (Maybe String -> Maybe String) -> a -> a   usingOrigin = origin `using` setOrigin -  usingOrigin' :: a -> (String -> String) -> a-  usingOrigin' = (. fmap) . usingOrigin+  usingOrigin' :: (String -> String) -> a -> a+  usingOrigin' = usingOrigin . fmap

@@ -7,5 +7,5 @@   pending :: a -> Bool   setPending :: Bool -> a -> a -  usingPending :: a -> (Bool -> Bool) -> a+  usingPending :: (Bool -> Bool) -> a -> a   usingPending = pending `using` setPending

@@ -7,5 +7,5 @@   perPage :: a -> String   setPerPage :: String -> a -> a -  usingPerPage :: a -> (String -> String) -> a+  usingPerPage :: (String -> String) -> a -> a   usingPerPage = perPage `using` setPerPage

@@ -7,5 +7,5 @@   public :: a -> Bool   setPublic :: Bool -> a -> a -  usingPublic :: a -> (Bool -> Bool) -> a+  usingPublic :: (Bool -> Bool) -> a -> a   usingPublic = public `using` setPublic

@@ -7,5 +7,5 @@   ref :: a -> String   setRef :: String -> a -> a -  usingRef :: a -> (String -> String) -> a+  usingRef :: (String -> String) -> a -> a   usingRef = ref `using` setRef

@@ -7,5 +7,5 @@   role :: a -> String   setRole :: String -> a -> a -  usingRole :: a -> (String -> String) -> a+  usingRole :: (String -> String) -> a -> a   usingRole = role `using` setRole

@@ -17,14 +17,14 @@   setTag :: Tag -> a -> a   setTag = setTags . return -  usingTags :: a -> ([Tag] -> [Tag]) -> a+  usingTags :: ([Tag] -> [Tag]) -> a -> a   usingTags = tags `using` setTags -  usingTag :: a -> (Tag -> Tag) -> a-  usingTag = (. map) . usingTags+  usingTag :: (Tag -> Tag) -> a -> a+  usingTag = usingTags . map -  usingTag' :: a -> ((String, String) -> (String, String)) -> a-  usingTag' a f = usingTag a (\t -> uncurry tag (f (k t, v t)))+  usingTag' :: ((String, String) -> (String, String)) -> a -> a+  usingTag' f a = usingTag (\t -> uncurry tag (f (k t, v t))) a  tagMap :: (Tags a) => a -> M.Map String String tagMap = M.fromList . map (k &&& v) . tags

@@ -9,5 +9,5 @@   timestamp :: a -> b   setTimestamp :: b -> a -> a -  usingTimestamp :: a -> (b -> b) -> a+  usingTimestamp :: (b -> b) -> a -> a   usingTimestamp = timestamp `using` setTimestamp

@@ -8,5 +8,5 @@   tpoints :: a -> Tracepoints   setTpoints :: Tracepoints -> a -> a -  usingTpoints :: a -> (Tracepoints -> Tracepoints) -> a+  usingTpoints :: (Tracepoints -> Tracepoints) -> a -> a   usingTpoints = tpoints `using` setTpoints

@@ -10,8 +10,8 @@   setUid' :: String -> a -> a   setUid' = setUid . return -  usingUid :: a -> (Maybe String -> Maybe String) -> a+  usingUid :: (Maybe String -> Maybe String) -> a -> a   usingUid = uid `using` setUid -  usingUid' :: a -> (String -> String) -> a-  usingUid' = (. fmap) . usingUid+  usingUid' :: (String -> String) -> a -> a+  usingUid' = usingUid . fmap

@@ -9,5 +9,5 @@   user :: a -> b   setUser :: b -> a -> a -  usingUser :: a -> (b -> b) -> a+  usingUser :: (b -> b) -> a -> a   usingUser = user `using` setUser

@@ -7,5 +7,5 @@   v :: a -> String   setV :: String -> a -> a -  usingV :: a -> (String -> String) -> a+  usingV :: (String -> String) -> a -> a   usingV = v `using` setV

@@ -9,5 +9,5 @@   version :: a -> b   setVersion :: b -> a -> a -  usingVersion :: a -> (b -> b) -> a+  usingVersion :: (b -> b) -> a -> a   usingVersion = version `using` setVersion

@@ -13,5 +13,5 @@   makeInvisible :: a -> a   makeInvisible = setVisible False -  usingVisible :: a -> (Bool -> Bool) -> a+  usingVisible :: (Bool -> Bool) -> a -> a   usingVisible = visible `using` setVisible

@@ -8,5 +8,5 @@   wnodes :: a -> Waynodes   setWnodes :: Waynodes -> a -> a -  usingWnodes :: a -> (Waynodes -> Waynodes) -> a+  usingWnodes :: (Waynodes -> Waynodes) -> a -> a   usingWnodes = wnodes `using` setWnodes

@@ -7,5 +7,5 @@   zoom :: a -> String   setZoom :: String -> a -> a -  usingZoom :: a -> (String -> String) -> a+  usingZoom :: (String -> String) -> a -> a   usingZoom = zoom  `using` setZoom

@@ -1,5 +1,5 @@ Name:                OSM-Version:             0.4.0+Version:             0.4.1 License:             BSD3 License-File:        LICENSE Synopsis:            Parse OpenStreetMap files