tairu 0.8.1 → 0.8.2

data/bin/tairu

@@ -24,9 +24,7 @@ OptionParser.new do |o|
 end.parse!
 
 if opts[:config]
-  unless defined?(Tairu)
-    require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'tairu')
-  end
+  require 'tairu'
 
   Tairu::CONFIG = Tairu::Configuration.new(opts[:config])
   Tairu::CACHE = Tairu::CONFIG.cache

data/config.ru

@@ -0,0 +1,3 @@
+$:.push File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+require 'tairu/server'
+run Tairu::Server.new

data/ext/mkrf_conf.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+end
+
+inst = Gem::DependencyInstaller.new
+
+begin
+  if defined?(JRUBY_VERSION)
+    inst.install 'jdbc-sqlite3'
+  else
+    inst.install 'sqlite3'
+  end
+rescue
+  exit(1)
+end
+
+p File.expand_path(__FILE__)
+
+f = File.open(File.join(File.expand_path(File.dirname(__FILE__)), 'Rakefile'), 'w')
+f.write("task :default\n")
+f.close

data/lib/tairu/store/esri.rb

@@ -19,8 +19,13 @@ module Tairu
         "%#{length}x" % int_value
       end
 
-      def self.get(tileset, coord, format = 'jpg')
-        data = File.read(File.join(File.dirname(__FILE__), '..', '..', 'tilesets', tileset, 'Layers', '_alllayers', "L#{coord[:zoom]}", "R#{encode_hex(coord[:row])}", "C#{encode_hex(coord[:col])}.#{format}"))
+      def self.get(layer, tileset, coord, format = 'png')
+        loc = File.expand_path(Tairu::CONFIG.data['cache']['layers'][layer]['location'])
+        path = File.join(loc, tileset, 'Layers', '_alllayers', "L#{'%02i' % coord.zoom}", "R#{encode_hex(coord.row)}", "C#{encode_hex(coord.column)}.#{format}")
+
+        return nil unless File.exists?(path)
+
+        data = File.read(path)
         mime_type = "image/#{format}"
         Tairu::Tile.new(data, mime_type)
       end

data/lib/tairu/version.rb

@@ -1,3 +1,3 @@
 module Tairu
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tairu
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -80,10 +80,12 @@ email:
 - scooterwadsworth@gmail.com
 executables:
 - tairu
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - README.md
+- config.ru
 - bin/tairu
 - lib/tairu/cache/disk.rb
 - lib/tairu/cache/memory.rb
@@ -98,6 +100,7 @@ files:
 - lib/tairu/tile.rb
 - lib/tairu/version.rb
 - lib/tairu.rb
+- ext/mkrf_conf.rb
 homepage: https://github.com/scooterw/tairu
 licenses:
 - MIT