Merge pull request #6 from milafrerichs/documentation-fix

Fix the Basic Tile Server example code thanks @milafrerichs

index.erb

@@ -273,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",
@@ -293,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>
 
@@ -327,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|
@@ -372,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>

index.html

@@ -255,15 +255,15 @@ <h2>Overview</h2>
 
 <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>
   <span class="n">m</span><span class="o">.</span><span class="n">height</span>  <span class="o">=</span> <span class="mi">260</span>
   <span class="n">m</span><span class="o">.</span><span class="n">set_bounds</span><span class="p">(</span><span class="o">-</span><span class="mi">585080</span><span class="o">.</span><span class="mi">885134</span><span class="p">,</span> <span class="mi">6849466</span><span class="o">.</span><span class="mi">721081</span><span class="p">,</span> <span class="mi">4161303</span><span class="o">.</span><span class="mi">603672</span><span class="p">,</span> <span class="mi">9587780</span><span class="o">.</span><span class="mi">816356</span><span class="p">)</span>
 
   <span class="no">Dir</span><span class="o">[</span><span class="s2">&quot;</span><span class="si">#{</span><span class="no">ROOT</span><span class="si">}</span><span class="s2">/data/*.shp&quot;</span><span class="o">].</span><span class="n">each</span> <span class="k">do</span> <span class="o">|</span><span class="n">shp</span><span class="o">|</span>
-    <span class="n">m</span><span class="o">.</span><span class="n">vector_layer</span> <span class="n">shp</span> <span class="k">do</span> <span class="o">|</span><span class="n">l</span><span class="o">|</span>
+    <span class="n">m</span><span class="o">.</span><span class="n">layer</span> <span class="n">shp</span> <span class="k">do</span> <span class="o">|</span><span class="n">l</span><span class="o">|</span>
       <span class="n">l</span><span class="o">.</span><span class="n">query</span> <span class="s2">&quot;select * from &#39;</span><span class="si">#{</span><span class="no">File</span><span class="o">.</span><span class="n">basename</span> <span class="n">shp</span><span class="p">,</span> <span class="s1">&#39;.shp&#39;</span><span class="si">}</span><span class="s2">&#39;&quot;</span> <span class="k">do</span> <span class="o">|</span><span class="n">q</span><span class="o">|</span>
         <span class="n">q</span><span class="o">.</span><span class="n">styles</span> <span class="s2">&quot;stroke&quot;</span> <span class="o">=&gt;</span> <span class="s2">&quot;#111111&quot;</span><span class="p">,</span>
               <span class="s2">&quot;line-join&quot;</span> <span class="o">=&gt;</span> <span class="s2">&quot;round&quot;</span><span class="p">,</span>
@@ -282,7 +282,7 @@ <h2>A Basic Tile Server</h2>
 
     <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>
 
@@ -306,15 +306,15 @@ <h2>A Basic Tile Server</h2>
   <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>
 
     <span class="c1"># Set the slippy map parameters from the url</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="c1"># Add a layer based on the parameters in the URL</span>
-    <span class="n">m</span><span class="o">.</span><span class="n">vector_layer</span> <span class="no">File</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="no">ROOT</span><span class="p">,</span> <span class="n">params</span><span class="o">[</span><span class="ss">:splat</span><span class="o">].</span><span class="n">first</span><span class="p">)</span> <span class="k">do</span> <span class="o">|</span><span class="n">l</span><span class="o">|</span>
+    <span class="n">m</span><span class="o">.</span><span class="n">layer</span> <span class="no">File</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="no">ROOT</span><span class="p">,</span> <span class="n">params</span><span class="o">[</span><span class="ss">:splat</span><span class="o">].</span><span class="n">first</span><span class="p">)</span> <span class="k">do</span> <span class="o">|</span><span class="n">l</span><span class="o">|</span>
 
       <span class="c1"># Grab all of the data from the shapefile</span>
       <span class="n">l</span><span class="o">.</span><span class="n">query</span> <span class="s2">&quot;select * from &#39;</span><span class="si">#{</span><span class="no">File</span><span class="o">.</span><span class="n">basename</span><span class="p">(</span><span class="n">params</span><span class="o">[</span><span class="ss">:splat</span><span class="o">].</span><span class="n">first</span><span class="p">,</span> <span class="s1">&#39;.shp&#39;</span><span class="p">)</span><span class="si">}</span><span class="s2">&#39;&quot;</span> <span class="k">do</span> <span class="o">|</span><span class="n">q</span><span class="o">|</span>
@@ -359,7 +359,7 @@ <h2>A Basic Tile Server</h2>
 <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>
@@ -384,7 +384,7 @@ <h2>Raster Demo</h2>
   <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="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>

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