nofxx-georuby 1.9.0 → 1.9.1

data/spec/data/georss/atom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:georss="http://www.georss.org/georss">
+  <title>Earthquakes</title>
+  <subtitle>International earthquake observation labs</subtitle>
+  <link href="http://example.org/"/>
+  <updated>2005-12-13T18:30:02Z</updated>
+  <author>
+    <name>Dr. Thaddeus Remor</name>
+    <email>tremor@quakelab.edu</email>
+  </author>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <entry>
+    <title>M 3.2, Mona Passage</title>
+    <link href="http://example.org/2005/09/09/atom01"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <updated>2005-08-17T07:02:32Z</updated>
+    <summary>We just had a big one.</summary>
+    <georss:point>45.256 -71.92</georss:point>
+  </entry>
+</feed>

data/spec/data/georss/gml.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0"
+     xmlns:georss="http://www.georss.org/georss"
+     xmlns:gml="http://www.opengis.net/gml">
+  <channel>
+    <link>http://maps.google.com</link>
+    <title>Cambridge Neighborhoods</title>
+    <description>One guy's view of Cambridge, MA</description>
+    <item>
+      <guid isPermaLink="false">00000111c36421c1321d3</guid>
+      <pubDate>Thu, 05 Apr 2007 20:16:31 +0000</pubDate>
+      <title>Central Square</title>
+      <description>The heart and soul of the "old" Cambridge. Depending on where you
+      stand, you can feel like you're in the 1970s or 2020.</description>
+      <author>rajrsingh</author>
+      <gml:Polygon>
+        <gml:exterior>
+          <gml:LinearRing>
+            <gml:posList>
+              -71.106216 42.366661
+              -71.105576 42.367104
+              -71.104378 42.367134
+              -71.103729 42.366249
+              -71.098793 42.363331
+              -71.101028 42.362541
+              -71.106865 42.366123
+              -71.106216 42.366661
+            </gml:posList>
+          </gml:LinearRing>
+        </gml:exterior>
+      </gml:Polygon>
+    </item>
+    <item>
+      <guid isPermaLink="false">00000111c365564928974</guid>
+      <pubDate>Thu, 05 Apr 2007 20:17:50 +0000</pubDate>
+      <title>MIT</title>
+      <description>Massachusetts Institute of Technology</description>
+      <author>rajrsingh</author>
+      <gml:Polygon>
+        <Snip and end fragment>

data/spec/data/georss/w3c.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="/eqcenter/catalogs/rssxsl.php?feed=eqs7day-M5.xml" type="text/xsl"
+media="screen"?>
+<rss version="2.0"
+     xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+     xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <title>USGS M5+ Earthquakes</title>
+    <description>Real-time, worldwide earthquake list for the past 7 days</description>
+    <link>http://earthquake.usgs.gov/eqcenter/</link>
+    <dc:publisher>U.S. Geological Survey</dc:publisher>
+    <pubDate>Thu, 27 Dec 2007 23:56:15 PST</pubDate>
+    <item>
+      <pubDate>Fri, 28 Dec 2007 05:24:17 GMT</pubDate>
+      <title>M 5.3, northern Sumatra, Indonesia</title>
+      <description>December 28, 2007 05:24:17 GMT</description>
+      <link>http://earthquake.usgs.gov/eqcenter/recenteqsww/Quakes/us2007llai.php</link>
+      <geo:lat>5.5319</geo:lat>
+      <geo:long>95.8972</geo:long>
+    </item>
+  </channel>
+</rss>

data/spec/geo_ruby/{simple_features/geojson_parser_spec.rb → geojson_spec.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-DATA_DIR = File.dirname(__FILE__) + '/../../data/geojson/'
+DATA_DIR = File.dirname(__FILE__) + '/../data/geojson/'
 
 # All geojson test examples are from the GeoJSON spec unless otherwise
 # specified
@@ -111,13 +111,13 @@ describe GeojsonParser do
   it "should create a specified Feature" do
     feature_json = <<-EOJ
       {
-        "type":"Feature", 
-        "id":"OpenLayers.Feature.Vector_314", 
-        "properties":{"prop0": "value0"}, 
+        "type":"Feature",
+        "id":"OpenLayers.Feature.Vector_314",
+        "properties":{"prop0": "value0"},
         "geometry":{
-          "type":"Point", 
+          "type":"Point",
           "coordinates":[97.03125, 39.7265625]
-        } 
+        }
       }
     EOJ
     f = Geometry.from_geojson(feature_json)

data/spec/geo_ruby/georss_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+RSS_DATA_DIR = File.dirname(__FILE__) + '/../data/georss/'
+
+describe GeorssParser do
+
+  it "should parse an rss file" do
+    geo = GeorssParser.new.parse(File.read(RSS_DATA_DIR + "/w3c.xml"))
+    geo.should be_a Point
+  end
+
+
+
+end

data/spec/spec_helper.rb

@@ -9,13 +9,15 @@ require 'rubygems'
 # begin
 #   require 'spec'
 # rescue LoadError
-  require 'rspec'
+require 'rspec'
 #end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'geo_ruby'
 require 'geo_ruby/shp'
 require 'geo_ruby/gpx'
+require 'geo_ruby/geojson'
+require 'geo_ruby/georss'
 
 include GeoRuby
 include SimpleFeatures

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-georuby
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
+  prerelease: 
+  version: 1.9.1
 platform: ruby
 authors: 
 - Guilhem Vellut
@@ -17,54 +13,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -02:00
+date: 2011-03-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
+  name: dbf
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  type: :runtime
+        version: 1.5.0
+  type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.3.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dbf
-  prerelease: false
+  name: bundler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        version: 1.0.0
   type: :development
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: dbf
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: GeoRuby provides geometric data types from the OGC 'Simple Features' specification.
 email: georuby@simplitex.com
 executables: []
@@ -75,12 +92,16 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/geo_ruby.rb
+- lib/geo_ruby/geojson.rb
+- lib/geo_ruby/georss.rb
 - lib/geo_ruby/gpx.rb
 - lib/geo_ruby/gpx4r/gpx.rb
 - lib/geo_ruby/shp.rb
@@ -89,11 +110,9 @@ files:
 - lib/geo_ruby/simple_features/envelope.rb
 - lib/geo_ruby/simple_features/ewkb_parser.rb
 - lib/geo_ruby/simple_features/ewkt_parser.rb
-- lib/geo_ruby/simple_features/geojson_parser.rb
 - lib/geo_ruby/simple_features/geometry.rb
 - lib/geo_ruby/simple_features/geometry_collection.rb
 - lib/geo_ruby/simple_features/geometry_factory.rb
-- lib/geo_ruby/simple_features/georss_parser.rb
 - lib/geo_ruby/simple_features/helper.rb
 - lib/geo_ruby/simple_features/line_string.rb
 - lib/geo_ruby/simple_features/linear_ring.rb
@@ -102,12 +121,10 @@ files:
 - lib/geo_ruby/simple_features/multi_polygon.rb
 - lib/geo_ruby/simple_features/point.rb
 - lib/geo_ruby/simple_features/polygon.rb
-- marcusmateus-georuby.gemspec
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
 - spec/data/geojson/feature_collection.json
+- spec/data/georss/atom.xml
+- spec/data/georss/gml.xml
+- spec/data/georss/w3c.xml
 - spec/data/gpx/fells_loop.gpx
 - spec/data/gpx/long.gpx
 - spec/data/gpx/long.kml
@@ -127,16 +144,17 @@ files:
 - spec/data/polyline.dbf
 - spec/data/polyline.shp
 - spec/data/polyline.shx
+- spec/geo_ruby/geojson_spec.rb
+- spec/geo_ruby/georss.rb
+- spec/geo_ruby/georss_spec.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
 - spec/geo_ruby/simple_features/ewkb_parser_spec.rb
 - spec/geo_ruby/simple_features/ewkt_parser_spec.rb
-- spec/geo_ruby/simple_features/geojson_parser_spec.rb
 - spec/geo_ruby/simple_features/geometry_collection_spec.rb
 - spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/geometry_spec.rb
-- spec/geo_ruby/simple_features/georss_parser_spec.rb
 - spec/geo_ruby/simple_features/line_string_spec.rb
 - spec/geo_ruby/simple_features/linear_ring_spec.rb
 - spec/geo_ruby/simple_features/multi_line_string_spec.rb
@@ -160,35 +178,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby data holder for OGC Simple Features
 test_files: 
+- spec/geo_ruby/geojson_spec.rb
+- spec/geo_ruby/georss.rb
+- spec/geo_ruby/georss_spec.rb
 - spec/geo_ruby/gpx4r/gpx_spec.rb
 - spec/geo_ruby/shp4r/shp_spec.rb
 - spec/geo_ruby/simple_features/envelope_spec.rb
 - spec/geo_ruby/simple_features/ewkb_parser_spec.rb
 - spec/geo_ruby/simple_features/ewkt_parser_spec.rb
-- spec/geo_ruby/simple_features/geojson_parser_spec.rb
 - spec/geo_ruby/simple_features/geometry_collection_spec.rb
 - spec/geo_ruby/simple_features/geometry_factory_spec.rb
 - spec/geo_ruby/simple_features/geometry_spec.rb
-- spec/geo_ruby/simple_features/georss_parser_spec.rb
 - spec/geo_ruby/simple_features/line_string_spec.rb
 - spec/geo_ruby/simple_features/linear_ring_spec.rb
 - spec/geo_ruby/simple_features/multi_line_string_spec.rb

data/lib/geo_ruby/simple_features/geojson_parser.rb

@@ -1,132 +0,0 @@
-# GeoJSON parser based on the v1.0 spec at http://geojson.org/geojson-spec.html
-require 'json/pure'
-
-module GeoRuby
-  module SimpleFeatures
-    #Raised when an error in the GeoJSON string is detected
-    class GeojsonFormatError < StandardError
-    end
-
-    # Class added to support geojson 'Feature' objects
-    class GeojsonFeature
-      attr_accessor :geometry, :properties, :id
-      
-      def initialize(geometry, properties = {}, id = nil)
-        @geometry = geometry
-        @properties = properties
-        @id = id
-      end
-
-      def ==(other)
-        if (self.class != other.class)
-          false
-        else
-          (self.id == other.id) && (self.geometry == other.geometry) && (self.properties == other.properties) 
-        end
-      end
-
-      def to_json(options={})
-        output = {}
-        output[:type] = 'Feature'
-        output[:geometry] = geometry
-        output[:properties] = properties
-        output[:id] = id unless id.nil?
-        output.to_json(options)
-      end
-      alias :as_geojson :to_json
-    end
-
-    # Class added to support geojson 'Feature Collection' objects
-    class GeojsonFeatureCollection
-      attr_accessor :features
-
-      def initialize(features)
-        @features = features
-      end
-
-      def ==(other)
-        if (self.class != other.class) || (features.size != other.features.size)
-          return false
-        else
-          features.each_index do |index|
-            return false if self.features[index] != other.features[index]
-          end
-        end
-        true
-      end
-
-      def to_json(options = {})
-        {:type => 'FeatureCollection',
-         :features => features}.to_json(options)
-      end
-      alias :as_geojson :to_json
-    end
-
-
-    class GeojsonParser
-      attr_reader :geometry
-      
-      def parse(geojson, srid=DEFAULT_SRID)
-        @geometry = nil
-        geohash = JSON.parse(geojson)
-        parse_geohash(geohash, srid)
-      end
-
-      private
-
-      def parse_geohash(geohash, srid)
-        srid = srid_from_crs(geohash['crs']) || srid
-        case geohash['type']
-        when 'Point', 'MultiPoint', 'LineString', 'MultiLineString', 'Polygon', 'MultiPolygon', 'GeometryCollection'
-          @geometry = parse_geometry(geohash, srid)
-        when 'Feature'
-          @geometry = parse_geojson_feature(geohash, srid)
-        when 'FeatureCollection'
-          @geometry = parse_geojson_feature_collection(geohash, srid)
-        else
-          GeojsonFormatError.new('Unknown GeoJSON type')
-        end
-      end
-      
-      def parse_geometry(geohash, srid)
-        srid = srid_from_crs(geohash['crs']) || srid
-        if geohash['type'] == 'GeometryCollection'
-          parse_geometry_collection(geohash, srid)
-        else
-          klass = GeoRuby::SimpleFeatures.const_get(geohash['type'])
-          klass.from_coordinates(geohash['coordinates'], srid, false, false)
-        end
-      end
-
-      def parse_geometry_collection(geohash, srid)
-        srid = srid_from_crs(geohash['crs']) || srid
-        geometries = geohash['geometries'].map{|g| parse_geometry(g,srid)}
-        GeometryCollection.from_geometries(geometries,srid)
-      end
-
-      def parse_geojson_feature(geohash, srid)
-        srid = srid_from_crs(geohash['crs']) || srid
-        geometry = parse_geometry(geohash['geometry'],srid)
-        GeojsonFeature.new(geometry, geohash['properties'], geohash['id'])
-      end
-
-      def parse_geojson_feature_collection(geohash, srid)
-        srid = srid_from_crs(geohash['crs']) || srid
-        features = []
-        geohash['features'].each do |feature|
-          features << parse_geojson_feature(feature, srid)
-        end
-        GeojsonFeatureCollection.new(features)
-      end
-
-      def srid_from_crs(crs)
-        # We somehow need to map crs to srid, currently only support for EPSG 
-        if crs && crs['type'] == 'OGC'
-          urn = crs['properties']['urn'].split(':')
-          return urn.last if urn[4] == 'EPSG'
-        end
-        return nil
-      end
-    end
-  end
-end