cartocss_helper 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8686f0a5acb7db504aec14f93f683c89dfd06248
-  data.tar.gz: 1f482eba9f389cdceb37e5253c2520a47725128b
+  metadata.gz: 8d44210fbbf9317e53a5c01b2b91f9e121523995
+  data.tar.gz: 5a4e1209c655ad3168da06877fb77a1baf0d6f39
 SHA512:
-  metadata.gz: f23d8415d318009faf84f70e3f6ae1fb63b80033227c340ba3d647c45a0cc86314c4ec76dc4e07e3d5a2a751415b0cb60affa2a6db92351f1cd031492af54a19
-  data.tar.gz: e86b7bca3b6b4f9f1a84aee7d861d121bb276b1667e7a005d86fc052e1bfe858266da79c2f256de19c3824802fbbcdcf4f33ce2ddd6889f758ff199a0c11d7db
+  metadata.gz: 282ff9198c3c1d46c75d0a2b2bc4afb3426e9e2e5f22c01a9a5d51d5ca261da19c8653979af15ef5b72e5fd09de8a56a3c2347716a6c5e261fea6644df9d5071
+  data.tar.gz: 8fc86923dff9816152f56e1d4ba667a59e03f6bcdbe398904ae6f04406d3ce699b3a82c792be4698da35899d3203c970c2dd848495a80cea50e482161352ad1d

data/lib/cartocss_helper/notes_downloader.rb

@@ -2,21 +2,23 @@ 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

data/lib/cartocss_helper/overpass_downloader.rb

@@ -1,16 +1,28 @@
 require_relative 'util/generic_downloader.rb'
 require_relative 'util/generic_cached_downloader.rb'
 require 'uri' # for URI.escape
+require 'digest/sha1'
 
 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

data/lib/cartocss_helper/overpass_query_generator.rb

@@ -3,6 +3,7 @@ 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 +49,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
 
@@ -184,7 +185,7 @@ module CartoCSSHelper
     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 +194,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 +207,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/style_specific/default_osm_style.rb

@@ -237,6 +237,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 +262,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),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client