Skip to content
Browse files

merge with upstream package

  • Loading branch information...
2 parents 14d73e2 + 0522b17 commit 2b617bbc57cacb1260fffe93ee18f8e57f4d4d9a @tonymorris committed Jan 15, 2012
Showing with 33 additions and 39 deletions.
  1. +8 −0 .ghci
  2. +2 −0 .gitignore
  3. +2 −2 LICENSE
  4. +18 −12 OSM.cabal
  5. +3 −0 Setup.hs
  6. +0 −3 Setup.lhs
  7. 0 { → src}/Data/Geo/OSM.hs
  8. 0 { → src}/Data/Geo/OSM/Accessor/Accessor.hs
  9. 0 { → src}/Data/Geo/OSM/Accessor/AccountCreated.hs
  10. 0 { → src}/Data/Geo/OSM/Accessor/Ar.hs
  11. 0 { → src}/Data/Geo/OSM/Accessor/BoundOrs.hs
  12. 0 { → src}/Data/Geo/OSM/Accessor/Box.hs
  13. 0 { → src}/Data/Geo/OSM/Accessor/Changeset.hs
  14. 0 { → src}/Data/Geo/OSM/Accessor/DisplayName.hs
  15. 0 { → src}/Data/Geo/OSM/Accessor/Generator.hs
  16. 0 { → src}/Data/Geo/OSM/Accessor/Hm.hs
  17. 0 { → src}/Data/Geo/OSM/Accessor/Id.hs
  18. 0 { → src}/Data/Geo/OSM/Accessor/K.hs
  19. 0 { → src}/Data/Geo/OSM/Accessor/Lat.hs
  20. 0 { → src}/Data/Geo/OSM/Accessor/Lon.hs
  21. 0 { → src}/Data/Geo/OSM/Accessor/Maximum.hs
  22. 0 { → src}/Data/Geo/OSM/Accessor/Maxlat.hs
  23. 0 { → src}/Data/Geo/OSM/Accessor/Maxlon.hs
  24. 0 { → src}/Data/Geo/OSM/Accessor/Members.hs
  25. 0 { → src}/Data/Geo/OSM/Accessor/Minimum.hs
  26. 0 { → src}/Data/Geo/OSM/Accessor/Minlat.hs
  27. 0 { → src}/Data/Geo/OSM/Accessor/Minlon.hs
  28. 0 { → src}/Data/Geo/OSM/Accessor/Mtype.hs
  29. 0 { → src}/Data/Geo/OSM/Accessor/Name.hs
  30. 0 { → src}/Data/Geo/OSM/Accessor/Nds.hs
  31. 0 { → src}/Data/Geo/OSM/Accessor/NodeWayRelations.hs
  32. 0 { → src}/Data/Geo/OSM/Accessor/Origin.hs
  33. 0 { → src}/Data/Geo/OSM/Accessor/Pending.hs
  34. 0 { → src}/Data/Geo/OSM/Accessor/PerPage.hs
  35. 0 { → src}/Data/Geo/OSM/Accessor/Public.hs
  36. 0 { → src}/Data/Geo/OSM/Accessor/Ref.hs
  37. 0 { → src}/Data/Geo/OSM/Accessor/Role.hs
  38. 0 { → src}/Data/Geo/OSM/Accessor/Tags.hs
  39. 0 { → src}/Data/Geo/OSM/Accessor/Timestamp.hs
  40. 0 { → src}/Data/Geo/OSM/Accessor/Tpoints.hs
  41. 0 { → src}/Data/Geo/OSM/Accessor/Uid.hs
  42. 0 { → src}/Data/Geo/OSM/Accessor/User.hs
  43. 0 { → src}/Data/Geo/OSM/Accessor/V.hs
  44. 0 { → src}/Data/Geo/OSM/Accessor/Version.hs
  45. 0 { → src}/Data/Geo/OSM/Accessor/Visible.hs
  46. 0 { → src}/Data/Geo/OSM/Accessor/Wnodes.hs
  47. 0 { → src}/Data/Geo/OSM/Accessor/Zoom.hs
  48. +0 −1 { → src}/Data/Geo/OSM/Api.hs
  49. +0 −1 { → src}/Data/Geo/OSM/Area.hs
  50. +0 −1 { → src}/Data/Geo/OSM/Bound.hs
  51. +0 −1 { → src}/Data/Geo/OSM/Bounds.hs
  52. +0 −1 { → src}/Data/Geo/OSM/ChangesetE.hs
  53. 0 { → src}/Data/Geo/OSM/Example/CampSites.hs
  54. 0 { → src}/Data/Geo/OSM/Example/WayTags.hs
  55. +0 −1 { → src}/Data/Geo/OSM/GpxFile.hs
  56. +0 −1 { → src}/Data/Geo/OSM/Home.hs
  57. +0 −1 { → src}/Data/Geo/OSM/Member.hs
  58. +0 −1 { → src}/Data/Geo/OSM/MemberType.hs
  59. 0 { → src}/Data/Geo/OSM/NWRCommon.hs
  60. +0 −1 { → src}/Data/Geo/OSM/Nd.hs
  61. +0 −1 { → src}/Data/Geo/OSM/Node.hs
  62. +0 −1 { → src}/Data/Geo/OSM/NodeWayRelation.hs
  63. +0 −1 { → src}/Data/Geo/OSM/OSM.hs
  64. +0 −1 { → src}/Data/Geo/OSM/OSMChildren.hs
  65. +0 −1 { → src}/Data/Geo/OSM/Preferences.hs
  66. +0 −1 { → src}/Data/Geo/OSM/Relation.hs
  67. +0 −1 { → src}/Data/Geo/OSM/Tag.hs
  68. +0 −1 { → src}/Data/Geo/OSM/Tracepoints.hs
  69. +0 −1 { → src}/Data/Geo/OSM/UserE.hs
  70. +0 −1 { → src}/Data/Geo/OSM/VersionE.hs
  71. +0 −1 { → src}/Data/Geo/OSM/Way.hs
  72. +0 −1 { → src}/Data/Geo/OSM/Waynodes.hs
View
8 .ghci
@@ -0,0 +1,8 @@
+:set -isrc
+:m + Test.QuickCheck
+:l Data.Geo.OSM
+:m + Data.Geo.OSM
+:set prompt ">> "
+:set -Wall
+:set -fno-warn-name-shadowing
+
View
2 .gitignore
@@ -0,0 +1,2 @@
+dist
+*.lkshs
View
4 LICENSE
@@ -1,4 +1,4 @@
-Copyright 2009 Tony Morris
+Copyright 2011 Tony Morris
All rights reserved.
@@ -24,4 +24,4 @@ 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.
+SUCH DAMAGE.
View
30 OSM.cabal
@@ -1,28 +1,34 @@
Name: OSM
-Version: 0.5.1
+Version: 0.6.0
License: BSD3
License-File: LICENSE
Synopsis: Parse OpenStreetMap files
Description: Parse OpenStreetMap http:\/\/osm.org/ files using HXT into data structures.
The Data.Geo.OSM module is the core module that exports all others.
-Homepage: http://code.google.com/p/geo-osm/
+Homepage: https://github.com/tonymorris/geo-osm
Category: Utils
-Author: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>
-Maintainer: Tony Morris
-Copyright: 2009-2010 Tony Morris
-build-type: Simple
-cabal-version: >= 1.2
+Author: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>, Thomas DuBuisson
+Maintainer: Tony Morris, Thomas DuBuisson
+Copyright: 2009 -- 2012 Tony Morris, Thomas DuBuisson
+Build-Type: Simple
+Cabal-Version: >= 1.6
+Source-Repository head
+ Type: git
+ Location: git@github.com:tonymorris/geo-osm.git
-Flag small_base
+Flag small_base
Description: Choose the new, split-up base package.
Library
- if flag(small_base)
- Build-Depends: base < 5 && >= 3, hxt >= 9.0, hxt-extras, containers
- else
- Build-Depends: base < 5 && >= 3, hxt >= 9.0, hxt-extras, containers
+ Build-Depends: base < 5 && >= 3
+ , hxt >= 9
+ , containers
GHC-Options: -Wall
+ -fno-warn-name-shadowing
+
+ Hs-Source-Dirs: src
+
Exposed-Modules: Data.Geo.OSM
Data.Geo.OSM.Api
Data.Geo.OSM.Area
View
3 Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+main = defaultMain
+
View
3 Setup.lhs
@@ -1,3 +0,0 @@
-#!/usr/bin/env runhaskell
-> import Distribution.Simple
-> main = defaultMain
View
0 Data/Geo/OSM.hs → src/Data/Geo/OSM.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Accessor.hs → src/Data/Geo/OSM/Accessor/Accessor.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/AccountCreated.hs → src/Data/Geo/OSM/Accessor/AccountCreated.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Ar.hs → src/Data/Geo/OSM/Accessor/Ar.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/BoundOrs.hs → src/Data/Geo/OSM/Accessor/BoundOrs.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Box.hs → src/Data/Geo/OSM/Accessor/Box.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Changeset.hs → src/Data/Geo/OSM/Accessor/Changeset.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/DisplayName.hs → src/Data/Geo/OSM/Accessor/DisplayName.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Generator.hs → src/Data/Geo/OSM/Accessor/Generator.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Hm.hs → src/Data/Geo/OSM/Accessor/Hm.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Id.hs → src/Data/Geo/OSM/Accessor/Id.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/K.hs → src/Data/Geo/OSM/Accessor/K.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Lat.hs → src/Data/Geo/OSM/Accessor/Lat.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Lon.hs → src/Data/Geo/OSM/Accessor/Lon.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Maximum.hs → src/Data/Geo/OSM/Accessor/Maximum.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Maxlat.hs → src/Data/Geo/OSM/Accessor/Maxlat.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Maxlon.hs → src/Data/Geo/OSM/Accessor/Maxlon.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Members.hs → src/Data/Geo/OSM/Accessor/Members.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Minimum.hs → src/Data/Geo/OSM/Accessor/Minimum.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Minlat.hs → src/Data/Geo/OSM/Accessor/Minlat.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Minlon.hs → src/Data/Geo/OSM/Accessor/Minlon.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Mtype.hs → src/Data/Geo/OSM/Accessor/Mtype.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Name.hs → src/Data/Geo/OSM/Accessor/Name.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Nds.hs → src/Data/Geo/OSM/Accessor/Nds.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/NodeWayRelations.hs → ...Data/Geo/OSM/Accessor/NodeWayRelations.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Origin.hs → src/Data/Geo/OSM/Accessor/Origin.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Pending.hs → src/Data/Geo/OSM/Accessor/Pending.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/PerPage.hs → src/Data/Geo/OSM/Accessor/PerPage.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Public.hs → src/Data/Geo/OSM/Accessor/Public.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Ref.hs → src/Data/Geo/OSM/Accessor/Ref.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Role.hs → src/Data/Geo/OSM/Accessor/Role.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Tags.hs → src/Data/Geo/OSM/Accessor/Tags.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Timestamp.hs → src/Data/Geo/OSM/Accessor/Timestamp.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Tpoints.hs → src/Data/Geo/OSM/Accessor/Tpoints.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Uid.hs → src/Data/Geo/OSM/Accessor/Uid.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/User.hs → src/Data/Geo/OSM/Accessor/User.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/V.hs → src/Data/Geo/OSM/Accessor/V.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Version.hs → src/Data/Geo/OSM/Accessor/Version.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Visible.hs → src/Data/Geo/OSM/Accessor/Visible.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Wnodes.hs → src/Data/Geo/OSM/Accessor/Wnodes.hs
File renamed without changes.
View
0 Data/Geo/OSM/Accessor/Zoom.hs → src/Data/Geo/OSM/Accessor/Zoom.hs
File renamed without changes.
View
1 Data/Geo/OSM/Api.hs → src/Data/Geo/OSM/Api.hs
@@ -7,7 +7,6 @@ module Data.Geo.OSM.Api(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.VersionE
import Data.Geo.OSM.Area
import Data.Geo.OSM.Tracepoints
View
1 Data/Geo/OSM/Area.hs → src/Data/Geo/OSM/Area.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Area(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Maximum
-- | The @area@ element of a OSM file.
View
1 Data/Geo/OSM/Bound.hs → src/Data/Geo/OSM/Bound.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Bound(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Box
import Data.Geo.OSM.Accessor.Origin
View
1 Data/Geo/OSM/Bounds.hs → src/Data/Geo/OSM/Bounds.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Bounds(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Minlat
import Data.Geo.OSM.Accessor.Maxlat
import Data.Geo.OSM.Accessor.Minlon
View
1 Data/Geo/OSM/ChangesetE.hs → src/Data/Geo/OSM/ChangesetE.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.ChangesetE(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Tag
import Data.Geo.OSM.Accessor.Tags
View
0 Data/Geo/OSM/Example/CampSites.hs → src/Data/Geo/OSM/Example/CampSites.hs
File renamed without changes.
View
0 Data/Geo/OSM/Example/WayTags.hs → src/Data/Geo/OSM/Example/WayTags.hs
File renamed without changes.
View
1 Data/Geo/OSM/GpxFile.hs → src/Data/Geo/OSM/GpxFile.hs
@@ -7,7 +7,6 @@ module Data.Geo.OSM.GpxFile(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Char
import Data.Geo.OSM.Accessor.Id
import Data.Geo.OSM.Accessor.Name
View
1 Data/Geo/OSM/Home.hs → src/Data/Geo/OSM/Home.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Home(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Lat
import Data.Geo.OSM.Accessor.Lon
import Data.Geo.OSM.Accessor.Zoom
View
1 Data/Geo/OSM/Member.hs → src/Data/Geo/OSM/Member.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Member(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.MemberType
import Data.Geo.OSM.Accessor.Mtype
import Data.Geo.OSM.Accessor.Ref
View
1 Data/Geo/OSM/MemberType.hs → src/Data/Geo/OSM/MemberType.hs
@@ -8,7 +8,6 @@ module Data.Geo.OSM.MemberType(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Char
-- | The @type@ attribute of a @member@ element of a OSM file.
View
0 Data/Geo/OSM/NWRCommon.hs → src/Data/Geo/OSM/NWRCommon.hs
File renamed without changes.
View
1 Data/Geo/OSM/Nd.hs → src/Data/Geo/OSM/Nd.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Nd(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Ref
-- | The @nd@ element of a OSM file.
View
1 Data/Geo/OSM/Node.hs → src/Data/Geo/OSM/Node.hs
@@ -7,7 +7,6 @@ module Data.Geo.OSM.Node(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.NWRCommon
import Data.Geo.OSM.Tag
import Data.Geo.OSM.Accessor.Id
View
1 Data/Geo/OSM/NodeWayRelation.hs → src/Data/Geo/OSM/NodeWayRelation.hs
@@ -11,7 +11,6 @@ module Data.Geo.OSM.NodeWayRelation(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Node
import Data.Geo.OSM.Way
import Data.Geo.OSM.Relation
View
1 Data/Geo/OSM/OSM.hs → src/Data/Geo/OSM/OSM.hs
@@ -19,7 +19,6 @@ module Data.Geo.OSM.OSM(
import Prelude hiding (mapM, foldr)
import Text.XML.HXT.Core
-import Text.XML.HXT.Extras
import Control.Monad hiding (mapM)
import Data.Foldable
import Data.Traversable
View
1 Data/Geo/OSM/OSMChildren.hs → src/Data/Geo/OSM/OSMChildren.hs
@@ -10,7 +10,6 @@ module Data.Geo.OSM.OSMChildren(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.UserE
import Data.Geo.OSM.Preferences
import Data.Geo.OSM.GpxFile
View
1 Data/Geo/OSM/Preferences.hs → src/Data/Geo/OSM/Preferences.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.Preferences(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Tag
import Data.Geo.OSM.Accessor.Tags
View
1 Data/Geo/OSM/Relation.hs → src/Data/Geo/OSM/Relation.hs
@@ -7,7 +7,6 @@ module Data.Geo.OSM.Relation(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Member
import Data.Geo.OSM.NWRCommon
import Data.Geo.OSM.Tag
View
1 Data/Geo/OSM/Tag.hs → src/Data/Geo/OSM/Tag.hs
@@ -6,7 +6,6 @@ module Data.Geo.OSM.Tag(
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.K
import Data.Geo.OSM.Accessor.V
View
1 Data/Geo/OSM/Tracepoints.hs → src/Data/Geo/OSM/Tracepoints.hs
@@ -6,7 +6,6 @@ module Data.Geo.OSM.Tracepoints(
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.PerPage
-- | The @tracepoints@ element of a OSM file.
View
1 Data/Geo/OSM/UserE.hs → src/Data/Geo/OSM/UserE.hs
@@ -5,7 +5,6 @@ module Data.Geo.OSM.UserE(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Home
import Data.Geo.OSM.Accessor.Hm
import Data.Geo.OSM.Accessor.DisplayName
View
1 Data/Geo/OSM/VersionE.hs → src/Data/Geo/OSM/VersionE.hs
@@ -6,7 +6,6 @@ module Data.Geo.OSM.VersionE(
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Minimum
import Data.Geo.OSM.Accessor.Maximum
View
1 Data/Geo/OSM/Way.hs → src/Data/Geo/OSM/Way.hs
@@ -7,7 +7,6 @@ module Data.Geo.OSM.Way(
) where
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Nd
import Data.Geo.OSM.NWRCommon
import Data.Geo.OSM.Tag
View
1 Data/Geo/OSM/Waynodes.hs → src/Data/Geo/OSM/Waynodes.hs
@@ -6,7 +6,6 @@ module Data.Geo.OSM.Waynodes(
import Text.XML.HXT.Arrow.Pickle
-import Text.XML.HXT.Extras
import Data.Geo.OSM.Accessor.Maximum
-- | The @waynodes@ element of a OSM file.

0 comments on commit 2b617bb

Please sign in to comment.
Something went wrong with that request. Please try again.