ruby_mapnik 0.1.4 → 0.1.5

data/Manifest.txt

@@ -125,6 +125,7 @@ ext/ruby_mapnik/_mapnik_text_symbolizer.rb.cpp
 ext/ruby_mapnik/_mapnik_text_symbolizer.rb.h
 ext/ruby_mapnik/extconf.rb
 ext/ruby_mapnik/ruby_mapnik.cpp
+lib/mapnik.rb
 lib/ruby_mapnik.rb
 lib/ruby_mapnik/mapnik/font_engine.rb
 lib/ruby_mapnik/mapnik/layer.rb

data/README.rdoc

@@ -4,11 +4,17 @@ https://github.com/mapnik/Ruby-Mapnik
 
 == Requirements
 
-* Rake
+* Rake (and extentiontask)
 * Mapnik 2.x (Currently available at https://github.com/mapnik/mapnik)
 * Rice >= 1.4.2
 * rcairo (https://github.com/rcairo/rcairo) (Optional)
 
+On OS X install ruby deps like:
+
+    sudo gem install rake-compiler
+    export ARCHFLAGS="-arch x86_64"
+    sudo bash -c 'ARCHFLAGS="-arch x86_64" gem install rice cairo'
+
 == Description
 
 A set of bindings between Ruby and Mapnik. Supports many of the common uses for 

data/ext/ruby_mapnik/_mapnik_map.rb.cpp

@@ -39,6 +39,7 @@ SOFTWARE.
 #include <mapnik/load_map.hpp>
 #include <mapnik/save_map.hpp>
 
+#include <boost/optional.hpp>
 
 // Seems like one could metaprogram these two away...
 template<>
@@ -79,6 +80,7 @@ Rice::Object to_ruby<std::vector<mapnik::layer> >(std::vector<mapnik::layer> con
 
 std::map<std::string,mapnik::feature_type_style> & (mapnik::Map::*_map_styles_)() = &mapnik::Map::styles;
 std::vector<mapnik::layer> & (mapnik::Map::*_map_layers_)() = &mapnik::Map::layers;
+boost::optional<mapnik::box2d<double> > const& (mapnik::Map::*maximum_extent_const)() const =  &mapnik::Map::maximum_extent;
 
 namespace {
 
@@ -269,7 +271,7 @@ void register_map(Rice::Module rb_mapnik){
   * Document-method: maximum_extent
   * @return [Mapnik::Envelope]
   */
-  rb_cmap.define_method("maximum_extent", &mapnik::Map::maximum_extent);
+  rb_cmap.define_method("maximum_extent", maximum_extent_const);
 
   /*
   * Document-method: maximum_extent=

data/ext/ruby_mapnik/_mapnik_raster_symbolizer.rb.cpp

@@ -28,10 +28,39 @@ SOFTWARE.
 #include <rice/Enum.hpp>
 
 // Mapnik
+#include <mapnik/version.hpp>
 #include <mapnik/raster_symbolizer.hpp>
 
+#if MAPNIK_VERSION >= 200100
+  #include <mapnik/image_scaling.hpp>
+#endif
+
 void register_raster_symbolizer(Rice::Module rb_mapnik){
-  /*
+
+#if MAPNIK_VERSION >= 200100  
+  Rice::Enum<mapnik::scaling_method_e> scaling_enum = Rice::define_enum<mapnik::scaling_method_e>("ScalingMethod", rb_mapnik);
+  
+  scaling_enum.define_value("NEAR",mapnik::SCALING_NEAR);
+  scaling_enum.define_value("BILINEAR",mapnik::SCALING_BILINEAR);
+  scaling_enum.define_value("BICUBIC", mapnik::SCALING_BICUBIC);
+  scaling_enum.define_value("SPLINE16", mapnik::SCALING_SPLINE16);
+  scaling_enum.define_value("SPLINE36", mapnik::SCALING_SPLINE36);
+  scaling_enum.define_value("HANNING", mapnik::SCALING_HANNING);
+  scaling_enum.define_value("HAMMING", mapnik::SCALING_HAMMING);
+  scaling_enum.define_value("HERMITE", mapnik::SCALING_HERMITE);
+  scaling_enum.define_value("KAISER", mapnik::SCALING_KAISER);
+  scaling_enum.define_value("QUADRIC", mapnik::SCALING_QUADRIC);
+  scaling_enum.define_value("CATROM", mapnik::SCALING_CATROM);
+  scaling_enum.define_value("GAUSSIAN", mapnik::SCALING_GAUSSIAN);
+  scaling_enum.define_value("BESSEL", mapnik::SCALING_BESSEL);
+  scaling_enum.define_value("MITCHELL", mapnik::SCALING_MITCHELL);
+  scaling_enum.define_value("SINC", mapnik::SCALING_SINC);
+  scaling_enum.define_value("LANCZOS", mapnik::SCALING_LANCZOS);
+  scaling_enum.define_value("BLACKMAN", mapnik::SCALING_BLACKMAN);
+  scaling_enum.define_value("BILINEAR8", mapnik::SCALING_BILINEAR8);
+#endif
+
+  /*  
     @@Module_var rb_mapnik = Mapnik
   */
   Rice::Data_Type< mapnik::raster_symbolizer > rb_craster_symbolizer = Rice::define_class_under< mapnik::raster_symbolizer >(rb_mapnik, "RasterSymbolizer");
@@ -39,10 +68,15 @@ void register_raster_symbolizer(Rice::Module rb_mapnik){
   
   rb_craster_symbolizer.define_method("mode", &mapnik::raster_symbolizer::get_mode);
   rb_craster_symbolizer.define_method("mode=", &mapnik::raster_symbolizer::set_mode);
-  
+
+#if MAPNIK_VERSION >= 200100
+  rb_craster_symbolizer.define_method("scaling", &mapnik::raster_symbolizer::get_scaling_method);
+  rb_craster_symbolizer.define_method("scaling=", &mapnik::raster_symbolizer::set_scaling_method);
+#else
   rb_craster_symbolizer.define_method("scaling", &mapnik::raster_symbolizer::get_scaling);
   rb_craster_symbolizer.define_method("scaling=", &mapnik::raster_symbolizer::set_scaling);
-  
+#endif
+
   rb_craster_symbolizer.define_method("opacity", &mapnik::raster_symbolizer::get_opacity);
   rb_craster_symbolizer.define_method("opacity=", &mapnik::raster_symbolizer::set_opacity);
   

data/lib/mapnik.rb

@@ -0,0 +1 @@
+require File.join(path = File.expand_path(File.dirname(__FILE__)), 'ruby_mapnik')

data/lib/ruby_mapnik.rb

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

data/test/test_mapnik_raster_symbolizer.rb

@@ -6,10 +6,15 @@ class TestMapnikRasterSymbolizer < Test::Unit::TestCase
     @sym = Mapnik::RasterSymbolizer.new
   end
   
-  def test_presence
-    assert Mapnik::RasterSymbolizer
+  def test_should_have_scaling_method
+    scaling_methods = [:NEAR, :BILINEAR, :BICUBIC, 
+                       :SPLINE16, :SPLINE36, :HANNING, 
+                       :HAMMING, :HERMITE, :KAISER, :QUADRIC, 
+                       :CATROM, :GAUSSIAN, :BESSEL, :MITCHELL, 
+                       :SINC, :LANCZOS, :BLACKMAN, :BILINEAR8]
+    assert_equal scaling_methods, Mapnik::ScalingMethod.constants
   end
-  
+
   def test_should_get_and_set_mode
     possible_values = ["normal", "grain_merge", "grain_merge2", "multiply",
      "multiply2", "divide", "divide2", "screen", "hard_light"]
@@ -20,8 +25,8 @@ class TestMapnikRasterSymbolizer < Test::Unit::TestCase
   end
   
   def test_should_get_and_set_scaling
-    possible_values = [ "fast","bilinear","bilinear8"]
-    possible_values.each do |value|
+    Mapnik::ScalingMethod.constants.each do |const_sym|
+      value =  Mapnik::ScalingMethod.const_get(const_sym)
       @sym.scaling = value
       assert_equal value, @sym.scaling
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_mapnik
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
-  requirement: &2166805120 !ruby/object:Gem::Requirement
+  requirement: &2165892980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2166805120
+  version_requirements: *2165892980
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2166804600 !ruby/object:Gem::Requirement
+  requirement: &2165892440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166804600
+  version_requirements: *2165892440
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &2166803860 !ruby/object:Gem::Requirement
+  requirement: &2165891900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166803860
+  version_requirements: *2165891900
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2166800680 !ruby/object:Gem::Requirement
+  requirement: &2165891360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2166800680
+  version_requirements: *2165891360
 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
@@ -196,6 +196,7 @@ files:
 - ext/ruby_mapnik/_mapnik_text_symbolizer.rb.h
 - ext/ruby_mapnik/extconf.rb
 - ext/ruby_mapnik/ruby_mapnik.cpp
+- lib/mapnik.rb
 - lib/ruby_mapnik.rb
 - lib/ruby_mapnik/mapnik/font_engine.rb
 - lib/ruby_mapnik/mapnik/layer.rb