cartocss_helper 5.0.0 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abeb68cede68758d9f0c8ef8ef4b85c192190d20
-  data.tar.gz: 9c6d087f808d57a21aa8330babedf98cbfce032a
+  metadata.gz: 687e90505435113721d6c181afce5feb18be9813
+  data.tar.gz: 127cf1604bb20100d21dde261ca687cad19a8300
 SHA512:
-  metadata.gz: ba4dcae451a8fa7d2ceff112a7c309a1cff302fc31bf38aa3323d79d62e13696d86be19a8f52f24af13ecc312a7fbf9d6bc908bd6af48e43bcb957439ebf5c30
-  data.tar.gz: 74a622f7cb5c73a6a95ff89f1c12ec02f86acbb14e83b057217e665cf020768ef4e266d5155a708f7786ba37ab64de228b3ab4f32ae2dfc93996cfb25a7c87a6
+  metadata.gz: b6d068d926cf96ac6047044bd34631edc40d259980f10c08bf1fc111b3336bdf94e278ac69731d1878ef637effae7131ab48408d23a48b696b6b63c3293dd5f9
+  data.tar.gz: c35e933f2ab3484797d2a7ce1f4617af3cb71134c984cb1189b1a5950afc56019c2bdd46373915feee974d08058fa6a12f800acefaca0ab64a4720ddbbf63508

data/lib/cartocss_helper.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'open3'
 
 module CartoCSSHelper

data/lib/cartocss_helper/configuration.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'find'
 

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/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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'util/generic_cached_downloader.rb'
 
 module CartoCSSHelper

data/lib/cartocss_helper/overpass_downloader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'util/generic_downloader.rb'
 require_relative 'util/generic_cached_downloader.rb'
 require 'uri' # for URI.escape
@@ -41,6 +43,8 @@ module CartoCSSHelper
         puts url
         puts
         puts e
+      elsif e.http_code == 414
+        puts 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
       end
       raise e
     end
@@ -54,8 +58,13 @@ module CartoCSSHelper
       query = query.gsub('\\', '\\\\')
       query = query.delete("\n")
       query = query.delete("\t")
+      query = URI.escape(query)
+      query = query.gsub("&", "%26")
+      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,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'sys/filesystem'
 require_relative 'overpass_downloader.rb'
@@ -134,7 +135,11 @@ 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 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"
@@ -167,21 +172,21 @@ module CartoCSSHelper
     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}
+      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)
@@ -190,17 +195,21 @@ module CartoCSSHelper
 
     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])
+      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}']"
+        return "\t['#{key}']"
       elsif value == :any_value && operator == :not_equal
-         return "\t['#{key}'!~'.*']"
+        return "\t['#{key}'!~'.*']"
       elsif value != :any_value && operator == :equal
-         return "\t['#{key}'='#{value}']"
+        return "\t['#{key}'='#{value}']"
       elsif value != :any_value && operator == :not_equal
-         return "\t['#{key}'!='#{value}']"
+        return "\t['#{key}'!='#{value}']"
       else
         raise "unexpected situation in <#{tag}>"
       end
@@ -210,14 +219,12 @@ module CartoCSSHelper
       # 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
 

data/lib/cartocss_helper/renderer_handler.rb

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

data/lib/cartocss_helper/style_specific/default_osm_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative('style_specific')
 
 module CartoCSSHelper

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'

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'
 

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'

data/lib/data/testing_locations.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.3
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Tool to make development of CartoCSS styles more efficient.