tairu 0.10.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDYzN2EyYWQ2MTZlMTBmNGVhMjcxMzYxM2M4MjRjOGNhOTE2OTI2ZA==
+  data.tar.gz: !binary |-
+    ZmNmNDEzZDFhNGVhMTA2MDNhNjkwOWNiZjhmYTI1YmE3NWY1YmIxZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmEyNTI0YWJkNWQxMDIzZmM5MTc0YWE2YTgyMTljMzk2YjRhZDgwZmFkMzA3
+    MTY2NWYxY2E1NTRlZGNiZWM5MWY3ZDdjZTg2MTM4N2E5YjIyNGQ3YjhmODUz
+    ZmVhYjYwMGM3ZmM0N2Q2OWM4MjU4N2QxYWZmNTVhYzU0YmY4NjE=
+  data.tar.gz: !binary |-
+    ZjMwZjMxNmM1YjNlYzZhMDJlMzRlOWU1ZjEwZTZmZTk2NTU4Mzk5MjZiNjI1
+    ZGE0NThlNTEwZjg1OTEzNmEzMGZhMzEzZWU1MGEyOTdjMWJiNTgzOTcxYjI0
+    ZGQ3YmQ3MjQzNDIxOGVmZDUyNGQ2YTJkNWQzZjkxYWEwMWI0M2I=

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/scooterw/tairu.png?branch=master)](https://travis-ci.org/scooterw/tairu)
+
 tairu ... simple map tile server
 
 In development mode (irb): `rake console`

data/lib/tairu/configuration.rb

@@ -28,6 +28,17 @@ module Tairu
       end
     end
 
+    def add_layers(layers={})
+      raise RuntimeError.new('No layers specified') if layers.empty?
+      
+      layers.each do |k,v|
+        unless self.layers.include?(k)
+          self.layers[k] = v
+          self.tilesets[k] = Tairu::Store::TYPES[v['provider'].downcase].new(k)
+        end
+      end
+    end
+
     def configure_layers
       raise RuntimeError.new('At least one layer must be specified') unless self.layers
     end

data/lib/tairu/server.rb

@@ -32,7 +32,7 @@ module Tairu
       end
     end
 
-    get '/:tileset/:zoom/:col/:row' do
+    get '/:tileset/:zoom/:col/:row.?:format' do
       coord = Tairu::Coordinate.new(Integer(params[:row]), Integer(params[:col]), Integer(params[:zoom]))
       tile = Tairu.get_tile(params[:tileset], coord)
 

data/lib/tairu/store.rb

@@ -1,13 +1,15 @@
 require 'store/mbtiles'
 require 'store/esri'
 require 'store/tms'
+require 'store/geojson'
 
 module Tairu
   module Store
     TYPES = {
       'mbtiles' => Tairu::Store::MBTiles,
       'esri' => Tairu::Store::Esri,
-      'tms' => Tairu::Store::TMS
+      'tms' => Tairu::Store::TMS,
+      'json' => Tairu::Store::GeoJSON
     }
   end
-end
+end

data/lib/tairu/store/geojson.rb

@@ -0,0 +1,35 @@
+module Tairu
+  module Store
+    class GeoJSON
+      def initialize(layer)
+        @tileset = File.join(File.expand_path(Tairu.layers[layer]['location']), Tairu.layers[layer]['tileset'])
+        @flip = Tairu.layers[layer]['flip_y_coordinate']
+      end
+
+      def flip_y(z, y)
+        (2 ** z - 1) - y
+      end
+
+      def get(coord)
+        y = @flip ? flip_y(coord.zoom, coord.row) : coord.row
+
+        path = File.join(@tileset, coord.zoom, coord.column, "#{y}.json")
+
+        return nil unless File.exists?(path)
+
+        data = File.open(path, 'r') do |f|
+          begin
+            f.flock(File::LOCK_SH)
+            f.read
+          ensure
+            f.flock(File::LOCK_UN)
+          end
+        end
+
+        mime_type = 'application/json'
+        tile = data.nil? ? nil : Tairu::Tile.new(data, mime_type)
+        tile
+      end
+    end
+  end
+end

data/lib/tairu/version.rb

@@ -1,3 +1,3 @@
 module Tairu
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: tairu
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Scooter Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.46.0
+        version: 3.48.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.46.0
+        version: 3.48.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,6 +141,7 @@ files:
 - lib/tairu/coordinate.rb
 - lib/tairu/server.rb
 - lib/tairu/store/esri.rb
+- lib/tairu/store/geojson.rb
 - lib/tairu/store/mbtiles.rb
 - lib/tairu/store/tms.rb
 - lib/tairu/store.rb
@@ -167,26 +151,25 @@ files:
 homepage: https://github.com/scooterw/tairu
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Simple Tile Server for Ruby
+specification_version: 4
+summary: Simple Tile Server (MBTiles, TMS, Esri) for Ruby
 test_files: []