vectortiles 1.2.0.1 → 1.2.0.2
raw patch · 3 files changed
+15/−8 lines, 3 filesdep −th-printfdep ~vectorPVP ok
version bump matches the API change (PVP)
Dependencies removed: th-printf
Dependency ranges changed: vector
API changes (from Hackage documentation)
Files
- CHANGELOG.md +8/−0
- Geography/VectorTile/Protobuf/Internal.hs +5/−5
- vectortiles.cabal +2/−3
CHANGELOG.md view
@@ -1,6 +1,14 @@ Changelog ========= +1.2.0.2+-------+- Bump `vector` upper bound.++1.2.0.1+-------+- Remove the redundant `Monoid` instance for `Point`.+ 1.2.0 -----
Geography/VectorTile/Protobuf/Internal.hs view
@@ -67,10 +67,10 @@ import qualified Data.Vector.Unboxed as U import Data.Word import GHC.Generics (Generic)-import qualified Geography.VectorTile.VectorTile as VT import qualified Geography.VectorTile.Geometry as G import Geography.VectorTile.Util-import Text.Printf.TH+import qualified Geography.VectorTile.VectorTile as VT+import Text.Printf --- @@ -200,7 +200,7 @@ -- with a count greater than 0. instance ProtobufGeom G.Point where fromCommands [MoveTo ps] = Right . U.convert $ evalState (U.mapM expand ps) (0,0)- fromCommands (c:_) = Left $ [st|Invalid command found in Point feature: %s|] (show c)+ fromCommands (c:_) = Left . pack $ printf "Invalid command found in Point feature: %s" (show c) fromCommands [] = Left "No points given!" -- | A multipoint geometry must reduce to a single `MoveTo` command.@@ -243,7 +243,7 @@ po <- flip U.snoc here <$> U.mapM expand (U.cons h ps) fmap (V.cons (G.Polygon po V.empty)) <$> f rs f [] = pure $ Right V.empty- f _ = pure . Left $ [st|Polygon decode: Invalid command sequence given: %s|] (show cs)+ f _ = pure . Left . pack $ printf "Polygon decode: Invalid command sequence given: %s" (show cs) g acc p | G.area p > 0 = do -- New external rings. curr <- get put p@@ -279,7 +279,7 @@ (2,m) -> Right $ both fromIntegral (2,m) (7,1) -> Right (7,1) (7,m) -> Left $ "ClosePath was given a parameter count: " <> pack (show m)- (m,_) -> Left $ [st|Invalid command integer %d found in: %X|] m n+ (m,_) -> Left . pack $ printf "Invalid command integer %d found in: %X" m n where cmd = n .&. 7 count = shift n (-3)
vectortiles.cabal view
@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: vectortiles-version: 1.2.0.1+version: 1.2.0.2 synopsis: GIS Vector Tiles, as defined by Mapbox. description: GIS Vector Tiles, as defined by Mapbox. .@@ -50,11 +50,10 @@ -- other-extensions: build-depends: base >=4.9 && <4.10 , text >= 1.2 && < 1.3- , vector >= 0.11 && < 0.12+ , vector >= 0.11 && < 0.13 , containers , protobuf >= 0.2.1.1 && < 0.3 , deepseq >= 1.4 && < 1.5- , th-printf >= 0.3 && < 0.4 , transformers >= 0.5 && < 0.6 , cereal >= 0.5 && < 0.6 , bytestring