cartocss_helper 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de353ff0f5a1fe946a3e7e782c185570587fdf097afce030a352909772195b79
-  data.tar.gz: 0327dbf4cdbabc8671292766f120c83468d24334fa16475410e82a2cef3f8900
+  metadata.gz: 24a2a7383e9f2b78c6cf6030f0364646a7a1b5334a0b6045ae7e87c8f64cd80d
+  data.tar.gz: e128e7c79ab18d866e75e9f6ad6c750a7b3bd966cff179beec672f1f48efb0db
 SHA512:
-  metadata.gz: c1d4815aac6fe77f2735f1b106d8318794f6d8e705768207b902b73666cabbfc4ed9f4a953fb92a54d3d0d091ad162f79309f884f51aae6fb880741b0ac28f1d
-  data.tar.gz: d7240dd1d35eccac5151b576dea66f86483b0944b12c508fce3f87725cde37029eaaaf2c60dab11e43b097f42c39bcf89b9ed9fe54653d5f3d134630f808b2c1
+  metadata.gz: 9178c18bea33811ed65f5bef2f08f7553291a46ce2d37e6550d7d878b9d8eed8217c23e63a2a991e8c59fc54a3912b66d76df107dc391f312b71ef0604b6acfe
+  data.tar.gz: 4a4b630a3b59b43680c4832e1afb7e059301afb8cd0576ebe57d14fff220857ca1f8289d3547af802d8d4946e87676e4dc76776f2579c3b54e4c0df7da4f95a2

data/lib/cartocss_helper/overpass_downloader.rb

@@ -42,8 +42,8 @@ module CartoCSSHelper
         puts
         puts url
         puts
-        puts "url with %20 replaced back by spaces, %22 by \""
-        puts url.replace("%20", " ").replace("%22", '"')
+        puts "url with %20 replaced back by spaces, %22 by \", newline by %0A"
+        puts url.replace("%20", " ").replace("%22", '"').replace("\n", "%0A")
         puts
         puts e
       elsif e.http_code == 414
@@ -66,15 +66,14 @@ module CartoCSSHelper
       query = query.gsub('\\', '\\\\')
 
       # newlines, tabs added in query for readability may be safely deleted
-      query = query.delete("\n")
+      #query = query.delete("\n") - can be escaped! Results in nicer Overpass failures
       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
+      query = query.gsub("/", "%2F") # escape slashes manually
 
       # inside query also & and + must be escaped (entire query is an url parameter)
       query = query.gsub("&", "%26")

data/lib/cartocss_helper/overpass_query_generator.rb

@@ -33,35 +33,35 @@ module CartoCSSHelper
       return "#{min_latitude},#{min_longitude},#{max_latitude},#{max_longitude}"
     end
 
-    def self.find_data_pair(tags_a, tags_b, latitude, longitude, type_a, type_b, bb_size: 0.1, distance_in_meters: 20)
+    def self.find_data_pair(tags_a, tags_b, latitude, longitude, type_a, type_b, bb_size: 0.1, distance_in_meters: 20, invalidate_cache: false)
       return nil, nil if bb_size > 0.5
       bb = overpass_bbox_string(latitude, longitude, bb_size.to_f)
       query = OverpassQueryGenerator.get_query_to_find_data_pair(bb, tags_a, tags_b, type_a, type_b, distance_in_meters: distance_in_meters)
       description = "find #{VisualDiff.tag_dict_to_string(tags_a)} nearby #{VisualDiff.tag_dict_to_string(tags_b)} - bb size: #{bb_size}"
-      list = OverpassQueryGenerator.get_overpass_query_results(query, description)
+      list = OverpassQueryGenerator.get_overpass_query_results(query, description, invalidate_cache: invalidate_cache)
       if list.length != 0
         return OverpassQueryGenerator.list_returned_by_overpass_to_a_single_location(list)
       end
       return OverpassQueryGenerator.find_data_pair(tags_a, tags_b, latitude, longitude, type_a, type_b, bb_size: bb_size * 2, distance_in_meters: distance_in_meters)
     end
 
-    def self.get_file_with_downloaded_osm_data_for_location(latitude, longitude, size)
+    def self.get_file_with_downloaded_osm_data_for_location(latitude, longitude, size, invalidate_cache: false)
       query = get_query_to_download_data_around_location(latitude, longitude, size)
       description = "download data for #{latitude} #{longitude} (#{size})"
-      get_overpass_query_results(query, description)
+      get_overpass_query_results(query, description, invalidate_cache: invalidate_cache)
 
       filename = OverpassDownloader.cache_filename(query)
       return filename
     end
 
-    def self.download_osm_data_for_location(latitude, longitude, size, accept_cache = true)
+    def self.download_osm_data_for_location(latitude, longitude, size, accept_cache = true) # TODO: conflict with invalidate_cache 
       filename = CartoCSSHelper::Configuration.get_path_to_folder_for_cache + "#{latitude} #{longitude} #{size}.osm"
       if File.exist?(filename)
         return filename if accept_cache
         SystemHelper.delete_file(filename, 'query refusing to accept cache was used')
       end
       query = get_query_to_download_data_around_location(latitude, longitude, size)
-      text = get_overpass_query_results(query, "download data for #{latitude} #{longitude} (#{size})")
+      text = get_overpass_query_results(query, "download data for #{latitude} #{longitude} (#{size})", invalidate_cache: false)
       File.new(filename, 'w') do |file|
         file.write text
       end
@@ -85,17 +85,17 @@ module CartoCSSHelper
       return query
     end
 
-    def self.get_elements_near_given_location(tags, type, latitude, longitude, range_in_meters)
+    def self.get_elements_near_given_location(tags, type, latitude, longitude, range_in_meters, invalidate_cache: false)
       description = "find #{tags} #{type} within #{range_in_meters / 1000}km from #{latitude}, #{longitude}"
       query = OverpassQueryGenerator.get_query_to_get_location(tags, type, latitude, longitude, range_in_meters)
-      list = OverpassQueryGenerator.get_overpass_query_results(query, description)
+      list = OverpassQueryGenerator.get_overpass_query_results(query, description, invalidate_cache: invalidate_cache)
       return list_returned_by_overpass_to_array(list)
     end
 
-    def self.get_elements_across_world(tags, type)
+    def self.get_elements_across_world(tags, type, invalidate_cache: false)
       description = "find #{tags} #{type} across the world"
       query = OverpassQueryGenerator.get_query_to_get_location(tags, type, 0, 0, :infinity)
-      list = OverpassQueryGenerator.get_overpass_query_results(query, description)
+      list = OverpassQueryGenerator.get_overpass_query_results(query, description, invalidate_cache: invalidate_cache)
       return list_returned_by_overpass_to_array(list)
     end
 
@@ -245,6 +245,8 @@ module CartoCSSHelper
 
     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))
+        puts("response cached as failed")
+        puts(get_query_cache_refused_response_filename(query))
         raise OverpassDownloader::OverpassRefusedResponse
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client