cartocss_helper 1.2.1 → 4.0.0

data/lib/cartocss_helper/visualise_changes_image_generation.rb

@@ -1,6 +1,7 @@
 require_relative 'visualise_changes_diff_from_images'
 require_relative 'git'
-require_relative 'downloader'
+require_relative 'renderer_handler'
+require_relative 'overpass_query_generator'
 require_relative 'util/filehelper'
 
 module CartoCSSHelper
@@ -9,9 +10,9 @@ module CartoCSSHelper
     @@jobs = []
 
     def self.enable_job_pooling
-      #it results in avoiding loading the same database mutiple times
-      #useful if the same database will be used multiple times (for example the same place in multiple comparisons)
-      #use run_jobs function to run jobs
+      # it results in avoiding loading the same database mutiple times
+      # useful if the same database will be used multiple times (for example the same place in multiple comparisons)
+      # use run_jobs function to run jobs
       @@job_pooling = true
     end
 
@@ -20,28 +21,23 @@ module CartoCSSHelper
     end
 
     class MapGenerationJob
-      attr_reader :filename, :active
+      attr_reader :filename
       def initialize(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size)
-        @filename = filename
         @latitude = latitude
         @longitude = longitude
         @zlevels = zlevels
         @header = header
         @old_branch = old_branch
         @new_branch = new_branch
-        @download_bbox_size = download_bbox_size
         @image_size = image_size
-        @active = true
+        @filename = filename
+        @data_source = CartoCSSHelper::VisualDiff::FileDataSource.new(@latitude, @longitude, download_bbox_size, @filename)
       end
+
       def run_job
-        if !@active
-          return
-        end
-        print
-        source = CartoCSSHelper::VisualDiff::FileDataSource.new(@latitude, @longitude, @download_bbox_size, @filename)
-        CartoCSSHelper::VisualDiff.visualise_changes_for_given_source(@latitude, @longitude, @zlevels, @header, @new_branch, @old_branch, @image_size, source)
-        @active = false
+        CartoCSSHelper::VisualDiff.visualise_for_given_source(@latitude, @longitude, @zlevels, @header, @new_branch, @old_branch, @image_size, @data_source)
       end
+
       def print
         puts "#{@filename.gsub(Configuration.get_path_to_folder_for_cache, '#')} [#{@latitude};#{@longitude}], z: #{@zlevels}, text: #{@header}, '#{@old_branch}'->'#{@new_branch}', bbox:#{@download_bbox_size}, #{@image_size}px"
       end
@@ -52,45 +48,48 @@ module CartoCSSHelper
       new_job = MapGenerationJob.new(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size)
       new_job.print
 
-      raise "#{filename} does not exists" unless File.exists?(filename)
-      raise "#{latitude} is not a number" unless latitude.kind_of? Numeric
-      raise "#{longitude} is not a number" unless longitude.kind_of? Numeric
+      raise "#{filename} does not exists" unless File.exist?(filename)
+      raise "#{latitude} is not a number" unless latitude.is_a? Numeric
+      raise "#{longitude} is not a number" unless longitude.is_a? Numeric
       raise "#{zlevels} is not a range" unless zlevels.class == Range
       raise "#{header} is not a string" unless header.class == String
       raise "#{new_branch} is not a string" unless new_branch.class == String
       raise "#{old_branch} is not a string" unless old_branch.class == String
-      raise "#{download_bbox_size} is not a number" unless download_bbox_size.kind_of? Numeric
-      raise "#{image_size} is not a integer" unless image_size.kind_of? Integer
+      raise "#{download_bbox_size} is not a number" unless download_bbox_size.is_a? Numeric
+      raise "#{image_size} is not a integer" unless image_size.is_a? Integer
 
       @@jobs.push(new_job)
     end
 
     def self.run_jobs
-      for i in 0..@@jobs.length-1
-        if @@jobs[i].active
-          @@jobs[i].run_job
-          for x in 0..@@jobs.length-1
-            if @@jobs[i].filename == @@jobs[x].filename
-              @@jobs[x].run_job
-            end
-          end
+      new_job_array = []
+      return if @@jobs == []
+      @@jobs[0].run_job
+      for x in 1..@@jobs.length - 1
+        if @@jobs[0].filename == @@jobs[x].filename
+          # requires loading the same file as just run job
+          # it may be safely run without reloading database
+          @@jobs[x].run_job
+        else
+          new_job_array << @@jobs[x].filename
         end
       end
-      @@jobs = []
+      @@jobs = new_job_array
     end
 
     def self.shuffle_jobs(seed)
       @@jobs.shuffle!(random: Random.new(seed))
     end
 
-    def self.visualise_changes_synthethic_test(tags, type, on_water, zlevel_range, new_branch, old_branch)
-      tags = VisualDiff.remove_magic_from_tags(tags)
+    def self.make_header(tags, type, on_water)
       on_water_string = ''
-      if on_water
-        on_water_string = ' on water'
-      end
-      header = "#{ VisualDiff.dict_to_pretty_tag_list(tags) } #{ type }#{ on_water_string }"
-      puts "visualise_changes_synthethic_test <#{header}> #{old_branch} -> #{new_branch}"
+      on_water_string = ' on water' if on_water
+      return "#{VisualDiff.tag_dict_to_string(tags)} #{type}#{on_water_string}"
+    end
+
+    def self.visualise_on_synthethic_data(tags, type, on_water, zlevel_range, new_branch, old_branch)
+      header = make_header(tags, type, on_water)
+      puts "visualise_on_synthethic_data <#{header}> #{old_branch} -> #{new_branch}"
       Git.checkout(old_branch)
       old = VisualDiff.collect_images_for_synthethic_test(tags, type, on_water, zlevel_range)
       Git.checkout(new_branch)
@@ -98,23 +97,12 @@ module CartoCSSHelper
       VisualDiff.pack_image_sets old, new, header, new_branch, old_branch, 200
     end
 
-    def self.remove_magic_from_tags(tags)
-      magicless_tags = Hash.new
-      tags.each {|key, value|
-        if value == :any
-          value = 'any tag value'
-        end
-        magicless_tags[key]=value
-      }
-      return magicless_tags
-    end
-
     def self.collect_images_for_synthethic_test(tags, type, on_water, zlevel_range)
       collection = []
-      zlevel_range.each { |zlevel|
+      zlevel_range.each do |zlevel|
         scene = Scene.new(tags, zlevel, on_water, type)
         collection.push(ImageForComparison.new(scene.get_image_filename, "z#{zlevel}"))
-      }
+      end
       return collection
     end
 
@@ -129,7 +117,7 @@ module CartoCSSHelper
       end
 
       def load
-        if !@loaded
+        unless @loaded
           DataFileLoader.load_data_into_database(@data_filename)
           puts "\tgenerating images"
           @loaded = true
@@ -137,45 +125,40 @@ module CartoCSSHelper
       end
 
       def get_timestamp
-        return Downloader.get_timestamp_of_file(@data_filename)
+        return GenericCachedDownloader.new.get_cache_timestamp(@data_filename)
       end
     end
 
-    def self.visualise_changes_on_real_data(tags, type, wanted_latitude, wanted_longitude, zlevels, new_branch, old_branch='master')
-      #special support for following tag values:  :any_value
-      header_prefix = "#{ VisualDiff.dict_to_pretty_tag_list(tags) } #{type} [#{ wanted_latitude }, #{ wanted_longitude }] -> "
+    def self.visualise_on_overpass_data(tags, type, wanted_latitude, wanted_longitude, zlevels, new_branch, old_branch = 'master')
+      # special support for following tag values:  :any_value
+      header_prefix = "#{VisualDiff.tag_dict_to_string(tags)} #{type} [#{wanted_latitude}, #{wanted_longitude}] -> "
       target_location = '[?, ?]'
       header_sufix = " #{old_branch}->#{new_branch} #{zlevels}"
-      puts "visualise_changes_on_real_data <#{header_prefix}#{header_sufix}> #{old_branch} -> #{new_branch}"
+      puts "visualise_on_overpass_data <#{header_prefix}#{header_sufix}> #{old_branch} -> #{new_branch}"
       begin
-        latitude, longitude = Downloader.locate_element_with_given_tags_and_type tags, type, wanted_latitude, wanted_longitude
+        latitude, longitude = OverpassQueryGenerator.locate_element_with_given_tags_and_type tags, type, wanted_latitude, wanted_longitude
         target_location = "[#{latitude}, #{longitude}]"
-      rescue Downloader::OverpassRefusedResponse
+      rescue OverpassQueryGenerator::NoLocationFound, OverpassDownloader::OverpassRefusedResponse
         puts 'No nearby instances of tags and tag is not extremely rare - no generation of nearby location and wordwide search was impossible. No diff image will be generated for this location.'
         return false
       end
-      download_bbox_size = 0.4
-      visualise_changes_for_location(latitude, longitude, zlevels, header_prefix+target_location+header_sufix, new_branch, old_branch, download_bbox_size)
+      visualise_for_location(latitude, longitude, zlevels, header_prefix + target_location + header_sufix, new_branch, old_branch)
       return true
     end
 
-    def self.visualise_changes_for_location(latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size=400)
-      filename = Downloader.get_file_with_downloaded_osm_data_for_location(latitude, longitude, download_bbox_size)
-      visualise_changes_for_location_from_file(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size)
+    def self.visualise_for_location(latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size = 0.4, image_size = 400)
+      filename = OverpassQueryGenerator.get_file_with_downloaded_osm_data_for_location(latitude, longitude, download_bbox_size)
+      visualise_for_location_from_file(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size)
     end
 
-    def self.visualise_changes_for_location_from_file(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size=400)
+    def self.visualise_for_location_from_file(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size = 0.4, image_size = 400)
       prefix = ''
-      if @@job_pooling
-        prefix = 'pool <- '
-      end
+      prefix = 'pool <- ' if @@job_pooling
       add_job(filename, latitude, longitude, zlevels, header, new_branch, old_branch, download_bbox_size, image_size, prefix)
-      if !@@job_pooling
-        run_jobs
-      end
+      run_jobs unless @@job_pooling
     end
 
-    def self.visualise_changes_for_given_source(latitude, longitude, zlevels, header, new_branch, old_branch, image_size, source)
+    def self.visualise_for_given_source(latitude, longitude, zlevels, header, new_branch, old_branch, image_size, source)
       Git.checkout old_branch
       old = VisualDiff.collect_images_for_real_data_test(latitude, longitude, zlevels, source, image_size)
       Git.checkout new_branch
@@ -183,56 +166,45 @@ module CartoCSSHelper
       VisualDiff.pack_image_sets old, new, header, new_branch, old_branch, image_size
     end
 
-    def self.scale(zlevel, reference_value, reference_zlevel)
-      diff = zlevel - reference_zlevel
-      rescaler = 2.0**diff
-      return reference_value*rescaler
-    end
-
     def self.get_render_bbox_size(zlevel, wanted_image_size, latitude)
       longitude_equator_rendered_length_in_pixels = 256 * 2**zlevel
-      longitude_size = 360*wanted_image_size.to_f/longitude_equator_rendered_length_in_pixels
-      latitude_size = longitude_size * Math.cos(latitude*Math::PI/180)
+      longitude_size = 360 * wanted_image_size.to_f / longitude_equator_rendered_length_in_pixels
+      latitude_size = longitude_size * Math.cos(latitude * Math::PI / 180)
       return [latitude_size, longitude_size]
     end
 
-    def self.collect_images_for_real_data_test(latitude, longitude, zlevels, source, image_size=400)
+    def self.collect_images_for_real_data_test(latitude, longitude, zlevels, source, image_size = 400)
       collection = []
-      zlevels.each { |zlevel|
+      zlevels.each do |zlevel|
         render_bbox_size = VisualDiff.get_render_bbox_size(zlevel, image_size, latitude)
-        cache_folder = CartoCSSHelper::Configuration.get_path_to_folder_for_branch_specific_cache
-        filename = "#{cache_folder+"#{latitude} #{longitude} #{zlevel}zlevel #{image_size}px #{source.get_timestamp} #{source.download_bbox_size}.png"}"
-        if !File.exists?(filename)
+        filename = "#{latitude} #{longitude} #{zlevel}zlevel #{image_size}px #{source.get_timestamp} #{source.download_bbox_size}.png"
+        unless RendererHandler.image_available_from_cache(latitude, longitude, zlevel, render_bbox_size, image_size, filename)
           source.load
-          TilemillHandler.run_tilemill_export_image(latitude, longitude, zlevel, render_bbox_size, image_size, filename)
         end
-        collection.push(ImageForComparison.new(filename, "z#{zlevel}"))
-      }
+        file_location = RendererHandler.request_image_from_renderer(latitude, longitude, zlevel, render_bbox_size, image_size, filename)
+        collection.push(ImageForComparison.new(file_location, "z#{zlevel}"))
+      end
       return collection
     end
 
     def self.pack_image_sets(old, new, header, new_branch, old_branch, image_size)
-      old_branch = FileHelper::make_string_usable_as_filename(old_branch)
-      new_branch = FileHelper::make_string_usable_as_filename(new_branch)
-      header_for_filename = FileHelper::make_string_usable_as_filename(header)
-      filename_sufix = "#{ old_branch } -> #{ new_branch }"
-      filename = CartoCSSHelper::Configuration.get_path_to_folder_for_output + "#{header_for_filename} #{filename_sufix} #{image_size}px.png"
+      old_branch = FileHelper.make_string_usable_as_filename(old_branch)
+      new_branch = FileHelper.make_string_usable_as_filename(new_branch)
+      header_for_filename = FileHelper.make_string_usable_as_filename(header)
+      filename_sufix = "#{old_branch} -> #{new_branch}"
+      filename = CartoCSSHelper::Configuration.get_path_to_folder_for_output + "#{header_for_filename} #{filename_sufix} #{image_size}px #{RendererHandler.renderer_marking}.png"
       diff = FullSetOfComparedImages.new(old, new, header, filename, image_size)
       diff.save
     end
 
-    def self.dict_to_pretty_tag_list(dict)
+    def self.tag_dict_to_string(dict)
       result = ''
-      dict.to_a.each { |tag|
-        if result != ''
-          result << '; '
-        end
+      dict.to_a.each do |tag|
+        result << '; ' if result != ''
         value = "'#{tag[1]}'"
-        if tag[1] == :any_value
-          value = '{any value}'
-        end
+        value = '{any value}' if tag[1] == :any_value
         result << "#{tag[0]}=#{value}"
-      }
+      end
       return result
     end
   end

data/lib/data/testing_locations.rb

@@ -1,17 +1,18 @@
-def get_list_of_testing_locations
-  return [
-      [50.1, 19.9], #Krakow
-      [53.2, -1.8], #rural uk
-      [36.1, 140.7], #Japan
-      [54.8, 31.7], #Russia
-      [21.3, 39.5], #Mecca
-      [41.4, 44.5], #Georgia
-      [51.5, -0.1], #London
-      #TODO: solve problems with response too big to store in memory
-      #[52.09, 5.11], #Utrecht
+module CartoCSSHelper
+  def self.get_list_of_testing_locations
+    return [
+      [50.1, 19.9], # Krakow
+      [53.2, -1.8], # rural uk
+      [36.1, 140.7], # Japan
+      [54.8, 31.7], # Russia
+      [21.3, 39.5], # Mecca
+      [41.4, 44.5], # Georgia
+      [51.5, -0.1], # London
+      # TODO: solve problems with response too big to store in memory
+      # [52.09, 5.11], #Utrecht
 
-      #http://overpass-turbo.eu/s/ar4
-      #capital locations
+      # http://overpass-turbo.eu/s/ar4
+      # capital locations
       [-41.2887639, 174.7772239],
       [37.9841493, 23.7279843],
       [46.0498650, 14.5068921],
@@ -19,7 +20,7 @@ def get_list_of_testing_locations
       [28.6138967, 77.2159562],
       [33.6945756, 73.0643744],
       [48.2083537, 16.3725042],
-      #[48.8565056, 2.3521334], TODO: solve problems with rest-client crashing and blabbing about negative integers
+      # [48.8565056, 2.3521334], TODO: solve problems with rest-client crashing and blabbing about negative integers
       [46.9482713, 7.4514512],
       [45.4210328, -75.6900219],
       [59.9132694, 10.7391112],
@@ -238,5 +239,6 @@ def get_list_of_testing_locations
       [-8.5202604, 179.1974823],
       [4.1779879, 73.5107387],
       [53.3497645, -6.2602732],
-  ]
+    ]
+  end
 end

data/readme.md

@@ -22,23 +22,47 @@ Install ruby - see https://www.ruby-lang.org/en/documentation/installation/ for
 
 Unfortunately, standard `gem install cartocss_helper` may not be enough as CartoCSS Helper depends on RMagick gem that requires special installation.
 
-Install RMagick gem. `gem install rmagick` may not be enough - in my case, on Ubuntu 14.04 it was necessary to start from installing additional packages (`apt-get install ruby-dev imagemagick libmagickcore-dev libmagickwand-dev` solved the problem), followed by `gem install rmagick`.
+1. install software necessary to install RMagick gem. On Lubuntu 14.04 it was enough to run `sudo apt-get install ruby-dev imagemagick libmagickcore-dev libmagickwand-dev`.
+2. `gem install --user-install rmagick`
+3. `gem install --user-install cartocss_helper`.
 
-Finally, run `gem install cartocss_helper`.
+###Examples
 
-###Example
+It is assumed that CartoCSS project with Default OSM Style (https://github.com/gravitystorm/openstreetmap-carto/) is located at `~/Documents/MapBox/project/osm-carto`.
 
-It is assumed that TileMill project with Default OSM Style (https://github.com/gravitystorm/openstreetmap-carto/) is located at `~/Documents/MapBox/project/osm-carto`.
+    require 'cartocss_helper'
 
-    require cartocss_helper
     CartoCSSHelper::Configuration.set_style_specific_data(CartoCSSHelper::StyleDataForDefaultOSM.get_style_data)
-    CartoCSSHelper::Configuration.set_path_to_tilemill_project_folder(File.join(ENV['HOME'], 'Documents', 'MapBox', 'project', 'osm-carto', ''))
-    CartoCSSHelper::Configuration.set_path_to_folder_for_output(File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-output', ''))
-    CartoCSSHelper::Configuration.set_path_to_folder_for_cache(File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-tmp', ''))
+    project_location = File.join(ENV['HOME'], 'Documents', 'MapBox', 'project', 'osm-carto', '')
+    CartoCSSHelper::Configuration.set_path_to_cartocss_project_folder(project_location)
+    output_folder = File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-output', '')
+    CartoCSSHelper::Configuration.set_path_to_folder_for_output(output_folder)
+    cache_folder = File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-tmp', '')
+    CartoCSSHelper::Configuration.set_path_to_folder_for_cache(cache_folder)
 
     tags = {'landuse' => 'village_green', 'tourism' => 'attraction'}
     CartoCSSHelper.test tags, 'master', 'v2.28.1'
 
+or, to just test on real examples of landuse=quarry tagged on ways (most will form areas)
+
+    require 'cartocss_helper'
+
+    CartoCSSHelper::Configuration.set_style_specific_data(CartoCSSHelper::StyleDataForDefaultOSM.get_style_data)
+    project_location = File.join(ENV['HOME'], 'Documents', 'MapBox', 'project', 'osm-carto', '')
+    CartoCSSHelper::Configuration.set_path_to_cartocss_project_folder(project_location)
+    output_folder = File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-output', '')
+    CartoCSSHelper::Configuration.set_path_to_folder_for_output(output_folder)
+    cache_folder = File.join(ENV['HOME'], 'Documents', 'CartoCSSHelper-tmp', '')
+    CartoCSSHelper::Configuration.set_path_to_folder_for_cache(cache_folder)
+
+    tags = {'landuse' => 'quarry'}
+    branch_name = 'quarry-icon'
+    base_branch_name = 'master'
+    zlevels = 10..22
+    type = 'way' #or 'node'
+    test_locations_count = 10
+    CartoCSSHelper.test_tag_on_real_data_for_this_type(tags, branch_name, base_branch_name, zlevels, type, test_locations_count)
+
 First part of this Ruby script is responsible for loading gem and configuration, including location of cache folder and folder where produced comparison images will be saved.
 
 Second part runs quick test for specified tag combination rendering only this element as node, way and a closed way. It is followed by locating multiple places across globe where such tag combination is used.
@@ -53,4 +77,5 @@ It is also possible to look for certain keys, with any value:
 
 ###Automated stuff
 
-[![Code Climate](https://codeclimate.com/github/mkoniecz/CartoCSSHelper/badges/gpa.svg)](https://codeclimate.com/github/mkoniecz/CartoCSSHelper)
+[![Code Climate](https://codeclimate.com/github/matkoniecz/CartoCSSHelper/badges/gpa.svg)](https://codeclimate.com/github/matkoniecz/CartoCSSHelper)
+[![Build Status](https://travis-ci.org/matkoniecz/CartoCSSHelper.svg?branch=master)](https://travis-ci.org/matkoniecz/CartoCSSHelper)

metadata

@@ -1,64 +1,159 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.2
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Tool to make development of CartoCSS styles more efficient. Automates
   actions necessary to produce test images and validates style. Loading data using
   osm2pgsql, rendering with TileMill, obtaining test data from overpass turbo.
@@ -69,46 +164,52 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cartocss_helper.rb
-- lib/cartocss_helper/visualise_changes_image_generation.rb
-- lib/cartocss_helper/tag_lister.rb
-- lib/cartocss_helper/image_generator.rb
-- lib/cartocss_helper/validator.rb
-- lib/cartocss_helper/downloader.rb
-- lib/cartocss_helper/tilemill_handler.rb
+- lib/cartocss_helper/configuration.rb
+- lib/cartocss_helper/data_file_handling.rb
 - lib/cartocss_helper/git.rb
-- lib/cartocss_helper/util/filehelper.rb
 - lib/cartocss_helper/heuristic.rb
-- lib/cartocss_helper/visualise_changes_diff_from_images.rb
-- lib/cartocss_helper/configuration.rb
-- lib/cartocss_helper/style_specific/style_specific.rb
+- lib/cartocss_helper/image_generator.rb
+- lib/cartocss_helper/notes_downloader.rb
+- lib/cartocss_helper/overpass_downloader.rb
+- lib/cartocss_helper/overpass_query_generator.rb
+- lib/cartocss_helper/renderer_handler.rb
 - lib/cartocss_helper/style_specific/default_osm_style.rb
-- lib/cartocss_helper/data_file_handling.rb
+- lib/cartocss_helper/style_specific/style_specific.rb
+- lib/cartocss_helper/tag_lister.rb
+- lib/cartocss_helper/util/filehelper.rb
+- lib/cartocss_helper/util/generic_cached_downloader.rb
+- lib/cartocss_helper/util/generic_downloader.rb
+- lib/cartocss_helper/util/logger.rb
+- lib/cartocss_helper/util/rest-client_wrapper.rb
+- lib/cartocss_helper/util/systemhelper.rb
+- lib/cartocss_helper/validator.rb
+- lib/cartocss_helper/visualise_changes_diff_from_images.rb
+- lib/cartocss_helper/visualise_changes_image_generation.rb
 - lib/data/testing_locations.rb
 - license.txt
 - readme.md
 homepage: https://github.com/matkoniecz/CartoCSSHelper
 licenses:
 - CC0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tool to make development of CartoCSS styles more efficient.
 test_files: []