simpler-tiles 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd21718ad62a0b2238de78ce0096cd783d25e1b3
-  data.tar.gz: a096000461cd55af2e4af2ff5485a10e5358ffa7
+  metadata.gz: 22d0e863687bc027956a3aa725e5eefa3ed707b6
+  data.tar.gz: f87f1123c15af135b559773b98d5dda545d68e36
 SHA512:
-  metadata.gz: 4071fcc119529339f57fb9d91b902f1f5794cde59de0aad1a7469064d6a4ace72bcc2c15248291e8e044dcbb1cf42d0690f0a7b93edda8e298efcf72fefdeaa4
-  data.tar.gz: e89e44f566b8a41069fff6828445b4246fb3db9eaf47852ea3511feb5d6bfb30b15da8bdd9c15488e5ef009578a20de01b494bc3b5be92b26d61cf1d268c15a1
+  metadata.gz: c9a2a6659ccdace5e4d7e2667c28615b32c28593a240ccfdbd75ee192ca58a7fb5914bd1c599dd57ec61e28ee961b68efe417999ef0325348188e9e058e1fe15
+  data.tar.gz: 1214773c0446ccd8429b8d3db38315b42e87d5f47540b7af15faada3aea4eaa900aa107d252535eec05f3c6b14941015d48985d29c08e8a2188ebd5257eebb05

data/ext/simpler_tiles/raster_layer.c

@@ -6,6 +6,13 @@
 
 VALUE cSimplerTilesRasterLayer;
 
+static simplet_raster_layer_t *
+get_layer(VALUE self){
+  simplet_raster_layer_t *layer;
+  Data_Get_Struct(self, simplet_raster_layer_t, layer);
+  return layer;
+}
+
 static void
 mark_layer(void *layer){
   simplet_raster_layer_t *lyr = layer;
@@ -19,6 +26,27 @@ layer_free(void *layer){
   simplet_raster_layer_free(lyr);
 }
 
+static VALUE
+lanczos(VALUE self, VALUE boolean){
+  simplet_raster_layer_t *layer = get_layer(self);
+  simplet_raster_layer_set_resample(layer, SIMPLET_LANCZOS);
+  return Qnil;
+}
+
+static VALUE
+bilinear(VALUE self, VALUE boolean){
+  simplet_raster_layer_t *layer = get_layer(self);
+  simplet_raster_layer_set_resample(layer, SIMPLET_BILINEAR);
+  return Qnil;
+}
+
+static VALUE
+nearest(VALUE self, VALUE boolean){
+  simplet_raster_layer_t *layer = get_layer(self);
+  simplet_raster_layer_set_resample(layer, SIMPLET_NEAREST);
+  return Qnil;
+}
+
 VALUE
 raster_layer_alloc(VALUE klass){
   simplet_raster_layer_t *layer;
@@ -35,5 +63,9 @@ void init_raster_layer(){
   rb_define_method(rRasterLayer, "source=", set_source, 1);
   rb_define_method(rRasterLayer, "source", get_source, 0);
 
+  rb_define_method(rRasterLayer, "bilinear!", bilinear, 0);
+  rb_define_method(rRasterLayer, "lanczos!", lanczos, 0);
+  rb_define_method(rRasterLayer, "nearest!", nearest, 0);
+
   cSimplerTilesRasterLayer = rRasterLayer;
 }

data/index.erb

@@ -181,6 +181,16 @@ $ gem install simpler-tiles
 </pre>
     </p>
 
+    <p>
+      <em>Note for Mac OS X users:</em> You might get an error warning about
+      <tt>xcb-shm</tt> if so, you'll need to install
+      <a href="http://xquartz.macosforge.org/landing/">XQuartz</a>, and add a
+      search directory to your path with:
+      <blockquote>
+        <tt>export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/X11/lib/pkgconfig</tt>
+      </blockquote>
+    </p>
+
     <p>
       The api docs are <a href="http://rdoc.info/github/propublica/simpler-tiles/master/framesl">here</a>, and if you have
       comments or questions head on over to <tt>#newsapps</tt> or <tt>#propublica</tt>
@@ -263,7 +273,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.vector_layer shp do |l|
+    m.layer shp do |l|
       l.query "select * from '\#\{File.basename shp, '.shp'\}'" do |q|
         q.styles "stroke" => "#111111",
               "line-join" => "round",
@@ -283,7 +293,7 @@ CODE
 
     <p>
       Simpler Tiles was designed to make <a href="http://wiki.openstreetmap.org/wiki/Slippy_Map">slippy maps</a>. The following is a basic tile
-      server using <a href="http://sinatrarb.com">Sinatra</a>. It will open display any shapefile on your hard drive
+      server using <a href="http://sinatrarb.com">Sinatra</a>. It will open display any shapefile in your home directory
       by visiting a url like: <a href="">http://localhost:4567/shape/path/to/shapefile.shp</a>
     </p>
 
@@ -317,7 +327,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.vector_layer File.join(ROOT, params[:splat].first) do |l|
+    m.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|
@@ -362,7 +372,7 @@ __END__
   <div id="map"></div>
   <script>
     var map = new L.Map('map');
-    var layer = new L.TileLayer('/tiles/\<\%\= params[:splat] \%\>/{x}/{y}/{z}.png')
+    var layer = new L.TileLayer('/tiles/\<\%\= params[:splat].first \%\>/{x}/{y}/{z}.png')
     map.addLayer(layer).setView(new L.LatLng(38, -95), 1);
   </script>
 </body>
@@ -376,6 +386,37 @@ CODE
       do as a simple replacement for QGIS!
     </p>
 
+
+    <h2>Raster Demo</h2>
+    <p>SimplerTiles can also turn raster images, like NASA's <a href="http://landsat.usgs.gov/">Landsat</a> scenes, into map tiles. Here's a
+    variant of the previous code for a raster tile server that serves a Landsat 8 true color image of New York City.</p>
+
+<%= highlight 'ruby', <<-CODE
+
+# Set up the tile url to capture x, y, z coordinates for slippy tile generation
+get '/tiles/:x/:y/:z.png' do
+
+  # Let the browser know we are sending a png
+  content_type 'image/png'
+
+  # Create a Map object
+  map = SimplerTiles::Map.new do |m|
+    m.slippy params[:x].to_i, params[:y].to_i, params[:z].to_i
+    m.raster_layer "path/to/raster.tif"
+  end
+  map.to_png
+end
+
+CODE
+%>
+
+    <p>Here's the result map:</p>
+
+    <p>
+      <iframe src="http://projects.propublica.org/nyc-raster-demo/" width="600" height="600" scrolling="no" border="0" frameborder="0"></iframe>
+    </p>
+
+
     <h2>Tips and Tricks</h2>
 
     <p>
@@ -385,20 +426,6 @@ CODE
     </p>
 
     <ol>
-      <li>
-        If you are using a PostGIS backend make sure to limit your queries to
-        the bounds of the image. You will want to add a <tt>where</tt> clause to each
-        trip to the database like so:
-<%= highlight 'ruby', <<-CODE
-
-layer.query Shape.where("the_geom && SRID=4326;\#\{map.buffered_bounds.reproject(map.srs, 'epsg:4326').to_wkt}'\}").to_sql do |query|
-  # ...
-end
-
-CODE
-%>
-        This will protect against doing a full table scan in your database.
-      </li>
       <li>
         <p>
           If you are serving images as part of a tiled map, you'll also want to

data/index.html

@@ -161,7 +161,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>
@@ -172,6 +173,14 @@ $ gem install simpler-tiles
 </pre>
     </p>
 
+    <p>
+      <em>Note for Mac OS X users:</em> You might get an error warning about
+      <tt>xcb-shm</tt> if so, you'll need to reinstall cairo with:
+      <blockquote>
+        <tt>brew reinstall cairo --without-x11</tt>
+      </blockquote>
+    </p>
+
     <p>
       The api docs are <a href="http://rdoc.info/github/propublica/simpler-tiles/master/framesl">here</a>, and if you have
       comments or questions head on over to <tt>#newsapps</tt> or <tt>#propublica</tt>
@@ -208,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
@@ -238,7 +253,7 @@ $ gem install simpler-tiles
 
 <span class="no">ROOT</span> <span class="o">=</span> <span class="no">File</span><span class="o">.</span><span class="n">expand_path</span><span class="p">(</span><span class="no">File</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="bp">__FILE__</span><span class="p">))</span>
 
-<span class="n">map</span> <span class="o">=</span> <span class="ss">SimplerTiles</span><span class="p">:</span><span class="ss">:Map</span><span class="o">.</span><span class="n">new</span> <span class="k">do</span> <span class="o">|</span><span class="n">m</span><span class="o">|</span>
+<span class="n">map</span> <span class="o">=</span> <span class="no">SimplerTiles</span><span class="o">::</span><span class="no">Map</span><span class="o">.</span><span class="n">new</span> <span class="k">do</span> <span class="o">|</span><span class="n">m</span><span class="o">|</span>
   <span class="n">m</span><span class="o">.</span><span class="n">srs</span>     <span class="o">=</span> <span class="s2">&quot;EPSG:3083&quot;</span>
   <span class="n">m</span><span class="o">.</span><span class="n">bgcolor</span> <span class="o">=</span> <span class="s2">&quot;#ffffff&quot;</span>
   <span class="n">m</span><span class="o">.</span><span class="n">width</span>   <span class="o">=</span> <span class="mi">423</span>
@@ -265,7 +280,7 @@ $ gem install simpler-tiles
 
     <p>
       Simpler Tiles was designed to make <a href="http://wiki.openstreetmap.org/wiki/Slippy_Map">slippy maps</a>. The following is a basic tile
-      server using <a href="http://sinatrarb.com">Sinatra</a>. It will open display any shapefile on your hard drive
+      server using <a href="http://sinatrarb.com">Sinatra</a>. It will open display any shapefile in your home directory
       by visiting a url like: <a href="">http://localhost:4567/shape/path/to/shapefile.shp</a>
     </p>
 
@@ -289,7 +304,7 @@ $ gem install simpler-tiles
   <span class="n">content_type</span> <span class="s1">&#39;image/png&#39;</span>
 
   <span class="c1"># Create a Map object</span>
-  <span class="n">map</span> <span class="o">=</span> <span class="ss">SimplerTiles</span><span class="p">:</span><span class="ss">:Map</span><span class="o">.</span><span class="n">new</span> <span class="k">do</span> <span class="o">|</span><span class="n">m</span><span class="o">|</span>
+  <span class="n">map</span> <span class="o">=</span> <span class="no">SimplerTiles</span><span class="o">::</span><span class="no">Map</span><span class="o">.</span><span class="n">new</span> <span class="k">do</span> <span class="o">|</span><span class="n">m</span><span class="o">|</span>
     <span class="c1"># Set the background color to black</span>
     <span class="n">m</span><span class="o">.</span><span class="n">bgcolor</span> <span class="o">=</span> <span class="s2">&quot;#000000&quot;</span>
 
@@ -342,7 +357,7 @@ $ gem install simpler-tiles
 <span class="cp">  &lt;div id=&quot;map&quot;&gt;&lt;/div&gt;</span>
 <span class="cp">  &lt;script&gt;</span>
 <span class="cp">    var map = new L.Map(&#39;map&#39;);</span>
-<span class="cp">    var layer = new L.TileLayer(&#39;/tiles/&lt;%= params[:splat] %&gt;/{x}/{y}/{z}.png&#39;)</span>
+<span class="cp">    var layer = new L.TileLayer(&#39;/tiles/&lt;%= params[:splat].first %&gt;/{x}/{y}/{z}.png&#39;)</span>
 <span class="cp">    map.addLayer(layer).setView(new L.LatLng(38, -95), 1);</span>
 <span class="cp">  &lt;/script&gt;</span>
 <span class="cp">&lt;/body&gt;</span>
@@ -355,6 +370,34 @@ $ gem install simpler-tiles
       do as a simple replacement for QGIS!
     </p>
 
+
+    <h2>Raster Demo</h2>
+    <p>SimplerTiles can also turn raster images, like NASA's <a href="http://landsat.usgs.gov/">Landsat</a> scenes, into map tiles. Here's a
+    variant of the previous code for a raster tile server that serves a Landsat 8 true color image of New York City.</p>
+
+<div class="highlight"><pre><span class="c1"># Set up the tile url to capture x, y, z coordinates for slippy tile generation</span>
+<span class="n">get</span> <span class="s1">&#39;/tiles/:x/:y/:z.png&#39;</span> <span class="k">do</span>
+
+  <span class="c1"># Let the browser know we are sending a png</span>
+  <span class="n">content_type</span> <span class="s1">&#39;image/png&#39;</span>
+
+  <span class="c1"># Create a Map object</span>
+  <span class="n">map</span> <span class="o">=</span> <span class="no">SimplerTiles</span><span class="o">::</span><span class="no">Map</span><span class="o">.</span><span class="n">new</span> <span class="k">do</span> <span class="o">|</span><span class="n">m</span><span class="o">|</span>
+    <span class="n">m</span><span class="o">.</span><span class="n">slippy</span> <span class="n">params</span><span class="o">[</span><span class="ss">:x</span><span class="o">].</span><span class="n">to_i</span><span class="p">,</span> <span class="n">params</span><span class="o">[</span><span class="ss">:y</span><span class="o">].</span><span class="n">to_i</span><span class="p">,</span> <span class="n">params</span><span class="o">[</span><span class="ss">:z</span><span class="o">].</span><span class="n">to_i</span>
+    <span class="n">m</span><span class="o">.</span><span class="n">raster_layer</span> <span class="s2">&quot;path/to/raster.tif&quot;</span>
+  <span class="k">end</span>
+  <span class="n">map</span><span class="o">.</span><span class="n">to_png</span>
+<span class="k">end</span>
+</pre></div>
+
+
+    <p>Here's the result map:</p>
+
+    <p>
+      <iframe src="http://projects.propublica.org/nyc-raster-demo/" width="600" height="600" scrolling="no" border="0" frameborder="0"></iframe>
+    </p>
+
+
     <h2>Tips and Tricks</h2>
 
     <p>
@@ -364,17 +407,6 @@ $ gem install simpler-tiles
     </p>
 
     <ol>
-      <li>
-        If you are using a PostGIS backend make sure to limit your queries to
-        the bounds of the image. You will want to add a <tt>where</tt> clause to each
-        trip to the database like so:
-<div class="highlight"><pre><span class="n">layer</span><span class="o">.</span><span class="n">query</span> <span class="no">Shape</span><span class="o">.</span><span class="n">where</span><span class="p">(</span><span class="s2">&quot;the_geom &amp;&amp; SRID=4326;</span><span class="si">#{</span><span class="n">map</span><span class="o">.</span><span class="n">buffered_bounds</span><span class="o">.</span><span class="n">reproject</span><span class="p">(</span><span class="n">map</span><span class="o">.</span><span class="n">srs</span><span class="p">,</span> <span class="s1">&#39;epsg:4326&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">to_wkt</span><span class="si">}</span><span class="s2">&#39;}&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">to_sql</span> <span class="k">do</span> <span class="o">|</span><span class="n">query</span><span class="o">|</span>
-  <span class="c1"># ...</span>
-<span class="k">end</span>
-</pre></div>
-
-        This will protect against doing a full table scan in your database.
-      </li>
       <li>
         <p>
           If you are serving images as part of a tiled map, you'll also want to
@@ -415,7 +447,7 @@ $ gem install simpler-tiles
     <h2>Change Log</h2>
 
     <dl>
-      <dd><b>0.2.0</b> &mdash; June 21st, 2014</dd>
+      <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>

data/lib/simpler_tiles/map.rb

@@ -16,8 +16,8 @@ module SimplerTiles
     end
 
     # Add a raster layer
-    def raster_layer(source)
-      layer = SimplerTiles::RasterLayer.new(source)
+    def raster_layer(source, &blk)
+      layer = SimplerTiles::RasterLayer.new(source, &blk)
       add_raster_layer layer
     end
 

data/lib/simpler_tiles/version.rb

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

data/simpler-tiles.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   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"])
+  s.add_development_dependency(%q<pygmentize>, ["~> 0.0.3"])
 end

data/test/test_simpler_tiles.rb

@@ -17,7 +17,8 @@ class TestSimplerTiles < Test::Unit::TestCase
       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"
+      raster = m.raster_layer "#{File.dirname(__FILE__)}/../data/someplaceintexas-nodata.jpg"
+      # raster.lanczos!
     end
 
     assert map.valid?
@@ -32,34 +33,34 @@ class TestSimplerTiles < Test::Unit::TestCase
 
 
   should "not crash with memory errors" do
-    # 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
+    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-nodata.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)
-    # GC.enable
-    # GC.start
+        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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpler-tiles
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Larson
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: pygmentize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: Ruby bindings for Simple Tiles
 email: thejefflarson@gmail.com
 executables: []
@@ -148,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A set of ruby bindings for the Simple Tiles mapping library.