simpler-tiles 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b61f77954101ab8a753016497e1add4289eda62
-  data.tar.gz: de284f7de5e1a8508003946f42d98e6df6a2ca8f
+  metadata.gz: bd21718ad62a0b2238de78ce0096cd783d25e1b3
+  data.tar.gz: a096000461cd55af2e4af2ff5485a10e5358ffa7
 SHA512:
-  metadata.gz: e1cd8686e83a43ea74d0fd2de2167b99f646296fb63d15a932a389cff36c13c02fbfaa7cec581ed9747ebdd2f8620a0032fc27a9bcfef285e1ac02d61c2a52b8
-  data.tar.gz: 7dcdfec476b4ffbf3459c685f6b8afd9951491b7a13362268fe8abe1eed7eb935982c2582876dfd8e8b298b93683e287dea313a11a8e94e3a0dd753faf4e7abb
+  metadata.gz: 4071fcc119529339f57fb9d91b902f1f5794cde59de0aad1a7469064d6a4ace72bcc2c15248291e8e044dcbb1cf42d0690f0a7b93edda8e298efcf72fefdeaa4
+  data.tar.gz: e89e44f566b8a41069fff6828445b4246fb3db9eaf47852ea3511feb5d6bfb30b15da8bdd9c15488e5ef009578a20de01b494bc3b5be92b26d61cf1d268c15a1

data/.gitignore

@@ -12,6 +12,7 @@ Gemfile
 .document
 Gemfile.lock
 *.orig
+*.gem
 test/*.png
 mkmf.log
 ext/simpler_tiles/Makefile

data/Rakefile

@@ -29,7 +29,6 @@ task :publish do |t|
   `git checkout master`
 end
 
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -38,17 +37,15 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
-
+# e.g. DEV_CONFIG='--with-simple-tiles-include=/tmp/simple-tiles/usr/local/include/ --with-simple-tiles-lib=/tmp/simple-tiles/usr/local/lib/' bundle exec rake test
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('simpler_tiles') do |ext|
+  if ENV['DEV_CONFIG']
+    ext.config_options << ENV['DEV_CONFIG']
+  end
   ext.lib_dir = File.join('lib', 'simpler_tiles')
 end
 
-DEPEND = "ext/simpler_tiles/depend"
-file DEPEND => FileList["ext/simpler_tiles/*.c"] do |t|
-  `cd ext/simpler_tiles/; gcc -MM *.c > depend`
-end
-
 DATA = "data/tl_2010_us_state10.shp"
 file DATA do |t|
   if !File.exists? t.name
@@ -62,10 +59,5 @@ file DATA do |t|
   end
 end
 
-Rake::Task[:compile].prerequisites.unshift DEPEND
 Rake::Task[:test].prerequisites.unshift DATA
-Rake::Task[:test].prerequisites.unshift :compile
-
-
-
-
+Rake::Task[:test].prerequisites.unshift :compile

data/ext/simpler_tiles/bounds.c

@@ -70,7 +70,6 @@ reproject(VALUE self, VALUE from, VALUE to) {
 static VALUE
 alloc_bounds(VALUE self){
   simplet_bounds_t *bounds;
-  VALUE args[4];
   if(!(bounds = simplet_bounds_new()))
     rb_raise(rb_eRuntimeError, "Error in creating bounds.");
 

data/ext/simpler_tiles/extconf.rb

@@ -6,8 +6,8 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 LIBDIR = RbConfig::CONFIG['libdir']
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 
-$CFLAGS << " #{ENV["CFLAGS"]}" << `PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --cflags simple-tiles pangocairo`.chomp << `gdal-config --cflags`.chomp
-$LIBS << " #{ENV["LIBS"]}" << `PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH pkg-config --libs simple-tiles pangocairo`.chomp << `gdal-config --libs`
+$CFLAGS << " #{ENV["CFLAGS"]}" << `pkg-config --cflags simple-tiles`.chomp << `gdal-config --cflags`.chomp
+$LIBS << " #{ENV["LIBS"]}" << `pkg-config --libs simple-tiles`.chomp << `gdal-config --libs`
 
 HEADER_DIRS = [
  '/usr/local/include',

data/ext/simpler_tiles/layer.c

@@ -1,10 +1,7 @@
 #include "layer.h"
 #include <simple-tiles/layer.h>
-#include <simple-tiles/query.h>
 #include <simple-tiles/list.h>
 
-VALUE cSimplerTilesLayer;
-
 static simplet_layer_t *
 get_layer(VALUE self){
   simplet_layer_t *layer;
@@ -12,27 +9,13 @@ get_layer(VALUE self){
   return layer;
 }
 
-static void
-mark_layer(void *layer){
-  simplet_layer_t *lyr = layer;
-  VALUE ref = (VALUE)simplet_layer_get_user_data(lyr);
-  if(ref) rb_gc_mark(ref);
-}
-
-static void
-layer_free(void *layer){
-  simplet_layer_t *lyr = layer;
-  simplet_layer_free(lyr);
-}
-
-
 /*
 Set the source attribute for the Layer.
 
 @return (String)
 @param (String)
 */
-static VALUE
+VALUE
 set_source(VALUE self, VALUE source){
   Check_Type(source, T_STRING);
   simplet_layer_t *layer = get_layer(self);
@@ -45,47 +28,10 @@ Get a copy of the Layer's source.
 
 @return (String)
 */
-static VALUE
+VALUE
 get_source(VALUE self) {
   simplet_layer_t *layer = get_layer(self);
   char *source;
   simplet_layer_get_source(layer, &source);
   return rb_str_new2(source);
-}
-
-/*
-Add a query object to this Layer's list of queries.
-
-@param (String)
-@return (Query)
-*/
-static VALUE
-add_query(VALUE self, VALUE query){
-  simplet_layer_t *layer = get_layer(self);
-  simplet_query_t *qry;
-  Data_Get_Struct(query, simplet_query_t, qry);
-  simplet_layer_add_query_directly(layer, qry);
-  VALUE circ_ref = self;
-  simplet_query_set_user_data(qry, (void *)circ_ref);
-  simplet_retain((simplet_retainable_t*) qry);
-  return query;
-}
-
-VALUE
-layer_alloc(VALUE klass){
-  simplet_layer_t *layer;
-  if(!(layer = simplet_layer_new("")))
-    rb_fatal("Could not allocate space for a new SimplerTiles::Layer in memory.");
-
-  return Data_Wrap_Struct(klass, mark_layer, layer_free, layer);
-}
-
-void init_layer(){
-  VALUE rlayer = rb_define_class_under(mSimplerTiles, "Layer", rb_cObject);
-  rb_define_alloc_func(rlayer, layer_alloc);
-  rb_define_method(rlayer, "source=", set_source, 1);
-  rb_define_method(rlayer, "source", get_source, 0);
-  rb_define_private_method(rlayer, "add_query", add_query, 1);
-
-  cSimplerTilesLayer = rlayer;
-}
+}

data/ext/simpler_tiles/layer.h

@@ -7,10 +7,14 @@
 extern "C" {
 #endif
 
-void init_layer();
-extern VALUE cSimplerTilesLayer;
+VALUE
+set_source(VALUE self, VALUE source);
+
+VALUE
+get_source(VALUE self);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif

data/ext/simpler_tiles/map.c

@@ -1,7 +1,9 @@
 #include "map.h"
-#include "util.h"
+#include <simple-tiles/util.h>
 #include <simple-tiles/map.h>
-#include <simple-tiles/layer.h>
+#include <simple-tiles/memory.h>
+#include <simple-tiles/vector_layer.h>
+#include <simple-tiles/raster_layer.h>
 #include <simple-tiles/bounds.h>
 #include <simple-tiles/list.h>
 
@@ -211,23 +213,42 @@ set_height(VALUE self, VALUE height){
 
 
 /*
-Create and return a {Layer} based on the passed in string.
+Create and return a {VectorLayer} based on the passed in string.
 
 @param (String)
 @return (Layer)
 */
 static VALUE
-add_layer(VALUE self, VALUE layer){
+add_vector_layer(VALUE self, VALUE layer){
   simplet_map_t *map = get_map(self);
-  simplet_layer_t *lyr;
-  Data_Get_Struct(layer, simplet_layer_t, lyr);
-  simplet_map_add_layer_directly(map, lyr);
+  simplet_vector_layer_t *lyr;
+  Data_Get_Struct(layer, simplet_vector_layer_t, lyr);
+  simplet_map_add_layer_directly(map, (simplet_layer_t *) lyr);
   VALUE circ_ref = self;
-  simplet_layer_set_user_data(lyr, (void *)circ_ref);
+  simplet_vector_layer_set_user_data(lyr, (void *)circ_ref);
   simplet_retain((simplet_retainable_t*) lyr);
   return layer;
 }
 
+/*
+Create and return a {RasterLayer} based on the passed in string.
+
+@param (String)
+@return (Layer)
+*/
+static VALUE
+add_raster_layer(VALUE self, VALUE layer){
+  simplet_map_t *map = get_map(self);
+  simplet_raster_layer_t *lyr;
+  Data_Get_Struct(layer, simplet_raster_layer_t, lyr);
+  simplet_map_add_layer_directly(map, (simplet_layer_t *) lyr);
+  VALUE circ_ref = self;
+  simplet_raster_layer_set_user_data(lyr, (void *)circ_ref);
+  simplet_retain((simplet_retainable_t*) lyr);
+  return layer;
+}
+
+
 /*
 Test to see if the Map has fulfilled the requirements for rendering
 
@@ -333,7 +354,8 @@ init_map(){
   rb_define_method(rmap, "slippy", slippy, 3);
   rb_define_method(rmap, "valid?", is_valid, 0);
   rb_define_private_method(rmap, "to_png_stream", to_png_stream, 1);
-  rb_define_private_method(rmap, "add_layer", add_layer, 1);
+  rb_define_private_method(rmap, "add_vector_layer", add_vector_layer, 1);
+  rb_define_private_method(rmap, "add_raster_layer", add_raster_layer, 1);
 
   cSimplerTilesMap = rmap;
 }

data/ext/simpler_tiles/query.c

@@ -1,6 +1,7 @@
 #include "query.h"
 #include <simple-tiles/query.h>
 #include <simple-tiles/style.h>
+#include <simple-tiles/memory.h>
 
 VALUE cSimplerTilesQuery;
 

data/ext/simpler_tiles/raster_layer.c

@@ -0,0 +1,39 @@
+#include "raster_layer.h"
+#include "layer.h"
+#include <simple-tiles/layer.h>
+#include <simple-tiles/raster_layer.h>
+#include <simple-tiles/list.h>
+
+VALUE cSimplerTilesRasterLayer;
+
+static void
+mark_layer(void *layer){
+  simplet_raster_layer_t *lyr = layer;
+  VALUE ref = (VALUE)simplet_raster_layer_get_user_data(lyr);
+  if(ref) rb_gc_mark(ref);
+}
+
+static void
+layer_free(void *layer){
+  simplet_raster_layer_t *lyr = layer;
+  simplet_raster_layer_free(lyr);
+}
+
+VALUE
+raster_layer_alloc(VALUE klass){
+  simplet_raster_layer_t *layer;
+  if(!(layer = simplet_raster_layer_new("")))
+    rb_fatal("Could not allocate space for a new SimplerTiles::Layer in memory.");
+
+  return Data_Wrap_Struct(klass, mark_layer, layer_free, layer);
+}
+
+void init_raster_layer(){
+  VALUE rRasterLayer = rb_define_class_under(mSimplerTiles, "RasterLayer", rb_cObject);
+  rb_define_alloc_func(rRasterLayer, raster_layer_alloc);
+
+  rb_define_method(rRasterLayer, "source=", set_source, 1);
+  rb_define_method(rRasterLayer, "source", get_source, 0);
+
+  cSimplerTilesRasterLayer = rRasterLayer;
+}

data/ext/simpler_tiles/raster_layer.h

@@ -0,0 +1,17 @@
+#ifndef _SIMPLER_RASTER_LAYER_H
+#define _SIMPLER_RASTER_LAYER_H
+
+#include "simpler_tiles.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void init_raster_layer();
+extern VALUE cSimplerTilesRasterLayer;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/ext/simpler_tiles/simpler_tiles.c

@@ -7,7 +7,8 @@ Init_simpler_tiles(){
   mSimplerTiles = rb_define_module("SimplerTiles");
   init_map();
   init_bounds();
-  init_layer();
+  init_vector_layer();
+  init_raster_layer();
   init_query();
   init_style();
 }

data/ext/simpler_tiles/simpler_tiles.h

@@ -2,11 +2,14 @@
 #define _SIMPLER_TILES_H
 
 #include <simple-tiles/simple_tiles.h>
+#undef STRNCASECMP
+#undef STRCASECMP
 #include <ruby.h>
 
 #include "map.h"
 #include "bounds.h"
-#include "layer.h"
+#include "vector_layer.h"
+#include "raster_layer.h"
 #include "query.h"
 #include "style.h"
 

data/ext/simpler_tiles/style.c

@@ -1,5 +1,5 @@
 #include "style.h"
-#include "util.h"
+#include <simple-tiles/util.h>
 #include <simple-tiles/style.h>
 
 VALUE cSimplerTilesStyle;

data/ext/simpler_tiles/vector_layer.c

@@ -0,0 +1,67 @@
+#include "vector_layer.h"
+#include "layer.h"
+#include <simple-tiles/layer.h>
+#include <simple-tiles/vector_layer.h>
+#include <simple-tiles/query.h>
+#include <simple-tiles/list.h>
+#include <simple-tiles/memory.h>
+
+VALUE cSimplerTilesVectorLayer;
+
+static simplet_vector_layer_t *
+get_layer(VALUE self){
+  simplet_vector_layer_t *layer;
+  Data_Get_Struct(self, simplet_vector_layer_t, layer);
+  return layer;
+}
+
+
+static void
+mark_layer(void *layer){
+  simplet_vector_layer_t *lyr = layer;
+  VALUE ref = (VALUE)simplet_vector_layer_get_user_data(lyr);
+  if(ref) rb_gc_mark(ref);
+}
+
+static void
+layer_free(void *layer){
+  simplet_vector_layer_t *lyr = layer;
+  simplet_vector_layer_free(lyr);
+}
+
+/*
+Add a query object to this Layer's list of queries.
+
+@param (String)
+@return (Query)
+*/
+static VALUE
+add_query(VALUE self, VALUE query){
+  simplet_vector_layer_t *layer = get_layer(self);
+  simplet_query_t *qry;
+  Data_Get_Struct(query, simplet_query_t, qry);
+  simplet_vector_layer_add_query_directly(layer, qry);
+  VALUE circ_ref = self;
+  simplet_query_set_user_data(qry, (void *)circ_ref);
+  simplet_retain((simplet_retainable_t*) qry);
+  return query;
+}
+
+VALUE
+vector_layer_alloc(VALUE klass){
+  simplet_vector_layer_t *layer;
+  if(!(layer = simplet_vector_layer_new("")))
+    rb_fatal("Could not allocate space for a new SimplerTiles::Layer in memory.");
+
+  return Data_Wrap_Struct(klass, mark_layer, layer_free, layer);
+}
+
+void init_vector_layer(){
+  VALUE rVectorLayer = rb_define_class_under(mSimplerTiles, "VectorLayer", rb_cObject);
+  rb_define_alloc_func(rVectorLayer, vector_layer_alloc);
+  rb_define_method(rVectorLayer, "source=", set_source, 1);
+  rb_define_method(rVectorLayer, "source", get_source, 0);
+  rb_define_private_method(rVectorLayer, "add_query", add_query, 1);
+
+  cSimplerTilesVectorLayer = rVectorLayer;
+}

data/ext/simpler_tiles/vector_layer.h

@@ -0,0 +1,17 @@
+#ifndef _SIMPLER_VECTOR_LAYER_H
+#define _SIMPLER_VECTOR_LAYER_H
+
+#include "simpler_tiles.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void init_vector_layer();
+extern VALUE cSimplerTilesVectorLayer;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/index.erb

@@ -169,7 +169,8 @@
       GIS image generation library. It allows you to generate PNG based map
       images without having to dip into straight C and easily connects with
       ActiveRecord. It can display any vector data that
-      <a href="http://www.gdal.org/ogr/ogr_formats.html">OGR</a> can read.
+      <a href="http://www.gdal.org/ogr/ogr_formats.html">OGR</a> can read and any
+      raster data that <a href="http://www.gdal.org/formats_list.html">GDAL</a> can read..
     </p>
 
     <p>
@@ -216,10 +217,16 @@ $ gem install simpler-tiles
         C structure and specifies the limit of the map in spatial coordinates.
       </li>
       <li>
-        <tt><a href="doc/SimplerTiles/Map.html">SimplerTiles::Layer</a></tt>: wraps
-        the <tt><a href="http://propublica.github.com/simple-tiles/#layers">simplet_layer_t</a></tt>
+        <tt><a href="doc/SimplerTiles/Map.html">SimplerTiles::VectorLayer</a></tt>: wraps
+        the <tt><a href="http://propublica.github.com/simple-tiles/#vector_layers">simplet_vector_layer_t</a></tt>
         C structure and contains an OGR connection string for a particular data source,
-        and contains a list of <tt>SimplerTiles::Query</tt> objects.
+        and contains a list of <tt>SimplerTiles::Query</tt> objects. <strong>Note:</strong> The <tt>SimplerTiles::Layer</tt>
+        class now proxies to <tt>VectorLayer</tt>.
+      </li>
+      <li>
+        <tt><a href="doc/SimplerTiles/Map.html">SimplerTiles::RasterLayer</a></tt>: wraps
+        the <tt><a href="http://propublica.github.com/simple-tiles/#raster_layers">simplet_raster_layer_t</a></tt>
+        C structure and contains an GDAL connection string for a particular data source.
       </li>
       <li>
         <tt><a href="doc/SimplerTiles/Query.html">SimplerTiles::Query</a></tt>: wraps
@@ -256,7 +263,7 @@ map = SimplerTiles::Map.new do |m|
   m.set_bounds(-585080.885134, 6849466.721081, 4161303.603672, 9587780.816356)
 
   Dir["\#\{ROOT\}/data/*.shp"].each do |shp|
-    m.layer shp do |l|
+    m.vector_layer shp do |l|
       l.query "select * from '\#\{File.basename shp, '.shp'\}'" do |q|
         q.styles "stroke" => "#111111",
               "line-join" => "round",
@@ -310,7 +317,7 @@ get '/tiles/*/:x/:y/:z.png' do
     m.slippy params[:x].to_i, params[:y].to_i, params[:z].to_i
 
     # Add a layer based on the parameters in the URL
-    m.layer File.join(ROOT, params[:splat].first) do |l|
+    m.vector_layer File.join(ROOT, params[:splat].first) do |l|
 
       # Grab all of the data from the shapefile
       l.query "select * from '\#\{File.basename(params[:splat].first, '.shp')\}'" do |q|
@@ -435,6 +442,10 @@ CODE
     <h2>Change Log</h2>
 
     <dl>
+      <dd><b>0.2.1</b> &mdash; June 21st, 2014</dd>
+      <dt>Added raster support. (thanks <a href="http://github.com/ashaw">Al Shaw</a>)</dt>
+      <dd><b>0.1.1</b> &mdash; February, 10th 2014</dd>
+      <dt>Small fix for building on OSX.</dt>
       <dd><b>0.1.1</b> &mdash; February, 10th 2014</dd>
       <dt>Small fix for building on OSX.</dt>
       <dd><b>0.1.0</b> &mdash; February, 4th 2014</dd>
@@ -444,13 +455,13 @@ CODE
       <dd><b>0.0.8</b> &mdash; April, 11th 2013</dd>
       <dt>Fix missing constant</dt>
       <dd><b>0.0.7</b> &mdash; February, 27th 2013</dd>
-      <dt>Fix deprecation warnings and compatibility with Simple Tiles 0.3.0, (thanks <a href="http://github.com/adamtrilling">adamtrilling</a>)</dt>
+      <dt>Fix deprecation warnings and compatibility with Simple Tiles 0.3.0, (thanks <a href="http://github.com/adamtrilling">Adam Trilling</a>)</dt>
       <dd><b>0.0.6</b> &mdash; January, 30th 2013</dd>
       <dt><tt>ar_layer</tt> now yields like <tt>layer</tt></dt>
       <dd><b>0.0.5</b> &mdash; January, 14th 2013</dd>
       <dt>Make the connection string for <tt>ar_layer</tt> more robust.</dt>
       <dd><b>0.0.4</b> &mdash; December 8, 2012</dd>
-      <dt>Fix connection string for <tt>ar_layer</tt> (thanks <a href="http://github.com/adamtrilling">adamtrilling</a>)</dt>
+      <dt>Fix connection string for <tt>ar_layer</tt> (thanks <a href="http://github.com/adamtrilling">Adam Trilling</a>)</dt>
       <dd><b>0.0.3</b> &mdash; June 23, 2012</dd>
       <dt>Better search paths for cairo.</dt>
       <dd><b>0.0.2</b> &mdash; April 10, 2012</dd>

data/index.html

@@ -415,6 +415,10 @@ $ gem install simpler-tiles
     <h2>Change Log</h2>
 
     <dl>
+      <dd><b>0.2.0</b> &mdash; June 21st, 2014</dd>
+      <dt>Added raster support. (thanks <a href="http://github.com/ashaw">Al Shaw</a>)</dt>
+      <dd><b>0.1.1</b> &mdash; February, 10th 2014</dd>
+      <dt>Small fix for building on OSX.</dt>
       <dd><b>0.1.1</b> &mdash; February, 10th 2014</dd>
       <dt>Small fix for building on OSX.</dt>
       <dd><b>0.1.0</b> &mdash; February, 4th 2014</dd>
@@ -424,13 +428,13 @@ $ gem install simpler-tiles
       <dd><b>0.0.8</b> &mdash; April, 11th 2013</dd>
       <dt>Fix missing constant</dt>
       <dd><b>0.0.7</b> &mdash; February, 27th 2013</dd>
-      <dt>Fix deprecation warnings and compatibility with Simple Tiles 0.3.0, (thanks <a href="http://github.com/adamtrilling">adamtrilling</a>)</dt>
+      <dt>Fix deprecation warnings and compatibility with Simple Tiles 0.3.0, (thanks <a href="http://github.com/adamtrilling">Adam Trilling</a>)</dt>
       <dd><b>0.0.6</b> &mdash; January, 30th 2013</dd>
       <dt><tt>ar_layer</tt> now yields like <tt>layer</tt></dt>
       <dd><b>0.0.5</b> &mdash; January, 14th 2013</dd>
       <dt>Make the connection string for <tt>ar_layer</tt> more robust.</dt>
       <dd><b>0.0.4</b> &mdash; December 8, 2012</dd>
-      <dt>Fix connection string for <tt>ar_layer</tt> (thanks <a href="http://github.com/adamtrilling">adamtrilling</a>)</dt>
+      <dt>Fix connection string for <tt>ar_layer</tt> (thanks <a href="http://github.com/adamtrilling">Adam Trilling</a>)</dt>
       <dd><b>0.0.3</b> &mdash; June 23, 2012</dd>
       <dt>Better search paths for cairo.</dt>
       <dd><b>0.0.2</b> &mdash; April 10, 2012</dd>

data/lib/simpler_tiles.rb

@@ -8,6 +8,8 @@ require "#{SimplerTiles::ROOT}/simpler_tiles/simpler_tiles"
 require "#{SimplerTiles::ROOT}/simpler_tiles/mixins/pp"
 require "#{SimplerTiles::ROOT}/simpler_tiles/map"
 require "#{SimplerTiles::ROOT}/simpler_tiles/layer"
+require "#{SimplerTiles::ROOT}/simpler_tiles/layer/vector_layer"
+require "#{SimplerTiles::ROOT}/simpler_tiles/layer/raster_layer"
 require "#{SimplerTiles::ROOT}/simpler_tiles/query"
 require "#{SimplerTiles::ROOT}/simpler_tiles/style"
 require "#{SimplerTiles::ROOT}/simpler_tiles/bounds"

data/lib/simpler_tiles/layer.rb

@@ -1,25 +1,6 @@
 module SimplerTiles
   # The Layer object contains connection info for a particular datasource and
   # tracks a list of {Query}s.
-  class Layer
-    include SimplerTiles::PP
-
-    # Initialize a Layer
-    def initialize(source)
-      self.source = source
-      yield self if block_given?
-    end
-
-    # Add a query to this Layer's c list.
-    def query(sql, &blk)
-      layer = SimplerTiles::Query.new(sql, &blk)
-      add_query layer
-    end
-
-  private
-
-    def inspect_attributes
-      [:source]
-    end
+  class Layer < VectorLayer
   end
 end

data/lib/simpler_tiles/layer/raster_layer.rb

@@ -0,0 +1,16 @@
+module SimplerTiles
+  class RasterLayer
+    include SimplerTiles::PP
+
+    def initialize(source)
+      self.source = source
+      yield self if block_given?
+    end
+
+  private
+
+    def inspect_attributes
+      [:source]
+    end
+  end
+end

data/lib/simpler_tiles/layer/vector_layer.rb

@@ -0,0 +1,24 @@
+module SimplerTiles
+  # The VectorLayer object contains connection info for a particular datasource and
+  # tracks a list of {Query}s.
+  class VectorLayer
+    include SimplerTiles::PP
+
+    def initialize(source)
+      self.source = source
+      yield self if block_given?
+    end
+
+    # Add a query to this Layer's c list.
+    def query(sql, &blk)
+      layer = SimplerTiles::Query.new(sql, &blk)
+      add_query layer
+    end
+
+  private
+
+    def inspect_attributes
+      [:source]
+    end
+  end
+end

data/lib/simpler_tiles/map.rb

@@ -11,8 +11,14 @@ module SimplerTiles
 
     # Add a layer to the c list of layers and yield the new layer.
     def layer(source, &blk)
-      layer = SimplerTiles::Layer.new(source, &blk)
-      add_layer layer
+      layer = SimplerTiles::VectorLayer.new(source, &blk)
+      add_vector_layer layer
+    end
+
+    # Add a raster layer
+    def raster_layer(source)
+      layer = SimplerTiles::RasterLayer.new(source)
+      add_raster_layer layer
     end
 
     # A convienence method to use Active Record configuration and add a new

data/lib/simpler_tiles/version.rb

@@ -1,4 +1,4 @@
 module SimplerTiles
   # The version of the library
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/simpler-tiles.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.summary = %q{A set of ruby bindings for the Simple Tiles mapping library.}
 
   s.add_development_dependency(%q<rake-compiler>, [">= 0"])
-  s.add_development_dependency(%q<bundler>, ["~> 1.5.0"])
+  s.add_development_dependency(%q<bundler>, [">= 1.5.0"])
+  s.add_development_dependency(%q<minitest>, ["~> 4.0.0"])
   s.add_development_dependency(%q<shoulda>, ["~> 3.5.0"])
   s.add_development_dependency(%q<yard>, ["~> 0.8.0"])
 end

data/test/test_simpler_tiles.rb

@@ -3,15 +3,21 @@ require "#{File.join(File.dirname(__FILE__))}/helper"
 class TestSimplerTiles < Test::Unit::TestCase
   should "produce a png image" do
     map = SimplerTiles::Map.new do |m|
-      m.slippy 3, 6, 4
+      # m.bgcolor = "#000000"
+      m.srs = "EPSG:32614"
+      m.width = 256
+      m.height = 256
+      m.set_bounds(195585.000, 3472515.000, 427815.000, 3235485.000)
       m.layer "#{File.dirname(__FILE__)}/../data/tl_2010_us_state10.shp" do |l|
         l.query "SELECT * from 'tl_2010_us_state10'" do |q|
-          q.styles 'fill' => "#061F3799",
+          q.styles 'fill' => "#000dff",
               'line-join' => "round",
-               'line-cap' => "square",
-               'seamless' => "true"
+               'line-cap' => "square"
         end
       end
+      # to set a nodata flag on a landsat look img
+      # gdal_translate -a_nodata 0 someplaceintexas.jpg someplaceintexas_nodata.jpg
+      m.raster_layer "#{File.dirname(__FILE__)}/../data/someplaceintexas-nodata.jpg"
     end
 
     assert map.valid?
@@ -26,33 +32,34 @@ class TestSimplerTiles < Test::Unit::TestCase
 
 
   should "not crash with memory errors" do
-    GC.disable
-    t = 100.times.map do
-      Thread.new do
-        map = SimplerTiles::Map.new do |m|
-          m.slippy 3, 6, 4
-          m.layer "#{File.dirname(__FILE__)}/../data/tl_2010_us_state10.shp" do |l|
-            l.query "SELECT * from 'tl_2010_us_state10'" do |q|
-              q.styles 'fill' => "#061F3799",
-                  'line-join' => "round",
-                   'line-cap' => "square",
-                   'seamless' => "true"
-            end
-          end
-        end
+    # GC.disable
+    # t = 10.times.map do
+    #   Thread.new do
+    #     map = SimplerTiles::Map.new do |m|
+    #       m.slippy 3, 6, 4
+    #       m.layer "#{File.dirname(__FILE__)}/../data/tl_2010_us_state10.shp" do |l|
+    #         l.query "SELECT * from 'tl_2010_us_state10'" do |q|
+    #           q.styles 'fill' => "#061F3799",
+    #               'line-join' => "round",
+    #                'line-cap' => "square",
+    #                'seamless' => "true"
+    #         end
+    #       end
+    #       m.raster_layer "#{File.dirname(__FILE__)}/../data/someplaceintexas.jpg"
+    #     end
 
-        assert map.valid?
-        map.to_png do |data|
-          assert data
-          File.open "#{File.dirname(__FILE__)}/out.png", "wb" do |f|
-            f.write data
-          end
-          assert data.length
-        end
-      end
-    end
-    t.map(&:join)
+    #     assert map.valid?
+    #     map.to_png do |data|
+    #       assert data
+    #       File.open "#{File.dirname(__FILE__)}/out.png", "wb" do |f|
+    #         f.write data
+    #       end
+    #       assert data.length
+    #     end
+    #   end
+    # end
+    # t.map(&:join)
+    # GC.enable
+    # GC.start
   end
-  GC.enable
-  GC.start
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpler-tiles
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jeff Larson
@@ -28,16 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +96,6 @@ files:
 - Rakefile
 - ext/simpler_tiles/bounds.c
 - ext/simpler_tiles/bounds.h
-- ext/simpler_tiles/depend
 - ext/simpler_tiles/extconf.rb
 - ext/simpler_tiles/layer.c
 - ext/simpler_tiles/layer.h
@@ -90,15 +103,21 @@ files:
 - ext/simpler_tiles/map.h
 - ext/simpler_tiles/query.c
 - ext/simpler_tiles/query.h
+- ext/simpler_tiles/raster_layer.c
+- ext/simpler_tiles/raster_layer.h
 - ext/simpler_tiles/simpler_tiles.c
 - ext/simpler_tiles/simpler_tiles.h
 - ext/simpler_tiles/style.c
 - ext/simpler_tiles/style.h
+- ext/simpler_tiles/vector_layer.c
+- ext/simpler_tiles/vector_layer.h
 - index.erb
 - index.html
 - lib/simpler_tiles.rb
 - lib/simpler_tiles/bounds.rb
 - lib/simpler_tiles/layer.rb
+- lib/simpler_tiles/layer/raster_layer.rb
+- lib/simpler_tiles/layer/vector_layer.rb
 - lib/simpler_tiles/map.rb
 - lib/simpler_tiles/mixins/pp.rb
 - lib/simpler_tiles/query.rb