cartocss_helper 5.0.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abeb68cede68758d9f0c8ef8ef4b85c192190d20
-  data.tar.gz: 9c6d087f808d57a21aa8330babedf98cbfce032a
+SHA256:
+  metadata.gz: 24a2a7383e9f2b78c6cf6030f0364646a7a1b5334a0b6045ae7e87c8f64cd80d
+  data.tar.gz: e128e7c79ab18d866e75e9f6ad6c750a7b3bd966cff179beec672f1f48efb0db
 SHA512:
-  metadata.gz: ba4dcae451a8fa7d2ceff112a7c309a1cff302fc31bf38aa3323d79d62e13696d86be19a8f52f24af13ecc312a7fbf9d6bc908bd6af48e43bcb957439ebf5c30
-  data.tar.gz: 74a622f7cb5c73a6a95ff89f1c12ec02f86acbb14e83b057217e665cf020768ef4e266d5155a708f7786ba37ab64de228b3ab4f32ae2dfc93996cfb25a7c87a6
+  metadata.gz: 9178c18bea33811ed65f5bef2f08f7553291a46ce2d37e6550d7d878b9d8eed8217c23e63a2a991e8c59fc54a3912b66d76df107dc391f312b71ef0604b6acfe
+  data.tar.gz: 4a4b630a3b59b43680c4832e1afb7e059301afb8cd0576ebe57d14fff220857ca1f8289d3547af802d8d4946e87676e4dc76776f2579c3b54e4c0df7da4f95a2

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'util/generic_cached_downloader.rb'
 
 module CartoCSSHelper
@@ -40,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,7 +1,9 @@
+# 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
@@ -40,7 +42,12 @@ module CartoCSSHelper
         puts
         puts url
         puts
+        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
+        puts 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
       end
       raise e
     end
@@ -49,13 +56,38 @@ module CartoCSSHelper
       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('\\', '\\\\')
-      query = query.delete("\n")
+
+      # newlines, tabs added in query for readability may be safely deleted
+      #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
+
+      # 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,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'digest/sha1'
 require 'sys/filesystem'
 require_relative 'overpass_downloader.rb'
@@ -32,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
@@ -84,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
 
@@ -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
 
@@ -238,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
 

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'
 
@@ -17,6 +19,8 @@ class RestClientWrapper
   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'

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/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.3.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -30,7 +30,7 @@ dependencies:
     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
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -93,25 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: matkoniecz-ruby-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +148,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 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.