cartocss_helper 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d44210fbbf9317e53a5c01b2b91f9e121523995
-  data.tar.gz: 5a4e1209c655ad3168da06877fb77a1baf0d6f39
+  metadata.gz: abeb68cede68758d9f0c8ef8ef4b85c192190d20
+  data.tar.gz: 9c6d087f808d57a21aa8330babedf98cbfce032a
 SHA512:
-  metadata.gz: 282ff9198c3c1d46c75d0a2b2bc4afb3426e9e2e5f22c01a9a5d51d5ca261da19c8653979af15ef5b72e5fd09de8a56a3c2347716a6c5e261fea6644df9d5071
-  data.tar.gz: 8fc86923dff9816152f56e1d4ba667a59e03f6bcdbe398904ae6f04406d3ce699b3a82c792be4698da35899d3203c970c2dd848495a80cea50e482161352ad1d
+  metadata.gz: ba4dcae451a8fa7d2ceff112a7c309a1cff302fc31bf38aa3323d79d62e13696d86be19a8f52f24af13ecc312a7fbf9d6bc908bd6af48e43bcb957439ebf5c30
+  data.tar.gz: 74a622f7cb5c73a6a95ff89f1c12ec02f86acbb14e83b057217e665cf020768ef4e266d5155a708f7786ba37ab64de228b3ab4f32ae2dfc93996cfb25a7c87a6

data/lib/cartocss_helper/overpass_downloader.rb

@@ -32,6 +32,17 @@ 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 e
+      end
+      raise e
     end
 
     def self.get_allowed_timeout_in_seconds

data/lib/cartocss_helper/overpass_query_generator.rb

@@ -99,7 +99,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)
@@ -135,7 +135,7 @@ module CartoCSSHelper
     end
 
     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 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'
@@ -157,20 +157,57 @@ 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 = overpass_escape(filter_data[:value])
+      key = overpass_escape(filter_data[:key])
+      operator = filter_data[:operator]
+      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)

data/lib/cartocss_helper/renderer_handler.rb

@@ -85,7 +85,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/util/generic_downloader.rb

@@ -57,7 +57,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/rest-client_wrapper.rb

@@ -10,12 +10,11 @@ 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
     raise_issue_359_exception(e)

data/lib/cartocss_helper/visualise_changes_image_generation.rb

@@ -130,7 +130,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 +198,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/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.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ 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
@@ -73,73 +73,73 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">"
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">"
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
+        version: '0.52'
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
+        version: '0.52'
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement