geojson 4.0.3 → 4.0.4
raw patch · 7 files changed
+14/−14 lines, 7 filesdep ~aesondep ~basePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: aeson, base
API changes (from Hackage documentation)
- Data.Geospatial: bbox :: forall a_avmA. Lens' (GeoFeature a_avmA) (Maybe BoundingBoxWithoutCRS)
+ Data.Geospatial: bbox :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) (Maybe BoundingBoxWithoutCRS)
- Data.Geospatial: boundingbox :: forall a_awSU. Lens' (GeoFeatureCollection a_awSU) (Maybe BoundingBoxWithoutCRS)
+ Data.Geospatial: boundingbox :: forall a_a1hOi. Lens' (GeoFeatureCollection a_a1hOi) (Maybe BoundingBoxWithoutCRS)
- Data.Geospatial: class HasGeoPositionWithoutCRS c_aczn
+ Data.Geospatial: class HasGeoPositionWithoutCRS c_agg5
- Data.Geospatial: featureId :: forall a_avmA. Lens' (GeoFeature a_avmA) (Maybe FeatureID)
+ Data.Geospatial: featureId :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) (Maybe FeatureID)
- Data.Geospatial: geoPositionWithoutCRS :: HasGeoPositionWithoutCRS c_aczn => Lens' c_aczn GeoPositionWithoutCRS
+ Data.Geospatial: geoPositionWithoutCRS :: HasGeoPositionWithoutCRS c_agg5 => Lens' c_agg5 GeoPositionWithoutCRS
- Data.Geospatial: geofeatures :: forall a_awSU a_awVt. Lens (GeoFeatureCollection a_awSU) (GeoFeatureCollection a_awVt) (Seq (GeoFeature a_awSU)) (Seq (GeoFeature a_awVt))
+ Data.Geospatial: geofeatures :: forall a_a1hOi a_a1hQR. Lens (GeoFeatureCollection a_a1hOi) (GeoFeatureCollection a_a1hQR) (Seq (GeoFeature a_a1hOi)) (Seq (GeoFeature a_a1hQR))
- Data.Geospatial: geometry :: forall a_avmA. Lens' (GeoFeature a_avmA) GeospatialGeometry
+ Data.Geospatial: geometry :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) GeospatialGeometry
- Data.Geospatial: properties :: forall a_avmA a_avu2. Lens (GeoFeature a_avmA) (GeoFeature a_avu2) a_avmA a_avu2
+ Data.Geospatial: properties :: forall a_a1c7d a_a1ceF. Lens (GeoFeature a_a1c7d) (GeoFeature a_a1ceF) a_a1c7d a_a1ceF
- Data.Geospatial.Internal.BasicTypes: class HasGeoPositionWithoutCRS c_aczn
+ Data.Geospatial.Internal.BasicTypes: class HasGeoPositionWithoutCRS c_agg5
- Data.Geospatial.Internal.BasicTypes: geoPositionWithoutCRS :: HasGeoPositionWithoutCRS c_aczn => Lens' c_aczn GeoPositionWithoutCRS
+ Data.Geospatial.Internal.BasicTypes: geoPositionWithoutCRS :: HasGeoPositionWithoutCRS c_agg5 => Lens' c_agg5 GeoPositionWithoutCRS
- Data.Geospatial.Internal.GeoFeature: bbox :: forall a_avmA. Lens' (GeoFeature a_avmA) (Maybe BoundingBoxWithoutCRS)
+ Data.Geospatial.Internal.GeoFeature: bbox :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) (Maybe BoundingBoxWithoutCRS)
- Data.Geospatial.Internal.GeoFeature: featureId :: forall a_avmA. Lens' (GeoFeature a_avmA) (Maybe FeatureID)
+ Data.Geospatial.Internal.GeoFeature: featureId :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) (Maybe FeatureID)
- Data.Geospatial.Internal.GeoFeature: geometry :: forall a_avmA. Lens' (GeoFeature a_avmA) GeospatialGeometry
+ Data.Geospatial.Internal.GeoFeature: geometry :: forall a_a1c7d. Lens' (GeoFeature a_a1c7d) GeospatialGeometry
- Data.Geospatial.Internal.GeoFeature: properties :: forall a_avmA a_avu2. Lens (GeoFeature a_avmA) (GeoFeature a_avu2) a_avmA a_avu2
+ Data.Geospatial.Internal.GeoFeature: properties :: forall a_a1c7d a_a1ceF. Lens (GeoFeature a_a1c7d) (GeoFeature a_a1ceF) a_a1c7d a_a1ceF
- Data.Geospatial.Internal.GeoFeatureCollection: boundingbox :: forall a_awSU. Lens' (GeoFeatureCollection a_awSU) (Maybe BoundingBoxWithoutCRS)
+ Data.Geospatial.Internal.GeoFeatureCollection: boundingbox :: forall a_a1hOi. Lens' (GeoFeatureCollection a_a1hOi) (Maybe BoundingBoxWithoutCRS)
- Data.Geospatial.Internal.GeoFeatureCollection: geofeatures :: forall a_awSU a_awVt. Lens (GeoFeatureCollection a_awSU) (GeoFeatureCollection a_awVt) (Seq (GeoFeature a_awSU)) (Seq (GeoFeature a_awVt))
+ Data.Geospatial.Internal.GeoFeatureCollection: geofeatures :: forall a_a1hOi a_a1hQR. Lens (GeoFeatureCollection a_a1hOi) (GeoFeatureCollection a_a1hQR) (Seq (GeoFeature a_a1hOi)) (Seq (GeoFeature a_a1hQR))
Files
- README.md +8/−0
- geojson.cabal +6/−6
- src/Data/Geospatial/Internal/CRS.hs +0/−1
- src/Data/Geospatial/Internal/Geometry.hs +0/−1
- src/Data/Geospatial/Internal/Geometry/Aeson.hs +0/−2
- src/Data/LineString.hs +0/−1
- src/Data/LinearRing.hs +0/−3
README.md view
@@ -2,6 +2,14 @@ A thin GeoJSON Layer above the `aeson` library +## Development++Run tests:+* `stack test :geojson-test`++Run hlint:+* `stack test :geojson-hlint`+ ### Other Projects/Documentation [Geometry Survival Guide](https://www.gaia-gis.it/spatialite-3.0.0-BETA/GeoNotations.pdf)
geojson.cabal view
@@ -1,5 +1,5 @@ name: geojson-version: 4.0.3+version: 4.0.4 license: BSD3 license-file: LICENCE author: Dom De Re@@ -27,12 +27,12 @@ source-repository this type: git location: https://github.com/zellige/hs-geojson.git- tag: 4.0.3+ tag: 4.0.4 library hs-source-dirs: src build-depends: base >= 4.9 && < 5- , aeson >=0.8 && <1.6+ , aeson >= 0.8 && <1.6 , containers >= 0.5.10.1 , deepseq >= 1.4 , lens >= 4.11@@ -66,8 +66,8 @@ hs-source-dirs: test main-is: Main.hs type: exitcode-stdio-1.0- build-depends: base < 5 && >= 4.9 && < 5- , aeson <1.6 && >= 0.8 && < 1.6+ build-depends: base >= 4.9 && < 5+ , aeson >= 0.8 && < 1.6 , bytestring >= 0.10 , containers >= 0.5.10.1 , geojson@@ -93,7 +93,7 @@ hs-source-dirs: hlint main-is: Main.hs type: exitcode-stdio-1.0- build-depends: base < 5 && >= 4.9+ build-depends: base >= 4.9 && < 5 , hlint default-language: Haskell2010 ghc-options: -Wall
src/Data/Geospatial/Internal/CRS.hs view
@@ -25,7 +25,6 @@ import Data.Geospatial.Internal.BasicTypes -import Control.Applicative ((<$>), (<*>)) import Control.Lens (makePrisms) import Control.Monad (mzero) import Data.Aeson (FromJSON (..), Object,
src/Data/Geospatial/Internal/Geometry.hs view
@@ -46,7 +46,6 @@ import Data.Geospatial.Internal.Geometry.GeoPoint import Data.Geospatial.Internal.Geometry.GeoPolygon -import Control.Applicative ((<$>)) import Control.DeepSeq import Control.Lens (makePrisms) import Control.Monad (mzero)
src/Data/Geospatial/Internal/Geometry/Aeson.hs view
@@ -17,12 +17,10 @@ , optAttributes ) where -import Control.Applicative ((<$>)) import Control.Monad (mzero) import Data.Aeson (FromJSON (..), Object, ToJSON (..), Value, object, (.:), (.:?), (.=)) import Data.Aeson.Types (Pair, Parser)-import Data.Maybe (Maybe (..)) import Data.Text (Text)
src/Data/LineString.hs view
@@ -32,7 +32,6 @@ import Prelude hiding (foldr) -import Control.Applicative (Applicative (..)) import Control.DeepSeq import Control.Lens (( # ), (^?)) import Control.Monad (mzero)
src/Data/LinearRing.hs view
@@ -38,14 +38,12 @@ import Prelude #endif -import Control.Applicative (Applicative (..)) import Control.DeepSeq import Control.Lens (( # ), (^?)) import Control.Monad (mzero) import Data.Aeson (FromJSON (..), ToJSON (..), Value) import Data.Aeson.Types (Parser, typeMismatch) import qualified Data.Foldable as Foldable-import Data.Functor ((<$>)) import Data.List (intercalate) import Data.List.NonEmpty as NL (NonEmpty, toList) import qualified Data.Sequence as Sequence@@ -174,7 +172,6 @@ else Validation._Failure # pure (FirstNotEqualToLast first third) v -> Validation._Failure # pure (SequenceTooShort (Sequence.length v))- _ -> Validation._Failure # pure (SequenceTooShort 0) {-# INLINE fromSeq #-} -- |