gps 1.0.1 → 1.0.2

raw patch · 3 files changed

+37/−7 lines, 3 filesdep ~GPXPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: GPX

API changes (from Hackage documentation)

Files

• Data/GPS/Core.hs +5/−5
• LICENSE +30/−0
• gps.cabal +2/−2

@@ -124,7 +124,7 @@ 	(lat,lon) = getRadianPairD p 	lat2 = asin (sin (lat) * cos (d / radiusOfEarth) + cos(lat)                       * sin(d/radiusOfEarth) * cos h)-        lon2 = lon + atan2 (sin h * sin (d / radiusOfEarth) * cos lat)+        lon2 = lon - atan2 (sin h * sin (d / radiusOfEarth) * cos lat)                            (cos (d/radiusOfEarth) - sin lat * sin lat2)  -- | Speed in meters per second, only if a 'Time' was recorded for each waypoint.@@ -254,13 +254,13 @@ writeGPX fp ps = writeGpxFile fp $ gpx "1.0" "Haskell GPS Package (via the GPX package)" Nothing [] [] [trk Nothing Nothing Nothing Nothing [] Nothing Nothing Nothing [trkseg ps Nothing]] Nothing  -- writeGpxFile should go in the GPX package-writeGpxFile :: FilePath -> Gpx -> IO ()-writeGpxFile fp gpx = runX_ (constA gpx >>> xpickleDocument (xpickle :: PU Gpx) [] fp)+writeGpxFile :: FilePath -> GPX -> IO ()+writeGpxFile fp gpx = runX_ (constA gpx >>> xpickleDocument (xpickle :: PU GPX) [] fp)  runX_ t = runX t >> return ()  readGPXSegments :: FilePath -> IO [Trail Wpt] readGPXSegments = liftM (map (concatMap (^. trkptsL)) . map (^. trksegsL) . concatMap (^. trksL)) . readGpxFile -readGpxFile :: FilePath -> IO [Gpx]-readGpxFile = runX . xunpickleDocument (xpickle :: PU Gpx) [withRemoveWS yes, withValidate no]+readGpxFile :: FilePath -> IO [GPX]+readGpxFile = runX . xunpickleDocument (xpickle :: PU GPX) [withRemoveWS yes, withValidate no]

@@ -0,0 +1,30 @@+Copyright (c)2012, Thomas M. DuBuisson++All rights reserved.++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met:++    * Redistributions of source code must retain the above copyright+      notice, this list of conditions and the following disclaimer.++    * Redistributions in binary form must reproduce the above+      copyright notice, this list of conditions and the following+      disclaimer in the documentation and/or other materials provided+      with the distribution.++    * Neither the name of Thomas M. DuBuisson nor the names of other+      contributors may be used to endorse or promote products derived+      from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -1,5 +1,5 @@ name:		gps-version:	1.0.1+version:	1.0.2 license:	BSD3 license-file:	LICENSE author:		Thomas DuBuisson <thomas.dubuisson@gmail.com>@@ -16,7 +16,7 @@ Library   Build-Depends: base >= 3 && < 6,                    pretty >= 1.0 , prettyclass >= 1.0,-                   time >= 1.1, GPX >= 0.6 && < 0.7+                   time >= 1.1, GPX >= 0.7 && < 0.8                  , hxt >= 9.1 && < 9.2, xsd >= 0.3 && < 0.4,                    vector >= 0.7, statistics >= 0.9, data-lens >= 2.0 && < 2.1   hs-source-dirs: