cartocss_helper 4.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8686f0a5acb7db504aec14f93f683c89dfd06248
-  data.tar.gz: 1f482eba9f389cdceb37e5253c2520a47725128b
+SHA256:
+  metadata.gz: de353ff0f5a1fe946a3e7e782c185570587fdf097afce030a352909772195b79
+  data.tar.gz: 0327dbf4cdbabc8671292766f120c83468d24334fa16475410e82a2cef3f8900
 SHA512:
-  metadata.gz: f23d8415d318009faf84f70e3f6ae1fb63b80033227c340ba3d647c45a0cc86314c4ec76dc4e07e3d5a2a751415b0cb60affa2a6db92351f1cd031492af54a19
-  data.tar.gz: e86b7bca3b6b4f9f1a84aee7d861d121bb276b1667e7a005d86fc052e1bfe858266da79c2f256de19c3824802fbbcdcf4f33ce2ddd6889f758ff199a0c11d7db
+  metadata.gz: c1d4815aac6fe77f2735f1b106d8318794f6d8e705768207b902b73666cabbfc4ed9f4a953fb92a54d3d0d091ad162f79309f884f51aae6fb880741b0ac28f1d
+  data.tar.gz: d7240dd1d35eccac5151b576dea66f86483b0944b12c508fce3f87725cde37029eaaaf2c60dab11e43b097f42c39bcf89b9ed9fe54653d5f3d134630f808b2c1

data/lib/cartocss_helper.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'open3'
 
 module CartoCSSHelper
@@ -11,6 +12,7 @@ require_relative 'cartocss_helper/validator.rb'
 require_relative 'cartocss_helper/git.rb'
 require_relative 'cartocss_helper/util/generic_downloader.rb'
 require_relative 'cartocss_helper/notes_downloader.rb'
+require_relative 'cartocss_helper/history_downloader.rb'
 require_relative 'cartocss_helper/style_specific/default_osm_style.rb'
 require_relative 'data/testing_locations'
 

data/lib/cartocss_helper/configuration.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'find'
 
@@ -102,6 +103,12 @@ module CartoCSSHelper::Configuration
     return location
   end
 
+  def get_path_to_folder_for_history_api_cache
+    location = File.join(get_path_to_folder_for_cache, 'history-api', '')
+    FileUtils.mkdir_p location
+    return location
+  end
+
   def get_data_filename
     return get_path_to_folder_for_branch_specific_cache + 'data.osm'
   end

data/lib/cartocss_helper/data_file_handling.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative 'configuration'
 require_relative 'util/systemhelper.rb'
 

data/lib/cartocss_helper/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'configuration.rb'
 require_relative 'util/systemhelper.rb'
 

data/lib/cartocss_helper/heuristic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CartoCSSHelper
   module Heuristic
     require 'set'

data/lib/cartocss_helper/history_downloader.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'util/generic_cached_downloader.rb'
+
+module CartoCSSHelper
+  class HistoryDownloader
+    def self.cache_filename(type, id)
+      url = HistoryDownloader.format_query_into_url(type, id)
+      return CartoCSSHelper::Configuration.get_path_to_folder_for_history_api_cache + url.delete("/") + ".cache"
+    end
+
+    def self.run_history_query(type, id, invalidate_cache: false)
+      timeout = HistoryDownloader.get_allowed_timeout_in_seconds
+      downloader = GenericCachedDownloader.new(timeout: timeout, stop_on_timeout: false)
+      file = cache_filename(type, id)
+      url = HistoryDownloader.format_query_into_url(type, id)
+      return downloader.get_specified_resource(url, file, invalidate_cache: invalidate_cache)
+    end
+
+    def self.cache_timestamp(type, id)
+      downloader = GenericCachedDownloader.new
+      file = cache_filename(type, id)
+      return downloader.get_cache_timestamp(file)
+    end
+
+    def self.get_allowed_timeout_in_seconds
+      return 10 * 60
+    end
+
+    def self.format_query_into_url(type, id)
+      # documentated at https://wiki.openstreetmap.org/wiki/API_v0.6
+      return "http://api.openstreetmap.org/api/0.6/#{type}/#{id}/history"
+    end
+  end
+end

data/lib/cartocss_helper/image_generator.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative 'configuration.rb'
 require_relative 'heuristic.rb'
 require_relative 'data_file_handling.rb'

data/lib/cartocss_helper/notes_downloader.rb

@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 require_relative 'util/generic_cached_downloader.rb'
 
 module CartoCSSHelper
   class NotesDownloader
+    def self.cache_filename(lat, lon, range)
+      url = NotesDownloader.format_query_into_url(lat, lon, range)
+      return CartoCSSHelper::Configuration.get_path_to_folder_for_notes_api_cache + url.delete("/") + ".cache"
+    end
+
     def self.run_note_query(lat, lon, range, invalidate_cache: false)
       timeout = NotesDownloader.get_allowed_timeout_in_seconds
       downloader = GenericCachedDownloader.new(timeout: timeout, stop_on_timeout: false)
-
+      file = cache_filename(lat, lon, range)
       url = NotesDownloader.format_query_into_url(lat, lon, range)
-      cache_filename = CartoCSSHelper::Configuration.get_path_to_folder_for_notes_api_cache + url.delete("/") + ".cache"
-      return downloader.get_specified_resource(url, cache_filename, invalidate_cache: invalidate_cache)
+      return downloader.get_specified_resource(url, file, invalidate_cache: invalidate_cache)
     end
 
     def self.cache_timestamp(lat, lon, range)
       downloader = GenericCachedDownloader.new
-
-      url = NotesDownloader.format_query_into_url(lat, lon, range)
-      cache_filename = CartoCSSHelper::Configuration.get_path_to_folder_for_notes_api_cache + url.delete("/") + ".cache"
-      return downloader.get_cache_timestamp(cache_filename)
+      file = cache_filename(lat, lon, range)
+      return downloader.get_cache_timestamp(file)
     end
 
     def self.get_allowed_timeout_in_seconds
@@ -38,9 +42,5 @@ module CartoCSSHelper
       max_longitude = longitude + size / 2
       return "#{min_longitude},#{min_latitude},#{max_longitude},#{max_latitude}"
     end
-
-    def self.get_overpass_instance_url
-      return CartoCSSHelper::Configuration.get_overpass_instance_url
-    end
   end
 end

data/lib/cartocss_helper/overpass_downloader.rb

@@ -1,16 +1,30 @@
+# frozen_string_literal: true
+
 require_relative 'util/generic_downloader.rb'
 require_relative 'util/generic_cached_downloader.rb'
-require 'uri' # for URI.escape
+require 'digest/sha1'
+require 'addressable/uri'
 
 module CartoCSSHelper
   class OverpassDownloader
     class OverpassRefusedResponse < IOError; end
 
-    def self.run_overpass_query(query, description, cache_filename)
+    def self.cache_filename(query)
+      hash = Digest::SHA1.hexdigest query
+      query_cache_filename = CartoCSSHelper::Configuration.get_path_to_folder_for_overpass_cache + hash + '_query.cache'
+      return query_cache_filename
+    end
+
+    def self.cache_timestamp(query)
+      downloader = GenericCachedDownloader.new
+      return downloader.get_cache_timestamp(cache_filename(query))
+    end
+
+    def self.run_overpass_query(query, description, invalidate_cache: false)
       url = OverpassDownloader.format_query_into_url(query)
       timeout = OverpassDownloader.get_allowed_timeout_in_seconds
       downloader = GenericCachedDownloader.new(timeout: timeout, stop_on_timeout: false)
-      return downloader.get_specified_resource(url, cache_filename, description: description)
+      return downloader.get_specified_resource(url, cache_filename(query), description: description, invalidate_cache: invalidate_cache)
     rescue RequestTimeout => e
       puts 'Overpass API refused to process this request. It will be not attempted again, most likely query is too complex. It is also possible that Overpass servers are unavailable'
       puts
@@ -20,19 +34,61 @@ module CartoCSSHelper
       puts
       puts e
       raise OverpassRefusedResponse
+    rescue ExceptionWithResponse => e
+      if e.http_code == 400
+        puts "invalid query"
+        puts
+        puts query
+        puts
+        puts url
+        puts
+        puts "url with %20 replaced back by spaces, %22 by \""
+        puts url.replace("%20", " ").replace("%22", '"')
+        puts
+        puts e
+      elsif e.http_code == 414
+        puts 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
+      end
+      raise e
     end
 
     def self.get_allowed_timeout_in_seconds
       return 10 * 60
     end
 
-    def self.format_query_into_url(query)
-      query = query.gsub(/\/\/.*\n/, '') # add proper parsing - it will mutilate // inside quotes etc
+    def self.escape_query(query)
+      # code causing bug - (// inside quotes, as predicted) - why it was even added?
+      #query = query.gsub(/\/\/.*\n/, '') # add proper parsing - it will mutilate // inside quotes etc
+      # TODO: replace complaint above by a test
+      # maybe URI.escape(query, "/") is sufficient?
+
+      # escape backslash - turns \ into \\
       query = query.gsub('\\', '\\\\')
+
+      # newlines, tabs added in query for readability may be safely deleted
       query = query.delete("\n")
       query = query.delete("\t")
+
+      #query = URI.escape(query) # no escaping for / [add require 'uri' to use it]
+      #query = URI.escape(query, "/") # escapes only / [add require 'uri' to use it]
+      #query = CGI.escape(query) # escapes spaces to + sign
+      
+      query = Addressable::URI.encode_component(query, Addressable::URI::CharacterClasses::QUERY)
+            query = query.gsub("/", "%2F") # escape slashes manually
+
+      # inside query also & and + must be escaped (entire query is an url parameter)
+      query = query.gsub("&", "%26")
+      query = query.gsub('+', '%2B')
+      return query
+    end
+
+    def self.format_query_into_url(query)
+      query = escape_query(query)
+      if query.length > 8174 #8175 is too much and allows crashes
+        raise 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
+      end
       base_overpass_url = OverpassDownloader.get_overpass_instance_url
-      return base_overpass_url + '/interpreter?data=' + URI.escape(query)
+      return base_overpass_url + '/interpreter?data=' + query
     end
 
     def self.get_overpass_instance_url

data/lib/cartocss_helper/overpass_query_generator.rb

@@ -1,8 +1,10 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'sys/filesystem'
 require_relative 'overpass_downloader.rb'
 require_relative 'util/systemhelper.rb'
+require_relative 'util/logger.rb'
 
 module CartoCSSHelper
   class OverpassQueryGenerator
@@ -48,7 +50,7 @@ module CartoCSSHelper
       description = "download data for #{latitude} #{longitude} (#{size})"
       get_overpass_query_results(query, description)
 
-      filename = get_query_cache_filename(query)
+      filename = OverpassDownloader.cache_filename(query)
       return filename
     end
 
@@ -98,7 +100,7 @@ module CartoCSSHelper
     end
 
     def self.locate_element_with_given_tags_and_type(tags, type, latitude, longitude, max_range_in_km_for_radius = 1600)
-      # special support for following tag values:  :any_value
+      # special support for some tag values - see CartoCSSHelper::OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter for details
       range = 10 * 1000
       while range <= max_range_in_km_for_radius * 1000
         list = OverpassQueryGenerator.get_elements_near_given_location(tags, type, latitude, longitude, range)
@@ -133,8 +135,12 @@ module CartoCSSHelper
       return get_query_to_get_location_set_format(tags, type, latitude, longitude, range, "[out:csv(::lat,::lon;false)]")
     end
 
+    # TODO: better, more generic function name
+    # get_query_to_get_objects_matching?
+    # put latitude, longitude, range together to avoid passing dummy variables
     def self.get_query_to_get_location_set_format(tags, type, latitude, longitude, range, format)
-      # special support for following tag values:  :any_value
+      # special support for range == :infinity
+      # special support for some tag values - see CartoCSSHelper::OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter for details
       locator = "[timeout:#{OverpassDownloader.get_allowed_timeout_in_seconds}]#{format};"
       locator += "\n"
       type = 'way' if type == 'closed_way'
@@ -156,35 +162,74 @@ module CartoCSSHelper
     end
 
     def self.turn_list_of_tags_in_overpass_filter(tags)
+      # special support for following tag values:  :any_value, {operation: :not_equal_to, value: "tag"}
       element = ''
       tags.each do |tag|
-        element += if tag[1] == :any_value
-                     "\t['#{tag[0]}']"
-                   else
-                     "\t['#{tag[0]}'='#{tag[1]}']"
-                   end
+        element += turn_tag_into_overpass_filter(tag)
         element += "\n"
       end
       return element
     end
 
+    def self.translate_tag_object_into_filter_data(tag)
+      operator = :equal
+      key = tag[0]
+      value = :any_value
+      if tag[1].class == Hash
+        # complex operation
+        if tag[1][:operation] == :not_equal_to
+          operator = :not_equal
+        else
+          raise "unexpected operation in #{tag[1]}"
+        end
+        value = tag[1][:value]
+      else
+        value = tag[1]
+      end
+      return { operator: operator, key: key, value: value }
+     end
+
+    def self.overpass_escape(text)
+      return text.gsub("\\", "\\\\\\").gsub("'", "\\\\'")
+    end
+
+    def self.turn_tag_into_overpass_filter(tag)
+      filter_data = translate_tag_object_into_filter_data(tag)
+      value = filter_data[:value]
+      key = filter_data[:key]
+      operator = filter_data[:operator]
+
+      value = overpass_escape(value) if value != :any_value
+      key = overpass_escape(key)
+
+      if value == :any_value && operator == :equal
+        return "\t['#{key}']"
+      elsif value == :any_value && operator == :not_equal
+        return "\t['#{key}'!~'.*']"
+      elsif value != :any_value && operator == :equal
+        return "\t['#{key}'='#{value}']"
+      elsif value != :any_value && operator == :not_equal
+        return "\t['#{key}'!='#{value}']"
+      else
+        raise "unexpected situation in <#{tag}>"
+      end
+     end
+
     def self.get_query_element_to_get_location(tags, latitude, longitude, type, range)
-      # special support for following tag values:  :any_value
+      # special support for some tag values - see CartoCSSHelper::OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter for details
       # TODO - escape value with quotation signs in them
       element = "(#{type}"
-      element += OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter(tags)
-      element += "\n"
+      element += OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter(tags).strip
       if range != :infinity
-        element += "\t(around:#{range},#{latitude},#{longitude});"
-        element += "\n"
+        element += "(around:#{range},#{latitude},#{longitude})"
       end
-      element += ');'
-      element += "\n"
+      element += ';);'
+      element += "\n\n"
       return element
     end
 
     def self.get_query_cache_refused_response_filename(query)
-      return get_query_cache_filename(query) + '_response_refused'
+      return OverpassDownloader.cache_filename(query) + '_response_refused'
     end
 
     def self.mark_query_as_refused(query)
@@ -193,13 +238,12 @@ module CartoCSSHelper
       file.close
     end
 
-    def self.get_query_cache_filename(query)
-      hash = Digest::SHA1.hexdigest query
-      query_cache_filename = CartoCSSHelper::Configuration.get_path_to_folder_for_overpass_cache + hash + '_query.cache'
-      return query_cache_filename
+    def self.get_query_cache_filename(_query)
+      Log.warn "call OverpassDownloader.cache_filename directly"
+      return OverpassDownloader.cache_filename
     end
 
-    def self.get_overpass_query_results(query, description, debug = false)
+    def self.get_overpass_query_results(query, description, debug = false, invalidate_cache: false) # TODO: - make debug parameter named
       if File.exist?(get_query_cache_refused_response_filename(query))
         raise OverpassDownloader::OverpassRefusedResponse
       end
@@ -207,14 +251,13 @@ module CartoCSSHelper
       check_for_free_space
 
       if debug
-        puts query
-        puts
+        Log.info query
+        Log.info
       end
 
-      cache_filename = get_query_cache_filename(query)
       description = 'Running Overpass query (connection initiated on ' + Time.now.to_s + ') ' + description
       begin
-        return OverpassDownloader.run_overpass_query query, description, cache_filename
+        return OverpassDownloader.run_overpass_query query, description, invalidate_cache: invalidate_cache
       rescue OverpassDownloader::OverpassRefusedResponse
         mark_query_as_refused(query)
         raise OverpassDownloader::OverpassRefusedResponse

data/lib/cartocss_helper/renderer_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'util/systemhelper.rb'
 
 include SystemHelper
@@ -85,7 +87,9 @@ module CartoCSSHelper
 
       execute_rendering_command(command_to_execute, export_location, debug)
 
-      puts "generated in #{(Time.now - start).to_i}s (#{Git.get_commit_hash})"
+      generation_time = (Time.now - start).to_i
+
+      puts "generated in #{generation_time}s (#{Git.get_commit_hash})"
       return export_location
     end
 

data/lib/cartocss_helper/style_specific/default_osm_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative('style_specific')
 
 module CartoCSSHelper
@@ -237,6 +239,7 @@ module CartoCSSHelper
         TagRenderingStatus.new('layer', '-4', :composite, { 'highway' => 'service' }), # modifies ordering
         TagRenderingStatus.new('layer', '-5', :composite, { 'highway' => 'service' }), # modifies ordering
         TagRenderingStatus.new('leisure', 'common', :primary),
+        TagRenderingStatus.new('leisure', 'dog_park', :primary),
         TagRenderingStatus.new('leisure', 'garden', :primary),
         TagRenderingStatus.new('leisure', 'golf_course', :primary),
         TagRenderingStatus.new('leisure', 'marina', :primary),
@@ -261,6 +264,7 @@ module CartoCSSHelper
         TagRenderingStatus.new('man_made', 'groyne', :primary),
         TagRenderingStatus.new('man_made', 'lighthouse', :primary),
         TagRenderingStatus.new('man_made', 'mast', :primary),
+        TagRenderingStatus.new('man_made', 'obelisk', :primary),
         TagRenderingStatus.new('man_made', 'pier', :primary),
         TagRenderingStatus.new('man_made', 'water_tower', :primary),
         TagRenderingStatus.new('man_made', 'windmill', :primary),

data/lib/cartocss_helper/style_specific/style_specific.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CartoCSSHelper
   class StyleSpecificData
     attr_reader :min_z, :max_z, :list_of_documented_tags, :list_of_documented_compositions, :name_label_is_not_required

data/lib/cartocss_helper/tag_lister.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'configuration.rb'
 require_relative 'image_generator.rb'
 include CartoCSSHelper::Configuration

data/lib/cartocss_helper/util/filehelper.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module FileHelper
   def self.make_string_usable_as_filename(string)
     return string.gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')

data/lib/cartocss_helper/util/generic_cached_downloader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'generic_downloader.rb'
 
 class GenericCachedDownloader

data/lib/cartocss_helper/util/generic_downloader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby-progressbar'
 require_relative 'rest-client_wrapper.rb'
 require_relative 'logger.rb'
@@ -57,7 +59,11 @@ class GenericDownloader
     output_shared_error_part(url, e)
     Log.warn e.response
     Log.warn e.http_code
-    get_specified_resource(url) if retry_allowed(e)
+    if retry_allowed(e)
+      get_specified_resource(url)
+    else
+      raise e
+    end
   rescue ExceptionWithoutResponse => e
     output_shared_error_part(url, e)
     raise e

data/lib/cartocss_helper/util/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Log

data/lib/cartocss_helper/util/rest-client_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require_relative 'generic_downloader.rb'
 
@@ -10,14 +12,15 @@ class RestClientWrapper
     wait if url == @last_url_fetched
     @last_url_fetched = url
     return execute_fetch_data_from_url(url, request_timeout)
-  # http://www.rubydoc.info/gems/rest-client/1.8.0/RestClient/Exception
   rescue RestClient::RequestTimeout => e
     raise RequestTimeout, e.to_s
   rescue RestClient::ExceptionWithResponse => e
     raise_exception_about_returned_response(e)
-  rescue RestClient::MaxRedirectsReached, RestClient::SSLCertificateNotVerified, RestClient::ServerBrokeConnection, SocketError, URI::InvalidURIError
+  rescue RestClient::SSLCertificateNotVerified, RestClient::ServerBrokeConnection, SocketError, URI::InvalidURIError
     raise ExceptionWithoutResponse.new(e), e.to_s
   rescue ArgumentError => e
+    puts "url:"
+    puts url
     raise_issue_359_exception(e)
   rescue => e
     puts 'unhandled exception! It is a clear bug!'

data/lib/cartocss_helper/util/systemhelper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FailedCommandException < StandardError
 end
 

data/lib/cartocss_helper/validator.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require_relative 'heuristic.rb'
 require_relative 'image_generator.rb'
 require_relative 'configuration.rb'

data/lib/cartocss_helper/visualise_changes_diff_from_images.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rmagick'
 
 module CartoCSSHelper

data/lib/cartocss_helper/visualise_changes_image_generation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'visualise_changes_diff_from_images'
 require_relative 'git'
 require_relative 'renderer_handler'
@@ -130,7 +132,7 @@ module CartoCSSHelper
     end
 
     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
+      # special support for some tag values - see CartoCSSHelper::OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter for details
       header_prefix = "#{VisualDiff.tag_dict_to_string(tags)} #{type} [#{wanted_latitude}, #{wanted_longitude}] -> "
       target_location = '[?, ?]'
       header_sufix = " #{old_branch}->#{new_branch} #{zlevels}"
@@ -198,14 +200,7 @@ module CartoCSSHelper
     end
 
     def self.tag_dict_to_string(dict)
-      result = ''
-      dict.to_a.each do |tag|
-        result << '; ' if result != ''
-        value = "'#{tag[1]}'"
-        value = '{any value}' if tag[1] == :any_value
-        result << "#{tag[0]}=#{value}"
-      end
-      return result
+      return OverpassQueryGenerator.turn_list_of_tags_in_overpass_filter(dict)
     end
   end
 end

data/lib/data/testing_locations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CartoCSSHelper
   def self.get_list_of_testing_locations
     return [

data/readme.md

@@ -1,4 +1,4 @@
-##CartoCSS Helper
+## CartoCSS Helper
 
 It is a tool making development of CartoCSS styles more efficient. Allows to write simple Ruby scripts that generate comparison images of how rendering changed between two versions of map style. It is also possible to generate validation reports detecting for example too low values of text-dy. Loading data using osm2pgsql, rendering with TileMill, obtaining test data from overpass turbo.
 
@@ -12,7 +12,7 @@ It is work in progress, major problems that should be solved include:
 * Executing git checkout commands on map style git repository during normal script operation (https://github.com/matkoniecz/CartoCSSHelper/issues/9)
 * Current rendering method is obnoxiously slow. (https://github.com/matkoniecz/CartoCSSHelper/issues/1)
 
-###Installation
+### Installation
 
 Assumes that osm2pgsql and TileMill are installed.
 
@@ -26,7 +26,7 @@ Unfortunately, standard `gem install cartocss_helper` may not be enough as Carto
 2. `gem install --user-install rmagick`
 3. `gem install --user-install cartocss_helper`.
 
-###Examples
+### Examples
 
 It is assumed that CartoCSS project with Default OSM Style (https://github.com/gravitystorm/openstreetmap-carto/) is located at `~/Documents/MapBox/project/osm-carto`.
 
@@ -74,8 +74,15 @@ It is also possible to look for certain keys, with any value:
     tags = {'landuse' => 'village_green', 'tourism' => 'attraction', 'name' => :any_value}
     CartoCSSHelper.test tags, 'master', 'v2.28.1'
 
+### Tests
 
-###Automated stuff
+Tests are written using rspec. Use `rspec` command to run them.
+
+### Automated stuff
 
 [![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)
+[![Build Status](https://travis-ci.org/matkoniecz/CartoCSSHelper.svg?branch=master)](https://travis-ci.org/matkoniecz/CartoCSSHelper)
+
+### RubyGems link
+
+[https://rubygems.org/gems/cartocss_helper](https://rubygems.org/gems/cartocss_helper)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
@@ -73,25 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.41'
-  type: :development
+        version: '2.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,19 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: matkoniecz-ruby-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -141,19 +135,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.8'
 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.
@@ -168,6 +162,7 @@ files:
 - lib/cartocss_helper/data_file_handling.rb
 - lib/cartocss_helper/git.rb
 - lib/cartocss_helper/heuristic.rb
+- lib/cartocss_helper/history_downloader.rb
 - lib/cartocss_helper/image_generator.rb
 - lib/cartocss_helper/notes_downloader.rb
 - lib/cartocss_helper/overpass_downloader.rb
@@ -200,15 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Tool to make development of CartoCSS styles more efficient.