ruby_mapnik 0.1.3 → 0.1.4

data/Gemfile

@@ -6,6 +6,7 @@ source :gemcutter
 
 gem "rice", ">=1.4.2"
 
+gem "chunky_png", ">=0", :group => [:development, :test]
 gem "rake-compiler", ">=0", :group => [:development, :test]
 gem "hoe", "~>2.10", :group => [:development, :test]
 

data/Manifest.txt

@@ -89,8 +89,6 @@ ext/ruby_mapnik/_mapnik_feature.rb.cpp
 ext/ruby_mapnik/_mapnik_feature.rb.h
 ext/ruby_mapnik/_mapnik_font_engine.rb.cpp
 ext/ruby_mapnik/_mapnik_font_engine.rb.h
-ext/ruby_mapnik/_mapnik_geometry.rb.cpp
-ext/ruby_mapnik/_mapnik_geometry.rb.h
 ext/ruby_mapnik/_mapnik_layer.rb.cpp
 ext/ruby_mapnik/_mapnik_layer.rb.h
 ext/ruby_mapnik/_mapnik_line_pattern_symbolizer.rb.cpp
@@ -152,7 +150,6 @@ test/test_mapnik_envelope.rb
 test/test_mapnik_expression.rb
 test/test_mapnik_feature.rb
 test/test_mapnik_font_engine.rb
-test/test_mapnik_geometry.rb
 test/test_mapnik_layer.rb
 test/test_mapnik_line_symbolizer.rb
 test/test_mapnik_map.rb

data/Rakefile

@@ -31,7 +31,7 @@ Hoe.spec 'ruby_mapnik' do
   self.history_file  = 'History.txt'
   self.extra_deps << ['rice', '>= 1.4.2']
   self.extra_dev_deps << ['rake-compiler', '>= 0']
-
+  self.extra_dev_deps << ['chunky_png', '>= 0']
 
   self.spec_extras = { :extensions => ["ext/ruby_mapnik/extconf.rb"] }
 

data/ext/ruby_mapnik/_mapnik.cpp

@@ -30,7 +30,6 @@ void register_mapnik(){
   register_datasource_cache(rb_mapnik);
   register_envelope(rb_mapnik);
   register_feature(rb_mapnik);
-  register_geometry(rb_mapnik);
   register_polygon_symbolizer(rb_mapnik);
   register_line_symbolizer(rb_mapnik);
   register_stroke(rb_mapnik);

data/ext/ruby_mapnik/_mapnik.h

@@ -38,7 +38,6 @@ SOFTWARE.
 #include "_mapnik_datasource_cache.rb.h"
 #include "_mapnik_envelope.rb.h"
 #include "_mapnik_feature.rb.h"
-#include "_mapnik_geometry.rb.h"
  
 #include "_mapnik_polygon_symbolizer.rb.h" 
 #include "_mapnik_line_symbolizer.rb.h" 

data/ext/ruby_mapnik/_mapnik_feature.rb.cpp

@@ -40,22 +40,31 @@ namespace {
   }
 
   class context_holder {
+  private:
+    mapnik::context_ptr ptr;
   public:
-    mapnik::context_ptr ptr;  
-    context_holder(){
-      ptr = boost::make_shared<mapnik::context_type>();
+      
+    context_holder()
+      : ptr (boost::make_shared<mapnik::context_type>())
+    {
+      return;
     }
 
     int push(std::string const& str){
       return ptr->push(str);
     }
+
+    mapnik::context_ptr get_ptr(){
+      return ptr;
+    }
+
   };
 
 }
 template<>
 mapnik::context_ptr from_ruby<mapnik::context_ptr>(Rice::Object ruby_obj){
   context_holder ctx = from_ruby<context_holder>(ruby_obj);
-  return ctx.ptr;
+  return ctx.get_ptr();
 }
 
 void register_feature(Rice::Module rb_mapnik){

data/ext/ruby_mapnik/_mapnik_layer.rb.cpp

@@ -109,7 +109,7 @@ void register_layer(Rice::Module rb_mapnik){
   * Document-method: min_zoom
   * @return [Integer] the layer's minimum zoom factor
   */
-  rb_clayer.define_method("min_zoom", &mapnik::layer::getMinZoom);
+  rb_clayer.define_method("min_zoom", &mapnik::layer::min_zoom);
   
   /*
   * Document-method: min_zoom=
@@ -117,13 +117,13 @@ void register_layer(Rice::Module rb_mapnik){
   *   min_zoom=(min_zoom)
   * @return [nil]
   */
-  rb_clayer.define_method("min_zoom=", &mapnik::layer::setMinZoom, Rice::Arg("new_min_zoom"));
+  rb_clayer.define_method("min_zoom=", &mapnik::layer::set_min_zoom, Rice::Arg("new_min_zoom"));
   
   /*
   * Document-method: max_zoom
   * @return [Integer] the layer's maximum zoom factor
   */
-  rb_clayer.define_method("max_zoom", &mapnik::layer::getMaxZoom);
+  rb_clayer.define_method("max_zoom", &mapnik::layer::max_zoom);
   
  
   /*
@@ -132,19 +132,19 @@ void register_layer(Rice::Module rb_mapnik){
   *   min_zoom=(min_zoom)
   * @return [nil]
   */
-  rb_clayer.define_method("max_zoom=", &mapnik::layer::setMaxZoom, Rice::Arg("new_max_zoom"));
+  rb_clayer.define_method("max_zoom=", &mapnik::layer::set_max_zoom, Rice::Arg("new_max_zoom"));
 
   /*
   * Document-method: visible_at_scale?
   * @return [Boolean]
   */
-  rb_clayer.define_method("visible_at_scale?", &mapnik::layer::isVisible, Rice::Arg("scale"));
+  rb_clayer.define_method("visible_at_scale?", &mapnik::layer::visible, Rice::Arg("scale"));
   
   /*
   * Document-method: active?
   * @return [Boolean]
   */
-  rb_clayer.define_method("active?", &mapnik::layer::isActive);
+  rb_clayer.define_method("active?", &mapnik::layer::active);
   
   /*
   * Document-method: active=
@@ -152,13 +152,13 @@ void register_layer(Rice::Module rb_mapnik){
   *   active=(new_active_value)
   * @return [nil]
   */
-  rb_clayer.define_method("active=", &mapnik::layer::setActive, Rice::Arg("new_active_value"));
+  rb_clayer.define_method("active=", &mapnik::layer::set_active, Rice::Arg("new_active_value"));
   
   /*
   * Document-method: queryable?
   * @return [Boolean]
   */
-  rb_clayer.define_method("queryable?", &mapnik::layer::isQueryable);
+  rb_clayer.define_method("queryable?", &mapnik::layer::queryable);
   
   /*
   * Document-method: queryable=
@@ -166,7 +166,7 @@ void register_layer(Rice::Module rb_mapnik){
   *   queryable=(new_queryable_value)
   * @return [nil]
   */
-  rb_clayer.define_method("queryable=", &mapnik::layer::setQueryable, Rice::Arg("new_queryable_value"));
+  rb_clayer.define_method("queryable=", &mapnik::layer::set_queryable, Rice::Arg("new_queryable_value"));
   
   /*
   * Document-method: cache_features?

data/ext/ruby_mapnik/_mapnik_map.rb.cpp

@@ -82,8 +82,7 @@ std::vector<mapnik::layer> & (mapnik::Map::*_map_layers_)() = &mapnik::Map::laye
 
 namespace {
 
-  void render_map_to_file(const mapnik::Map& map, const std::string& filename){
-    std::string format = mapnik::guess_type(filename);
+  void render_map_to_file_with_format(const mapnik::Map& map, const std::string& filename, const std::string& format){
     if (format == "pdf" || format == "svg" || format =="ps") {
   #if defined(HAVE_CAIRO)
     mapnik::save_to_cairo_file(map,filename,format);
@@ -94,10 +93,14 @@ namespace {
         mapnik::image_32 image(map.width(),map.height());
         mapnik::agg_renderer<mapnik::image_32> ren(map,image,1.0,0,0);
         ren.apply();
-        mapnik::save_to_file(image,filename);
+        mapnik::save_to_file(image,filename, format);
     }
   }
 
+  void render_map_to_file(const mapnik::Map& map, const std::string& filename){
+    render_map_to_file_with_format(map, filename, mapnik::guess_type(filename));
+  }
+
   std::string render_map_to_string(const mapnik::Map& map, std::string const& format){
     mapnik::image_32 image(map.width(),map.height());
     mapnik::agg_renderer<mapnik::image_32> ren(map,image,1.0,0,0);
@@ -417,6 +420,11 @@ void register_map(Rice::Module rb_mapnik){
   */
   rb_cmap.define_method("__render_to_file__", &render_map_to_file);
 
+  /*
+  * Dont-Document-method: __render_to_file_with_format__
+  */
+  rb_cmap.define_method("__render_to_file_with_format__", &render_map_to_file_with_format);
+
   /*
   * Document-method: to_xml
   * @return [String] 

data/lib/ruby_mapnik.rb

@@ -37,7 +37,7 @@ require "#{path}/ruby_mapnik/mapnik/tile"
 
 
 module Mapnik
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   
   FontEngine.register_fonts(FONT_PATH)
   DatasourceCache.register(INPUT_PLUGIN_PATH)

data/lib/ruby_mapnik/mapnik/font_engine.rb

@@ -26,7 +26,7 @@ module Mapnik
     DEFAULT_VALID_EXTENSIONS = ['ttf','otf','ttc','pfa','pfb','ttc','dfont']
     
     def self.register_fonts(path, valid_extensions = DEFAULT_VALID_EXTENSIONS)
-      file_names = Dir.glob(File.join("#{path}", "*.{#{valid_extensions.join(',')}}"))
+      file_names = Dir.glob(File.join("#{path}", "**", "*.{#{valid_extensions.join(',')}}"))
       file_names.each{|filename| register_font(filename)} 
     end
     

data/lib/ruby_mapnik/mapnik/map.rb

@@ -149,10 +149,15 @@ module Mapnik
 
     # Renders the map to a file. Returns true or false depending if the
     # render was successful. The image type is inferred from the filename.
-    # @param [String] filename Should end in one of "png", "jpg", or "tiff"
+    # @param [String] filename Should end in one of "png", "jpg", or "tiff" if format not specified
+    # @param [String] format Should be one of formats supported by Mapnik or nil (to be guessed from filename)
     # @return [Boolean]
-    def render_to_file(filename)
-      __render_to_file__(filename)
+    def render_to_file(filename, format = nil)
+      if format
+        __render_to_file_with_format__(filename, format)
+      else
+        __render_to_file__(filename)
+      end
       return File.exists?(filename)
     end
     

data/lib/ruby_mapnik/mapnik/tile.rb

@@ -44,11 +44,11 @@ module Mapnik
       setup_bounds
     end
       
-    def render(map, filename)
+    def render(map, filename, format=nil)
       map.height = @height
       map.width = @width
       map.zoom_to_box(forwarded_envelope)
-      map.render_to_file(filename)
+      map.render_to_file(filename, format)
     end
 
     def render_to_string(map)

data/test/test_helper.rb

@@ -25,5 +25,5 @@ CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 require File.join(CURRENT_PATH, '..', 'lib', 'ruby_mapnik')
 
 unless defined?(SHAPEFILE)
-  SHAPEFILE = "#{File.expand_path(File.dirname(__FILE__))}/data/TM_WORLD_BORDERS_SIMPL_0.3_MOD"
+  SHAPEFILE = File.join(CURRENT_PATH, 'data', 'TM_WORLD_BORDERS_SIMPL_0.3_MOD')
 end

data/test/test_mapnik_coord.rb

@@ -58,55 +58,35 @@ class TestMapnikCoord < Test::Unit::TestCase
   
   # These could be refactored, I suppose...
   def test_should_return_a_new_coord_when_multiplied_by_a_number
-    start_x = 1
-    start_y = 2
-    factor  = 3
-    coord2d = Mapnik::Coord2d.new(start_x, start_y)
-    multiplied_coord = coord2d * factor
-    assert_not_equal(coord2d.object_id, multiplied_coord.object_id)
-    assert_equal(coord2d.x * factor, multiplied_coord.x)
-    assert_equal(coord2d.y * factor, multiplied_coord.y)
-    assert_equal(coord2d.x, start_x)
-    assert_equal(coord2d.y, start_y)
+    coord_check_with_operator(:*)
   end
   
   def test_should_return_a_new_coord_when_added_to_by_a_number
-    start_x = 1
-    start_y = 2
-    factor  = 3
-    coord2d = Mapnik::Coord2d.new(start_x, start_y)
-    added_coord = coord2d + factor
-    assert_not_equal(coord2d.object_id, added_coord.object_id)
-    assert_equal(coord2d.x + factor, added_coord.x)
-    assert_equal(coord2d.y + factor, added_coord.y)
-    assert_equal(coord2d.x, start_x)
-    assert_equal(coord2d.y, start_y)
+    coord_check_with_operator(:+)
   end
   
   def test_should_return_a_new_coord_when_subtracted_from_by_a_number
-    start_x = 1
-    start_y = 2
-    factor  = 3
-    coord2d = Mapnik::Coord2d.new(start_x, start_y)
-    subtracted_coord = coord2d - factor
-    assert_not_equal(coord2d.object_id, subtracted_coord.object_id)
-    assert_equal(coord2d.x - factor, subtracted_coord.x)
-    assert_equal(coord2d.y - factor, subtracted_coord.y)
-    assert_equal(coord2d.x, start_x)
-    assert_equal(coord2d.y, start_y)
+    coord_check_with_operator(:-)
   end
   
   def test_should_return_a_new_coord_when_divided_by_a_number
+    coord_check_with_operator(:/)
+  end
+  
+private
+  
+  def coord_check_with_operator(operator)
     start_x = 1
     start_y = 2
     factor  = 3
     coord2d = Mapnik::Coord2d.new(start_x, start_y)
-    divided_coord = coord2d / factor
-    assert_not_equal(coord2d.object_id, divided_coord.object_id)
-    assert_equal(coord2d.x / factor, divided_coord.x)
-    assert_equal(coord2d.y / factor, divided_coord.y)
+    updated_coord = coord2d.send(operator, factor)
+    
+    assert_not_equal(coord2d.object_id, updated_coord.object_id)
+    assert_equal(coord2d.x.send(operator, factor), updated_coord.x)
+    assert_equal(coord2d.y.send(operator, factor), updated_coord.y)
     assert_equal(coord2d.x, start_x)
     assert_equal(coord2d.y, start_y)
   end
-  
+
 end

data/test/test_mapnik_map.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require "chunky_png"
 
 class TestMapnikMap < Test::Unit::TestCase
       
@@ -151,7 +152,17 @@ class TestMapnikMap < Test::Unit::TestCase
     assert File.exists?(filename)
     File.delete(filename)
   end
-  
+
+  def test_should_render_to_file_with_explicit_format
+    map = build_complete_map
+    filename = File.join(File.expand_path(File.dirname(__FILE__)), "../tmp/world-256.png")
+    assert_equal 0, File.size(filename) if File.exists?(filename)
+    assert map.render_to_file(filename, "png256")
+    assert File.exists?(filename)
+    assert_not_nil ChunkyPNG::Datastream.from_file(filename).palette_chunk
+    File.delete(filename)
+  end
+
   def test_should_load_from_xml_string
     map_1 = build_complete_map
     map_2 = Mapnik::Map.from_xml(map_1.to_xml)

metadata

@@ -1,98 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby_mapnik
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Elliot Laster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rice
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2166805120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2166805120
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &2166804600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2166804600
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: &2166803860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2166803860
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &2166800680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 13
-        version: "2.13"
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id004
-description: |-
-  A set of bindings between Ruby and Mapnik. Supports many of the common uses for 
-  Mapnik, and one day, might support all of them. Rendering is available using
-  the standard AGG library, or additionally via Cairo, if the rcairo gem is 
-  installed and Mapnik has been compiled with Cairo support.
-email: 
+  prerelease: false
+  version_requirements: *2166800680
+description: ! "A set of bindings between Ruby and Mapnik. Supports many of the common
+  uses for \nMapnik, and one day, might support all of them. Rendering is available
+  using\nthe standard AGG library, or additionally via Cairo, if the rcairo gem is
+  \ninstalled and Mapnik has been compiled with Cairo support."
+email:
 - elliotlaster@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/ruby_mapnik/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - demo/data/COPYRIGHT.txt
 - demo/data/test/readme.txt
-files: 
+files:
 - .autotest
 - .yardopts
 - Gemfile
@@ -184,8 +160,6 @@ files:
 - ext/ruby_mapnik/_mapnik_feature.rb.h
 - ext/ruby_mapnik/_mapnik_font_engine.rb.cpp
 - ext/ruby_mapnik/_mapnik_font_engine.rb.h
-- ext/ruby_mapnik/_mapnik_geometry.rb.cpp
-- ext/ruby_mapnik/_mapnik_geometry.rb.h
 - ext/ruby_mapnik/_mapnik_layer.rb.cpp
 - ext/ruby_mapnik/_mapnik_layer.rb.h
 - ext/ruby_mapnik/_mapnik_line_pattern_symbolizer.rb.cpp
@@ -247,7 +221,6 @@ files:
 - test/test_mapnik_expression.rb
 - test/test_mapnik_feature.rb
 - test/test_mapnik_font_engine.rb
-- test/test_mapnik_geometry.rb
 - test/test_mapnik_layer.rb
 - test/test_mapnik_line_symbolizer.rb
 - test/test_mapnik_map.rb
@@ -270,39 +243,31 @@ files:
 - .gemtest
 homepage: https://github.com/mapnik/Ruby-Mapnik
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby_mapnik
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A set of bindings between Ruby and Mapnik
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/test_line_pattern_symbolizer.rb
 - test/test_mapnik_color.rb
@@ -312,7 +277,6 @@ test_files:
 - test/test_mapnik_expression.rb
 - test/test_mapnik_feature.rb
 - test/test_mapnik_font_engine.rb
-- test/test_mapnik_geometry.rb
 - test/test_mapnik_layer.rb
 - test/test_mapnik_line_symbolizer.rb
 - test/test_mapnik_map.rb

data/ext/ruby_mapnik/_mapnik_geometry.rb.cpp

@@ -1,82 +0,0 @@
-/*****************************************************************************
-Copyright (C) 2011 Elliot Laster
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the ‘Software’), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
- *****************************************************************************/
-#include <_mapnik_geometry.rb.h>
-
-// Rice
-#include <rice/Data_Type.hpp>
-#include <rice/Constructor.hpp>
-#include <rice/Class.hpp>
-#include <rice/Enum.hpp>
-
-// Mapnik
-#include <mapnik/geometry.hpp>
-#include <mapnik/wkt/wkt_factory.hpp>
-
-namespace{
-
-  typedef boost::ptr_vector<mapnik::geometry_type> path_type;
-
-  // Borrowed from the python bindings...
-  void from_wkt_impl(path_type& p, std::string const& wkt)
-  {
-      bool result = mapnik::from_wkt(wkt, p);
-      if (!result) throw std::runtime_error("Failed to parse WKT");
-  }
-
-/*
-  mapnik::geometry_type * from_wkt_impl(std::string const& wkt) {
-    std::pair<bool,mapnik::geometry_type*> result = mapnik::from_wkt(wkt);
-    if (result.first){
-      return result.second;
-    }
-    throw std::runtime_error("Failed to parse WKT");
-  }
-*/
-
-}
-
-Rice::Enum<mapnik::eGeomType> geometry_enum;
-
-template<>
-mapnik::eGeomType from_ruby<mapnik::eGeomType>(Rice::Object x) {
-  Rice::Data_Object<mapnik::eGeomType> d(x, geometry_enum);
-  return *d;
-}
-
-
-void register_geometry(Rice::Module rb_mapnik){
-  /*
-    @@Module_var rb_mapnik = Mapnik
-  */
-  geometry_enum = Rice::define_enum<mapnik::eGeomType>("GeometryType", rb_mapnik);
-  geometry_enum.define_value("Point",mapnik::Point);
-  geometry_enum.define_value("LineString",mapnik::LineString);
-  geometry_enum.define_value("Polygon",mapnik::Polygon);
-  
-  Rice::Data_Type< mapnik::geometry_type > rb_cgeometry2d = Rice::define_class_under< mapnik::geometry_type >(rb_mapnik, "Geometry2d");
-  rb_cgeometry2d.define_method("envelope", &mapnik::geometry_type::envelope);
-  rb_cgeometry2d.define_method("type", &mapnik::geometry_type::type);
-
-  Rice::Data_Type< path_type > rb_cpath = Rice::define_class_under< path_type >(rb_mapnik, "Path");
-  rb_cpath.define_singleton_method("from_wkt", &from_wkt_impl, Rice::Arg("wkt"));
-}
-

data/ext/ruby_mapnik/_mapnik_geometry.rb.h

@@ -1,32 +0,0 @@
-/*****************************************************************************
-Copyright (C) 2011 Elliot Laster
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the ‘Software’), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
- *****************************************************************************/
-#ifndef PIKA2_MAPNIK_GEOMETRY
-#define PIKA2_MAPNIK_GEOMETRY
-
-namespace Rice
-{
- class Module; 
-}
-
-void register_geometry(Rice::Module rb_mapnik);
-
-#endif

data/test/test_mapnik_geometry.rb

@@ -1,84 +0,0 @@
-require "test_helper"
-
-class TestMapnikGeometry < Test::Unit::TestCase
-  
-  STATEMENT = "Geometry tests no longer valid. See https://github.com/mapnik/Ruby-Mapnik/issues/11"
-
-  def test_presence
-    assert Mapnik::GeometryType
-    assert Mapnik::Geometry2d
-    assert Mapnik::GeometryType::Point
-    assert Mapnik::GeometryType::LineString
-    assert Mapnik::GeometryType::Polygon
-  end
-  
-  def test_should_make_point_from_wkt
-    omit(STATEMENT)
-    # point = Mapnik::Geometry2d.from_wkt("POINT(30 10)")
-    # assert_equal Mapnik::GeometryType::Point, point.type
-    # assert_equal 30, point.envelope.min_x
-    # assert_equal 30, point.envelope.max_x
-    # assert_equal 10, point.envelope.max_y
-    # assert_equal 10, point.envelope.min_y
-    # assert_equal 0, point.area
-  end
-  
-  def test_should_make_linestring_from_wkt
-    omit(STATEMENT)
-    # linestring = Mapnik::Geometry2d.from_wkt("LINESTRING (29 11, 12 30, 41 40)")
-    # assert_equal Mapnik::GeometryType::LineString, linestring.type
-    # assert_equal 12, linestring.envelope.min_x
-    # assert_equal 41, linestring.envelope.max_x
-    # assert_equal 40, linestring.envelope.max_y
-    # assert_equal 11, linestring.envelope.min_y
-    # assert_equal 0, linestring.area -> Not sure what the correct value is here  
-  end
-  
-  def test_should_make_polygon_from_wkt
-    omit(STATEMENT)
-    # polygon = Mapnik::Geometry2d.from_wkt("POLYGON ((30 10, 10 20, 20 40, 40 40, 30 10))")
-    # assert_equal Mapnik::GeometryType::Polygon, polygon.type
-    # assert_equal 10, polygon.envelope.min_x
-    # assert_equal 40, polygon.envelope.max_x
-    # assert_equal 40, polygon.envelope.max_y
-    # assert_equal 10, polygon.envelope.min_y
-    # assert_equal 0, polygon.area
-  end
-  
-  def test_should_make_multipoint_from_wkt
-    omit(STATEMENT)
-    # multipoint = Mapnik::Geometry2d.from_wkt("MULTIPOINT (10 40, 40 30, 20 20, 30 10)")
-    # assert_equal Mapnik::GeometryType::MultiPoint, multipoint.type
-    # assert_equal 10, multipoint.envelope.min_x
-    # assert_equal 40, multipoint.envelope.max_x
-    # assert_equal 40, multipoint.envelope.max_y
-    # assert_equal 10, multipoint.envelope.min_y
-  end
-  
-  def test_should_make_multilinestring_from_wkt
-    omit(STATEMENT)
-    # multi_line = Mapnik::Geometry2d.from_wkt("MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))")
-    # assert_equal Mapnik::GeometryType::MultiLineString, multi_line.type
-    # assert_equal 10, multi_line.envelope.min_x
-    # assert_equal 40, multi_line.envelope.max_x
-    # assert_equal 40, multi_line.envelope.max_y
-    # assert_equal 10, multi_line.envelope.min_y
-  end
-  
-  def test_should_make_multipolygon_from_wkt
-    omit(STATEMENT)
-    # multi_polygon = Mapnik::Geometry2d.from_wkt("MULTIPOLYGON (((30 20, 10 40, 45 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))")
-    # assert_equal Mapnik::GeometryType::MultiPolygon, multi_polygon.type
-    # assert_equal 5, multi_polygon.envelope.min_x
-    # assert_equal 45, multi_polygon.envelope.max_x
-    # assert_equal 40, multi_polygon.envelope.max_y
-    # assert_equal 5, multi_polygon.envelope.min_y
-  end
-
-private
-  
-  def omit(str)
-    puts str
-  end
-
-end