From 20c81a25b9af59bc2aa1558c446b73cc932fc394 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 06:08:43 +0300
Subject: [PATCH 001/152] ActiveSupport::Testing::Performance extracted to a
 gem

---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 92051d954..1e8d37b90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ group :test do
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
   gem 'test-unit'
+  gem 'rails-perftest'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index d781a44a8..f3ed72068 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,6 +130,7 @@ GEM
       activesupport (= 3.2.22.5)
       bundler (~> 1.0)
       railties (= 3.2.22.5)
+    rails-perftest (0.0.7)
     railties (3.2.22.5)
       actionpack (= 3.2.22.5)
       activesupport (= 3.2.22.5)
@@ -223,6 +224,7 @@ DEPENDENCIES
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
   rails (~> 3.2)
+  rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
   recaptcha

From d4131fde8b988deda68e5c99a2f4630b31cf9e86 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 06:12:58 +0300
Subject: [PATCH 002/152] ruby prof required as a dependency

---
 Gemfile      | 3 ++-
 Gemfile.lock | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1e8d37b90..bbc1f2d49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :dependencies do
   gem "open_id_authentication"
   gem "RubyInline"
   gem "paperclip", "~>4.3.7"
+  gem 'ruby-prof'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
@@ -43,8 +44,8 @@ group :test do
   gem "rubocop", '~> 0.52.0'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'test-unit'
   gem 'rails-perftest'
+  gem 'test-unit'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f3ed72068..fe9f980c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,6 +162,7 @@ GEM
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-prof (0.18.0)
     ruby-progressbar (1.10.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -231,6 +232,7 @@ DEPENDENCIES
   right_aws
   rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
+  ruby-prof
   sass
   simplecov
   simplecov-cobertura
@@ -247,4 +249,4 @@ RUBY VERSION
    ruby 2.4.6p354
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

From 9c219521980a89b19262664e6a68588a8d96b898 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 05:15:27 +0300
Subject: [PATCH 003/152] Configurations update for rails 4.0

---
 Gemfile                                       |   6 +-
 Gemfile.lock                                  | 163 ++++++++++--------
 bin/bundle                                    |   3 +
 bin/rails                                     |   4 +
 bin/rake                                      |   4 +
 bin/setup                                     |  29 ++++
 config/application.rb                         |  27 +--
 config/boot.rb                                |   5 +-
 config/environment.rb                         |   4 +-
 config/environments/development.rb            |  37 ++--
 config/environments/production.rb             |  89 +++++-----
 config/environments/test.rb                   |  32 ++--
 config/initializers/assets.rb                 |  11 ++
 config/initializers/cookies_serializer.rb     |   3 +
 .../initializers/filter_parameter_logging.rb  |   4 +
 config/initializers/inflections.rb            |  11 +-
 config/initializers/mime_types.rb             |   1 -
 config/initializers/session_store.rb          |   7 +-
 config/initializers/wrap_parameters.rb        |   6 +-
 config/locales/en.yml                         |  22 ++-
 config/secrets.yml                            |  22 +++
 21 files changed, 304 insertions(+), 186 deletions(-)
 create mode 100755 bin/bundle
 create mode 100755 bin/rails
 create mode 100755 bin/rake
 create mode 100755 bin/setup
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 create mode 100644 config/initializers/filter_parameter_logging.rb
 create mode 100644 config/secrets.yml

diff --git a/Gemfile b/Gemfile
index bbc1f2d49..e3360daf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-ruby "2.4.6"
-gem "rails", "~>3.2"
+ruby '2.4.6'
+gem 'rails', '~>4.0'
 gem 'rake',  '~> 12.3.2'
 gem 'skylight'
 
@@ -42,9 +42,9 @@ end
 
 group :test do
   gem "rubocop", '~> 0.52.0'
+  gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'rails-perftest'
   gem 'test-unit'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fe9f980c6..a4ac481c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,34 +4,41 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.2)
-    actionmailer (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      mail (~> 2.5.4)
-    actionpack (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22.5)
-      activemodel (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
+      builder (~> 3.1)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      arel (~> 6.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
     ast (2.4.0)
     autoprefixer-rails (9.5.1.1)
       execjs
@@ -40,45 +47,53 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    builder (3.0.4)
+    builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
+    crass (1.0.4)
     docile (1.3.1)
     erubis (2.7.0)
     execjs (2.7.0)
     faker (1.9.3)
       i18n (>= 0.7)
     ffi (1.11.1)
-    friendly_id (4.0.10.1)
-      activerecord (>= 3.0, < 4.0)
+    friendly_id (5.2.5)
+      activerecord (>= 4.0.0)
     geokit (1.13.1)
     geokit-rails (1.1.4)
       geokit (>= 1.5.0)
-    hike (1.2.3)
-    httparty (0.16.2)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    httparty (0.17.0)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    journey (1.0.4)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
       rake
     json (1.8.6)
     libv8 (3.16.14.19)
-    mail (2.5.5)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     method_source (0.9.2)
-    mime-types (1.25.1)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
     mimemagic (0.3.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.4.0)
+    minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
@@ -103,7 +118,6 @@ GEM
     passenger (6.0.2)
       rack
       rake (>= 0.8.1)
-    polyglot (0.3.5)
     popper_js (1.14.5)
     power_assert (1.1.4)
     powerpack (0.1.2)
@@ -112,40 +126,43 @@ GEM
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (1.4.7)
-    rack-cache (1.9.0)
-      rack (>= 0.4)
+    rack (1.6.11)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22.5)
-      actionmailer (= 3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activerecord (= 3.2.22.5)
-      activeresource (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      bundler (~> 1.0)
-      railties (= 3.2.22.5)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.11.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-perftest (0.0.7)
-    railties (3.2.22.5)
-      actionpack (= 3.2.22.5)
-      activesupport (= 3.2.22.5)
-      rack-ssl (~> 1.3.2)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
     recaptcha (4.14.0)
       json
     ref (2.0.0)
@@ -176,13 +193,17 @@ GEM
     simplecov-cobertura (1.3.1)
       simplecov (~> 0.8)
     simplecov-html (0.10.2)
-    skylight (1.7.2)
-      activesupport (>= 3.0.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    skylight (4.0.2)
+      skylight-core (= 4.0.2)
+    skylight-core (4.0.2)
+      activesupport (>= 4.2.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -190,11 +211,9 @@ GEM
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.3)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.55)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
@@ -224,7 +243,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
-  rails (~> 3.2)
+  rails (~> 4.0)
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
diff --git a/bin/bundle b/bin/bundle
new file mode 100755
index 000000000..66e9889e8
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100755
index 000000000..5191e6927
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 000000000..17240489f
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/bin/setup b/bin/setup
new file mode 100755
index 000000000..acdb2c138
--- /dev/null
+++ b/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
diff --git a/config/application.rb b/config/application.rb
index 63217e5ba..09d4d4575 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,12 +2,9 @@
 
 require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module Mapknitter
   class Application < Rails::Application
@@ -19,13 +16,6 @@ class Application < Rails::Application
     # config.autoload_paths += %W(#{config.root}/extras)
     config.autoload_paths += %W(#{config.root}/lib/)
 
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -43,16 +33,14 @@ class Application < Rails::Application
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
     # Enforce whitelist mode for mass assignment.
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -60,6 +48,5 @@ class Application < Rails::Application
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.3'
     config.assets.paths << Rails.root.join("public","lib")
-
   end
 end
diff --git a/config/boot.rb b/config/boot.rb
index f2830ae31..44358b8e4 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,3 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index 761c5657b..99fb29737 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Mapknitter::Application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index f834629b2..dd73b21a2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,33 +1,43 @@
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
   # Do not compress assets
   config.assets.compress = false
@@ -37,5 +47,4 @@
   config.serve_static_assets = true
 
   config.assets.logger = false
-
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ca5cdf415..219f7fc32 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,65 +1,74 @@
-require 'uglifier'
-
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
 
-  # Code is not reloaded between requests
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = true
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  config.assets.js_compressor = Uglifier.new(:harmony => true)
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = true
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
   config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
   config.assets.precompile += ['tags.js',
-                                 'uploads.js',
-                                 'knitter.js',
-                                 'annotations.js',
-                                 'maps.js']
-
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+                               'uploads.js',
+                               'knitter.js',
+                               'annotations.js',
+                               'maps.js']
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
   config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
   config.action_mailer.delivery_method = :sendmail
   config.action_mailer.sendmail_settings = {
@@ -67,18 +76,16 @@
     arguments: '-i'
   }
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8b5dc4405..278bd7e91 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,6 @@
 Mapknitter::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +8,36 @@
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 000000000..01ef3e663
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 000000000..ac5f8b663
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 000000000..4a994e1e7
--- /dev/null
+++ b/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 5d8d9be23..ac033bf9d 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,15 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
+
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e44..dc1899682 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 24b534974..d496b7352 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Mapknitter::Application.config.session_store :cookie_store, key: '_mapknitter_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Mapknitter::Application.config.session_store :active_record_store
+Rails.application.config.session_store :cookie_store, key: '_mapknitter_session'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 999df2018..35d7efeaf 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,14 +1,14 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
 
-# Disable root element in JSON by default.
+# Disable root element in JSON for ActiveRecord objects.
 ActiveSupport.on_load(:active_record) do
   self.include_root_in_json = false
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 179c14ca5..065395716 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,23 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 000000000..b839a03ad
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: d4b805f25ee5bdba59cfd75d808721c6a73215f9e499e86af29dc2855c2e377bf05a463c8ee46e7ad896a435cd3f4e912794a9f9eb788b75a85c75624b34f01e
+
+test:
+  secret_key_base: 3aecc44ce8fabf9194016bb240fa78113f3c26b8d2c7b1b4dc0611300fbe6f95fdb89fef41f025f2494ec2281c40ca0dd0b86ac3eee3a46683abc42f63c449af
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

From c4a3cba4b091fe318296fdbe7b30c7ef45b72cbe Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 12:24:03 +0300
Subject: [PATCH 004/152] disable rubocop on bin folder

---
 .codeclimate.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 4c1449c23..7922fef22 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,23 +1,23 @@
 version: 2
-plugins: 
-  rubocop: 
+plugins:
+  rubocop:
     enabled: true
     channel: rubocop-0-70
-  brakeman: 
+  brakeman:
     enabled: true
-  bundler-audit: 
+  bundler-audit:
     enabled: true
-  duplication: 
+  duplication:
     enabled: true
     config:
       languages:
         - ruby:
         - javascript:
-  eslint: 
+  eslint:
     enabled: true
-  fixme: 
+  fixme:
     enabled: true
-  rubocop: 
+  rubocop:
     enabled: true
 
 exclude_patterns:
@@ -25,5 +25,6 @@ exclude_patterns:
 - db/
 - vendor/
 - log/
+- bin/
 
 

From 58b80a188f69db462b519e168f6512c500bfd4e8 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sun, 5 May 2019 23:51:00 +0300
Subject: [PATCH 005/152] http patch

---
 config/routes.rb | 66 +++---------------------------------------------
 1 file changed, 4 insertions(+), 62 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 6dd6d53f8..2cd514153 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,57 +1,13 @@
 Mapknitter::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+
+  root :to => 'maps#index'
+
   get 'front-page' => 'front_ui#index'
   get 'mappers' => 'front_ui#nearby_mappers'
   post "save_location" => 'front_ui#save_location'
   get 'about' => 'front_ui#about'
   get 'all_maps' => 'front_ui#all_maps'
 
-  # these are a mess:
   get 'external_url_test' => 'export#external_url_test'
   get 'local/:login' => 'sessions#local'
   get 'logout' => 'sessions#logout'
@@ -61,10 +17,8 @@
 
   # since rails 3.2, we use this to log in:
   get 'sessions/create' => 'sessions#create'
-  # believe this is unnecessary:
-  #get 'session' => 'sessions#create', :conditions => { :method => :get }
 
-  resources :users, :sessions
+  resources :users, :sessions, :maps
 
   # redirect legacy route:
   get 'tag/:id', to: redirect('/tags/%{id}')
@@ -87,20 +41,14 @@
   get 'tms/:id/alt/' => 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
-  get 'maps' => 'maps#index'
-  post 'maps' => 'maps#create' # legacy, will be replaced by resourceful route
   get 'map/map' => 'maps#map'
-  put 'map/:id' => 'maps#update' # legacy, will be replaced by resourceful route
   get 'search/:id' => 'maps#search'
   get 'search' => 'maps#search'
-  get 'map/update/:id' => 'maps#update' # legacy
   get 'map/archive/:id' => 'maps#archive'
   get 'map/region/:id' => 'maps#region'
   get 'map/license/:id' => 'maps#license'
   get 'maps/featured' => 'maps#featured'
   get 'map/view/:id', to: redirect('/maps/%{id}') # legacy
-  get 'maps/new' => 'maps#new' # legacy, will be replaced by resourceful route
-  get 'maps/:id/edit' => 'maps#edit' # legacy, will be replaced by resourceful route
   get 'maps/:id/annotate' => 'maps#annotate'
   get 'maps/exports/:id' => 'maps#exports'
   get 'maps/:id/warpables' => 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
@@ -108,7 +56,6 @@
   get 'export/progress/:id' => 'export#progress'
   get 'export/status/:id' => 'export#status'
   get 'exports' => 'export#index'
-  get 'maps/:id' => 'maps#show'
   get 'map/:id', to: redirect('/maps/%{id}')
   get 'embed/:id' => 'maps#embed'
   post 'maps/export/:id' => 'maps#export'
@@ -125,13 +72,8 @@
   delete 'maps/:map_id/warpables/:id' => 'images#destroy' #legacy, will be resourceful
   delete 'images/:id' => 'images#destroy' #legacy, will be resourceful
 
-  # You can have the root of your site routed with 'root'
-  # just remember to delete public/index.html.
-  root :to => 'maps#index'
-
   # RESTful API
   resources :maps do
-    resources :tags
     resources :tags,  only: [:create, :show, :destroy]
     resources :comments
     resources :warpables

From 76d6e33bfd2c95130693dab1b889b1bd1d5d8902 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 00:14:41 +0300
Subject: [PATCH 006/152] Comment out to allow testing

---
 config/initializers/visitor.rb    | 26 +++++++++++++-------------
 test/performance/browsing_test.rb | 20 ++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/config/initializers/visitor.rb b/config/initializers/visitor.rb
index 443c9ce3b..df4d800c5 100644
--- a/config/initializers/visitor.rb
+++ b/config/initializers/visitor.rb
@@ -11,18 +11,18 @@
 # Arel is now bundled in the Active Record gem, and maintained in the rails/rails repository. 
 # This code can be deleted on update to `activerecord >= 6.0` (Rails 6)
 
-module Arel
-  module Visitors
-    class DepthFirst < Arel::Visitors::Visitor
-      alias :visit_Integer :terminal
-    end
+# module Arel
+#   module Visitors
+#     class DepthFirst < Arel::Visitors::Visitor
+#       alias :visit_Integer :terminal
+#     end
 
-    class Dot < Arel::Visitors::Visitor
-      alias :visit_Integer :visit_String
-    end
+#     class Dot < Arel::Visitors::Visitor
+#       alias :visit_Integer :visit_String
+#     end
 
-    class ToSql < Arel::Visitors::Visitor
-      alias :visit_Integer :literal
-    end
-  end
-end
\ No newline at end of file
+#     class ToSql < Arel::Visitors::Visitor
+#       alias :visit_Integer :literal
+#     end
+#   end
+# end
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 3fea27b91..96ebe7f1e 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -1,12 +1,12 @@
-require 'test_helper'
-require 'rails/performance_test_help'
+# require 'test_helper'
+# require 'rails/performance_test_help'
 
-class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
+# class BrowsingTest < ActionDispatch::PerformanceTest
+#   # Refer to the documentation for all available options
+#   # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+#   #                          :output => 'tmp/performance', :formats => [:flat] }
 
-  def test_homepage
-    get '/'
-  end
-end
+#   def test_homepage
+#     get '/'
+#   end
+# end

From 3d7d8ba97d3dc07a5a7257b56cd4d56720714e96 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 00:16:18 +0300
Subject: [PATCH 007/152] no longer supports plugin loading

---
 vendor/plugins/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 vendor/plugins/.gitkeep

diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep
deleted file mode 100644
index e69de29bb..000000000

From 8b2eaaf01b0f339a26df3b31200a6a1ed33e0f4f Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 01:17:34 +0300
Subject: [PATCH 008/152] lock to sprockets 2.12

---
 Gemfile      |  2 +-
 Gemfile.lock | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index e3360daf2..2453ee174 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ group :dependencies do
   gem "rdiscount", "2.2.0.1"
 
   # asset pipelining
-  gem "sprockets"#, "2.12.1"
+  gem 'sprockets', '2.12.1'
   gem "sass", :require => 'sass'
   gem "autoprefixer-rails"
   gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index a4ac481c6..d3010eb1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       geokit (>= 1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    hike (1.2.3)
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -197,13 +198,15 @@ GEM
       skylight-core (= 4.0.2)
     skylight-core (4.0.2)
       activesupport (>= 4.2.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    sprockets (2.12.1)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -212,6 +215,7 @@ GEM
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
+    tilt (1.4.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -256,7 +260,7 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   skylight
-  sprockets
+  sprockets (= 2.12.1)
   sqlite3
   test-unit
   therubyracer

From ddb6d7c4b31099f09c7266a61ccc97680c931bde Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Mon, 6 May 2019 01:18:12 +0300
Subject: [PATCH 009/152] Active record patches

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              |  2 +-
 app/controllers/annotations_controller.rb | 28 +++++++++------
 app/controllers/comments_controller.rb    | 13 ++++---
 app/controllers/export_controller.rb      |  6 ++++
 app/controllers/feeds_controller.rb       | 17 ++++-----
 app/controllers/images_controller.rb      | 10 ++++--
 app/controllers/maps_controller.rb        |  6 +++-
 app/controllers/tags_controller.rb        |  6 ++++
 app/controllers/users_controller.rb       |  5 +++
 app/models/annotation.rb                  |  2 --
 app/models/comment.rb                     |  1 -
 app/models/export.rb                      | 13 +++----
 app/models/map.rb                         | 42 +++++++++--------------
 app/models/node.rb                        |  1 -
 app/models/tag.rb                         |  8 ++---
 app/models/user.rb                        |  1 -
 app/models/warpable.rb                    |  4 +--
 app/models/way.rb                         |  3 +-
 app/views/maps/_statistics.html.erb       |  4 +--
 config/initializers/assets.rb             |  5 +++
 21 files changed, 103 insertions(+), 76 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2453ee174..e3360daf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ group :dependencies do
   gem "rdiscount", "2.2.0.1"
 
   # asset pipelining
-  gem 'sprockets', '2.12.1'
+  gem "sprockets"#, "2.12.1"
   gem "sass", :require => 'sass'
   gem "autoprefixer-rails"
   gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index d3010eb1d..bfb4b9980 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -260,7 +260,7 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   skylight
-  sprockets (= 2.12.1)
+  sprockets
   sqlite3
   test-unit
   therubyracer
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 3435ce4c0..9905f52bc 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -9,7 +9,7 @@ def index
   end
 
   def create
-    geojson = params[:annotation]
+    geojson = annotation_params # params[:annotation]
 
     respond_to do |format|
       format.json do
@@ -32,15 +32,16 @@ def show
 
   def update
     @annotation = Annotation.find params[:id]
-    geojson = params[:annotation]
-    return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
-
-    Annotation.update(@annotation.id,
-      coordinates: geojson[:geometry][:coordinates],
-      text: geojson[:properties][:textContent],
-      style: geojson[:properties][:style])
-    render file: 'annotations/update.json.erb',
-           content_type: 'application/json'
+
+    geojson = annotation_params
+    if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
+      Annotation.update(@annotation.id,
+                        coordinates: geojson[:geometry][:coordinates],
+                        text: geojson[:properties][:textContent],
+                        style: geojson[:properties][:style])
+      render file: 'annotations/update.json.erb',
+             content_type: 'application/json'
+    end
   end
 
   def destroy
@@ -54,4 +55,11 @@ def destroy
   def find_map
     @map = Map.find params[:map_id]
   end
+
+  private
+
+  def annotation_params
+    params.require(:annotation).permit(:annotation_type,
+                                       :coordinates, :text, :style)
+  end
 end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index c0e01fbf0..d73678f11 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,10 +3,7 @@ def create
     if logged_in?
       @map = Map.find params[:map_id]
 
-      @comment = @map.comments.new(
-        user_id: current_user.id,
-        body: params[:comment][:body]
-      )
+      @comment = @map.comments.new(comment_params, user_id: current_user.id)
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
@@ -31,7 +28,7 @@ def create
   def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
-      @comment.update_attribute(:body, params[:comment][:body])
+      @comment.update_attribute(comment_params)
       redirect_to '/maps/' + params[:map_id]
     else
       flash[:error] = 'You do not have permissions to update that comment.'
@@ -50,4 +47,10 @@ def destroy
     end
     redirect_to "/maps/#{params[:map_id]}"
   end
+
+  private
+
+  def comment_params
+    params.require(:comment).permit(:body)
+  end
 end
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 2b3c98470..424fa4a71 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -85,4 +85,10 @@ def status
   def external_url_test
     render json: Export.last.to_json
   end
+
+  private
+
+  def export_params
+    params.require(:export).permit(:status, :export_url)
+  end
 end
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 3405ea31d..2224f9e53 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -3,10 +3,11 @@ class FeedsController < ApplicationController
 
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
-    @maps = Map.find(:all, order: 'id DESC', limit: 20,
-                           conditions: { archived: false, password: '' },
-                           joins: %i(user warpables),
-                           group: 'maps.id')
+    @maps = Map.where(archived: false, password: '')
+               .joins(%i[user warpables])
+               .group('maps.id')
+               .order('id DESC')
+               .limit(20)
     render layout: false, template: 'feeds/all'
     response.headers['Content-Type'] = 'application/xml; charset=utf-8'
   end
@@ -23,10 +24,10 @@ def license
   end
 
   def author
-    @maps = Map.find_all_by_author(params[:id],
-      order: 'id DESC',
-      conditions: { archived: false, password: '' },
-      joins: :warpables, group: 'maps.id')
+    @maps = Map.where(author: params[:id], archived: false, password: '')
+               .order('id DESC')
+               .joins(:warpables)
+               .group('maps.id')
     images = []
     @maps.each do |map|
       images += map.warpables
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 2f670da0f..fe79c6a14 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -23,8 +23,8 @@ def fetch
 
   # assign attributes directly after rails update
   def create
-    @warpable = Warpable.new
-    @warpable.image = params[:uploaded_data]
+    @warpable = Warpable.new(image_params)
+    # @warpable.image = params[:uploaded_data]
     map = Map.find(params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
@@ -109,4 +109,10 @@ def destroy
       redirect_to '/login'
     end
   end
+
+  private
+
+  def image_params
+    params.require(:warpable).permit(:image)
+  end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 51258908e..69337853b 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -32,7 +32,7 @@ def new
 
   def create
     if logged_in?
-      @map = current_user.maps.new(params[:map])
+      @map = current_user.maps.new(map_params)
       @map.author = current_user.login # eventually deprecate
       if @map.save
         redirect_to "/maps/#{@map.slug}"
@@ -200,4 +200,8 @@ def search
   def find_map
     @map = Map.find(params[:id])
   end
+
+  def map_params
+    params.require(:map).permit(:author, :name, :slug, :lat, :lon, :location, :description, :zoom, :license)
+  end
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f6ad5ab3d..eba31b0f3 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -32,4 +32,10 @@ def destroy
       redirect_to '/login'
     end
   end
+
+  private
+
+  def tag_params
+    params.require(:tag).permit(:name)
+  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 56d9379e6..5dc4f187f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -27,4 +27,9 @@ def sort_column
   def sort_direction
     params[:direction] || 'desc'
   end
+
+  def user_params
+    params.require(:user).permit(:login, :email, :name,
+                                 :password, :password_confirmation)
+  end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index bfa3ce87c..05575fdff 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -2,8 +2,6 @@ class Annotation < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  attr_accessible :annotation_type, :coordinates, :text, :style
-
   serialize :coordinates, Array
   serialize :style, Hash
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 8ac15586e..0021e4761 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,4 @@
 class Comment < ActiveRecord::Base
-  attr_accessible :user_id, :body
 
   belongs_to :map
   belongs_to :user
diff --git a/app/models/export.rb b/app/models/export.rb
index d37b52021..d85d62aa4 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -1,6 +1,4 @@
 class Export < ActiveRecord::Base
-  attr_accessible :map_id, :status, :user_id, :export_url
-
   belongs_to :map
   belongs_to :user
 
@@ -10,7 +8,7 @@ def running?
   end
 
   def self.average_cm_per_pixel
-    e = Export.find :all, conditions: ['cm_per_pixel != "" AND cm_per_pixel < 500']
+    e = Export.where('cm_per_pixel != "" AND cm_per_pixel < 500')
     sum = 0
     e.each do |export|
       sum += export.cm_per_pixel
@@ -23,7 +21,8 @@ def self.average_cm_per_pixel
   end
 
   def self.histogram_cm_per_pixel
-    e = Export.find :all, conditions: ['cm_per_pixel != "" AND cm_per_pixel < 500'], order: "cm_per_pixel DESC"
+    e = Export.where('cm_per_pixel != "" AND cm_per_pixel < 500')
+              .order('cm_per_pixel DESC')
     if !e.empty?
       hist = []
       (0..e.first.cm_per_pixel.to_i).each do |bin|
@@ -52,11 +51,13 @@ def self.histogram_cm_per_pixel_in_tens
   end
 
   def self.export_count
-    Export.count :all, conditions: ['status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?', (DateTime.now - 24.hours).to_s(:db)]
+    Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
+                 (DateTime.now-24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
-    Export.find :all, conditions: ['status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?', (DateTime.now - 24.hours).to_s(:db)]
+    Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
+                 (DateTime.now-24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 0ff3c51d4..9091c9722 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -3,33 +3,23 @@ class Map < ActiveRecord::Base
   extend FriendlyId
   friendly_id :name, use: %i(slugged static)
 
-  attr_accessible :author, :name, :slug, :lat, :lon,
-    :location, :description, :zoom, :license
   attr_accessor :image_urls
 
-  validates :name, :slug, :author, :lat, :lon, presence: true
-
-  validates :slug, format: {
-    with: /^[\w-]*$/,
-    message: "must only include permitted URL safe character types:
-              alphanumerics, dashes, and underscores. It will be in your map's
-              URL path (i.e., https://mapknitter.org/maps/your-map-name)."
-  }, uniqueness: true, on: :create
-
-  validates :location, presence: {
-    message: ' cannot be found.
-              Try entering a latitude and longitude if this problem persists.'
-  }
-  #  validates :tile_url, format { with:
-  #   /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.
-  #   [a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
-  # }
-  validates :lat, :lon, NotAtOrigin: true
-
-  has_many :exports, dependent: :destroy
-  has_many :tags, dependent: :destroy
-  has_many :comments, dependent: :destroy
-  has_many :annotations, dependent: :destroy
+  validates_presence_of :name, :slug, :author, :lat, :lon
+  validates_uniqueness_of :slug
+  validates_presence_of :location, :message => ' cannot be found. Try entering a latitude and longitude if this problem persists.'
+  # validates_format_of   :slug,
+  #                       :with => /^[\w-]*$/,
+  #                       :message => " must not include spaces and must be alphanumeric, as it'll be used in the URL of your map, like: https://mapknitter.org/maps/your-map-name. You may use dashes and underscores.",
+  #                       :on => :create
+#  validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+  validates_with NotAtOriginValidator
+    validates :lat, :lon, NotAtOrigin: true
+
+  has_many :exports, :dependent => :destroy
+  has_many :tags, :dependent => :destroy
+  has_many :comments, :dependent => :destroy
+  has_many :annotations, :dependent => :destroy
   belongs_to :user
 
   has_many :warpables 
@@ -272,7 +262,7 @@ def license_link
   end
 
   def has_tag(tagname)
-    !Tag.find(:all, conditions: { map_id: id, name: tagname }).empty?
+    !Tag.where(map_id: self.id, name: tagname).empty?
   end
 
   def add_tag(tagname, user)
diff --git a/app/models/node.rb b/app/models/node.rb
index 92aa1ee70..a6e3018b7 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,4 +1,3 @@
 class Node < ActiveRecord::Base
-  attr_accessible :body, :lat, :lon, :map_id, :way_order, :way_id, :color, :author, :name
   belongs_to :way
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 3a699d727..be5a179e5 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,11 +2,9 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  attr_accessible :name, :map_id, :user_id
-
-  validates_presence_of :name, on: :create, message: "can't be blank"
-  validates_presence_of :user_id, on: :create, message: "can't be blank"
-  validates_presence_of :map_id, on: :create, message: "can't be blank"
+  validates_presence_of :name, :on => :create, :message => "can't be blank"
+  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
+  validates_presence_of :map_id, :on => :create, :message => "can't be blank"
 
   def maps
     Map.where(id: Tag.where(name: name).collect(&:map_id).uniq)
diff --git a/app/models/user.rb b/app/models/user.rb
index 0eaa31479..55e036669 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,7 +18,6 @@ class User < ActiveRecord::Base
   # HACK: HACK HACK -- how to do attr_accessible from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
-  attr_accessible :login, :email, :name, :password, :password_confirmation
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   #
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index a35fce0d1..bac4a300f 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,5 +1,4 @@
 class Warpable < ActiveRecord::Base
-  attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs
@@ -109,7 +108,8 @@ def get_cm_per_pixel
   end
 
   def self.histogram_cm_per_pixel
-    w = Warpable.find :all, conditions: ['cm_per_pixel != 0 AND cm_per_pixel < 500'], order: "cm_per_pixel DESC"
+    w = Warpable.where('cm_per_pixel != 0 AND cm_per_pixel < 500')
+                .order('cm_per_pixel DESC')
     if !w.empty?
       hist = []
       (0..w.first.cm_per_pixel.to_i).each do |bin|
diff --git a/app/models/way.rb b/app/models/way.rb
index f92f1f1df..8237be702 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,6 +1,5 @@
 class Way < ActiveRecord::Base
-  attr_accessible :body, :lat, :lon, :map_id, :color
-  has_many :nodes, dependent: :destroy
+  has_many :nodes, :dependent => :destroy
 
   def bbox=(bbox)
     # counting from left, counter-clockwise
diff --git a/app/views/maps/_statistics.html.erb b/app/views/maps/_statistics.html.erb
index 5935c074d..7f53e5463 100644
--- a/app/views/maps/_statistics.html.erb
+++ b/app/views/maps/_statistics.html.erb
@@ -1,9 +1,9 @@
 <div class="statistics">
-  <% if (Export.count(:all, :conditions => ["cm_per_pixel != ''"]) > 0) %>
+<% if (Export.where("cm_per_pixel != ''").count > 0) %>
     <h4>What people have been doing with MapKnitter</h4>
     <hr>
     <p class="card-text">
-      MapKnitter is hosting <b><%= Export.count(:all, :conditions => ["cm_per_pixel != ''"]) %> completed maps</b> of an average resolution of <b><%= Export.average_cm_per_pixel.to_i %> cm per pixel</b>. Images average. Currently <a href="/exports">exporting <%= Export.export_count %> maps</a>.</p>
+      MapKnitter is hosting <b><%= Export.where("cm_per_pixel != ''").count %> completed maps</b> of an average resolution of <b><%= Export.average_cm_per_pixel.to_i %> cm per pixel</b>. Images average. Currently <a href="/exports">exporting <%= Export.export_count %> maps</a>.</p>
     <p class="card-text"><small>Resolutions:</small></p>
     <p class="card-text"><small>Resolutions:</small></p>
     <p class="card-text"><small><b>Maps:</b>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 01ef3e663..f5d0ac0f0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,3 +9,8 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += ['tags.js',
+                                               'uploads.js',
+                                               'knitter.js',
+                                               'annotations.js',
+                                               'maps.js']

From a79930a51d3cde63a895a22f3157d73958ea3467 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 02:17:59 +0300
Subject: [PATCH 010/152] remove deprecated test syntax

---
 test/functional/maps_controller_test.rb     | 4 ++--
 test/functional/sessions_controller_test.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 47acfc77b..866f4c288 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -190,7 +190,7 @@ def teardown
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
-    assert_true @map.archived
+    assert @map.archived
   end
 
   test 'should not archive map without enough permissions' do
@@ -199,7 +199,7 @@ def teardown
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
-    assert_false @map.archived
+    assert_not @map.archived
   end
 
   test 'should update map' do
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 4087cf6b9..98da1b9dd 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -19,7 +19,7 @@ class SessionsControllerTest < ActionController::TestCase
   test 'logs out a user' do
     session[:user_id] = 1
     get :logout
-    assert_equal nil, session[:user_id]
+    assert_nil session[:user_id]
     assert flash[:success].present?
     assert_equal 'You have successfully logged out.', flash[:success]
     assert_redirected_to "/?_=#{Time.now.to_i}"

From a1d0aaf10e1ba31577c648478487ccc6557aa496 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 12:16:16 +0300
Subject: [PATCH 011/152] fix failing tests

---
 app/controllers/comments_controller.rb      | 14 +++++++-------
 app/controllers/images_controller.rb        | 10 ++--------
 app/controllers/maps_controller.rb          |  2 +-
 app/views/images/_new.html.erb              |  3 ++-
 test/functional/comments_controller_test.rb |  1 +
 test/functional/maps_controller_test.rb     |  4 ++--
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d73678f11..347644693 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,15 +1,15 @@
 class CommentsController < ApplicationController
   def create
     if logged_in?
-      @map = Map.find params[:map_id]
 
-      @comment = @map.comments.new(comment_params, user_id: current_user.id)
+      @comment = current_user.comments.new(comment_params)
+      @map = Map.find comment_params[:map_id]
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
         users.uniq.each do |user|
-          unless user.id == current_user.id
-            CommentMailer.notify(user, @comment).deliver
+          unless @map.user_id == current_user.id
+            CommentMailer.notify(user, @comment).deliver_now
           end
         end
       end
@@ -28,8 +28,8 @@ def create
   def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
-      @comment.update_attribute(comment_params)
-      redirect_to '/maps/' + params[:map_id]
+      @comment.update_attributes(comment_params)
+      redirect_to "/maps/#{@comment.map.slug}"
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -51,6 +51,6 @@ def destroy
   private
 
   def comment_params
-    params.require(:comment).permit(:body)
+    params.require(:comment).permit(:body, :map_id)
   end
 end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index fe79c6a14..2f670da0f 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -23,8 +23,8 @@ def fetch
 
   # assign attributes directly after rails update
   def create
-    @warpable = Warpable.new(image_params)
-    # @warpable.image = params[:uploaded_data]
+    @warpable = Warpable.new
+    @warpable.image = params[:uploaded_data]
     map = Map.find(params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
@@ -109,10 +109,4 @@ def destroy
       redirect_to '/login'
     end
   end
-
-  private
-
-  def image_params
-    params.require(:warpable).permit(:image)
-  end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 69337853b..7e5cc7454 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -40,7 +40,7 @@ def create
         render 'new'
       end
     else
-      @map = Map.new(params[:map])
+      @map = Map.new(map_params)
       if Rails.env != 'production' || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not human! Try again!")
         if @map.save
           redirect_to "/maps/#{@map.slug}"
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 608db8b6f..27862c3cf 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -10,7 +10,8 @@
       </div>
       <div class="modal-body">
         <div>
-          <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
+          <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
+          <%= form_for(@map) do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 761d68717..d3f702668 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class CommentsControllerTest < ActionController::TestCase
+
   # called before every single test
   def setup
     @map = maps(:saugus)
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 866f4c288..c9fa24b18 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -226,8 +226,8 @@ def teardown
   end
 
   test 'should not update unless logged in' do
-    put :update, id: 2, map: { name: 'Street 5' }
-    assert_redirected_to '/login?back_to=/map/2'
+    put :update, id: 2, map: { name: 'Street 5'}
+    assert_redirected_to '/login?back_to=/maps/2'
   end
 
   test 'should display maps by region' do

From 7cb7a4dc604a92e3643c1b9f987508a4e4d0a13f Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 7 May 2019 12:44:48 +0300
Subject: [PATCH 012/152] change new super class

---
 config/initializers/visitor.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/initializers/visitor.rb b/config/initializers/visitor.rb
index df4d800c5..79f467501 100644
--- a/config/initializers/visitor.rb
+++ b/config/initializers/visitor.rb
@@ -11,18 +11,18 @@
 # Arel is now bundled in the Active Record gem, and maintained in the rails/rails repository. 
 # This code can be deleted on update to `activerecord >= 6.0` (Rails 6)
 
-# module Arel
-#   module Visitors
-#     class DepthFirst < Arel::Visitors::Visitor
-#       alias :visit_Integer :terminal
-#     end
+module Arel
+  module Visitors
+    class DepthFirst < Arel::Visitors::Visitor
+      alias :visit_Integer :terminal
+    end
 
-#     class Dot < Arel::Visitors::Visitor
-#       alias :visit_Integer :visit_String
-#     end
+    class Dot < Arel::Visitors::Visitor
+      alias :visit_Integer :visit_String
+    end
 
-#     class ToSql < Arel::Visitors::Visitor
-#       alias :visit_Integer :literal
-#     end
-#   end
-# end
+    class ToSql < Arel::Visitors::Reduce
+      alias :visit_Integer :literal
+    end
+  end
+end

From 2ef8715493363590fc84a2d63c278d365f717ba9 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 9 May 2019 22:48:33 +0300
Subject: [PATCH 013/152] replace right_aws with right_aws_api

right_aws is no longer maintained, was throwing an error
---
 Gemfile                         |  6 ++++--
 Gemfile.lock                    | 35 +++++++++++++++++++--------------
 lib/tasks/attachment_tasks.rake |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index e3360daf2..d3631c448 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,13 +21,14 @@ group :dependencies do
   gem "open_id_authentication"
   gem "RubyInline"
   gem "paperclip", "~>4.3.7"
-  gem 'ruby-prof'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
 
   # for rake image migration tasks
-  gem 'right_aws'
+  # gem 'right_aws'
+  gem 'right_aws_api'
+
 
   # compiling markdown to html
   gem "rdiscount", "2.2.0.1"
@@ -42,6 +43,7 @@ end
 
 group :test do
   gem "rubocop", '~> 0.52.0'
+  gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bfb4b9980..ff6e8fb53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,7 +68,6 @@ GEM
       geokit (>= 1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    hike (1.2.3)
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -82,6 +81,7 @@ GEM
       rake
     json (1.8.6)
     libv8 (3.16.14.19)
+    libxml-ruby (3.1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -98,6 +98,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
+    net-http-persistent (2.9.4)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     oa-core (0.3.2)
@@ -166,10 +167,16 @@ GEM
     rdiscount (2.2.0.1)
     recaptcha (4.14.0)
       json
+    redcarpet (3.4.0)
     ref (2.0.0)
-    right_aws (3.1.0)
-      right_http_connection (>= 1.2.5)
-    right_http_connection (1.5.0)
+    right_aws_api (0.3.5)
+      right_cloud_api_base (>= 0.2.6)
+    right_cloud_api_base (0.2.6)
+      json (>= 1.0.0)
+      libxml-ruby (>= 1.0.0)
+      net-http-persistent (~> 2.9)
+      redcarpet (>= 3.0.0)
+      ruby-hmac (>= 0.4.0)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
@@ -177,6 +184,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
@@ -198,15 +206,13 @@ GEM
       skylight-core (= 4.0.2)
     skylight-core (4.0.2)
       activesupport (>= 4.2.0)
-    sprockets (2.12.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
     test-unit (3.3.3)
       power_assert
@@ -215,7 +221,6 @@ GEM
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (1.4.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -252,7 +257,7 @@ DEPENDENCIES
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
   recaptcha
-  right_aws
+  right_aws_api
   rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
   ruby-prof
diff --git a/lib/tasks/attachment_tasks.rake b/lib/tasks/attachment_tasks.rake
index ffd517028..3f16fbebe 100644
--- a/lib/tasks/attachment_tasks.rake
+++ b/lib/tasks/attachment_tasks.rake
@@ -1,5 +1,5 @@
 # see http://ramblingsonrails.com/how-to-migrate-a-rails-app-from-attachment_fu-to-paperclip
-require 'right_aws'
+require 'right_aws_api'
 
 namespace :utils do
   namespace :attachments do

From fc838a8731a2e142fadbf1ca652c283d911d833a Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 12:21:56 +0300
Subject: [PATCH 014/152] lock to rails 4.2.11.1

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d3631c448..d23fd673f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 ruby '2.4.6'
-gem 'rails', '~>4.0'
+gem 'rails', '4.2.11.1'
 gem 'rake',  '~> 12.3.2'
 gem 'skylight'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ff6e8fb53..a107967c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,7 +252,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails
-  rails (~> 4.0)
+  rails (= 4.2.11.1)
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)

From b5b6340f15cf4eaf5c46f89dcdfdec7e2e134a0d Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 12:35:02 +0300
Subject: [PATCH 015/152] change rails version in install script

---
 install_cloud.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_cloud.sh b/install_cloud.sh
index 27a11f658..f232a98e4 100755
--- a/install_cloud.sh
+++ b/install_cloud.sh
@@ -6,7 +6,7 @@ source ~/.rvm/scripts/rvm
 rvm install ruby-2.4.6
 source $(rvm 2.4.6 do rvm env --path)
 rvm use ruby-2.4.6
-gem install rails -v 3.2.0
+gem install rails -v 4.2.11.1
 sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server
 sudo apt-get -y install bundler libmysqlclient-dev imagemagick ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev libmagickcore-dev libmagickwand-dev npm nodejs-legacy

From 6dc3a69d92585ca5f6b75435e269348053729cee Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 23:42:42 +0300
Subject: [PATCH 016/152] remove deprecation warnings

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index dd73b21a2..1ab5e7b64 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -44,7 +44,7 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true#false
-  config.serve_static_assets = true
+  config.serve_static_files = true
 
   config.assets.logger = false
 end

From 06f4d0072a0bf0911c144b9f34b2ed6c96353ebd Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 14 May 2019 23:57:52 +0300
Subject: [PATCH 017/152] make app work

---
 app/controllers/maps_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 7e5cc7454..d16a66139 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -198,7 +198,7 @@ def search
   private
 
   def find_map
-    @map = Map.find(params[:id])
+    @map = Map.find_by( slug: params[:id])
   end
 
   def map_params

From 4db8646dd639a577ccaee36883d5de95559c37a0 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 11 May 2019 17:21:54 +0300
Subject: [PATCH 018/152] Change test lib to minitest, add  minitest reporters

---
 .gitignore          |  1 +
 Gemfile             |  3 ++-
 Gemfile.lock        | 12 ++++++++----
 test/test_helper.rb |  3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e85bb8860..be5a8500e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ todo.txt
 .sass-cache
 .byebug_history
 coverage_report/
+test/reports/
diff --git a/Gemfile b/Gemfile
index d23fd673f..2c2d031bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,8 @@ group :test do
   gem 'rails-perftest'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
-  gem 'test-unit'
+  gem 'minitest'
+  gem 'minitest-reporters'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a107967c3..626c55d9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    ansi (1.5.0)
     arel (6.0.4)
     ast (2.4.0)
     autoprefixer-rails (9.5.1.1)
@@ -95,6 +96,11 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    minitest-reporters (1.3.6)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.3.21)
@@ -121,7 +127,6 @@ GEM
       rack
       rake (>= 0.8.1)
     popper_js (1.14.5)
-    power_assert (1.1.4)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -214,8 +219,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
-    test-unit (3.3.3)
-      power_assert
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -245,6 +248,8 @@ DEPENDENCIES
   httparty
   image_science (= 1.3.0)
   jshintrb
+  minitest
+  minitest-reporters
   mysql2 (< 0.4)
   oa-openid (= 0.3.2)
   open_id_authentication
@@ -267,7 +272,6 @@ DEPENDENCIES
   skylight
   sprockets
   sqlite3
-  test-unit
   therubyracer
   uglifier
   will_paginate (= 3.1.7)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8b0be3ba0..8c0ee1f2f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,9 @@
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
+require 'minitest/reporters'
+MiniTest::Reporters.use! [MiniTest::Reporters::ProgressReporter.new,
+                          MiniTest::Reporters::JUnitReporter.new]
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.

From 6ddb5bcf9b7870a825f5a780c4164e25a564f474 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 15 May 2019 19:00:28 +0300
Subject: [PATCH 019/152] active record find patches

---
 app/controllers/maps_controller.rb      | 17 +++++++++--------
 app/controllers/tags_controller.rb      | 10 +++++-----
 test/functional/maps_controller_test.rb | 23 ++++++++++++-----------
 test/functional/tags_controller_test.rb |  4 ++--
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index d16a66139..2249be578 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -77,7 +77,7 @@ def archive
     else
       flash[:error] = 'Only admins may archive maps.'
     end
-    redirect_to '/?_=' + Time.now.to_i.to_s
+    redirect_to "/?_=#{Time.now.to_i.to_s}"
   end
 
   def embed
@@ -94,12 +94,13 @@ def annotate
   def edit; end
 
   def update
-    @map.name =        params[:map][:name]
-    @map.location =    params[:map][:location]
-    @map.lat =         params[:map][:lat]
-    @map.lon =         params[:map][:lon]
-    @map.description = params[:map][:description]
-    @map.license =     params[:map][:license] if @map.user_id == current_user.id
+    # @map.name =        params[:map][:name]
+    # @map.location =    params[:map][:location]
+    # @map.lat =         params[:map][:lat]
+    # @map.lon =         params[:map][:lon]
+    # @map.description = params[:map][:description]
+    # @map.license =     params[:map][:license] if @map.user_id == current_user.id
+  @map.update_attributes(map_params)
 
     save_tags(@map)
     @map.save
@@ -198,7 +199,7 @@ def search
   private
 
   def find_map
-    @map = Map.find_by( slug: params[:id])
+    @map = Map.find_by_slug params[:id]
   end
 
   def map_params
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index eba31b0f3..c0310452d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,21 +2,21 @@ class TagsController < ApplicationController
   before_filter :require_login, only: %i(edit update destroy)
 
   def create
-    @map = Map.find params[:map_id]
+    @map = Map.find_by_slug params[:map_id]
 
     if logged_in?
       save_tags(@map)
-      redirect_to '/maps/' + @map.slug
+      redirect_to "/maps/#{@map.slug}"
     else
       flash[:error] = 'You must be logged in to add tags'
-      redirect_to '/login?back_to=/maps/' + @map.slug
+      redirect_to "/login?back_to=/maps/#{@map.slug}"
     end
   end
 
   def show
     @tag = Tag.find_by_name params[:id]
     @maps = @tag.maps.paginate(page: params[:page], per_page: 24)
-    @title = "Maps tagged with '" + @tag.name + "'"
+    @title = "Maps tagged with ' #{@tag.name} '"
     render template: 'maps/index'
   end
 
@@ -25,7 +25,7 @@ def destroy
 
     if logged_in? && current_user.can_delete?(@tag)
       @tag.delete
-      flash[:notice] = 'Tag ' + @tag.name + ' deleted.'
+      flash[:notice] = "Tag #{@tag.name} deleted."
       redirect_to @tag.map
     else
       flash[:error] = 'You must be logged in to delete tags.'
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index c9fa24b18..f91d88d97 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class MapsControllerTest < ActionController::TestCase
+
   # called before every single test
   def setup
     @map = maps(:saugus)
@@ -161,7 +162,7 @@ def teardown
   test 'should not delete map if not owner' do
     session[:user_id] = 3
     before_count = Map.count
-    post(:destroy, id: @map.id)
+    post(:destroy, id: @map.slug)
 
     assert_redirected_to '/maps/' + @map.slug
     assert_equal flash[:error], 'Only admins or map owners may delete maps.'
@@ -171,15 +172,15 @@ def teardown
   test 'should delete map if owner' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:destroy, id: @map.id)
+    post(:destroy, id: @map.slug)
 
     assert_redirected_to '/'
     assert_not_equal before_count, Map.count
     assert_equal flash[:notice], 'Map deleted.'
   end
 
-  test 'should get show' do
-    get(:show, id: @map.id)
+  test "should get show" do
+    get(:show, id: @map.slug)
     assert_response :success
     assert_not_nil assigns(:map)
   end
@@ -205,7 +206,7 @@ def teardown
   test 'should update map' do
     session[:user_id] = 1
     put(:update,
-        id: 1,
+        id: @map.slug,
         map: {
           name: 'Schrute farms',
           location: 'USA',
@@ -216,8 +217,8 @@ def teardown
         tags: 'beets bears')
     @map.reload
 
-    assert_redirected_to '/maps/' + @map.id.to_s
-    assert_equal 'Schrute farms', @map.name
+    assert_redirected_to "/maps/#{@map.slug}"
+    assert_equal "Schrute farms", @map.name
     assert_equal 44, @map.lat
     assert_equal -74, @map.lon
     assert_equal 'A really green farm', @map.description
@@ -239,19 +240,19 @@ def teardown
   end
 
   test 'should annotate maps' do
-    get :annotate, id: @map.id
+    get :annotate, id: @map.slug
     assert_response :success
     assigns(:annotations) == true
   end
 
   test 'embed' do
-    get :embed, id: @map.id
+    get :embed, id: @map.slug
     assert_response :success
     assert_template :show
   end
 
   test 'it returns the images' do
-    get :images, id: @map.id
+    get :images, id: @map.slug
     assert_response :success
     assert_equal 'application/json', response.content_type
   end
@@ -274,7 +275,7 @@ def export_anonmymous_map
   end
 
   test 'returns the exports' do
-    get :exports, id: 1
+    get :exports, id: @map.slug
     assert_response :success
   end
 
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 0269542e3..ab3046e2c 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -9,7 +9,7 @@ def setup
 
   test "should create tag" do
     session[:user_id] = 1 # log in
-    post(:create, :map_id => @map.id, :tags => "test,nice")
+    post(:create, :map_id => @map.slug, :tags => "test,nice")
     assert_response :redirect
   end
 
@@ -20,7 +20,7 @@ def setup
   end
 
   test "should redirect to login when not logged in" do
-    post :create, map_id: @map.id, tags: "test,nice"
+    post :create, map_id: @map.slug, tags: "test,nice"
     assert_redirected_to "/login?back_to=/maps/#{@map.slug}"
     assert flash.present?
   end

From 4f3161646cc6cc93d76b19f553ca233ca40ff379 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 11:57:00 +0300
Subject: [PATCH 020/152] root_in_json include defaulted to false

---
 config/initializers/wrap_parameters.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index 35d7efeaf..b8e3fb7b6 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -9,6 +9,6 @@
 end
 
 # Disable root element in JSON for ActiveRecord objects.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
+# ActiveSupport.on_load(:active_record) do
+#   self.include_root_in_json = false
+# end

From 76e078a40ca551c26ff09fb0a9fa20ac6ca1650c Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 12:13:16 +0300
Subject: [PATCH 021/152] confirm option removed in link helper

---
 app/views/comments/_comment.html.erb |  8 ++++----
 app/views/images/_index.html.erb     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 68e8248e0..0bd9df9c5 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -14,11 +14,11 @@
         <% if current_user && current_user.can_delete?(comment) %>
           <%= link_to(
             [@map, comment],
-            :method => "delete",
+            method: "delete",
             #:remote => true,
-            :confirm => "Are you sure? This cannot be undone.",
-            :class => "btn btn-sm btn-outline-secondary float-right delete-comment-btn",
-            :id => "comment-delete-#{comment.id}"
+            data: { confirm: "Are you sure? This cannot be undone." },
+            class:  "btn btn-sm btn-outline-secondary float-right delete-comment-btn",
+            id: "comment-delete-#{comment.id}"
           ) do %>
 
             <span class="fa fa-trash" data-comment-id="<%= comment.id %>"></span>
diff --git a/app/views/images/_index.html.erb b/app/views/images/_index.html.erb
index 6f9c58bc7..9b06aa5fb 100644
--- a/app/views/images/_index.html.erb
+++ b/app/views/images/_index.html.erb
@@ -32,11 +32,12 @@
         <td>
           <% if logged_in? && current_user.can_delete?(warpable) %>
             <%= link_to "<i class='fa fa-remove'></i>".html_safe, [@map, warpable],
-                :method => "delete",
-                :confirm => "Are you sure? This cannot be undone.",
-                :class => "btn btn-sm btn-danger",
-                :title => "Delete",
-                :rel=> "tooltip" %>
+                method: "delete",
+                class: "btn btn-sm btn-danger",
+                title: "Delete",
+                rel: "tooltip",
+                data: { confirm: "Are you sure? This cannot be undone." }
+            %>
           <% end %>
           <% if warpable.placed? %>
             <a rel="tooltip" id="locate-warpable-<%= warpable.id %>" title="Pan to this image" class="btn btn-sm btn-success"><i class='fa fa-crosshairs'></i></a>

From 5d613e841f218ad53b7048ca04eb5e7ba38d0fe7 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 16:57:03 +0300
Subject: [PATCH 022/152] cookies serializer changed to hybrid

---
 config/initializers/cookies_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index ac5f8b663..54516e3f2 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :marshal
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid

From 80e12b77946d9a6a39cdeb5ed12b7e6d890a4c37 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Thu, 16 May 2019 18:57:47 +0300
Subject: [PATCH 023/152] Change render :text to :plain

render :text will be deprecated and poses a security risk
---
 app/controllers/comments_controller.rb    | 2 +-
 app/controllers/export_controller.rb      | 6 +++---
 app/controllers/feeds_controller.rb       | 2 +-
 app/controllers/images_controller.rb      | 2 +-
 app/controllers/maps_controller.rb        | 4 ++--
 test/functional/export_controller_test.rb | 2 +-
 test/functional/feeds_controller_test.rb  | 2 +-
 test/functional/images_controller_test.rb | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 347644693..ce1298ca9 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -21,7 +21,7 @@ def create
 
     else
       # we intercept this message in /app/assets/javascripts/maps.js
-      render text: 'Login required.'
+      render plain: 'Login required.'
     end
   end
 
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 424fa4a71..0b781ddff 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -41,10 +41,10 @@ def cancel
         flash[:notice] = 'Export cancelled.'
         redirect_to '/exports'
       else
-        render text: 'cancelled'
+        render plain: 'cancelled'
       end
     else
-      render text: 'You must be logged in to export, unless the map is anonymous.'
+      render plain: 'You must be logged in to export, unless the map is anonymous.'
     end
   end
 
@@ -64,7 +64,7 @@ def progress
              else
                'export has not been run'
              end
-    render text: output, layout: false
+    render plain: output, layout: false
   end
 
   def status
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 2224f9e53..6be25cbb9 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -43,7 +43,7 @@ def tag
     render layout: false, template: 'feeds/tag'
     response.headers['Content-Type'] = 'application/xml; charset=utf-8'
   rescue NoMethodError
-    render text: "No maps with tag #{params[:id]}"
+    render plain: "No maps with tag #{params[:id]}"
   end
 
   private
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 2f670da0f..5bbdd1518 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -93,7 +93,7 @@ def update
     @warpable.locked = params[:locked]
     @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
     @warpable.save
-    render text: 'success'
+    render plain: 'success'
   end
 
   def destroy
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 2249be578..d7d1be0bb 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -133,9 +133,9 @@ def images
   # run the export
   def export
     if logged_in? || Rails.env.development? || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not a human!")
-      render text: @map.run_export(current_user, params[:resolution].to_f)
+      render plain: @map.run_export(current_user, params[:resolution].to_f)
     else
-      render text: 'You must be logged in to export, unless the map is anonymous.'
+      render plain: 'You must be logged in to export, unless the map is anonymous.'
     end
   end
 
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index 0d84c1f1d..6fd084835 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -41,7 +41,7 @@ def teardown
     assert_response :success
     assert_equal 'You must be logged in to export, unless the map is anonymous.', @response.body
     assert assigns[:map]
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
     assert flash.empty?
   end
 
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 9a015cb0d..6074acbab 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -60,7 +60,7 @@ def setup
 
   test 'rescues if tag not present' do
     get :tag, id: 'cess'
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
     assert_equal 'No maps with tag cess', @response.body
   end
 end
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index d546182e5..9e04dba2e 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -55,7 +55,7 @@ def fetch_in_production
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
     put :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
-    assert_equal "text/html", response.content_type
+    assert_equal "text/plain", response.content_type
   end
 
   test 'correct user should destroy an image' do

From 01d86fa649b0226c801c263265a04ea2ab633cda Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 17 May 2019 00:44:52 +0300
Subject: [PATCH 024/152] console for dev web

---
 Gemfile      | 1 +
 Gemfile.lock | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Gemfile b/Gemfile
index 2c2d031bf..41de0ea12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,6 +60,7 @@ end
 group :development do
   gem "jshintrb"
   gem "therubyracer"
+  gem 'web-console', '~> 2.0'
 end
 
 group :sqlite do
diff --git a/Gemfile.lock b/Gemfile.lock
index 626c55d9e..0b66c4c94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
@@ -56,6 +58,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
+    debug_inspector (0.0.3)
     docile (1.3.1)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -230,6 +233,11 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     uuidtools (2.1.5)
+    web-console (2.3.0)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     will_paginate (3.1.7)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
@@ -274,6 +282,7 @@ DEPENDENCIES
   sqlite3
   therubyracer
   uglifier
+  web-console (~> 2.0)
   will_paginate (= 3.1.7)
   will_paginate-bootstrap4
 

From db6c5facbe376ae1fc378491dca1a5e3abd3626a Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 18 May 2019 10:43:45 +0300
Subject: [PATCH 025/152] Check and fix interface functionality

---
 app/controllers/comments_controller.rb  | 6 +++---
 app/controllers/maps_controller.rb      | 8 ++++----
 app/controllers/tags_controller.rb      | 3 +--
 app/views/comments/_new.html.erb        | 5 +++--
 test/functional/tags_controller_test.rb | 1 +
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index ce1298ca9..e28f5409a 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,7 +3,7 @@ def create
     if logged_in?
 
       @comment = current_user.comments.new(comment_params)
-      @map = Map.find comment_params[:map_id]
+      @map = Map.find_by(slug: params[:map_id])
       if @comment.save!
         users = @map.comments.collect(&:user)
         users += [@map.user] unless @map.user.nil?
@@ -45,12 +45,12 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to "/maps/#{params[:map_id]}"
+    redirect_to "/maps/#{@comment.map.slug}"
   end
 
   private
 
   def comment_params
-    params.require(:comment).permit(:body, :map_id)
+    params.require(:comment).permit(:body, :map_id, :user_id)
   end
 end
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index d7d1be0bb..b2365d89e 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -2,8 +2,9 @@
 
 class MapsController < ApplicationController
   protect_from_forgery except: :export
-  before_filter :require_login, only: %i(edit update destroy)
-  before_filter :find_map, only: %i(show annotate embed edit update images export exports destroy)
+
+  before_filter :require_login, only: %i[edit update destroy]
+  before_filter :find_map, only: %i[show annotate embed edit update images export exports destroy archive]
 
   layout 'knitter2'
 
@@ -66,7 +67,6 @@ def show
   end
 
   def archive
-    @map = Map.find_by_slug(params[:id])
     if logged_in? && current_user.can_delete?(@map)
       @map.archived = true
       if @map.save
@@ -199,7 +199,7 @@ def search
   private
 
   def find_map
-    @map = Map.find_by_slug params[:id]
+    @map = Map.find_by(slug: params[:id])
   end
 
   def map_params
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c0310452d..c04b6d0ac 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,8 +2,7 @@ class TagsController < ApplicationController
   before_filter :require_login, only: %i(edit update destroy)
 
   def create
-    @map = Map.find_by_slug params[:map_id]
-
+    @map = Map.find_by(slug: params[:map_id])
     if logged_in?
       save_tags(@map)
       redirect_to "/maps/#{@map.slug}"
diff --git a/app/views/comments/_new.html.erb b/app/views/comments/_new.html.erb
index c978c94b4..2ace3dbeb 100644
--- a/app/views/comments/_new.html.erb
+++ b/app/views/comments/_new.html.erb
@@ -1,9 +1,10 @@
 <div class="form-group">
   <% if logged_in? %>
-    <%= form_for([@map, Comment.new], remote:true) do |f| %>
+    <%= form_for([@map, Comment.new], remote: true) do |f| %>
+        <%= f.hidden_field :map_id, value: @map.id %>
       <%= f.label :body, "Leave a comment" %>
       <%= f.text_area :body, :class => "form-control" %>
- 
+
       <button type="submit" class="btn btn-primary">Post comment</button>
     <% end %>
   <% else %>
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index ab3046e2c..90a325700 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -29,6 +29,7 @@ def setup
     session[:user_id] = 1
     delete :destroy, id: @tag
     assert flash[:notice].present?
+    assert_redirected_to @tag.map
   end
 
   test 'should redirect destroy when not logged in' do

From 290273f8f04e081cddaf92633c9ef0583c4720c7 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 21 May 2019 13:31:19 +0300
Subject: [PATCH 026/152] fix export functionality

---
 app/controllers/export_controller.rb    | 6 +++---
 app/controllers/maps_controller.rb      | 4 +++-
 test/functional/maps_controller_test.rb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 0b781ddff..231f18d6c 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -32,7 +32,7 @@ def geotiff
   end
 
   def cancel
-    @map = Map.find params[:id]
+    @map = Map.find_by(id: params[:id])
     if @map.anonymous? || logged_in?
       export = @map.export
       export.status = 'none'
@@ -49,7 +49,7 @@ def cancel
   end
 
   def progress
-    map = Map.find params[:id]
+    map = Map.find_by(id: params[:id])
     export = map.export
     output = if export.present?
                if export.status == 'complete'
@@ -68,7 +68,7 @@ def progress
   end
 
   def status
-    map = Map.find(params[:id])
+    map = Map.find_by(id: params[:id])
     if export = map.export
       if export.export_url.present?
         status_response = ExporterClient.new(export.export_url).status
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index b2365d89e..874b89e4b 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -4,7 +4,7 @@ class MapsController < ApplicationController
   protect_from_forgery except: :export
 
   before_filter :require_login, only: %i[edit update destroy]
-  before_filter :find_map, only: %i[show annotate embed edit update images export exports destroy archive]
+  before_filter :find_map, only: %i[show annotate embed edit update images destroy archive]
 
   layout 'knitter2'
 
@@ -132,6 +132,7 @@ def images
 
   # run the export
   def export
+    @map = Map.find_by(id: params[:id])
     if logged_in? || Rails.env.development? || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not a human!")
       render plain: @map.run_export(current_user, params[:resolution].to_f)
     else
@@ -141,6 +142,7 @@ def export
 
   # render list of exports
   def exports
+    @map = Map.find_by(id: params[:id])
     render partial: 'maps/exports', layout: false
   end
 
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index f91d88d97..a9634e8df 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -275,7 +275,7 @@ def export_anonmymous_map
   end
 
   test 'returns the exports' do
-    get :exports, id: @map.slug
+    get :exports, id: @map.id
     assert_response :success
   end
 

From 36c9208002267866e26ab7faa7733b2dab9b1ae3 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 29 May 2019 02:26:36 +0300
Subject: [PATCH 027/152] add protected attributes for the warpable model

---
 Gemfile                | 1 +
 Gemfile.lock           | 3 +++
 app/models/warpable.rb | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 41de0ea12..d2dc1dd08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem "will_paginate", "3.1.7"
 gem 'will_paginate-bootstrap4'
 gem "friendly_id"
 gem 'popper_js', '~> 1.11', '>= 1.11.1'
+gem 'protected_attributes'
 
 # dependencies
 group :dependencies do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b66c4c94..5d9e6465e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,6 +131,8 @@ GEM
       rake (>= 0.8.1)
     popper_js (1.14.5)
     powerpack (0.1.2)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -264,6 +266,7 @@ DEPENDENCIES
   paperclip (~> 4.3.7)
   passenger
   popper_js (~> 1.11, >= 1.11.1)
+  protected_attributes
   pry-rails
   rails (= 4.2.11.1)
   rails-perftest
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index bac4a300f..4049b49be 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,4 +1,6 @@
 class Warpable < ActiveRecord::Base
+  include  ActiveModel::MassAssignmentSecurity
+  attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs

From c53bf2741dd96e36cbceffdb14215c999cbf05b5 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 31 May 2019 18:40:35 +0300
Subject: [PATCH 028/152] fix image upload

---
 app/controllers/images_controller.rb | 2 +-
 app/views/images/_new.html.erb       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 5bbdd1518..95b4c5885 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -25,7 +25,7 @@ def fetch
   def create
     @warpable = Warpable.new
     @warpable.image = params[:uploaded_data]
-    map = Map.find(params[:map_id])
+    map = Map.find_by(slug: params[:map_id])
     @warpable.history = ''
     @warpable.map_id = map.id
     map.updated_at = Time.now
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 27862c3cf..695767ad5 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -11,7 +11,8 @@
       <div class="modal-body">
         <div>
           <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
-          <%= form_for(@map) do |f| %>
+          <%# <%= form_for(@map) do |f| %1> %>
+               <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">

From 2f232522c124a1c185abd0ef207ea786d0f5860f Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Sat, 1 Jun 2019 19:24:16 +0300
Subject: [PATCH 029/152] Fix comments and images failing tests

---
 app/controllers/comments_controller.rb      |  9 ++++-----
 app/models/map.rb                           | 20 ++++++--------------
 app/views/images/_new.html.erb              |  4 +---
 test/functional/comments_controller_test.rb |  3 +--
 test/functional/export_controller_test.rb   |  2 +-
 test/functional/images_controller_test.rb   |  6 +++---
 test/test_helper.rb                         |  1 +
 7 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index e28f5409a..a4db91007 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,12 +3,11 @@ def create
     if logged_in?
 
       @comment = current_user.comments.new(comment_params)
-      @map = Map.find_by(slug: params[:map_id])
+      @map = @comment.map
       if @comment.save!
-        users = @map.comments.collect(&:user)
-        users += [@map.user] unless @map.user.nil?
-        users.uniq.each do |user|
-          unless @map.user_id == current_user.id
+        users = @map.comments.collect(&:user).uniq
+        users.each do |user|
+          unless user.id == @map.user_id && user.id == current_user.id
             CommentMailer.notify(user, @comment).deliver_now
           end
         end
diff --git a/app/models/map.rb b/app/models/map.rb
index 9091c9722..481333824 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -87,12 +87,9 @@ def self.featured
   end
 
   def self.new_maps
-    Map.find(
-      :all,
-      order: 'created_at DESC',
-      limit: 12,
-      conditions: ['password = "" AND archived = "false"']
-    )
+    Map.where( ['password = "" AND archived = "false"'])
+      .order('created_at DESC')
+      .limit(12)
   end
 
   def self.map
@@ -142,14 +139,9 @@ def nodes
   def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
-    Map.find(
-      :all,
-      limit: 10,
-      conditions: [
-        'id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-        id, lat - dist, lat + dist, lon - dist, lon + dist
-      ]
-    )
+    Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
+              id, lat - dist, lat + dist, lon - dist, lon + dist)
+      .limit(10)
   end
 
   def average_scale
diff --git a/app/views/images/_new.html.erb b/app/views/images/_new.html.erb
index 695767ad5..941b8232e 100644
--- a/app/views/images/_new.html.erb
+++ b/app/views/images/_new.html.erb
@@ -10,9 +10,7 @@
       </div>
       <div class="modal-body">
         <div>
-          <%# <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %1> %>
-          <%# <%= form_for(@map) do |f| %1> %>
-               <%= form_for [@map, Warpable.new], :html => { :multipart => true, :id => "fileupload" } do |f| %>
+            <%= form_for [@map, Warpable.new],  :html => { :multipart => true, :id => "fileupload" } do |f| %>
             <input id="warpable_map_id" name="map_id" type="hidden" value="<%= @map_id %>" />
 
             <div class="row">
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index d3f702668..97b12e3c1 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -7,7 +7,6 @@ def setup
     @map = maps(:saugus)
   end
 
-  # called after every single test
   def teardown
   end
 
@@ -146,7 +145,7 @@ def teardown
          })
 
     assert_response :success
-    assert !ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
+    assert_not ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
   end
 
   test "should send email to author if someone else comments" do
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index 6fd084835..d67b3cb96 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -65,7 +65,7 @@ def teardown
     get :progress, id: @map.id
     assert_response :success
     assert_equal 'export not running', @response.body
-    assert_equal 'text/html', @response.content_type
+    assert_equal 'text/plain', @response.content_type
   end
 
   test 'should display progress with no export' do
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 9e04dba2e..2fdb63f06 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -31,13 +31,13 @@ def fetch_in_production
   test 'create uploads an image' do
     before_count = Warpable.count
 
-    post :create, map_id: @map.id, uploaded_data: @uploaded_data
+    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
     assert_response :success
     assert_equal before_count + 1, Warpable.count
   end
 
   test 'should return correct status and type on create' do
-    post :create, map_id: @map.id, uploaded_data: @uploaded_data
+    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
 
     assert_equal 200, response.status
     assert_equal "text/html", response.content_type
@@ -53,7 +53,7 @@ def fetch_in_production
   test 'should update an image' do
     session[:user_id] = 1
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
-    put :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
+    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
     assert_equal "text/plain", response.content_type
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 8c0ee1f2f..56d5f30b9 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -16,4 +16,5 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
+  include ApplicationHelper
 end

From 0f76698cad5eb1db693cc00e841af7c3964eb8ce Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 04:37:32 +0300
Subject: [PATCH 030/152] include mass assignment security in annotations

---
 app/controllers/annotations_controller.rb   | 28 ++++++++-------------
 app/models/annotation.rb                    |  3 +++
 test/functional/comments_controller_test.rb | 14 +++++------
 test/unit/map_test.rb                       |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 9905f52bc..b27494903 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -9,7 +9,7 @@ def index
   end
 
   def create
-    geojson = annotation_params # params[:annotation]
+    geojson = params[:annotation]
 
     respond_to do |format|
       format.json do
@@ -32,16 +32,15 @@ def show
 
   def update
     @annotation = Annotation.find params[:id]
-
-    geojson = annotation_params
-    if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
-      Annotation.update(@annotation.id,
-                        coordinates: geojson[:geometry][:coordinates],
-                        text: geojson[:properties][:textContent],
-                        style: geojson[:properties][:style])
-      render file: 'annotations/update.json.erb',
-             content_type: 'application/json'
-    end
+    geojson = params[:annotation]
+    return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
+
+    Annotation.update(@annotation.id,
+                      coordinates: geojson[:geometry][:coordinates],
+                      text: geojson[:properties][:textContent],
+                      style: geojson[:properties][:style])
+    render file: 'annotations/update.json.erb',
+      content_type: 'application/json'
   end
 
   def destroy
@@ -55,11 +54,4 @@ def destroy
   def find_map
     @map = Map.find params[:map_id]
   end
-
-  private
-
-  def annotation_params
-    params.require(:annotation).permit(:annotation_type,
-                                       :coordinates, :text, :style)
-  end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 05575fdff..b4bed15ee 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,7 +1,10 @@
 class Annotation < ActiveRecord::Base
+  include  ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
+  attr_accessible :annotation_type, :coordinates, :text, :style
+
   serialize :coordinates, Array
   serialize :style, Hash
 
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 97b12e3c1..bf95ae235 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -28,8 +28,8 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
@@ -44,8 +44,8 @@ def teardown
 
     put(:update,
         id: @comment.id,
-        map_id: @map.slug,
         comment: {
+          map_id: @map.id,
           body: "I'm gonna troll you!"
         })
 
@@ -139,8 +139,8 @@ def teardown
     session[:user_id] = @user.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+           map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
@@ -153,9 +153,9 @@ def teardown
     session[:user_id] = 3
 
     post(:create,
-         map_id: @map.slug,
          comment: {
-           body: "I'm gonna troll you!"
+      map_id: @map.id,
+      body: "I'm gonna troll you!"
          })
 
     email = ActionMailer::Base.deliveries.last
@@ -172,16 +172,16 @@ def teardown
     session[:user_id] = @chris.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "I'm gonna troll you!"
          })
 
     session[:user_id] = @joshua.id
 
     post(:create,
-         map_id: @map.slug,
          comment: {
+         map_id: @map.id,
            body: "Yeah we'll see!"
          })
 
diff --git a/test/unit/map_test.rb b/test/unit/map_test.rb
index c90e20f30..dd5fbd9f5 100644
--- a/test/unit/map_test.rb
+++ b/test/unit/map_test.rb
@@ -31,7 +31,7 @@ class MapTest < ActiveSupport::TestCase
     assert_not_nil map.images_histogram
     assert_not_nil map.grouped_images_histogram(10)
     assert_not_nil map.nearby_maps(100) # in degrees lat/lon
-    assert_true Map.first.validate
+    assert Map.first.validate
     assert_equal Map.count, Map.new_maps.size
   end
 

From de27727ef8696c4d068b2e66d4377fe4ac74a79e Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 05:24:16 +0300
Subject: [PATCH 031/152] render html for update images

---
 app/controllers/images_controller.rb      | 2 +-
 test/functional/images_controller_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 95b4c5885..5ca999c4e 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -93,7 +93,7 @@ def update
     @warpable.locked = params[:locked]
     @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
     @warpable.save
-    render plain: 'success'
+    render html: 'success'
   end
 
   def destroy
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 2fdb63f06..5e7d427ab 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -55,7 +55,7 @@ def fetch_in_production
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
     patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
     assert_not_nil @warp.nodes
-    assert_equal "text/plain", response.content_type
+    assert_equal "text/html", response.content_type
   end
 
   test 'correct user should destroy an image' do

From 685143c04f18ab1bb50eae5220113f155e85efd7 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Tue, 4 Jun 2019 07:46:08 +0300
Subject: [PATCH 032/152] clear mail array before every test

---
 test/functional/comments_controller_test.rb | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index bf95ae235..b8dd69c39 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -5,6 +5,8 @@ class CommentsControllerTest < ActionController::TestCase
   # called before every single test
   def setup
     @map = maps(:saugus)
+    @emails = ActionMailer::Base.deliveries
+    @emails.clear
   end
 
   def teardown
@@ -145,7 +147,7 @@ def teardown
          })
 
     assert_response :success
-    assert_not ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
+    assert_not @emails.collect(&:to).include?([@user.email])
   end
 
   test "should send email to author if someone else comments" do
@@ -158,11 +160,9 @@ def teardown
       body: "I'm gonna troll you!"
          })
 
-    email = ActionMailer::Base.deliveries.last
-
     assert_response :success
-    assert ActionMailer::Base.deliveries.collect(&:to).include?([@user.email])
-    assert ActionMailer::Base.deliveries.collect(&:subject).include?("New comment on '#{@map.name}'")
+    assert @emails.collect(&:to).include?([@user.email])
+    assert @emails.collect(&:subject).include?("New comment on '#{@map.name}'")
   end
 
   test "should send email to all commenters on commenting" do
@@ -185,10 +185,8 @@ def teardown
            body: "Yeah we'll see!"
          })
 
-    email = ActionMailer::Base.deliveries.last
-
     assert_response :success
-    assert ActionMailer::Base.deliveries.collect(&:to).include?([@chris.email])
-    assert ActionMailer::Base.deliveries.collect(&:subject).include?("New comment on '#{@map.name}'")
+    assert @emails.collect(&:to).include?([@chris.email])
+    assert @emails.collect(&:subject).include?("New comment on '#{@map.name}'")
   end
 end

From 74a9ecb1f759681c2a734239d65e7f30e6303347 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 5 Jun 2019 21:27:54 +0300
Subject: [PATCH 033/152] Fix codeclimate issues

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 12 +++++++-----
 app/controllers/annotations_controller.rb |  6 +++---
 app/controllers/feeds_controller.rb       |  2 +-
 app/controllers/maps_controller.rb        | 14 ++++----------
 app/controllers/users_controller.rb       |  2 +-
 app/models/annotation.rb                  |  2 +-
 app/models/comment.rb                     |  1 -
 app/models/export.rb                      |  4 ++--
 app/models/map.rb                         | 18 +++++++++---------
 app/models/tag.rb                         |  6 +++---
 app/models/warpable.rb                    |  2 +-
 app/models/way.rb                         |  2 +-
 13 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2dc1dd08..3797b36d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :dependencies do
 end
 
 group :test do
-  gem "rubocop", '~> 0.52.0'
+  gem "rubocop", '~> 0.64.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d9e6465e..ee3e765f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,7 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jaro_winkler (1.5.2)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -187,13 +188,14 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.1)
+    rubocop (0.64.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -233,7 +235,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -274,7 +276,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha
   right_aws_api
-  rubocop (~> 0.52.0)
+  rubocop (~> 0.64.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index b27494903..d82ecf27d 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-                      coordinates: geojson[:geometry][:coordinates],
-                      text: geojson[:properties][:textContent],
-                      style: geojson[:properties][:style])
+     coordinates: geojson[:geometry][:coordinates],
+     text: geojson[:properties][:textContent],
+     style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 6be25cbb9..392051d23 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -4,7 +4,7 @@ class FeedsController < ApplicationController
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
     @maps = Map.where(archived: false, password: '')
-               .joins(%i[user warpables])
+               .joins(%i(user warpables))
                .group('maps.id')
                .order('id DESC')
                .limit(20)
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 874b89e4b..f2e9b6d38 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -3,8 +3,8 @@
 class MapsController < ApplicationController
   protect_from_forgery except: :export
 
-  before_filter :require_login, only: %i[edit update destroy]
-  before_filter :find_map, only: %i[show annotate embed edit update images destroy archive]
+  before_filter :require_login, only: %i(edit update destroy)
+  before_filter :find_map, only: %i(show annotate embed edit update images destroy archive)
 
   layout 'knitter2'
 
@@ -77,7 +77,7 @@ def archive
     else
       flash[:error] = 'Only admins may archive maps.'
     end
-    redirect_to "/?_=#{Time.now.to_i.to_s}"
+    redirect_to "/?_=#{Time.now.to_i}"
   end
 
   def embed
@@ -94,13 +94,7 @@ def annotate
   def edit; end
 
   def update
-    # @map.name =        params[:map][:name]
-    # @map.location =    params[:map][:location]
-    # @map.lat =         params[:map][:lat]
-    # @map.lon =         params[:map][:lon]
-    # @map.description = params[:map][:description]
-    # @map.license =     params[:map][:license] if @map.user_id == current_user.id
-  @map.update_attributes(map_params)
+    @map.update_attributes(map_params)
 
     save_tags(@map)
     @map.save
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5dc4f187f..40601a191 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -30,6 +30,6 @@ def sort_direction
 
   def user_params
     params.require(:user).permit(:login, :email, :name,
-                                 :password, :password_confirmation)
+      :password, :password_confirmation)
   end
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index b4bed15ee..e681cb9bc 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,5 +1,5 @@
 class Annotation < ActiveRecord::Base
-  include  ActiveModel::MassAssignmentSecurity
+  include ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 0021e4761..05d55677e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,4 @@
 class Comment < ActiveRecord::Base
-
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/export.rb b/app/models/export.rb
index d85d62aa4..59353d1c1 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,12 +52,12 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now-24.hours).to_s(:db)).count
+                 (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now-24.hours).to_s(:db))
+                  (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 481333824..798371cb6 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -7,19 +7,19 @@ class Map < ActiveRecord::Base
 
   validates_presence_of :name, :slug, :author, :lat, :lon
   validates_uniqueness_of :slug
-  validates_presence_of :location, :message => ' cannot be found. Try entering a latitude and longitude if this problem persists.'
+  validates_presence_of :location, message: ' cannot be found. Try entering a latitude and longitude if this problem persists.'
   # validates_format_of   :slug,
   #                       :with => /^[\w-]*$/,
   #                       :message => " must not include spaces and must be alphanumeric, as it'll be used in the URL of your map, like: https://mapknitter.org/maps/your-map-name. You may use dashes and underscores.",
   #                       :on => :create
-#  validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
+  # validates_format_of :tile_url, :with => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
   validates_with NotAtOriginValidator
-    validates :lat, :lon, NotAtOrigin: true
+  validates :lat, :lon, NotAtOrigin: true
 
-  has_many :exports, :dependent => :destroy
-  has_many :tags, :dependent => :destroy
-  has_many :comments, :dependent => :destroy
-  has_many :annotations, :dependent => :destroy
+  has_many :exports, dependent: :destroy
+  has_many :tags, dependent: :destroy
+  has_many :comments, dependent: :destroy
+  has_many :annotations, dependent: :destroy
   belongs_to :user
 
   has_many :warpables 
@@ -87,7 +87,7 @@ def self.featured
   end
 
   def self.new_maps
-    Map.where( ['password = "" AND archived = "false"'])
+    Map.where(['password = "" AND archived = "false"'])
       .order('created_at DESC')
       .limit(12)
   end
@@ -254,7 +254,7 @@ def license_link
   end
 
   def has_tag(tagname)
-    !Tag.where(map_id: self.id, name: tagname).empty?
+    !Tag.where(map_id: id, name: tagname).empty?
   end
 
   def add_tag(tagname, user)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index be5a179e5..390df29ac 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,9 +2,9 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  validates_presence_of :name, :on => :create, :message => "can't be blank"
-  validates_presence_of :user_id, :on => :create, :message => "can't be blank"
-  validates_presence_of :map_id, :on => :create, :message => "can't be blank"
+  validates_presence_of :name, on: :create, message: "can't be blank"
+  validates_presence_of :user_id, on: :create, message: "can't be blank"
+  validates_presence_of :map_id, on: :create, message: "can't be blank"
 
   def maps
     Map.where(id: Tag.where(name: name).collect(&:map_id).uniq)
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 4049b49be..86dcc14c7 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,5 +1,5 @@
 class Warpable < ActiveRecord::Base
-  include  ActiveModel::MassAssignmentSecurity
+  include ActiveModel::MassAssignmentSecurity
   attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
 
diff --git a/app/models/way.rb b/app/models/way.rb
index 8237be702..7fb80d1ed 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,5 +1,5 @@
 class Way < ActiveRecord::Base
-  has_many :nodes, :dependent => :destroy
+  has_many :nodes, dependent: :destroy
 
   def bbox=(bbox)
     # counting from left, counter-clockwise

From daac6143b347b810dbfd056a03a1f0d49bdecf64 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 15:59:15 +0300
Subject: [PATCH 034/152] skip failing test

The test is failing because of different names in model(warpable) and
controller(images) skipping this for now until we decide if we want to
standardize the names
---
 test/functional/maps_controller_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index a9634e8df..ceb8bb6a3 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -145,6 +145,7 @@ def teardown
   end
 
   test 'should render new if map not created' do
+    skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
     post(:create, map: {

From 528ec09a39ddb0604c9ce902c4004a4601eb4608 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 17:41:09 +0300
Subject: [PATCH 035/152] replace unprotected redirects

---
 app/controllers/comments_controller.rb | 4 ++--
 app/controllers/maps_controller.rb     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a4db91007..d68846c75 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -28,7 +28,7 @@ def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
       @comment.update_attributes(comment_params)
-      redirect_to "/maps/#{@comment.map.slug}"
+      redirect_to  @comment.map
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -44,7 +44,7 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to "/maps/#{@comment.map.slug}"
+    redirect_to  @comment.map
   end
 
   private
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index f2e9b6d38..66b2cbbc9 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -36,7 +36,7 @@ def create
       @map = current_user.maps.new(map_params)
       @map.author = current_user.login # eventually deprecate
       if @map.save
-        redirect_to "/maps/#{@map.slug}"
+        redirect_to @map
       else
         render 'new'
       end
@@ -44,7 +44,7 @@ def create
       @map = Map.new(map_params)
       if Rails.env != 'production' || verify_recaptcha(model: @map, message: "ReCAPTCHA thinks you're not human! Try again!")
         if @map.save
-          redirect_to "/maps/#{@map.slug}"
+          redirect_to @map
         else
           render 'new'
         end
@@ -108,7 +108,7 @@ def destroy
       redirect_to '/'
     else
       flash[:error] = 'Only admins or map owners may delete maps.'
-      redirect_to "/maps/#{@map.slug}"
+      redirect_to @map
     end
   end
 

From 1d220ec8db405a5b906a461f94be26cfb3109724 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Wed, 5 Jun 2019 21:27:54 +0300
Subject: [PATCH 036/152] Fix codeclimate issues

---
 app/models/map.rb | 2 +-
 app/models/tag.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/map.rb b/app/models/map.rb
index 798371cb6..7d20a84fc 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -140,7 +140,7 @@ def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
     Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-              id, lat - dist, lat + dist, lon - dist, lon + dist)
+               id, lat - dist, lat + dist, lon - dist, lon + dist)
       .limit(10)
   end
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 390df29ac..8e052b8df 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,7 +2,7 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  validates_presence_of :name, on: :create, message: "can't be blank"
+  validates_presence_of :name, on: :create, message:  "can't be blank"
   validates_presence_of :user_id, on: :create, message: "can't be blank"
   validates_presence_of :map_id, on: :create, message: "can't be blank"
 

From 5bb19c2ec8264d1b0a53855809a5fe3645f0af82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lax=20de=20Carvalho=20Alves?= <alaxallves@gmail.com>
Date: Thu, 6 Jun 2019 16:53:13 -0300
Subject: [PATCH 037/152] Autofixing rubocop offenses and Problematic test for
 #578 (#667)

* Autofixing rubocop offenses

* Adding Rubocop to Travis pipelines and development branch

* Fixing maps controller test

* Fixing remaining offenses
---
 .travis.yml                              |   2 +
 Gemfile                                  |   2 +-
 Gemfile.lock                             |  22 +--
 app/models/export.rb                     |   2 +-
 app/models/map.rb                        |   4 +-
 app/models/tag.rb                        |   2 +-
 db/schema.rb                             | 223 +++++++++++------------
 test/functional/maps_controller_test.rb  |   9 +-
 test/reports/TEST-ExportTest.xml         |   9 -
 test/reports/TEST-MapTest.xml            |  11 --
 test/reports/TEST-MapsControllerTest.xml |  66 -------
 test/reports/TEST-UserTest.xml           |  15 --
 12 files changed, 133 insertions(+), 234 deletions(-)
 delete mode 100644 test/reports/TEST-ExportTest.xml
 delete mode 100644 test/reports/TEST-MapTest.xml
 delete mode 100644 test/reports/TEST-MapsControllerTest.xml
 delete mode 100644 test/reports/TEST-UserTest.xml

diff --git a/.travis.yml b/.travis.yml
index e57873248..582219317 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ env:
     - TASK="CI=true TRAVIS=true rake test:integration"
     - TASK="CI=true TRAVIS=true rake test:functional"
     - TASK="CI=true TRAVIS=true rake assets:precompile"
+    - TASK="CI=true TRAVIS=true bundle exec rubocop"
 
 script:
   - docker-compose -f docker-compose.test.yml exec web bash -lc "$TASK"
@@ -34,4 +35,5 @@ branches:
   only:
     - main
     - unstable
+    - development
 
diff --git a/Gemfile b/Gemfile
index 3797b36d2..d2dc1dd08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ group :dependencies do
 end
 
 group :test do
-  gem "rubocop", '~> 0.64.0'
+  gem "rubocop", '~> 0.52.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index ee3e765f3..d06519882 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
     ansi (1.5.0)
     arel (6.0.4)
     ast (2.4.0)
-    autoprefixer-rails (9.5.1.1)
+    autoprefixer-rails (9.6.0)
       execjs
     aws-sdk (1.5.8)
       httparty (~> 0.7)
@@ -79,7 +79,6 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    jaro_winkler (1.5.2)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -176,7 +175,7 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    recaptcha (4.14.0)
+    recaptcha (5.0.0)
       json
     redcarpet (3.4.0)
     ref (2.0.0)
@@ -188,14 +187,13 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.64.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -214,9 +212,9 @@ GEM
     simplecov-cobertura (1.3.1)
       simplecov (~> 0.8)
     simplecov-html (0.10.2)
-    skylight (4.0.2)
-      skylight-core (= 4.0.2)
-    skylight-core (4.0.2)
+    skylight (4.1.0)
+      skylight-core (= 4.1.0)
+    skylight-core (4.1.0)
       activesupport (>= 4.2.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -235,7 +233,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
     uuidtools (2.1.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -276,7 +274,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha
   right_aws_api
-  rubocop (~> 0.64.0)
+  rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass
diff --git a/app/models/export.rb b/app/models/export.rb
index 59353d1c1..95d5c61db 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -58,6 +58,6 @@ def self.export_count
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                  (DateTime.now - 24.hours).to_s(:db))
+      (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 7d20a84fc..d916eb70c 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -22,7 +22,7 @@ class Map < ActiveRecord::Base
   has_many :annotations, dependent: :destroy
   belongs_to :user
 
-  has_many :warpables 
+  has_many :warpables
   scope :active, -> { where(archived: false) }
   scope :has_user, -> { where('user_id != ?', 0) }
 
@@ -140,7 +140,7 @@ def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
     Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-               id, lat - dist, lat + dist, lon - dist, lon + dist)
+      id, lat - dist, lat + dist, lon - dist, lon + dist)
       .limit(10)
   end
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 8e052b8df..390df29ac 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -2,7 +2,7 @@ class Tag < ActiveRecord::Base
   belongs_to :map
   belongs_to :user
 
-  validates_presence_of :name, on: :create, message:  "can't be blank"
+  validates_presence_of :name, on: :create, message: "can't be blank"
   validates_presence_of :user_id, on: :create, message: "can't be blank"
   validates_presence_of :map_id, on: :create, message: "can't be blank"
 
diff --git a/db/schema.rb b/db/schema.rb
index 9c3ddce87..4772d9b03 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,154 +9,153 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20190420025012) do
+ActiveRecord::Schema.define(version: 20190420025012) do
 
-  create_table "annotations", :force => true do |t|
-    t.integer  "map_id"
-    t.integer  "user_id"
-    t.string   "annotation_type"
-    t.string   "text"
-    t.string   "style"
-    t.string   "coordinates"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+  create_table "annotations", force: :cascade do |t|
+    t.integer  "map_id",          limit: 4
+    t.integer  "user_id",         limit: 4
+    t.string   "annotation_type", limit: 255
+    t.string   "text",            limit: 255
+    t.string   "style",           limit: 255
+    t.string   "coordinates",     limit: 255
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
   end
 
-  create_table "comments", :force => true do |t|
-    t.string   "user_id"
-    t.string   "body"
-    t.integer  "map_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "comments", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "body",       limit: 255
+    t.integer  "map_id",     limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
-  create_table "exports", :force => true do |t|
-    t.integer  "map_id",       :default => 0
-    t.integer  "size",         :default => 0
-    t.integer  "width",        :default => 0
-    t.integer  "height",       :default => 0
-    t.float    "cm_per_pixel", :default => 0.0
-    t.string   "status",       :default => "none"
-    t.boolean  "tms",          :default => false
-    t.boolean  "jpg",          :default => false
-    t.boolean  "geotiff",      :default => false
+  create_table "exports", force: :cascade do |t|
+    t.integer  "map_id",       limit: 4,     default: 0
+    t.integer  "size",         limit: 4,     default: 0
+    t.integer  "width",        limit: 4,     default: 0
+    t.integer  "height",       limit: 4,     default: 0
+    t.float    "cm_per_pixel", limit: 24,    default: 0.0
+    t.string   "status",       limit: 255,   default: "none"
+    t.boolean  "tms",                        default: false
+    t.boolean  "jpg",                        default: false
+    t.boolean  "geotiff",                    default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "zip",          :default => false,    :null => false
-    t.text     "bands_string",                       :null => false
-    t.string   "export_type",  :default => "normal", :null => false
-    t.integer  "user_id",      :default => 0
-    t.string   "export_url"
+    t.boolean  "zip",                        default: false,    null: false
+    t.text     "bands_string", limit: 65535,                    null: false
+    t.string   "export_type",  limit: 255,   default: "normal", null: false
+    t.integer  "user_id",      limit: 4,     default: 0
+    t.string   "export_url",   limit: 255
   end
 
-  create_table "maps", :force => true do |t|
-    t.string   "name",                                             :default => ""
-    t.decimal  "lat",              :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",              :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "version",                                          :default => 1
-    t.string   "password",                                         :default => ""
-    t.text     "styles"
+  create_table "maps", force: :cascade do |t|
+    t.string   "name",             limit: 255,                             default: ""
+    t.decimal  "lat",                            precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                            precision: 20, scale: 10, default: 0.0
+    t.integer  "version",          limit: 4,                               default: 1
+    t.string   "password",         limit: 255,                             default: ""
+    t.text     "styles",           limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "description"
-    t.string   "author",                                           :default => "anonymous"
-    t.decimal  "zoom",             :precision => 15, :scale => 10, :default => 2.0
-    t.string   "location",                                         :default => ""
-    t.string   "static_data",                                      :default => ""
-    t.boolean  "vectors",                                          :default => false,       :null => false
-    t.string   "tiles",                                            :default => "google",    :null => false
-    t.string   "email",                                            :default => "",          :null => false
-    t.boolean  "archived",                                         :default => false,       :null => false
-    t.text     "tile_url"
-    t.text     "tile_layer"
-    t.string   "license",                                          :default => "copyright"
-    t.integer  "user_id",                                          :default => 0
-    t.boolean  "anon_annotatable",                                 :default => false
-    t.string   "slug"
+    t.text     "description",      limit: 65535
+    t.string   "author",           limit: 255,                             default: "anonymous"
+    t.decimal  "zoom",                           precision: 15, scale: 10, default: 2.0
+    t.string   "location",         limit: 255,                             default: ""
+    t.string   "static_data",      limit: 255,                             default: ""
+    t.boolean  "vectors",                                                  default: false,       null: false
+    t.string   "tiles",            limit: 255,                             default: "google",    null: false
+    t.string   "email",            limit: 255,                             default: "",          null: false
+    t.boolean  "archived",                                                 default: false,       null: false
+    t.text     "tile_url",         limit: 65535
+    t.text     "tile_layer",       limit: 65535
+    t.string   "license",          limit: 255,                             default: "copyright"
+    t.integer  "user_id",          limit: 4,                               default: 0
+    t.boolean  "anon_annotatable",                                         default: false
+    t.string   "slug",             limit: 255
   end
 
-  add_index "maps", ["slug"], :name => "index_maps_on_slug", :unique => true
+  add_index "maps", ["slug"], name: "index_maps_on_slug", unique: true, using: :btree
 
-  create_table "nodes", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat",         :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",         :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "way_id",                                      :default => 0
-    t.integer  "order",                                       :default => 0
+  create_table "nodes", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat",                       precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                       precision: 20, scale: 10, default: 0.0
+    t.integer  "way_id",      limit: 4,                               default: 0
+    t.integer  "order",       limit: 4,                               default: 0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.integer  "map_id",                                      :default => 0
-    t.integer  "way_order",                                   :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.integer  "way_order",   limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
-  create_table "tags", :force => true do |t|
-    t.string   "user_id"
-    t.string   "name"
-    t.integer  "map_id"
-    t.integer  "warpable_id"
+  create_table "tags", force: :cascade do |t|
+    t.string   "user_id",     limit: 255
+    t.string   "name",        limit: 255
+    t.integer  "map_id",      limit: 4
+    t.integer  "warpable_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tags", ["map_id"], :name => "index_tags_on_map_id"
-  add_index "tags", ["user_id"], :name => "index_tags_on_user_id"
-  add_index "tags", ["warpable_id"], :name => "index_tags_on_warpable_id"
+  add_index "tags", ["map_id"], name: "index_tags_on_map_id", using: :btree
+  add_index "tags", ["user_id"], name: "index_tags_on_user_id", using: :btree
+  add_index "tags", ["warpable_id"], name: "index_tags_on_warpable_id", using: :btree
 
-  create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 40
-    t.string   "name",                      :limit => 100, :default => ""
-    t.string   "email",                     :limit => 100
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
-    t.string   "identity_url"
-    t.string   "role",                      :limit => 40,  :default => "basic"
+  create_table "users", force: :cascade do |t|
+    t.string   "login",                     limit: 40
+    t.string   "name",                      limit: 100, default: ""
+    t.string   "email",                     limit: 100
+    t.string   "crypted_password",          limit: 40
+    t.string   "salt",                      limit: 40
+    t.string   "identity_url",              limit: 255
+    t.string   "role",                      limit: 40,  default: "basic"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "remember_token",            :limit => 40
+    t.string   "remember_token",            limit: 40
     t.datetime "remember_token_expires_at"
   end
 
-  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
 
-  create_table "warpables", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "image_content_type"
-    t.string   "image_file_name"
-    t.string   "thumbnail"
-    t.integer  "image_file_size"
-    t.integer  "width"
-    t.integer  "height"
+  create_table "warpables", force: :cascade do |t|
+    t.integer  "parent_id",          limit: 4
+    t.string   "image_content_type", limit: 255
+    t.string   "image_file_name",    limit: 255
+    t.string   "thumbnail",          limit: 255
+    t.integer  "image_file_size",    limit: 4
+    t.integer  "width",              limit: 4
+    t.integer  "height",             limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "map_id",             :default => 0
-    t.string   "nodes",              :default => ""
-    t.boolean  "locked",             :default => false, :null => false
-    t.boolean  "deleted",            :default => false, :null => false
-    t.text     "history",                               :null => false
-    t.float    "cm_per_pixel",       :default => 0.0,   :null => false
+    t.integer  "map_id",             limit: 4,     default: 0
+    t.string   "nodes",              limit: 255,   default: ""
+    t.boolean  "locked",                           default: false, null: false
+    t.boolean  "deleted",                          default: false, null: false
+    t.text     "history",            limit: 65535,                 null: false
+    t.float    "cm_per_pixel",       limit: 24,    default: 0.0,   null: false
   end
 
-  create_table "ways", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lat2",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon2",        :precision => 20, :scale => 10, :default => 0.0
+  create_table "ways", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lat2",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon2",                      precision: 20, scale: 10, default: 0.0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.boolean  "complete",                                    :default => true
-    t.integer  "map_id",                                      :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.boolean  "complete",                                            default: true
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
 end
-
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index ceb8bb6a3..5b1b6ca07 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -148,12 +148,13 @@ def teardown
     skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
-    post(:create, map: {
-           name: 'Coal terminal map',
-           slug: 'coal-terminal'
-         })
+    post(:new, map: {
+      name: 'Coal terminal map',
+      slug: 'coal-terminal'
+    })
     @map = assigns(:map)
 
+    assert_not @map.save
     assert_response :success
     assert_template :new
     assert_equal before_count, Map.count
diff --git a/test/reports/TEST-ExportTest.xml b/test/reports/TEST-ExportTest.xml
deleted file mode 100644
index 6c6d2d3a3..000000000
--- a/test/reports/TEST-ExportTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
-  <testsuite name="ExportTest" filepath="/home/k/proj/mapknitter/test/unit/export_test.rb" skipped="0" failures="0" errors="0" tests="2" assertions="7" time="0.1806370220001554">
-    <testcase name="test_count_methods" lineno="4" classname="ExportTest" assertions="6" time="0.17920688500453252">
-    </testcase>
-    <testcase name="test_export_running" lineno="14" classname="ExportTest" assertions="1" time="0.0014301369956228882">
-    </testcase>
-  </testsuite>
-</testsuites>
diff --git a/test/reports/TEST-MapTest.xml b/test/reports/TEST-MapTest.xml
deleted file mode 100644
index 9a15a2d15..000000000
--- a/test/reports/TEST-MapTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
-  <testsuite name="MapTest" filepath="/home/k/proj/mapknitter/test/unit/map_test.rb" skipped="0" failures="0" errors="0" tests="3" assertions="30" time="0.03067347500473261">
-    <testcase name="test_basics" lineno="5" classname="MapTest" assertions="24" time="0.012606176009285264">
-    </testcase>
-    <testcase name="test_tag_basics" lineno="99" classname="MapTest" assertions="3" time="0.013976358997751959">
-    </testcase>
-    <testcase name="test_histograms" lineno="83" classname="MapTest" assertions="3" time="0.004090939997695386">
-    </testcase>
-  </testsuite>
-</testsuites>
diff --git a/test/reports/TEST-MapsControllerTest.xml b/test/reports/TEST-MapsControllerTest.xml
deleted file mode 100644
index b67e87d3b..000000000
--- a/test/reports/TEST-MapsControllerTest.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
-  <testsuite name="MapsControllerTest" filepath="/home/k/proj/mapknitter/test/functional/maps_controller_test.rb" skipped="0" failures="0" errors="1" tests="26" assertions="78" time="3.00662421900779">
-    <testcase name="test_embed" lineno="249" classname="MapsControllerTest" assertions="2" time="2.2494869669899344">
-    </testcase>
-    <testcase name="test_should_annotate_maps" lineno="243" classname="MapsControllerTest" assertions="1" time="0.06807511499209795">
-    </testcase>
-    <testcase name="test_should_not_update_unless_logged_in" lineno="230" classname="MapsControllerTest" assertions="2" time="0.0039022870041662827">
-    </testcase>
-    <testcase name="test_should_get_map_of_maps" lineno="52" classname="MapsControllerTest" assertions="3" time="0.009347153987619095">
-    </testcase>
-    <testcase name="test_featured" lineno="288" classname="MapsControllerTest" assertions="1" time="0.035135833008098416">
-    </testcase>
-    <testcase name="test_should_get_index" lineno="30" classname="MapsControllerTest" assertions="4" time="0.024817559999064542">
-    </testcase>
-    <testcase name="test_should_search_for_maps_by_description" lineno="82" classname="MapsControllerTest" assertions="3" time="0.020067279998329468">
-    </testcase>
-    <testcase name="test_should_not_delete_map_if_not_owner" lineno="163" classname="MapsControllerTest" assertions="4" time="0.008421691993135028">
-    </testcase>
-    <testcase name="test_should_not_display_archived_maps" lineno="40" classname="MapsControllerTest" assertions="4" time="0.040099802004988305">
-    </testcase>
-    <testcase name="test_should_display_image_url_for_maps_by_region" lineno="16" classname="MapsControllerTest" assertions="2" time="0.010083747009048238">
-    </testcase>
-    <testcase name="test_should_update_map" lineno="207" classname="MapsControllerTest" assertions="8" time="0.03921118000289425">
-    </testcase>
-    <testcase name="test_should_create_map_if_logged_in" lineno="91" classname="MapsControllerTest" assertions="6" time="0.1147474500030512">
-    </testcase>
-    <testcase name="test_should_get_show" lineno="183" classname="MapsControllerTest" assertions="2" time="0.06256500899326056">
-    </testcase>
-    <testcase name="test_it_returns_the_images" lineno="255" classname="MapsControllerTest" assertions="2" time="0.018422578999889083">
-    </testcase>
-    <testcase name="test_should_search_for_maps_by_location" lineno="73" classname="MapsControllerTest" assertions="3" time="0.04014417600410525">
-    </testcase>
-    <testcase name="test_should_create_map_if_not_logged_in" lineno="110" classname="MapsControllerTest" assertions="6" time="0.023595759994350374">
-    </testcase>
-    <testcase name="test_should_delete_map_if_owner" lineno="173" classname="MapsControllerTest" assertions="4" time="0.04676445900986437">
-    </testcase>
-    <testcase name="test_should_render_new_if_map_not_created" lineno="148" classname="MapsControllerTest" assertions="0" time="0.031077706007636152">
-    <error type="test_should_render_new_if_map_not_created" message="ActionView::Template::Error: No route matches {:action=&gt;&quot;index&quot;, :controller=&gt;&quot;warpables&quot;, :map_id=&gt;nil} missing required keys: [:map_id]...">
-Failure:
-test_should_render_new_if_map_not_created(Minitest::Result) [/home/k/.rvm/gems/ruby-2.4.6/gems/actionpack-4.2.11.1/lib/action_dispatch/routing/route_set.rb:234]:
-ActionView::Template::Error: No route matches {:action=&gt;"index", :controller=&gt;"warpables", :map_id=&gt;nil} missing required keys: [:map_id]
-    app/views/images/_new.html.erb:13:in `_app_views_images__new_html_erb___582794143336601479_47432368697160'
-    app/views/layouts/knitter2.html.erb:195:in `_app_views_layouts_knitter__html_erb__1554220659803257588_47432335059940'
-    app/controllers/maps_controller.rb:41:in `create'
-    test/functional/maps_controller_test.rb:151:in `block in &lt;class:MapsControllerTest&gt;'
-    </error>
-    </testcase>
-    <testcase name="test_assigns_current_user_as_map_author_if_logged_in" lineno="128" classname="MapsControllerTest" assertions="6" time="0.026720677997218445">
-    </testcase>
-    <testcase name="test_should_not_archive_map_without_enough_permissions" lineno="198" classname="MapsControllerTest" assertions="3" time="0.013543893001042306">
-    </testcase>
-    <testcase name="test_should_get_new" lineno="58" classname="MapsControllerTest" assertions="2" time="0.01243473100475967">
-    </testcase>
-    <testcase name="test_returns_the_exports" lineno="278" classname="MapsControllerTest" assertions="1" time="0.006508196005597711">
-    </testcase>
-    <testcase name="test_license" lineno="283" classname="MapsControllerTest" assertions="1" time="0.019753675995161757">
-    </testcase>
-    <testcase name="test_should_archive_map" lineno="189" classname="MapsControllerTest" assertions="3" time="0.01554052100982517">
-    </testcase>
-    <testcase name="test_should_display_maps_by_region" lineno="235" classname="MapsControllerTest" assertions="2" time="0.028362469995045103">
-    </testcase>
-    <testcase name="test_should_search_for_maps_by_name" lineno="64" classname="MapsControllerTest" assertions="3" time="0.03779429799760692">
-    </testcase>
-  </testsuite>
-</testsuites>
diff --git a/test/reports/TEST-UserTest.xml b/test/reports/TEST-UserTest.xml
deleted file mode 100644
index 4aea8b0da..000000000
--- a/test/reports/TEST-UserTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
-  <testsuite name="UserTest" filepath="/home/k/proj/mapknitter/test/unit/user_test.rb" skipped="0" failures="0" errors="0" tests="5" assertions="15" time="0.05865451000863686">
-    <testcase name="test_should_require_login" lineno="15" classname="UserTest" assertions="4" time="0.016862381002283655">
-    </testcase>
-    <testcase name="test_user_simple_query_methods" lineno="33" classname="UserTest" assertions="4" time="0.006921756998053752">
-    </testcase>
-    <testcase name="test_should_require_email" lineno="24" classname="UserTest" assertions="4" time="0.016311457002302632">
-    </testcase>
-    <testcase name="test_should_create_user" lineno="8" classname="UserTest" assertions="2" time="0.011182418995304033">
-    </testcase>
-    <testcase name="test_should_not_create_user" lineno="3" classname="UserTest" assertions="1" time="0.00737649601069279">
-    </testcase>
-  </testsuite>
-</testsuites>

From 11dd71f86aef38a7eeebfe08aec8a8440cbcfcdf Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 17:58:28 +0300
Subject: [PATCH 038/152] change post test to create since action new is a get
 action

---
 test/functional/maps_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 5b1b6ca07..a26156c76 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -148,7 +148,7 @@ def teardown
     skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
-    post(:new, map: {
+    post(:create, map: {
       name: 'Coal terminal map',
       slug: 'coal-terminal'
     })

From fbb29baae8e30f9d71f4e12cdd2d64d6b0a8a2cc Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 18:13:10 +0300
Subject: [PATCH 039/152] remove unprotected redirects

---
 app/controllers/comments_controller.rb | 4 ++--
 app/controllers/tags_controller.rb     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d68846c75..b147be42d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -28,7 +28,7 @@ def update
     @comment = Comment.find params[:id]
     if logged_in? && current_user.can_edit?(@comment)
       @comment.update_attributes(comment_params)
-      redirect_to  @comment.map
+      redirect_to @comment.map
     else
       flash[:error] = 'You do not have permissions to update that comment.'
       redirect_to '/login'
@@ -44,7 +44,7 @@ def destroy
     else
       flash[:error] = 'You do not have permission to delete that comment.'
     end
-    redirect_to  @comment.map
+    redirect_to @comment.map
   end
 
   private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c04b6d0ac..b3bf053c2 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -5,7 +5,7 @@ def create
     @map = Map.find_by(slug: params[:map_id])
     if logged_in?
       save_tags(@map)
-      redirect_to "/maps/#{@map.slug}"
+      redirect_to @map
     else
       flash[:error] = 'You must be logged in to add tags'
       redirect_to "/login?back_to=/maps/#{@map.slug}"

From bba8fad243a90f66b5c3f5c570a0fe67d9e20159 Mon Sep 17 00:00:00 2001
From: Cess <cessmbuguar@gmail.com>
Date: Fri, 7 Jun 2019 18:25:28 +0300
Subject: [PATCH 040/152] Fix codeclimate issues

---
 app/controllers/annotations_controller.rb | 6 +++---
 app/models/export.rb                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index d82ecf27d..88019d3f7 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-     coordinates: geojson[:geometry][:coordinates],
-     text: geojson[:properties][:textContent],
-     style: geojson[:properties][:style])
+      coordinates: geojson[:geometry][:coordinates],
+      text: geojson[:properties][:textContent],
+      style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/models/export.rb b/app/models/export.rb
index 95d5c61db..94fbce007 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,7 +52,7 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-                 (DateTime.now - 24.hours).to_s(:db)).count
+      (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running

From 6bc9a8c88b4d8a813865937441331c42b81a9504 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 12:45:55 +0530
Subject: [PATCH 041/152] Add yarn

---
 .yarnrc                               |    1 +
 Dockerfile                            |    2 +-
 app/assets/javascripts/application.js |    1 -
 bower.json                            |   41 -
 package.json                          |   50 +
 yarn-error.log                        | 2864 +++++++++++++++++++++++++
 yarn.lock                             | 2781 ++++++++++++++++++++++++
 7 files changed, 5697 insertions(+), 43 deletions(-)
 create mode 100644 .yarnrc
 delete mode 100644 bower.json
 create mode 100644 package.json
 create mode 100644 yarn-error.log
 create mode 100644 yarn.lock

diff --git a/.yarnrc b/.yarnrc
new file mode 100644
index 000000000..8a5f0bbba
--- /dev/null
+++ b/.yarnrc
@@ -0,0 +1 @@
+ --install.modules-folder "./public/lib"
diff --git a/Dockerfile b/Dockerfile
index c75784bdd..b4ff9f7c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -qq && apt-get install -y \
 COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y npm
-RUN npm install -g bower
+RUN npm install -g yarn
 
 # Install bundle of gems
 SHELL [ "/bin/bash", "-l", "-c" ]
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fa2ef6103..b2e85f506 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,7 +22,6 @@
 //= require leaflet-toolbar/dist/leaflet.toolbar.js
 //= require leaflet-distortableimage/dist/leaflet.distortableimage.js
 //= require leaflet-easybutton/src/easy-button.js
-//= require leaflet-google/index.js
 //= require sparklines/source/sparkline.js
 //= require annotations-legacy.js
 //= require glfx-js/dist/glfx.js
diff --git a/bower.json b/bower.json
deleted file mode 100644
index d33ef84db..000000000
--- a/bower.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "mapknitter",
-  "version": "2.0.2",
-  "dependencies": {
-    "fontawesome": "~4.2.0",
-    "bootstrap": "^4.3.1",
-    "ion-rangeslider": "git+https://github.com/ionDen/ion.rangeslider#~2.3.0",
-    "jquery": "~1.11",
-    "jquery-ui": "^1.12.1",
-    "jquery-ujs": "~1.0.3",
-    "ol2": "git+https://github.com/openlayers/ol2#release-2.13.1",
-    "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
-    "blueimp-tmpl": "2.5.4",
-    "exif-js": "",
-    "leaflet": "^1.0.0",
-    "leaflet-omnivore": "~0.3.2",
-    "leaflet-google": "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js",
-    "leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
-    "leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
-    "leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
-    "leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
-    "leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
-    "leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
-    "sparklines": "~1.0.0",
-    "modalbox": "okonet/modalbox",
-    "cartagen": "jywarren/cartagen",
-    "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
-    "scriptaculous": "http://script.aculo.us/dist/scriptaculous-js-1.9.0.zip",
-    "glfx-js": "git+https://github.com/jywarren/glfx.js.git",
-    "webgl-distort": "jywarren/webgl-distort",
-    "image-sequencer": "git+https://github.com/publiclab/image-sequencer.git#~1.4.0",
-    "junction": "theleagueof/junction",
-    "leaflet-environmental-layers": "^1.1.2",
-    "leaflet-spin": "1.1.0",
-    "leaflet-fullhash": "git+https://github.com/sagarpreet-chadha/leaflet-fullHash.git"
-  },
-  "resolutions": {
-    "jquery": "^2.1.3",
-    "leaflet": "^1.0.0"
-  }
-}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..b0cb11459
--- /dev/null
+++ b/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "mapknitter",
+  "version": "1.0.0",
+  "main": "app/assets/javascripts/application.js",
+  "repository": "https://github.com/publiclab/mapknitter",
+  "author": "Kaustubh Nair <kaustubh.nair108@gmail.com>",
+  "license": "MIT",
+  "files": [
+    "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
+  ],
+  "dependencies": {
+    "@bower_components/blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
+    "@bower_components/blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
+    "@bower_components/blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
+    "@bower_components/blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
+    "@bower_components/bootstrap": "twbs/bootstrap#^4.3.1",
+    "@bower_components/cartagen": "jywarren/cartagen#*",
+    "@bower_components/exif-js": "jseidelin/exif-js#*",
+    "@bower_components/font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
+    "@bower_components/fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
+    "@bower_components/glfx-js": "jywarren/glfx.js#*",
+    "@bower_components/image-sequencer": "publiclab/image-sequencer#~1.4.0",
+    "@bower_components/ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
+    "@bower_components/jquery": "jquery/jquery-dist#^2.1.3",
+    "@bower_components/jquery-ui": "components/jqueryui#^1.12.1",
+    "@bower_components/jquery-ujs": "rails/jquery-ujs#~1.0.3",
+    "@bower_components/junction": "theleagueof/junction#*",
+    "@bower_components/leaflet": "Leaflet/Leaflet#^1.0.0",
+    "@bower_components/leaflet-dist": "vperron/leaflet-dist#0.7.x",
+    "@bower_components/leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
+    "@bower_components/leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
+    "@bower_components/leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
+    "@bower_components/leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
+    "@bower_components/leaflet-fullhash": "sagarpreet-chadha/leaflet-fullHash#*",
+    "@bower_components/leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
+    "@bower_components/leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
+    "@bower_components/leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
+    "@bower_components/leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
+    "@bower_components/leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
+    "@bower_components/modalbox": "okonet/modalbox#*",
+    "@bower_components/ol2": "openlayers/ol2#release-2.13.1",
+    "@bower_components/prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
+    "@bower_components/sparklines": "mariusGundersen/sparkline#~1.0.0",
+    "@bower_components/spin.js": "fgnass/spin.js#^2.3.1",
+    "@bower_components/webgl-distort": "jywarren/webgl-distort#*"
+  },
+  "engines": {
+    "yarn": ">= 1.0.0"
+  }
+}
diff --git a/yarn-error.log b/yarn-error.log
new file mode 100644
index 000000000..d521643cf
--- /dev/null
+++ b/yarn-error.log
@@ -0,0 +1,2864 @@
+Arguments: 
+  /usr/bin/node /usr/share/yarn/bin/yarn.js
+
+PATH: 
+  /home/k/.rvm/gems/ruby-2.4.6/bin:/home/k/.rvm/gems/ruby-2.4.6@global/bin:/home/k/.rvm/rubies/ruby-2.4.6/bin:/home/k/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
+
+Yarn version: 
+  1.15.2
+
+Node version: 
+  8.10.0
+
+Platform: 
+  linux x64
+
+Trace: 
+  SyntaxError: /home/k/proj/mapknitter/package.json: Unexpected token : in JSON at position 287
+      at JSON.parse (<anonymous>)
+      at /usr/share/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/share/yarn/lib/cli.js:304:30)
+      at /usr/share/yarn/lib/cli.js:315:13
+      at <anonymous>
+
+npm manifest: 
+  {
+    "name": "mapknitter",
+    "version": "1.0.0",
+    "main": "app/assets/javascripts/application.js",
+    "repository": "https://github.com/publiclab/mapknitter",
+    "author": "Kaustubh Nair <kaustubh.nair108@gmail.com>",
+    "license": "MIT",
+    "files": [
+      "@bower_components/leaflet-google": "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
+    ],
+    "dependencies": {
+      "@bower_components/blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
+      "@bower_components/blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
+      "@bower_components/blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
+      "@bower_components/blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
+      "@bower_components/bootstrap": "twbs/bootstrap#^4.3.1",
+      "@bower_components/cartagen": "jywarren/cartagen#*",
+      "@bower_components/exif-js": "jseidelin/exif-js#*",
+      "@bower_components/font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
+      "@bower_components/fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
+      "@bower_components/glfx-js": "jywarren/glfx.js#*",
+      "@bower_components/image-sequencer": "publiclab/image-sequencer#~1.4.0",
+      "@bower_components/ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
+      "@bower_components/jquery": "jquery/jquery-dist#^2.1.3",
+      "@bower_components/jquery-ui": "components/jqueryui#^1.12.1",
+      "@bower_components/jquery-ujs": "rails/jquery-ujs#~1.0.3",
+      "@bower_components/junction": "theleagueof/junction#*",
+      "@bower_components/leaflet": "Leaflet/Leaflet#^1.0.0",
+      "@bower_components/leaflet-dist": "vperron/leaflet-dist#0.7.x",
+      "@bower_components/leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
+      "@bower_components/leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
+      "@bower_components/leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
+      "@bower_components/leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
+      "@bower_components/leaflet-fullhash": "sagarpreet-chadha/leaflet-fullHash#*",
+      "@bower_components/leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
+      "@bower_components/leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
+      "@bower_components/leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
+      "@bower_components/leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
+      "@bower_components/leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
+      "@bower_components/modalbox": "okonet/modalbox#*",
+      "@bower_components/ol2": "openlayers/ol2#release-2.13.1",
+      "@bower_components/prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
+      "@bower_components/sparklines": "mariusGundersen/sparkline#~1.0.0",
+      "@bower_components/spin.js": "fgnass/spin.js#^2.3.1",
+      "@bower_components/webgl-distort": "jywarren/webgl-distort#*"
+    },
+    "engines": {
+      "yarn": ">= 1.0.0"
+    },
+    "scripts": {
+      "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\""
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+  # yarn lockfile v1
+  
+  
+  "@bower_components/blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1":
+    version "3.14.0"
+    resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/9f3deb2e710d39c72a988559609d9dc9a319de0b"
+  
+  "@bower_components/blueimp-file-upload@blueimp/jQuery-File-Upload#~9.8.1":
+    version "9.8.1"
+    resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/80b9f7818563dc11b8979b69df30c65f49bc1203"
+  
+  "@bower_components/blueimp-load-image@blueimp/JavaScript-Load-Image#>=1.13.0":
+    version "2.22.0"
+    resolved "https://codeload.github.com/blueimp/JavaScript-Load-Image/tar.gz/b2e6b29de05a882048e80bec0c1f1e94d65ca41a"
+  
+  "@bower_components/blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4":
+    version "2.5.4"
+    resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
+  
+  "@bower_components/bootstrap@twbs/bootstrap#^4.3.1":
+    version "4.3.1"
+    resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
+  
+  "@bower_components/cartagen@jywarren/cartagen#*":
+    version "0.0.0"
+    resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
+  
+  "@bower_components/exif-js@jseidelin/exif-js#*":
+    version "2.3.0"
+    resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
+  
+  "@bower_components/font-awesome@FortAwesome/Font-Awesome#^4.2.0":
+    version "4.7.0"
+    resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"
+  
+  "@bower_components/fontawesome@FortAwesome/Font-Awesome#~4.2.0":
+    version "4.2.0"
+    resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
+  
+  "@bower_components/glfx-js@jywarren/glfx.js#*":
+    version "0.0.1"
+    resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
+  
+  "@bower_components/image-sequencer@publiclab/image-sequencer#~1.4.0":
+    version "1.4.1"
+    resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
+    dependencies:
+      bootstrap "~3.2.0"
+      buffer "~5.0.2"
+      commander "^2.11.0"
+      data-uri-to-buffer "^2.0.0"
+      fisheyegl "^0.1.2"
+      font-awesome "~4.5.0"
+      get-pixels "~3.3.0"
+      imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
+      jquery "~2"
+      jsqr "^0.2.2"
+      lodash "^4.17.5"
+      ndarray-gaussian-filter "^1.0.0"
+      ora "^2.0.0"
+      pace "0.0.4"
+      readline-sync "^1.4.7"
+      save-pixels "~2.3.4"
+      urify "^2.1.0"
+  
+  "@bower_components/ion-rangeslider@ionDen/ion.rangeslider#~2.3.0":
+    version "2.3.0"
+    resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
+    dependencies:
+      jquery ">=1.8"
+  
+  "@bower_components/jquery-ui@components/jqueryui#^1.12.1":
+    version "1.12.1"
+    resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
+  
+  "@bower_components/jquery-ujs@rails/jquery-ujs#~1.0.3":
+    version "0.0.0"
+    resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
+  
+  "@bower_components/jquery@jquery/jquery-dist#^2.1.3":
+    version "2.2.4"
+    resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
+  
+  "@bower_components/junction@theleagueof/junction#*":
+    version "0.0.0"
+    resolved "https://codeload.github.com/theleagueof/junction/tar.gz/fb73260e86dd301b383cf6cc9ca8e726ef806535"
+  
+  "@bower_components/leaflet-dist@vperron/leaflet-dist#0.7.x":
+    version "0.0.0"
+    resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
+  
+  "@bower_components/leaflet-distortableimage@publiclab/Leaflet.DistortableImage#^0.4.3":
+    version "0.4.3"
+    resolved "https://codeload.github.com/publiclab/Leaflet.DistortableImage/tar.gz/cb1ed3875f9ad07942903a9daa778076ce5d7fd1"
+    dependencies:
+      grunt-cli "^1.2.0"
+  
+  "@bower_components/leaflet-draw@Leaflet/Leaflet.draw#0.2.4":
+    version "0.2.3"
+    resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"
+  
+  "@bower_components/leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0":
+    version "0.0.0"
+    resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
+  
+  "@bower_components/leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2":
+    version "1.1.2"
+    resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
+    dependencies:
+      jquery "^3.3.1"
+      leaflet "^1.3.1"
+      leaflet-hash "0.2.1"
+      leaflet-heatmap "1.0.0"
+      leaflet-providers "^1.1.17"
+      leaflet-spin "1.1.0"
+  
+  "@bower_components/leaflet-fullhash@sagarpreet-chadha/leaflet-fullHash#*":
+    version "0.0.0"
+    resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/104a08c4bca0ddf943d24b21d270ee4082dd9654"
+  
+  "@bower_components/leaflet-illustrate@manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7":
+    version "0.0.2"
+    resolved "https://codeload.github.com/manleyjster/Leaflet.Illustrate/tar.gz/31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7"
+  
+  "@bower_components/leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2":
+    version "0.3.4"
+    resolved "https://codeload.github.com/mapbox/leaflet-omnivore/tar.gz/7c5885376671509b6dd30f6cd2c2508f39b2f7eb"
+    dependencies:
+      brfs "1.4.3"
+      corslite "0.0.7"
+      csv2geojson "~5.0.0"
+      polyline "0.2.0"
+      togeojson "0.13.0"
+      topojson "1.6.26"
+      wellknown "0.4.2"
+  
+  "@bower_components/leaflet-providers@leaflet-extras/leaflet-providers#1.0.6":
+    version "1.0.6"
+    resolved "https://codeload.github.com/leaflet-extras/leaflet-providers/tar.gz/620d7a433b74a47b93e6fa9bf6536a384b47d9da"
+  
+  "@bower_components/leaflet-spin@makinacorpus/Leaflet.Spin#1.1.0":
+    version "1.0.0"
+    resolved "https://codeload.github.com/makinacorpus/Leaflet.Spin/tar.gz/f7c86843d24e6a6a50f94a66d8881b370fb8218f"
+    dependencies:
+      spin.js "^2.3.1"
+  
+  "@bower_components/leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0":
+    version "0.3.0"
+    resolved "https://codeload.github.com/Leaflet/Leaflet.Toolbar/tar.gz/fb935befa99d753bdd0deb0ce2cad20335783459"
+  
+  "@bower_components/leaflet@Leaflet/Leaflet#^1.0.0":
+    version "1.5.1"
+    resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
+  
+  "@bower_components/modalbox@okonet/modalbox#*":
+    version "0.0.0"
+    resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
+  
+  "@bower_components/ol2@openlayers/ol2#release-2.13.1":
+    version "0.0.0"
+    resolved "https://codeload.github.com/openlayers/ol2/tar.gz/f4a4090814f240414548e8eda55070d16f3d3901"
+  
+  "@bower_components/prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2":
+    version "0.0.0"
+    resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"
+  
+  "@bower_components/sparklines@mariusGundersen/sparkline#~1.0.0":
+    version "1.0.0"
+    resolved "https://codeload.github.com/mariusGundersen/sparkline/tar.gz/097a83f6bbb6b2d088eb125c4c848edef30ba252"
+  
+  "@bower_components/spin.js@fgnass/spin.js#^2.3.1":
+    version "2.3.2"
+    resolved "https://codeload.github.com/fgnass/spin.js/tar.gz/f0cc4b82358bee8bbb50f0fd90090bfe4d612da1"
+  
+  "@bower_components/webgl-distort@jywarren/webgl-distort#*":
+    version "0.0.1"
+    resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
+  
+  "@types/node@^8.0.7":
+    version "8.10.49"
+    resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
+    integrity sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==
+  
+  abbrev@1:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+    integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+  
+  acorn-dynamic-import@^4.0.0:
+    version "4.0.0"
+    resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+    integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
+  
+  acorn-node@^1.3.0:
+    version "1.7.0"
+    resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.7.0.tgz#aac6a559d27af6176b076ab6fb13c5974c213e3b"
+    integrity sha512-XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==
+    dependencies:
+      acorn "^6.1.1"
+      acorn-dynamic-import "^4.0.0"
+      acorn-walk "^6.1.1"
+      xtend "^4.0.1"
+  
+  acorn-walk@^6.1.1:
+    version "6.1.1"
+    resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+    integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
+  
+  acorn@^5.0.0:
+    version "5.7.3"
+    resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+    integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  
+  acorn@^6.1.1:
+    version "6.1.1"
+    resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+    integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+  
+  ajv@^6.5.5:
+    version "6.10.0"
+    resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+    integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+    dependencies:
+      fast-deep-equal "^2.0.1"
+      fast-json-stable-stringify "^2.0.0"
+      json-schema-traverse "^0.4.1"
+      uri-js "^4.2.2"
+  
+  align-text@^0.1.1, align-text@^0.1.3:
+    version "0.1.4"
+    resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+    integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
+    dependencies:
+      kind-of "^3.0.2"
+      longest "^1.0.1"
+      repeat-string "^1.5.2"
+  
+  amdefine@>=0.0.4:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+    integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+  
+  ansi-regex@^3.0.0:
+    version "3.0.0"
+    resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+    integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  
+  ansi-styles@^3.2.1:
+    version "3.2.1"
+    resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+    integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+    dependencies:
+      color-convert "^1.9.0"
+  
+  arr-diff@^4.0.0:
+    version "4.0.0"
+    resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+    integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  
+  arr-flatten@^1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+    integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+  
+  arr-union@^3.1.0:
+    version "3.1.0"
+    resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+    integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+  
+  array-each@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+    integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
+  
+  array-from@^2.1.1:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
+    integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
+  
+  array-slice@^1.0.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+    integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
+  
+  array-unique@^0.3.2:
+    version "0.3.2"
+    resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+    integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+  
+  asn1@~0.2.3:
+    version "0.2.4"
+    resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+    integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+    dependencies:
+      safer-buffer "~2.1.0"
+  
+  assert-plus@1.0.0, assert-plus@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+    integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+  
+  assign-symbols@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+    integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  
+  asynckit@^0.4.0:
+    version "0.4.0"
+    resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+    integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  
+  atob@^2.1.1:
+    version "2.1.2"
+    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+  
+  aws-sign2@~0.7.0:
+    version "0.7.0"
+    resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+    integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+  
+  aws4@^1.8.0:
+    version "1.8.0"
+    resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+    integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+  
+  base64-js@^1.0.2:
+    version "1.3.0"
+    resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+    integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+  
+  base@^0.11.1:
+    version "0.11.2"
+    resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+    integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+    dependencies:
+      cache-base "^1.0.1"
+      class-utils "^0.3.5"
+      component-emitter "^1.2.1"
+      define-property "^1.0.0"
+      isobject "^3.0.1"
+      mixin-deep "^1.2.0"
+      pascalcase "^0.1.1"
+  
+  bcrypt-pbkdf@^1.0.0:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+    integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+    dependencies:
+      tweetnacl "^0.14.3"
+  
+  bit-twiddle@^1.0.0, bit-twiddle@^1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
+    integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
+  
+  bootstrap@~3.2.0:
+    version "3.2.0"
+    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637"
+    integrity sha1-oHJufBLnn0oqUE+NHunyhQqD9jc=
+  
+  braces@^2.3.1:
+    version "2.3.2"
+    resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+    integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+    dependencies:
+      arr-flatten "^1.1.0"
+      array-unique "^0.3.2"
+      extend-shallow "^2.0.1"
+      fill-range "^4.0.0"
+      isobject "^3.0.1"
+      repeat-element "^1.1.2"
+      snapdragon "^0.8.1"
+      snapdragon-node "^2.0.1"
+      split-string "^3.0.2"
+      to-regex "^3.0.1"
+  
+  brfs@1.4.3:
+    version "1.4.3"
+    resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216"
+    integrity sha1-22ddb16SPm3wh/ylhZyQkKrtMhY=
+    dependencies:
+      quote-stream "^1.0.1"
+      resolve "^1.1.5"
+      static-module "^1.1.0"
+      through2 "^2.0.0"
+  
+  brfs@^1.3.0:
+    version "1.6.1"
+    resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+    integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
+    dependencies:
+      quote-stream "^1.0.1"
+      resolve "^1.1.5"
+      static-module "^2.2.0"
+      through2 "^2.0.0"
+  
+  buffer-equal@0.0.1:
+    version "0.0.1"
+    resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+    integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+  
+  buffer-from@^1.0.0:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+    integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  
+  buffer@~5.0.2:
+    version "5.0.8"
+    resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24"
+    integrity sha512-xXvjQhVNz50v2nPeoOsNqWCLGfiv4ji/gXZM28jnVwdLJxH4mFyqgqCKfaK9zf1KUbG6zTkjLOy7ou+jSMarGA==
+    dependencies:
+      base64-js "^1.0.2"
+      ieee754 "^1.1.4"
+  
+  cache-base@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+    integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+    dependencies:
+      collection-visit "^1.0.0"
+      component-emitter "^1.2.1"
+      get-value "^2.0.6"
+      has-value "^1.0.0"
+      isobject "^3.0.1"
+      set-value "^2.0.0"
+      to-object-path "^0.3.0"
+      union-value "^1.0.0"
+      unset-value "^1.0.0"
+  
+  camelcase@^1.0.2:
+    version "1.2.1"
+    resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+    integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+  
+  caseless@~0.12.0:
+    version "0.12.0"
+    resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+    integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+  
+  center-align@^0.1.1:
+    version "0.1.3"
+    resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+    integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
+    dependencies:
+      align-text "^0.1.3"
+      lazy-cache "^1.0.3"
+  
+  chalk@^2.0.1, chalk@^2.3.1:
+    version "2.4.2"
+    resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+    integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+    dependencies:
+      ansi-styles "^3.2.1"
+      escape-string-regexp "^1.0.5"
+      supports-color "^5.3.0"
+  
+  charm@~0.1.0:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
+    integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
+  
+  class-utils@^0.3.5:
+    version "0.3.6"
+    resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+    integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+    dependencies:
+      arr-union "^3.1.0"
+      define-property "^0.2.5"
+      isobject "^3.0.0"
+      static-extend "^0.1.1"
+  
+  cli-cursor@^2.1.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+    integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+    dependencies:
+      restore-cursor "^2.0.0"
+  
+  cli-spinners@^1.1.0:
+    version "1.3.1"
+    resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
+    integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==
+  
+  cliui@^2.1.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+    integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
+    dependencies:
+      center-align "^0.1.1"
+      right-align "^0.1.1"
+      wordwrap "0.0.2"
+  
+  clone@^1.0.2:
+    version "1.0.4"
+    resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+    integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  
+  collection-visit@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+    integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+    dependencies:
+      map-visit "^1.0.0"
+      object-visit "^1.0.0"
+  
+  color-convert@^1.9.0:
+    version "1.9.3"
+    resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+    integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+    dependencies:
+      color-name "1.1.3"
+  
+  color-name@1.1.3:
+    version "1.1.3"
+    resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+    integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  
+  combined-stream@^1.0.6, combined-stream@~1.0.6:
+    version "1.0.8"
+    resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+    integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+    dependencies:
+      delayed-stream "~1.0.0"
+  
+  commander@^2.11.0:
+    version "2.20.0"
+    resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+    integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+  
+  component-emitter@^1.2.1:
+    version "1.3.0"
+    resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+    integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+  
+  concat-stream@~1.4.5:
+    version "1.4.11"
+    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz#1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f"
+    integrity sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==
+    dependencies:
+      inherits "~2.0.1"
+      readable-stream "~1.1.9"
+      typedarray "~0.0.5"
+  
+  concat-stream@~1.5.0, concat-stream@~1.5.1:
+    version "1.5.2"
+    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+    integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY=
+    dependencies:
+      inherits "~2.0.1"
+      readable-stream "~2.0.0"
+      typedarray "~0.0.5"
+  
+  concat-stream@~1.6.0:
+    version "1.6.2"
+    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+    integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+    dependencies:
+      buffer-from "^1.0.0"
+      inherits "^2.0.3"
+      readable-stream "^2.2.2"
+      typedarray "^0.0.6"
+  
+  contentstream@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/contentstream/-/contentstream-1.0.0.tgz#0bdcfa46da30464a86ce8fa7ece565410dc6f9a5"
+    integrity sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU=
+    dependencies:
+      readable-stream "~1.0.33-1"
+  
+  convert-source-map@^1.5.1:
+    version "1.6.0"
+    resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+    integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+    dependencies:
+      safe-buffer "~5.1.1"
+  
+  copy-descriptor@^0.1.0:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+    integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+  
+  core-util-is@1.0.2, core-util-is@~1.0.0:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+    integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  
+  corslite@0.0.7:
+    version "0.0.7"
+    resolved "https://registry.yarnpkg.com/corslite/-/corslite-0.0.7.tgz#8e451db5320a7556de1ef78d9bd3566343077721"
+    integrity sha1-jkUdtTIKdVbeHveNm9NWY0MHdyE=
+  
+  csv2geojson@~5.0.0:
+    version "5.0.2"
+    resolved "https://registry.yarnpkg.com/csv2geojson/-/csv2geojson-5.0.2.tgz#abd649f2ec57689219ad4f19d333be75456b6f59"
+    integrity sha1-q9ZJ8uxXaJIZrU8Z0zO+dUVrb1k=
+    dependencies:
+      concat-stream "~1.5.1"
+      d3-dsv "1.0.1"
+      optimist "~0.6.1"
+      sexagesimal "0.5.0"
+  
+  cwise-compiler@^1.0.0, cwise-compiler@^1.1.1, cwise-compiler@^1.1.2:
+    version "1.1.3"
+    resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
+    integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=
+    dependencies:
+      uniq "^1.0.0"
+  
+  cwise-parser@^1.0.0:
+    version "1.0.3"
+    resolved "https://registry.yarnpkg.com/cwise-parser/-/cwise-parser-1.0.3.tgz#8e493c17d54f97cb030a9e9854bc86c9dfb354fe"
+    integrity sha1-jkk8F9VPl8sDCp6YVLyGyd+zVP4=
+    dependencies:
+      esprima "^1.0.3"
+      uniq "^1.0.0"
+  
+  cwise@^1.0.4, cwise@^1.0.7:
+    version "1.0.10"
+    resolved "https://registry.yarnpkg.com/cwise/-/cwise-1.0.10.tgz#24eee6072ebdfd6b8c6f5dadb17090b649b12bef"
+    integrity sha1-JO7mBy69/WuMb12tsXCQtkmxK+8=
+    dependencies:
+      cwise-compiler "^1.1.1"
+      cwise-parser "^1.0.0"
+      static-module "^1.0.0"
+      uglify-js "^2.6.0"
+  
+  d3-dsv@1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.1.tgz#d495347c04cb1e0d26557bbdc4775c4d11a245ea"
+    integrity sha1-1JU0fATLHg0mVXu9xHdcTRGiReo=
+    dependencies:
+      rw "1"
+  
+  d3-geo-projection@0.2:
+    version "0.2.16"
+    resolved "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz#4994ecd1033ddb1533b6c4c5528a1c81dcc29427"
+    integrity sha1-SZTs0QM92xUztsTFUoocgdzClCc=
+    dependencies:
+      brfs "^1.3.0"
+  
+  d3-queue@1:
+    version "1.2.3"
+    resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-1.2.3.tgz#143a701cfa65fe021292f321c10d14e98abd491b"
+    integrity sha1-FDpwHPpl/gISkvMhwQ0U6Yq9SRs=
+  
+  d3-queue@2:
+    version "2.0.3"
+    resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-2.0.3.tgz#07fbda3acae5358a9c5299aaf880adf0953ed2c2"
+    integrity sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=
+  
+  d3@3:
+    version "3.5.17"
+    resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
+    integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=
+  
+  d@1:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+    integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+    dependencies:
+      es5-ext "^0.10.9"
+  
+  dashdash@^1.12.0:
+    version "1.14.1"
+    resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+    integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+    dependencies:
+      assert-plus "^1.0.0"
+  
+  data-uri-to-buffer@0.0.3:
+    version "0.0.3"
+    resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
+    integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=
+  
+  data-uri-to-buffer@^2.0.0:
+    version "2.0.1"
+    resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+    integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
+    dependencies:
+      "@types/node" "^8.0.7"
+  
+  debug@^2.2.0, debug@^2.3.3:
+    version "2.6.9"
+    resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+    integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+    dependencies:
+      ms "2.0.0"
+  
+  decamelize@^1.0.0:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+    integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  
+  decode-uri-component@^0.2.0:
+    version "0.2.0"
+    resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+    integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  
+  deep-is@~0.1.3:
+    version "0.1.3"
+    resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+    integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  
+  defaults@^1.0.3:
+    version "1.0.3"
+    resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+    integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+    dependencies:
+      clone "^1.0.2"
+  
+  define-property@^0.2.5:
+    version "0.2.5"
+    resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+    integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+    dependencies:
+      is-descriptor "^0.1.0"
+  
+  define-property@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+    integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+    dependencies:
+      is-descriptor "^1.0.0"
+  
+  define-property@^2.0.2:
+    version "2.0.2"
+    resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+    integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+    dependencies:
+      is-descriptor "^1.0.2"
+      isobject "^3.0.1"
+  
+  delayed-stream@~1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+    integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  
+  detect-file@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+    integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  
+  dup@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/dup/-/dup-1.0.0.tgz#51fc5ac685f8196469df0b905e934b20af5b4029"
+    integrity sha1-UfxaxoX4GWRp3wuQXpNLIK9bQCk=
+  
+  duplexer2@~0.0.2:
+    version "0.0.2"
+    resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+    integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
+    dependencies:
+      readable-stream "~1.1.9"
+  
+  duplexer2@~0.1.4:
+    version "0.1.4"
+    resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+    integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+    dependencies:
+      readable-stream "^2.0.2"
+  
+  ecc-jsbn@~0.1.1:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+    integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+    dependencies:
+      jsbn "~0.1.0"
+      safer-buffer "^2.1.0"
+  
+  es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+    version "0.10.50"
+    resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
+    integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
+    dependencies:
+      es6-iterator "~2.0.3"
+      es6-symbol "~3.1.1"
+      next-tick "^1.0.0"
+  
+  es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+    version "2.0.3"
+    resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+    integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+    dependencies:
+      d "1"
+      es5-ext "^0.10.35"
+      es6-symbol "^3.1.1"
+  
+  es6-map@^0.1.5:
+    version "0.1.5"
+    resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+    integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
+    dependencies:
+      d "1"
+      es5-ext "~0.10.14"
+      es6-iterator "~2.0.1"
+      es6-set "~0.1.5"
+      es6-symbol "~3.1.1"
+      event-emitter "~0.3.5"
+  
+  es6-set@^0.1.5, es6-set@~0.1.5:
+    version "0.1.5"
+    resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+    integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
+    dependencies:
+      d "1"
+      es5-ext "~0.10.14"
+      es6-iterator "~2.0.1"
+      es6-symbol "3.1.1"
+      event-emitter "~0.3.5"
+  
+  es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+    version "3.1.1"
+    resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+    integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+    dependencies:
+      d "1"
+      es5-ext "~0.10.14"
+  
+  escape-string-regexp@^1.0.5:
+    version "1.0.5"
+    resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+    integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  
+  escodegen@^1.8.1:
+    version "1.11.1"
+    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+    integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+    dependencies:
+      esprima "^3.1.3"
+      estraverse "^4.2.0"
+      esutils "^2.0.2"
+      optionator "^0.8.1"
+    optionalDependencies:
+      source-map "~0.6.1"
+  
+  escodegen@~0.0.24:
+    version "0.0.28"
+    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-0.0.28.tgz#0e4ff1715f328775d6cab51ac44a406cd7abffd3"
+    integrity sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=
+    dependencies:
+      esprima "~1.0.2"
+      estraverse "~1.3.0"
+    optionalDependencies:
+      source-map ">= 0.1.2"
+  
+  escodegen@~1.3.2:
+    version "1.3.3"
+    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.3.3.tgz#f024016f5a88e046fd12005055e939802e6c5f23"
+    integrity sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=
+    dependencies:
+      esprima "~1.1.1"
+      estraverse "~1.5.0"
+      esutils "~1.0.0"
+    optionalDependencies:
+      source-map "~0.1.33"
+  
+  escodegen@~1.9.0:
+    version "1.9.1"
+    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+    integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+    dependencies:
+      esprima "^3.1.3"
+      estraverse "^4.2.0"
+      esutils "^2.0.2"
+      optionator "^0.8.1"
+    optionalDependencies:
+      source-map "~0.6.1"
+  
+  esprima@^1.0.3:
+    version "1.2.5"
+    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9"
+    integrity sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=
+  
+  esprima@^3.1.3:
+    version "3.1.3"
+    resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+    integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+  
+  esprima@~1.0.2:
+    version "1.0.4"
+    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
+    integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
+  
+  esprima@~1.1.1:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
+    integrity sha1-W28VR/TRAuZw4UDFCb5ncdautUk=
+  
+  estraverse@^4.2.0:
+    version "4.2.0"
+    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+    integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+  
+  estraverse@~1.3.0:
+    version "1.3.2"
+    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.3.2.tgz#37c2b893ef13d723f276d878d60d8535152a6c42"
+    integrity sha1-N8K4k+8T1yPydth41g2FNRUqbEI=
+  
+  estraverse@~1.5.0:
+    version "1.5.1"
+    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
+    integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
+  
+  estree-is-function@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz#c0adc29806d7f18a74db7df0f3b2666702e37ad2"
+    integrity sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==
+  
+  esutils@^2.0.2:
+    version "2.0.2"
+    resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+    integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  
+  esutils@~1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
+    integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
+  
+  event-emitter@~0.3.5:
+    version "0.3.5"
+    resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+    integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+    dependencies:
+      d "1"
+      es5-ext "~0.10.14"
+  
+  expand-brackets@^2.1.4:
+    version "2.1.4"
+    resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+    integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+    dependencies:
+      debug "^2.3.3"
+      define-property "^0.2.5"
+      extend-shallow "^2.0.1"
+      posix-character-classes "^0.1.0"
+      regex-not "^1.0.0"
+      snapdragon "^0.8.1"
+      to-regex "^3.0.1"
+  
+  expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+    version "2.0.2"
+    resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+    integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+    dependencies:
+      homedir-polyfill "^1.0.1"
+  
+  extend-shallow@^2.0.1:
+    version "2.0.1"
+    resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+    integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+    dependencies:
+      is-extendable "^0.1.0"
+  
+  extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+    version "3.0.2"
+    resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+    integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+    dependencies:
+      assign-symbols "^1.0.0"
+      is-extendable "^1.0.1"
+  
+  extend@^3.0.0, extend@~3.0.2:
+    version "3.0.2"
+    resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+    integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+  
+  extglob@^2.0.4:
+    version "2.0.4"
+    resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+    integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+    dependencies:
+      array-unique "^0.3.2"
+      define-property "^1.0.0"
+      expand-brackets "^2.1.4"
+      extend-shallow "^2.0.1"
+      fragment-cache "^0.2.1"
+      regex-not "^1.0.0"
+      snapdragon "^0.8.1"
+      to-regex "^3.0.1"
+  
+  extsprintf@1.3.0:
+    version "1.3.0"
+    resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+    integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+  
+  extsprintf@^1.2.0:
+    version "1.4.0"
+    resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+    integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+  
+  falafel@^2.1.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+    integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
+    dependencies:
+      acorn "^5.0.0"
+      foreach "^2.0.5"
+      isarray "0.0.1"
+      object-keys "^1.0.6"
+  
+  fast-deep-equal@^2.0.1:
+    version "2.0.1"
+    resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+    integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+  
+  fast-json-stable-stringify@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+    integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  
+  fast-levenshtein@~2.0.4:
+    version "2.0.6"
+    resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+    integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  
+  fill-range@^4.0.0:
+    version "4.0.0"
+    resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+    integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+    dependencies:
+      extend-shallow "^2.0.1"
+      is-number "^3.0.0"
+      repeat-string "^1.6.1"
+      to-regex-range "^2.1.0"
+  
+  findup-sync@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+    integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+    dependencies:
+      detect-file "^1.0.0"
+      is-glob "^3.1.0"
+      micromatch "^3.0.4"
+      resolve-dir "^1.0.1"
+  
+  fined@^1.0.1:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+    integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
+    dependencies:
+      expand-tilde "^2.0.2"
+      is-plain-object "^2.0.3"
+      object.defaults "^1.1.0"
+      object.pick "^1.2.0"
+      parse-filepath "^1.0.1"
+  
+  fisheyegl@^0.1.2:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/fisheyegl/-/fisheyegl-0.1.2.tgz#4b7ad5705253444ad6030888a81296f5068e4972"
+    integrity sha1-S3rVcFJTRErWAwiIqBKW9QaOSXI=
+  
+  flagged-respawn@^1.0.0:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+    integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
+  
+  font-awesome@~4.5.0:
+    version "4.5.0"
+    resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
+    integrity sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=
+  
+  for-in@^1.0.1, for-in@^1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+    integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  
+  for-own@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+    integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+    dependencies:
+      for-in "^1.0.1"
+  
+  foreach@^2.0.5:
+    version "2.0.5"
+    resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+    integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+  
+  forever-agent@~0.6.1:
+    version "0.6.1"
+    resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+    integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+  
+  form-data@~2.3.2:
+    version "2.3.3"
+    resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+    integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+    dependencies:
+      asynckit "^0.4.0"
+      combined-stream "^1.0.6"
+      mime-types "^2.1.12"
+  
+  fragment-cache@^0.2.1:
+    version "0.2.1"
+    resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+    integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+    dependencies:
+      map-cache "^0.2.2"
+  
+  from2-string@^1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/from2-string/-/from2-string-1.1.0.tgz#18282b27d08a267cb3030cd2b8b4b0f212af752a"
+    integrity sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=
+    dependencies:
+      from2 "^2.0.3"
+  
+  from2@^2.0.3:
+    version "2.3.0"
+    resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+    integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+    dependencies:
+      inherits "^2.0.1"
+      readable-stream "^2.0.0"
+  
+  function-bind@^1.1.1:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+    integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+  
+  get-assigned-identifiers@^1.1.0:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
+    integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
+  
+  get-pixels@~3.3.0:
+    version "3.3.2"
+    resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03"
+    integrity sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ==
+    dependencies:
+      data-uri-to-buffer "0.0.3"
+      jpeg-js "^0.3.2"
+      mime-types "^2.0.1"
+      ndarray "^1.0.13"
+      ndarray-pack "^1.1.1"
+      node-bitmap "0.0.1"
+      omggif "^1.0.5"
+      parse-data-uri "^0.2.0"
+      pngjs "^3.3.3"
+      request "^2.44.0"
+      through "^2.3.4"
+  
+  get-value@^2.0.3, get-value@^2.0.6:
+    version "2.0.6"
+    resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+    integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+  
+  getpass@^0.1.1:
+    version "0.1.7"
+    resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+    integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+    dependencies:
+      assert-plus "^1.0.0"
+  
+  gif-encoder@~0.4.1:
+    version "0.4.3"
+    resolved "https://registry.yarnpkg.com/gif-encoder/-/gif-encoder-0.4.3.tgz#8a2b4fe8ca895a48e3a0b6cbb340a0a6a3571899"
+    integrity sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk=
+    dependencies:
+      readable-stream "~1.1.9"
+  
+  global-modules@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+    integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+    dependencies:
+      global-prefix "^1.0.1"
+      is-windows "^1.0.1"
+      resolve-dir "^1.0.0"
+  
+  global-prefix@^1.0.1:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+    integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+    dependencies:
+      expand-tilde "^2.0.2"
+      homedir-polyfill "^1.0.1"
+      ini "^1.3.4"
+      is-windows "^1.0.1"
+      which "^1.2.14"
+  
+  grunt-cli@^1.2.0:
+    version "1.3.2"
+    resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.3.2.tgz#60f12d12c1b5aae94ae3469c6b5fe24e960014e8"
+    integrity sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==
+    dependencies:
+      grunt-known-options "~1.1.0"
+      interpret "~1.1.0"
+      liftoff "~2.5.0"
+      nopt "~4.0.1"
+      v8flags "~3.1.1"
+  
+  grunt-known-options@~1.1.0:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.1.tgz#6cc088107bd0219dc5d3e57d91923f469059804d"
+    integrity sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==
+  
+  har-schema@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+    integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+  
+  har-validator@~5.1.0:
+    version "5.1.3"
+    resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+    integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+    dependencies:
+      ajv "^6.5.5"
+      har-schema "^2.0.0"
+  
+  has-flag@^3.0.0:
+    version "3.0.0"
+    resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+    integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  
+  has-value@^0.3.1:
+    version "0.3.1"
+    resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+    integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+    dependencies:
+      get-value "^2.0.3"
+      has-values "^0.1.4"
+      isobject "^2.0.0"
+  
+  has-value@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+    integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+    dependencies:
+      get-value "^2.0.6"
+      has-values "^1.0.0"
+      isobject "^3.0.0"
+  
+  has-values@^0.1.4:
+    version "0.1.4"
+    resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+    integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+  
+  has-values@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+    integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+    dependencies:
+      is-number "^3.0.0"
+      kind-of "^4.0.0"
+  
+  has@^1.0.0, has@^1.0.1:
+    version "1.0.3"
+    resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+    integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+    dependencies:
+      function-bind "^1.1.1"
+  
+  heatmap.js@*:
+    version "2.0.5"
+    resolved "https://registry.yarnpkg.com/heatmap.js/-/heatmap.js-2.0.5.tgz#466d3b86513f5d49112a49d25700ab2730149153"
+    integrity sha1-Rm07hlE/XUkRKknSVwCrJzAUkVM=
+  
+  homedir-polyfill@^1.0.1:
+    version "1.0.3"
+    resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+    integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+    dependencies:
+      parse-passwd "^1.0.0"
+  
+  http-signature@~1.2.0:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+    integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+    dependencies:
+      assert-plus "^1.0.0"
+      jsprim "^1.2.2"
+      sshpk "^1.7.0"
+  
+  iconv-lite@0.2:
+    version "0.2.11"
+    resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
+    integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
+  
+  ieee754@^1.1.4:
+    version "1.1.13"
+    resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+    integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+  
+  "imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
+    version "0.9.11-rc.1"
+    resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
+  
+  inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+    version "2.0.3"
+    resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+    integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  
+  ini@^1.3.4:
+    version "1.3.5"
+    resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+    integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  
+  interpret@~1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+    integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+  
+  iota-array@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
+    integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
+  
+  is-absolute@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+    integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+    dependencies:
+      is-relative "^1.0.0"
+      is-windows "^1.0.1"
+  
+  is-accessor-descriptor@^0.1.6:
+    version "0.1.6"
+    resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+    integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+    dependencies:
+      kind-of "^3.0.2"
+  
+  is-accessor-descriptor@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+    integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+    dependencies:
+      kind-of "^6.0.0"
+  
+  is-buffer@^1.0.2, is-buffer@^1.1.5:
+    version "1.1.6"
+    resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+    integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+  
+  is-data-descriptor@^0.1.4:
+    version "0.1.4"
+    resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+    integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+    dependencies:
+      kind-of "^3.0.2"
+  
+  is-data-descriptor@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+    integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+    dependencies:
+      kind-of "^6.0.0"
+  
+  is-descriptor@^0.1.0:
+    version "0.1.6"
+    resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+    integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+    dependencies:
+      is-accessor-descriptor "^0.1.6"
+      is-data-descriptor "^0.1.4"
+      kind-of "^5.0.0"
+  
+  is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+    integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+    dependencies:
+      is-accessor-descriptor "^1.0.0"
+      is-data-descriptor "^1.0.0"
+      kind-of "^6.0.2"
+  
+  is-extendable@^0.1.0, is-extendable@^0.1.1:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+    integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  
+  is-extendable@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+    integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+    dependencies:
+      is-plain-object "^2.0.4"
+  
+  is-extglob@^2.1.0:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+    integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  
+  is-glob@^3.1.0:
+    version "3.1.0"
+    resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+    integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+    dependencies:
+      is-extglob "^2.1.0"
+  
+  is-number@^3.0.0:
+    version "3.0.0"
+    resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+    integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+    dependencies:
+      kind-of "^3.0.2"
+  
+  is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+    version "2.0.4"
+    resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+    integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+    dependencies:
+      isobject "^3.0.1"
+  
+  is-relative@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+    integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+    dependencies:
+      is-unc-path "^1.0.0"
+  
+  is-typedarray@~1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+    integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  
+  is-unc-path@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+    integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+    dependencies:
+      unc-path-regex "^0.1.2"
+  
+  is-windows@^1.0.1, is-windows@^1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+    integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+  
+  isarray@0.0.1:
+    version "0.0.1"
+    resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+    integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  
+  isarray@1.0.0, isarray@~1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+    integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  
+  isexe@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+    integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  
+  isobject@^2.0.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+    integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+    dependencies:
+      isarray "1.0.0"
+  
+  isobject@^3.0.0, isobject@^3.0.1:
+    version "3.0.1"
+    resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+    integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  
+  isstream@~0.1.2:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+    integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+  
+  jpeg-js@0.0.4:
+    version "0.0.4"
+    resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e"
+    integrity sha1-Bqr0fv7HrwsZJKWc1pWm0rXthw4=
+  
+  jpeg-js@^0.3.2:
+    version "0.3.5"
+    resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.5.tgz#6fbd6cd0e49627c5a0341796c9e50c70a2aa3673"
+    integrity sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==
+  
+  jquery@>=1.8, jquery@^3.3.1:
+    version "3.4.1"
+    resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+    integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+  
+  jquery@~2:
+    version "2.2.4"
+    resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
+    integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
+  
+  jsbn@~0.1.0:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+    integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+  
+  json-schema-traverse@^0.4.1:
+    version "0.4.1"
+    resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+    integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+  
+  json-schema@0.2.3:
+    version "0.2.3"
+    resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+    integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+  
+  json-stringify-safe@~5.0.1:
+    version "5.0.1"
+    resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+    integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  
+  jsprim@^1.2.2:
+    version "1.4.1"
+    resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+    integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+    dependencies:
+      assert-plus "1.0.0"
+      extsprintf "1.3.0"
+      json-schema "0.2.3"
+      verror "1.10.0"
+  
+  jsqr@^0.2.2:
+    version "0.2.2"
+    resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
+    integrity sha1-jB8Ceft8lFQqqp6K63xyLVI+oJI=
+  
+  kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+    version "3.2.2"
+    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+    integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+    dependencies:
+      is-buffer "^1.1.5"
+  
+  kind-of@^4.0.0:
+    version "4.0.0"
+    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+    integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+    dependencies:
+      is-buffer "^1.1.5"
+  
+  kind-of@^5.0.0:
+    version "5.1.0"
+    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+    integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+  
+  kind-of@^6.0.0, kind-of@^6.0.2:
+    version "6.0.2"
+    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+    integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  
+  lazy-cache@^1.0.3:
+    version "1.0.4"
+    resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+    integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
+  
+  leaflet-hash@0.2.1:
+    version "0.2.1"
+    resolved "https://registry.yarnpkg.com/leaflet-hash/-/leaflet-hash-0.2.1.tgz#c36c718347c5243033b57cb4baea26119d82c701"
+    integrity sha1-w2xxg0fFJDAztXy0uuomEZ2CxwE=
+  
+  leaflet-heatmap@1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/leaflet-heatmap/-/leaflet-heatmap-1.0.0.tgz#83cc04249d39ed91526aeaa7d7669bdaa86d6b1f"
+    integrity sha1-g8wEJJ057ZFSauqn12ab2qhtax8=
+    dependencies:
+      heatmap.js "*"
+      leaflet "*"
+  
+  leaflet-providers@^1.1.17:
+    version "1.7.0"
+    resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.7.0.tgz#b462d6abba832b2e9f1cef6ca0ab3bf76a7ca9a9"
+    integrity sha512-7gXQnILnnIGuPy8TFaSP2aACsaxdT+y2sFae4rqbK8vX9ZwTJ9+5CI5DcBB+r867PdmdRlz5rjG99yvyLWOJYg==
+  
+  leaflet-spin@1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/leaflet-spin/-/leaflet-spin-1.1.0.tgz#7298be3be9ab05b540913d84915d6347f49b1e4e"
+    integrity sha1-cpi+O+mrBbVAkT2EkV1jR/SbHk4=
+    dependencies:
+      spin.js "^2.3.1"
+  
+  leaflet@*, leaflet@^1.3.1:
+    version "1.5.1"
+    resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf"
+    integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w==
+  
+  levn@~0.3.0:
+    version "0.3.0"
+    resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+    integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+    dependencies:
+      prelude-ls "~1.1.2"
+      type-check "~0.3.2"
+  
+  liftoff@~2.5.0:
+    version "2.5.0"
+    resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
+    integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
+    dependencies:
+      extend "^3.0.0"
+      findup-sync "^2.0.0"
+      fined "^1.0.1"
+      flagged-respawn "^1.0.0"
+      is-plain-object "^2.0.4"
+      object.map "^1.0.0"
+      rechoir "^0.6.2"
+      resolve "^1.1.7"
+  
+  lodash@^4.17.5:
+    version "4.17.11"
+    resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+    integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+  
+  log-symbols@^2.2.0:
+    version "2.2.0"
+    resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+    integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+    dependencies:
+      chalk "^2.0.1"
+  
+  longest@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+    integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+  
+  magic-string@^0.22.4:
+    version "0.22.5"
+    resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+    integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+    dependencies:
+      vlq "^0.2.2"
+  
+  make-iterator@^1.0.0:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+    integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
+    dependencies:
+      kind-of "^6.0.2"
+  
+  map-cache@^0.2.0, map-cache@^0.2.2:
+    version "0.2.2"
+    resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+    integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  
+  map-visit@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+    integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+    dependencies:
+      object-visit "^1.0.0"
+  
+  merge-source-map@1.0.4:
+    version "1.0.4"
+    resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+    integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+    dependencies:
+      source-map "^0.5.6"
+  
+  micromatch@^3.0.4:
+    version "3.1.10"
+    resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+    integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+    dependencies:
+      arr-diff "^4.0.0"
+      array-unique "^0.3.2"
+      braces "^2.3.1"
+      define-property "^2.0.2"
+      extend-shallow "^3.0.2"
+      extglob "^2.0.4"
+      fragment-cache "^0.2.1"
+      kind-of "^6.0.2"
+      nanomatch "^1.2.9"
+      object.pick "^1.3.0"
+      regex-not "^1.0.0"
+      snapdragon "^0.8.1"
+      to-regex "^3.0.2"
+  
+  mime-db@1.40.0:
+    version "1.40.0"
+    resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+    integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+  
+  mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
+    version "2.1.24"
+    resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+    integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+    dependencies:
+      mime-db "1.40.0"
+  
+  mime@^1.3.4:
+    version "1.6.0"
+    resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+    integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+  
+  mimic-fn@^1.0.0:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+    integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+  
+  minimist@0.0.8:
+    version "0.0.8"
+    resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+    integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+  
+  minimist@^1.1.3:
+    version "1.2.0"
+    resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+    integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+  
+  minimist@~0.0.1:
+    version "0.0.10"
+    resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+    integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+  
+  minimist@~1.1.2:
+    version "1.1.3"
+    resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+    integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
+  
+  mixin-deep@^1.2.0:
+    version "1.3.1"
+    resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+    integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+    dependencies:
+      for-in "^1.0.2"
+      is-extendable "^1.0.1"
+  
+  ms@2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+    integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  
+  nanomatch@^1.2.9:
+    version "1.2.13"
+    resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+    integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+    dependencies:
+      arr-diff "^4.0.0"
+      array-unique "^0.3.2"
+      define-property "^2.0.2"
+      extend-shallow "^3.0.2"
+      fragment-cache "^0.2.1"
+      is-windows "^1.0.2"
+      kind-of "^6.0.2"
+      object.pick "^1.3.0"
+      regex-not "^1.0.0"
+      snapdragon "^0.8.1"
+      to-regex "^3.0.1"
+  
+  ndarray-fft@^1.0.0:
+    version "1.0.3"
+    resolved "https://registry.yarnpkg.com/ndarray-fft/-/ndarray-fft-1.0.3.tgz#dc5bba18e3ab82c997adbaebb78e79f82c93a22a"
+    integrity sha1-3Fu6GOOrgsmXrbrrt455+CyToio=
+    dependencies:
+      bit-twiddle "^1.0.2"
+      cwise "^1.0.4"
+      ndarray "^1.0.15"
+      ndarray-ops "^1.2.2"
+      typedarray-pool "^1.0.0"
+  
+  ndarray-gaussian-filter@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/ndarray-gaussian-filter/-/ndarray-gaussian-filter-1.0.0.tgz#b521d8f8040af70e4e5c244a3c7f06cbb358024e"
+    integrity sha1-tSHY+AQK9w5OXCRKPH8Gy7NYAk4=
+    dependencies:
+      cwise "^1.0.7"
+      dup "^1.0.0"
+      ndarray "^1.0.18"
+      ndarray-fft "^1.0.0"
+      ndarray-ops "^1.2.2"
+      next-pow-2 "^1.0.0"
+      typedarray-pool "^1.1.0"
+  
+  ndarray-ops@^1.2.2:
+    version "1.2.2"
+    resolved "https://registry.yarnpkg.com/ndarray-ops/-/ndarray-ops-1.2.2.tgz#59e88d2c32a7eebcb1bc690fae141579557a614e"
+    integrity sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=
+    dependencies:
+      cwise-compiler "^1.0.0"
+  
+  ndarray-pack@^1.1.1:
+    version "1.2.1"
+    resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
+    integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=
+    dependencies:
+      cwise-compiler "^1.1.2"
+      ndarray "^1.0.13"
+  
+  ndarray@^1.0.13, ndarray@^1.0.15, ndarray@^1.0.18:
+    version "1.0.18"
+    resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793"
+    integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=
+    dependencies:
+      iota-array "^1.0.0"
+      is-buffer "^1.0.2"
+  
+  next-pow-2@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/next-pow-2/-/next-pow-2-1.0.0.tgz#cb5c2f1dae040c56cdd5cda1dc5c6a3a338f4367"
+    integrity sha1-y1wvHa4EDFbN1c2h3FxqOjOPQ2c=
+  
+  next-tick@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+    integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+  
+  node-bitmap@0.0.1:
+    version "0.0.1"
+    resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
+    integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
+  
+  nopt@~4.0.1:
+    version "4.0.1"
+    resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+    integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+    dependencies:
+      abbrev "1"
+      osenv "^0.1.4"
+  
+  oauth-sign@~0.9.0:
+    version "0.9.0"
+    resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+    integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+  
+  object-copy@^0.1.0:
+    version "0.1.0"
+    resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+    integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+    dependencies:
+      copy-descriptor "^0.1.0"
+      define-property "^0.2.5"
+      kind-of "^3.0.3"
+  
+  object-inspect@~0.4.0:
+    version "0.4.0"
+    resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec"
+    integrity sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=
+  
+  object-inspect@~1.4.0:
+    version "1.4.1"
+    resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+    integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+  
+  object-keys@^1.0.6:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+    integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+  
+  object-keys@~0.4.0:
+    version "0.4.0"
+    resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
+    integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
+  
+  object-visit@^1.0.0:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+    integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+    dependencies:
+      isobject "^3.0.0"
+  
+  object.defaults@^1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+    integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
+    dependencies:
+      array-each "^1.0.1"
+      array-slice "^1.0.0"
+      for-own "^1.0.0"
+      isobject "^3.0.0"
+  
+  object.map@^1.0.0:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+    integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
+    dependencies:
+      for-own "^1.0.0"
+      make-iterator "^1.0.0"
+  
+  object.pick@^1.2.0, object.pick@^1.3.0:
+    version "1.3.0"
+    resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+    integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+    dependencies:
+      isobject "^3.0.1"
+  
+  omggif@^1.0.5:
+    version "1.0.9"
+    resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
+    integrity sha1-3LcCTazVDFK00wPwSALJHAV8dl8=
+  
+  onetime@^2.0.0:
+    version "2.0.1"
+    resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+    integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+    dependencies:
+      mimic-fn "^1.0.0"
+  
+  optimist@0.3:
+    version "0.3.7"
+    resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+    integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
+    dependencies:
+      wordwrap "~0.0.2"
+  
+  optimist@~0.6.1:
+    version "0.6.1"
+    resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+    integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+    dependencies:
+      minimist "~0.0.1"
+      wordwrap "~0.0.2"
+  
+  optionator@^0.8.1:
+    version "0.8.2"
+    resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+    integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+    dependencies:
+      deep-is "~0.1.3"
+      fast-levenshtein "~2.0.4"
+      levn "~0.3.0"
+      prelude-ls "~1.1.2"
+      type-check "~0.3.2"
+      wordwrap "~1.0.0"
+  
+  ora@^2.0.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/ora/-/ora-2.1.0.tgz#6caf2830eb924941861ec53a173799e008b51e5b"
+    integrity sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==
+    dependencies:
+      chalk "^2.3.1"
+      cli-cursor "^2.1.0"
+      cli-spinners "^1.1.0"
+      log-symbols "^2.2.0"
+      strip-ansi "^4.0.0"
+      wcwidth "^1.0.1"
+  
+  os-homedir@^1.0.0:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+    integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+  
+  os-tmpdir@^1.0.0:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+    integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  
+  osenv@^0.1.4:
+    version "0.1.5"
+    resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+    integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+    dependencies:
+      os-homedir "^1.0.0"
+      os-tmpdir "^1.0.0"
+  
+  pace@0.0.4:
+    version "0.0.4"
+    resolved "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz#d66405d5f5bc12d25441a6e26c878dbc69e77a77"
+    integrity sha1-1mQF1fW8EtJUQabibIeNvGnnenc=
+    dependencies:
+      charm "~0.1.0"
+  
+  parse-data-uri@^0.2.0:
+    version "0.2.0"
+    resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
+    integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk=
+    dependencies:
+      data-uri-to-buffer "0.0.3"
+  
+  parse-filepath@^1.0.1:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+    integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
+    dependencies:
+      is-absolute "^1.0.0"
+      map-cache "^0.2.0"
+      path-root "^0.1.1"
+  
+  parse-passwd@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+    integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+  
+  pascalcase@^0.1.1:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+    integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+  
+  path-parse@^1.0.6:
+    version "1.0.6"
+    resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+    integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  
+  path-root-regex@^0.1.0:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+    integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+  
+  path-root@^0.1.1:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+    integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+    dependencies:
+      path-root-regex "^0.1.0"
+  
+  performance-now@^2.1.0:
+    version "2.1.0"
+    resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+    integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+  
+  pngjs-nozlib@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7"
+    integrity sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c=
+  
+  pngjs@^3.3.3:
+    version "3.4.0"
+    resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+    integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+  
+  polyline@0.2.0:
+    version "0.2.0"
+    resolved "https://registry.yarnpkg.com/polyline/-/polyline-0.2.0.tgz#4f2b716ca81134a6cbaa488975d236ecb1cc2840"
+    integrity sha1-TytxbKgRNKbLqkiJddI27LHMKEA=
+  
+  posix-character-classes@^0.1.0:
+    version "0.1.1"
+    resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+    integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+  
+  prelude-ls@~1.1.2:
+    version "1.1.2"
+    resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+    integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  
+  process-nextick-args@~1.0.6:
+    version "1.0.7"
+    resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+    integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+  
+  process-nextick-args@~2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+    integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  
+  psl@^1.1.24:
+    version "1.1.32"
+    resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
+    integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
+  
+  punycode@^1.4.1:
+    version "1.4.1"
+    resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+    integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+  
+  punycode@^2.1.0:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+    integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  
+  qs@~6.5.2:
+    version "6.5.2"
+    resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+    integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+  
+  quote-stream@^1.0.1, quote-stream@^1.0.2, quote-stream@~1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+    integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+    dependencies:
+      buffer-equal "0.0.1"
+      minimist "^1.1.3"
+      through2 "^2.0.0"
+  
+  quote-stream@~0.0.0:
+    version "0.0.0"
+    resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-0.0.0.tgz#cde29e94c409b16e19dc7098b89b6658f9721d3b"
+    integrity sha1-zeKelMQJsW4Z3HCYuJtmWPlyHTs=
+    dependencies:
+      minimist "0.0.8"
+      through2 "~0.4.1"
+  
+  readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
+    version "2.3.6"
+    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+    integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+    dependencies:
+      core-util-is "~1.0.0"
+      inherits "~2.0.3"
+      isarray "~1.0.0"
+      process-nextick-args "~2.0.0"
+      safe-buffer "~5.1.1"
+      string_decoder "~1.1.1"
+      util-deprecate "~1.0.1"
+  
+  readable-stream@~1.0.17, readable-stream@~1.0.27-1, readable-stream@~1.0.33-1:
+    version "1.0.34"
+    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+    integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+    dependencies:
+      core-util-is "~1.0.0"
+      inherits "~2.0.1"
+      isarray "0.0.1"
+      string_decoder "~0.10.x"
+  
+  readable-stream@~1.1.9:
+    version "1.1.14"
+    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+    integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+    dependencies:
+      core-util-is "~1.0.0"
+      inherits "~2.0.1"
+      isarray "0.0.1"
+      string_decoder "~0.10.x"
+  
+  readable-stream@~2.0.0:
+    version "2.0.6"
+    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+    integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+    dependencies:
+      core-util-is "~1.0.0"
+      inherits "~2.0.1"
+      isarray "~1.0.0"
+      process-nextick-args "~1.0.6"
+      string_decoder "~0.10.x"
+      util-deprecate "~1.0.1"
+  
+  readline-sync@^1.4.7:
+    version "1.4.9"
+    resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
+    integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
+  
+  rechoir@^0.6.2:
+    version "0.6.2"
+    resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+    integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
+    dependencies:
+      resolve "^1.1.6"
+  
+  regex-not@^1.0.0, regex-not@^1.0.2:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+    integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+    dependencies:
+      extend-shallow "^3.0.2"
+      safe-regex "^1.1.0"
+  
+  repeat-element@^1.1.2:
+    version "1.1.3"
+    resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+    integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  
+  repeat-string@^1.5.2, repeat-string@^1.6.1:
+    version "1.6.1"
+    resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+    integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  
+  request@^2.44.0:
+    version "2.88.0"
+    resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+    integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+    dependencies:
+      aws-sign2 "~0.7.0"
+      aws4 "^1.8.0"
+      caseless "~0.12.0"
+      combined-stream "~1.0.6"
+      extend "~3.0.2"
+      forever-agent "~0.6.1"
+      form-data "~2.3.2"
+      har-validator "~5.1.0"
+      http-signature "~1.2.0"
+      is-typedarray "~1.0.0"
+      isstream "~0.1.2"
+      json-stringify-safe "~5.0.1"
+      mime-types "~2.1.19"
+      oauth-sign "~0.9.0"
+      performance-now "^2.1.0"
+      qs "~6.5.2"
+      safe-buffer "^5.1.2"
+      tough-cookie "~2.4.3"
+      tunnel-agent "^0.6.0"
+      uuid "^3.3.2"
+  
+  resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+    integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+    dependencies:
+      expand-tilde "^2.0.0"
+      global-modules "^1.0.0"
+  
+  resolve-url@^0.2.1:
+    version "0.2.1"
+    resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+    integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  
+  resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7:
+    version "1.11.1"
+    resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+    integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+    dependencies:
+      path-parse "^1.0.6"
+  
+  restore-cursor@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+    integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+    dependencies:
+      onetime "^2.0.0"
+      signal-exit "^3.0.2"
+  
+  ret@~0.1.10:
+    version "0.1.15"
+    resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+    integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+  
+  right-align@^0.1.1:
+    version "0.1.3"
+    resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+    integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
+    dependencies:
+      align-text "^0.1.1"
+  
+  rw@1:
+    version "1.3.3"
+    resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+    integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+  
+  safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+    version "5.1.2"
+    resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+    integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+  
+  safe-regex@^1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+    integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+    dependencies:
+      ret "~0.1.10"
+  
+  safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+    version "2.1.2"
+    resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+    integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+  
+  save-pixels@~2.3.4:
+    version "2.3.4"
+    resolved "https://registry.yarnpkg.com/save-pixels/-/save-pixels-2.3.4.tgz#49d349c06b8d7c0127dbf0da24b44aca5afb59fe"
+    integrity sha1-SdNJwGuNfAEn2/DaJLRKylr7Wf4=
+    dependencies:
+      contentstream "^1.0.0"
+      gif-encoder "~0.4.1"
+      jpeg-js "0.0.4"
+      ndarray "^1.0.18"
+      ndarray-ops "^1.2.2"
+      pngjs-nozlib "^1.0.0"
+      through "^2.3.4"
+  
+  scope-analyzer@^2.0.1:
+    version "2.0.5"
+    resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.0.5.tgz#72c9c6770c3e66984f84c7d3c7045998a1a7db8a"
+    integrity sha512-+U5H0417mnTEstCD5VwOYO7V4vYuSqwqjFap40ythe67bhMFL5C3UgPwyBv7KDJsqUBIKafOD57xMlh1rN7eaw==
+    dependencies:
+      array-from "^2.1.1"
+      es6-map "^0.1.5"
+      es6-set "^0.1.5"
+      es6-symbol "^3.1.1"
+      estree-is-function "^1.0.0"
+      get-assigned-identifiers "^1.1.0"
+  
+  set-value@^0.4.3:
+    version "0.4.3"
+    resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+    integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+    dependencies:
+      extend-shallow "^2.0.1"
+      is-extendable "^0.1.1"
+      is-plain-object "^2.0.1"
+      to-object-path "^0.3.0"
+  
+  set-value@^2.0.0:
+    version "2.0.0"
+    resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+    integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+    dependencies:
+      extend-shallow "^2.0.1"
+      is-extendable "^0.1.1"
+      is-plain-object "^2.0.3"
+      split-string "^3.0.1"
+  
+  sexagesimal@0.5.0:
+    version "0.5.0"
+    resolved "https://registry.yarnpkg.com/sexagesimal/-/sexagesimal-0.5.0.tgz#9d815bd2bddd634b625ba6851bf8fe74a5ad3ef3"
+    integrity sha1-nYFb0r3dY0tiW6aFG/j+dKWtPvM=
+  
+  shallow-copy@~0.0.1:
+    version "0.0.1"
+    resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+    integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+  
+  shapefile@0.3:
+    version "0.3.1"
+    resolved "https://registry.yarnpkg.com/shapefile/-/shapefile-0.3.1.tgz#9bb9a429bd6086a0cfb03962d14cfdf420ffba12"
+    integrity sha1-m7mkKb1ghqDPsDli0Uz99CD/uhI=
+    dependencies:
+      d3-queue "1"
+      iconv-lite "0.2"
+      optimist "0.3"
+  
+  signal-exit@^3.0.2:
+    version "3.0.2"
+    resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+    integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  
+  snapdragon-node@^2.0.1:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+    integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+    dependencies:
+      define-property "^1.0.0"
+      isobject "^3.0.0"
+      snapdragon-util "^3.0.1"
+  
+  snapdragon-util@^3.0.1:
+    version "3.0.1"
+    resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+    integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+    dependencies:
+      kind-of "^3.2.0"
+  
+  snapdragon@^0.8.1:
+    version "0.8.2"
+    resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+    integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+    dependencies:
+      base "^0.11.1"
+      debug "^2.2.0"
+      define-property "^0.2.5"
+      extend-shallow "^2.0.1"
+      map-cache "^0.2.2"
+      source-map "^0.5.6"
+      source-map-resolve "^0.5.0"
+      use "^3.1.0"
+  
+  source-map-resolve@^0.5.0:
+    version "0.5.2"
+    resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+    integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+    dependencies:
+      atob "^2.1.1"
+      decode-uri-component "^0.2.0"
+      resolve-url "^0.2.1"
+      source-map-url "^0.4.0"
+      urix "^0.1.0"
+  
+  source-map-url@^0.4.0:
+    version "0.4.0"
+    resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+    integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  
+  "source-map@>= 0.1.2":
+    version "0.7.3"
+    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+    integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+  
+  source-map@^0.5.6, source-map@~0.5.1:
+    version "0.5.7"
+    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+    integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  
+  source-map@~0.1.33:
+    version "0.1.43"
+    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+    integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+    dependencies:
+      amdefine ">=0.0.4"
+  
+  source-map@~0.6.1:
+    version "0.6.1"
+    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+    integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+  
+  spin.js@^2.3.1:
+    version "2.3.2"
+    resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a"
+    integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho=
+  
+  split-string@^3.0.1, split-string@^3.0.2:
+    version "3.1.0"
+    resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+    integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+    dependencies:
+      extend-shallow "^3.0.0"
+  
+  sshpk@^1.7.0:
+    version "1.16.1"
+    resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+    integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+    dependencies:
+      asn1 "~0.2.3"
+      assert-plus "^1.0.0"
+      bcrypt-pbkdf "^1.0.0"
+      dashdash "^1.12.0"
+      ecc-jsbn "~0.1.1"
+      getpass "^0.1.1"
+      jsbn "~0.1.0"
+      safer-buffer "^2.0.2"
+      tweetnacl "~0.14.0"
+  
+  static-eval@^2.0.0, static-eval@^2.0.2:
+    version "2.0.2"
+    resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+    integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+    dependencies:
+      escodegen "^1.8.1"
+  
+  static-eval@~0.2.0:
+    version "0.2.4"
+    resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.4.tgz#b7d34d838937b969f9641ca07d48f8ede263ea7b"
+    integrity sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=
+    dependencies:
+      escodegen "~0.0.24"
+  
+  static-extend@^0.1.1:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+    integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+    dependencies:
+      define-property "^0.2.5"
+      object-copy "^0.1.0"
+  
+  static-module@^1.0.0, static-module@^1.1.0:
+    version "1.5.0"
+    resolved "https://registry.yarnpkg.com/static-module/-/static-module-1.5.0.tgz#27da9883c41a8cd09236f842f0c1ebc6edf63d86"
+    integrity sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=
+    dependencies:
+      concat-stream "~1.6.0"
+      duplexer2 "~0.0.2"
+      escodegen "~1.3.2"
+      falafel "^2.1.0"
+      has "^1.0.0"
+      object-inspect "~0.4.0"
+      quote-stream "~0.0.0"
+      readable-stream "~1.0.27-1"
+      shallow-copy "~0.0.1"
+      static-eval "~0.2.0"
+      through2 "~0.4.1"
+  
+  static-module@^2.2.0:
+    version "2.2.5"
+    resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+    integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
+    dependencies:
+      concat-stream "~1.6.0"
+      convert-source-map "^1.5.1"
+      duplexer2 "~0.1.4"
+      escodegen "~1.9.0"
+      falafel "^2.1.0"
+      has "^1.0.1"
+      magic-string "^0.22.4"
+      merge-source-map "1.0.4"
+      object-inspect "~1.4.0"
+      quote-stream "~1.0.2"
+      readable-stream "~2.3.3"
+      shallow-copy "~0.0.1"
+      static-eval "^2.0.0"
+      through2 "~2.0.3"
+  
+  static-module@^3.0.0:
+    version "3.0.3"
+    resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.3.tgz#cc2301ed3fe353e2d2a2195137013853676f9960"
+    integrity sha512-RDaMYaI5o/ym0GkCqL/PlD1Pn216omp8fY81okxZ6f6JQxWW5tptOw9reXoZX85yt/scYvbWIt6uoszeyf+/MQ==
+    dependencies:
+      acorn-node "^1.3.0"
+      concat-stream "~1.6.0"
+      convert-source-map "^1.5.1"
+      duplexer2 "~0.1.4"
+      escodegen "~1.9.0"
+      has "^1.0.1"
+      magic-string "^0.22.4"
+      merge-source-map "1.0.4"
+      object-inspect "~1.4.0"
+      readable-stream "~2.3.3"
+      scope-analyzer "^2.0.1"
+      shallow-copy "~0.0.1"
+      static-eval "^2.0.2"
+      through2 "~2.0.3"
+  
+  string_decoder@~0.10.x:
+    version "0.10.31"
+    resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+    integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+  
+  string_decoder@~1.1.1:
+    version "1.1.1"
+    resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+    integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+    dependencies:
+      safe-buffer "~5.1.0"
+  
+  strip-ansi@^4.0.0:
+    version "4.0.0"
+    resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+    integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+    dependencies:
+      ansi-regex "^3.0.0"
+  
+  supports-color@^5.3.0:
+    version "5.5.0"
+    resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+    integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+    dependencies:
+      has-flag "^3.0.0"
+  
+  through2@^2.0.0, through2@~2.0.3:
+    version "2.0.5"
+    resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+    integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+    dependencies:
+      readable-stream "~2.3.6"
+      xtend "~4.0.1"
+  
+  through2@~0.4.1:
+    version "0.4.2"
+    resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
+    integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
+    dependencies:
+      readable-stream "~1.0.17"
+      xtend "~2.1.1"
+  
+  through@^2.3.4:
+    version "2.3.8"
+    resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+    integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  
+  to-object-path@^0.3.0:
+    version "0.3.0"
+    resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+    integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+    dependencies:
+      kind-of "^3.0.2"
+  
+  to-regex-range@^2.1.0:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+    integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+    dependencies:
+      is-number "^3.0.0"
+      repeat-string "^1.6.1"
+  
+  to-regex@^3.0.1, to-regex@^3.0.2:
+    version "3.0.2"
+    resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+    integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+    dependencies:
+      define-property "^2.0.2"
+      extend-shallow "^3.0.2"
+      regex-not "^1.0.2"
+      safe-regex "^1.1.0"
+  
+  togeojson@0.13.0:
+    version "0.13.0"
+    resolved "https://registry.yarnpkg.com/togeojson/-/togeojson-0.13.0.tgz#0698890a0629375580f254688014657ae93be894"
+    integrity sha1-BpiJCgYpN1WA8lRogBRleuk76JQ=
+    dependencies:
+      concat-stream "~1.4.5"
+      minimist "0.0.8"
+      xmldom "~0.1.19"
+  
+  topojson@1.6.26:
+    version "1.6.26"
+    resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.26.tgz#365f88a5e1858ab064872d9b968496fa923857ad"
+    integrity sha1-Nl+IpeGFirBkhy2bloSW+pI4V60=
+    dependencies:
+      d3 "3"
+      d3-geo-projection "0.2"
+      d3-queue "2"
+      optimist "0.3"
+      rw "1"
+      shapefile "0.3"
+  
+  tough-cookie@~2.4.3:
+    version "2.4.3"
+    resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+    integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+    dependencies:
+      psl "^1.1.24"
+      punycode "^1.4.1"
+  
+  tunnel-agent@^0.6.0:
+    version "0.6.0"
+    resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+    integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+    dependencies:
+      safe-buffer "^5.0.1"
+  
+  tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+    version "0.14.5"
+    resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+    integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+  
+  type-check@~0.3.2:
+    version "0.3.2"
+    resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+    integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+    dependencies:
+      prelude-ls "~1.1.2"
+  
+  typedarray-pool@^1.0.0, typedarray-pool@^1.1.0:
+    version "1.1.0"
+    resolved "https://registry.yarnpkg.com/typedarray-pool/-/typedarray-pool-1.1.0.tgz#d114f484801489f53ecab5e8088aa23044f498d9"
+    integrity sha1-0RT0hIAUifU+yrXoCIqiMET0mNk=
+    dependencies:
+      bit-twiddle "^1.0.0"
+      dup "^1.0.0"
+  
+  typedarray@^0.0.6, typedarray@~0.0.5:
+    version "0.0.6"
+    resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+    integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+  
+  uglify-js@^2.6.0:
+    version "2.8.29"
+    resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+    integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+    dependencies:
+      source-map "~0.5.1"
+      yargs "~3.10.0"
+    optionalDependencies:
+      uglify-to-browserify "~1.0.0"
+  
+  uglify-to-browserify@~1.0.0:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+    integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+  
+  unc-path-regex@^0.1.2:
+    version "0.1.2"
+    resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+    integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+  
+  union-value@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+    integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+    dependencies:
+      arr-union "^3.1.0"
+      get-value "^2.0.6"
+      is-extendable "^0.1.1"
+      set-value "^0.4.3"
+  
+  uniq@^1.0.0:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+    integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+  
+  unset-value@^1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+    integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+    dependencies:
+      has-value "^0.3.1"
+      isobject "^3.0.0"
+  
+  uri-js@^4.2.2:
+    version "4.2.2"
+    resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+    integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+    dependencies:
+      punycode "^2.1.0"
+  
+  urify@^2.1.0:
+    version "2.1.1"
+    resolved "https://registry.yarnpkg.com/urify/-/urify-2.1.1.tgz#9af4b52ebfae451b1d0cee0f605573d1b1a073bc"
+    integrity sha512-4ybbjC35yivSWm0xgIj0duAJUElBRssLxst6QSGL1HapW3zYlsXHcjslBVGwrWd89ItTon5jmiL88UPtubjp1A==
+    dependencies:
+      from2-string "^1.1.0"
+      mime "^1.3.4"
+      quote-stream "^1.0.2"
+      readable-stream "^2.0.5"
+      resolve "^1.1.7"
+      static-module "^3.0.0"
+  
+  urix@^0.1.0:
+    version "0.1.0"
+    resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+    integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+  
+  use@^3.1.0:
+    version "3.1.1"
+    resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+    integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+  
+  util-deprecate@~1.0.1:
+    version "1.0.2"
+    resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+    integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  
+  uuid@^3.3.2:
+    version "3.3.2"
+    resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+    integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  
+  v8flags@~3.1.1:
+    version "3.1.3"
+    resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
+    integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
+    dependencies:
+      homedir-polyfill "^1.0.1"
+  
+  verror@1.10.0:
+    version "1.10.0"
+    resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+    integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+    dependencies:
+      assert-plus "^1.0.0"
+      core-util-is "1.0.2"
+      extsprintf "^1.2.0"
+  
+  vlq@^0.2.2:
+    version "0.2.3"
+    resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+    integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+  
+  wcwidth@^1.0.1:
+    version "1.0.1"
+    resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+    integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+    dependencies:
+      defaults "^1.0.3"
+  
+  wellknown@0.4.2:
+    version "0.4.2"
+    resolved "https://registry.yarnpkg.com/wellknown/-/wellknown-0.4.2.tgz#9f4dfbc6f57934e0910f7e6b3f43c391162da7f3"
+    integrity sha1-n037xvV5NOCRD35rP0PDkRYtp/M=
+    dependencies:
+      concat-stream "~1.5.0"
+      minimist "~1.1.2"
+  
+  which@^1.2.14:
+    version "1.3.1"
+    resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+    integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+    dependencies:
+      isexe "^2.0.0"
+  
+  window-size@0.1.0:
+    version "0.1.0"
+    resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+    integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
+  
+  wordwrap@0.0.2:
+    version "0.0.2"
+    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+    integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
+  
+  wordwrap@~0.0.2:
+    version "0.0.3"
+    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+    integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+  
+  wordwrap@~1.0.0:
+    version "1.0.0"
+    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+    integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+  
+  xmldom@~0.1.19:
+    version "0.1.27"
+    resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+    integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+  
+  xtend@^4.0.1, xtend@~4.0.1:
+    version "4.0.1"
+    resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+    integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+  
+  xtend@~2.1.1:
+    version "2.1.2"
+    resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
+    integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
+    dependencies:
+      object-keys "~0.4.0"
+  
+  yargs@~3.10.0:
+    version "3.10.0"
+    resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+    integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
+    dependencies:
+      camelcase "^1.0.2"
+      cliui "^2.1.0"
+      decamelize "^1.0.0"
+      window-size "0.1.0"
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..357b018f8
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,2781 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@bower_components/blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1":
+  version "3.14.0"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/9f3deb2e710d39c72a988559609d9dc9a319de0b"
+
+"@bower_components/blueimp-file-upload@blueimp/jQuery-File-Upload#~9.8.1":
+  version "9.8.1"
+  resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/80b9f7818563dc11b8979b69df30c65f49bc1203"
+
+"@bower_components/blueimp-load-image@blueimp/JavaScript-Load-Image#>=1.13.0":
+  version "2.22.0"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Load-Image/tar.gz/b2e6b29de05a882048e80bec0c1f1e94d65ca41a"
+
+"@bower_components/blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4":
+  version "2.5.4"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
+
+"@bower_components/bootstrap@twbs/bootstrap#^4.3.1":
+  version "4.3.1"
+  resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
+
+"@bower_components/cartagen@jywarren/cartagen#*":
+  version "0.0.0"
+  resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
+
+"@bower_components/exif-js@jseidelin/exif-js#*":
+  version "2.3.0"
+  resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
+
+"@bower_components/font-awesome@FortAwesome/Font-Awesome#^4.2.0":
+  version "4.7.0"
+  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"
+
+"@bower_components/fontawesome@FortAwesome/Font-Awesome#~4.2.0":
+  version "4.2.0"
+  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
+
+"@bower_components/glfx-js@jywarren/glfx.js#*":
+  version "0.0.1"
+  resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
+
+"@bower_components/image-sequencer@publiclab/image-sequencer#~1.4.0":
+  version "1.4.1"
+  resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
+  dependencies:
+    bootstrap "~3.2.0"
+    buffer "~5.0.2"
+    commander "^2.11.0"
+    data-uri-to-buffer "^2.0.0"
+    fisheyegl "^0.1.2"
+    font-awesome "~4.5.0"
+    get-pixels "~3.3.0"
+    imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
+    jquery "~2"
+    jsqr "^0.2.2"
+    lodash "^4.17.5"
+    ndarray-gaussian-filter "^1.0.0"
+    ora "^2.0.0"
+    pace "0.0.4"
+    readline-sync "^1.4.7"
+    save-pixels "~2.3.4"
+    urify "^2.1.0"
+
+"@bower_components/ion-rangeslider@ionDen/ion.rangeslider#~2.3.0":
+  version "2.3.0"
+  resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
+  dependencies:
+    jquery ">=1.8"
+
+"@bower_components/jquery-ui@components/jqueryui#^1.12.1":
+  version "1.12.1"
+  resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
+
+"@bower_components/jquery-ujs@rails/jquery-ujs#~1.0.3":
+  version "0.0.0"
+  resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
+
+"@bower_components/jquery@jquery/jquery-dist#^2.1.3":
+  version "2.2.4"
+  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
+
+"@bower_components/junction@theleagueof/junction#*":
+  version "0.0.0"
+  resolved "https://codeload.github.com/theleagueof/junction/tar.gz/fb73260e86dd301b383cf6cc9ca8e726ef806535"
+
+"@bower_components/leaflet-dist@vperron/leaflet-dist#0.7.x":
+  version "0.0.0"
+  resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
+
+"@bower_components/leaflet-distortableimage@publiclab/Leaflet.DistortableImage#^0.4.3":
+  version "0.4.3"
+  resolved "https://codeload.github.com/publiclab/Leaflet.DistortableImage/tar.gz/cb1ed3875f9ad07942903a9daa778076ce5d7fd1"
+  dependencies:
+    grunt-cli "^1.2.0"
+
+"@bower_components/leaflet-draw@Leaflet/Leaflet.draw#0.2.4":
+  version "0.2.3"
+  resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"
+
+"@bower_components/leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0":
+  version "0.0.0"
+  resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
+
+"@bower_components/leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2":
+  version "1.1.2"
+  resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
+  dependencies:
+    jquery "^3.3.1"
+    leaflet "^1.3.1"
+    leaflet-hash "0.2.1"
+    leaflet-heatmap "1.0.0"
+    leaflet-providers "^1.1.17"
+    leaflet-spin "1.1.0"
+
+"@bower_components/leaflet-fullhash@sagarpreet-chadha/leaflet-fullHash#*":
+  version "0.0.0"
+  resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/104a08c4bca0ddf943d24b21d270ee4082dd9654"
+
+"@bower_components/leaflet-illustrate@manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7":
+  version "0.0.2"
+  resolved "https://codeload.github.com/manleyjster/Leaflet.Illustrate/tar.gz/31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7"
+
+"@bower_components/leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2":
+  version "0.3.4"
+  resolved "https://codeload.github.com/mapbox/leaflet-omnivore/tar.gz/7c5885376671509b6dd30f6cd2c2508f39b2f7eb"
+  dependencies:
+    brfs "1.4.3"
+    corslite "0.0.7"
+    csv2geojson "~5.0.0"
+    polyline "0.2.0"
+    togeojson "0.13.0"
+    topojson "1.6.26"
+    wellknown "0.4.2"
+
+"@bower_components/leaflet-providers@leaflet-extras/leaflet-providers#1.0.6":
+  version "1.0.6"
+  resolved "https://codeload.github.com/leaflet-extras/leaflet-providers/tar.gz/620d7a433b74a47b93e6fa9bf6536a384b47d9da"
+
+"@bower_components/leaflet-spin@makinacorpus/Leaflet.Spin#1.1.0":
+  version "1.0.0"
+  resolved "https://codeload.github.com/makinacorpus/Leaflet.Spin/tar.gz/f7c86843d24e6a6a50f94a66d8881b370fb8218f"
+  dependencies:
+    spin.js "^2.3.1"
+
+"@bower_components/leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0":
+  version "0.3.0"
+  resolved "https://codeload.github.com/Leaflet/Leaflet.Toolbar/tar.gz/fb935befa99d753bdd0deb0ce2cad20335783459"
+
+"@bower_components/leaflet@Leaflet/Leaflet#^1.0.0":
+  version "1.5.1"
+  resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
+
+"@bower_components/modalbox@okonet/modalbox#*":
+  version "0.0.0"
+  resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
+
+"@bower_components/ol2@openlayers/ol2#release-2.13.1":
+  version "0.0.0"
+  resolved "https://codeload.github.com/openlayers/ol2/tar.gz/f4a4090814f240414548e8eda55070d16f3d3901"
+
+"@bower_components/prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2":
+  version "0.0.0"
+  resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"
+
+"@bower_components/sparklines@mariusGundersen/sparkline#~1.0.0":
+  version "1.0.0"
+  resolved "https://codeload.github.com/mariusGundersen/sparkline/tar.gz/097a83f6bbb6b2d088eb125c4c848edef30ba252"
+
+"@bower_components/spin.js@fgnass/spin.js#^2.3.1":
+  version "2.3.2"
+  resolved "https://codeload.github.com/fgnass/spin.js/tar.gz/f0cc4b82358bee8bbb50f0fd90090bfe4d612da1"
+
+"@bower_components/webgl-distort@jywarren/webgl-distort#*":
+  version "0.0.1"
+  resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
+
+"@types/node@^8.0.7":
+  version "8.10.49"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
+  integrity sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
+
+acorn-node@^1.3.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.7.0.tgz#aac6a559d27af6176b076ab6fb13c5974c213e3b"
+  integrity sha512-XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==
+  dependencies:
+    acorn "^6.1.1"
+    acorn-dynamic-import "^4.0.0"
+    acorn-walk "^6.1.1"
+    xtend "^4.0.1"
+
+acorn-walk@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
+
+acorn@^5.0.0:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
+acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
+ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-each@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
+
+array-from@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
+  integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
+
+array-slice@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+bit-twiddle@^1.0.0, bit-twiddle@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
+  integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
+
+bootstrap@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637"
+  integrity sha1-oHJufBLnn0oqUE+NHunyhQqD9jc=
+
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+brfs@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216"
+  integrity sha1-22ddb16SPm3wh/ylhZyQkKrtMhY=
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^1.1.0"
+    through2 "^2.0.0"
+
+brfs@^1.3.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^2.2.0"
+    through2 "^2.0.0"
+
+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer@~5.0.2:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24"
+  integrity sha512-xXvjQhVNz50v2nPeoOsNqWCLGfiv4ji/gXZM28jnVwdLJxH4mFyqgqCKfaK9zf1KUbG6zTkjLOy7ou+jSMarGA==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^2.0.1, chalk@^2.3.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+charm@~0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
+  integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-spinners@^1.1.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
+  integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^2.11.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+concat-stream@~1.4.5:
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz#1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f"
+  integrity sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "~1.1.9"
+    typedarray "~0.0.5"
+
+concat-stream@~1.5.0, concat-stream@~1.5.1:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY=
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "~2.0.0"
+    typedarray "~0.0.5"
+
+concat-stream@~1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+contentstream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/contentstream/-/contentstream-1.0.0.tgz#0bdcfa46da30464a86ce8fa7ece565410dc6f9a5"
+  integrity sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU=
+  dependencies:
+    readable-stream "~1.0.33-1"
+
+convert-source-map@^1.5.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+corslite@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/corslite/-/corslite-0.0.7.tgz#8e451db5320a7556de1ef78d9bd3566343077721"
+  integrity sha1-jkUdtTIKdVbeHveNm9NWY0MHdyE=
+
+csv2geojson@~5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/csv2geojson/-/csv2geojson-5.0.2.tgz#abd649f2ec57689219ad4f19d333be75456b6f59"
+  integrity sha1-q9ZJ8uxXaJIZrU8Z0zO+dUVrb1k=
+  dependencies:
+    concat-stream "~1.5.1"
+    d3-dsv "1.0.1"
+    optimist "~0.6.1"
+    sexagesimal "0.5.0"
+
+cwise-compiler@^1.0.0, cwise-compiler@^1.1.1, cwise-compiler@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
+  integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=
+  dependencies:
+    uniq "^1.0.0"
+
+cwise-parser@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cwise-parser/-/cwise-parser-1.0.3.tgz#8e493c17d54f97cb030a9e9854bc86c9dfb354fe"
+  integrity sha1-jkk8F9VPl8sDCp6YVLyGyd+zVP4=
+  dependencies:
+    esprima "^1.0.3"
+    uniq "^1.0.0"
+
+cwise@^1.0.4, cwise@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/cwise/-/cwise-1.0.10.tgz#24eee6072ebdfd6b8c6f5dadb17090b649b12bef"
+  integrity sha1-JO7mBy69/WuMb12tsXCQtkmxK+8=
+  dependencies:
+    cwise-compiler "^1.1.1"
+    cwise-parser "^1.0.0"
+    static-module "^1.0.0"
+    uglify-js "^2.6.0"
+
+d3-dsv@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.1.tgz#d495347c04cb1e0d26557bbdc4775c4d11a245ea"
+  integrity sha1-1JU0fATLHg0mVXu9xHdcTRGiReo=
+  dependencies:
+    rw "1"
+
+d3-geo-projection@0.2:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz#4994ecd1033ddb1533b6c4c5528a1c81dcc29427"
+  integrity sha1-SZTs0QM92xUztsTFUoocgdzClCc=
+  dependencies:
+    brfs "^1.3.0"
+
+d3-queue@1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-1.2.3.tgz#143a701cfa65fe021292f321c10d14e98abd491b"
+  integrity sha1-FDpwHPpl/gISkvMhwQ0U6Yq9SRs=
+
+d3-queue@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-2.0.3.tgz#07fbda3acae5358a9c5299aaf880adf0953ed2c2"
+  integrity sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=
+
+d3@3:
+  version "3.5.17"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
+  integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+data-uri-to-buffer@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
+  integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=
+
+data-uri-to-buffer@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
+  integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
+  dependencies:
+    "@types/node" "^8.0.7"
+
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+dup@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dup/-/dup-1.0.0.tgz#51fc5ac685f8196469df0b905e934b20af5b4029"
+  integrity sha1-UfxaxoX4GWRp3wuQXpNLIK9bQCk=
+
+duplexer2@~0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
+  dependencies:
+    readable-stream "~1.1.9"
+
+duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  dependencies:
+    readable-stream "^2.0.2"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.50"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
+  integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+    next-tick "^1.0.0"
+
+es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@^0.1.5, es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.8.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+escodegen@~0.0.24:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-0.0.28.tgz#0e4ff1715f328775d6cab51ac44a406cd7abffd3"
+  integrity sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=
+  dependencies:
+    esprima "~1.0.2"
+    estraverse "~1.3.0"
+  optionalDependencies:
+    source-map ">= 0.1.2"
+
+escodegen@~1.3.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.3.3.tgz#f024016f5a88e046fd12005055e939802e6c5f23"
+  integrity sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=
+  dependencies:
+    esprima "~1.1.1"
+    estraverse "~1.5.0"
+    esutils "~1.0.0"
+  optionalDependencies:
+    source-map "~0.1.33"
+
+escodegen@~1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@^1.0.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9"
+  integrity sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
+esprima@~1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
+  integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
+
+esprima@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
+  integrity sha1-W28VR/TRAuZw4UDFCb5ncdautUk=
+
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
+estraverse@~1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.3.2.tgz#37c2b893ef13d723f276d878d60d8535152a6c42"
+  integrity sha1-N8K4k+8T1yPydth41g2FNRUqbEI=
+
+estraverse@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
+  integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
+
+estree-is-function@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz#c0adc29806d7f18a74db7df0f3b2666702e37ad2"
+  integrity sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+
+esutils@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
+  integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+falafel@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
+  dependencies:
+    acorn "^5.0.0"
+    foreach "^2.0.5"
+    isarray "0.0.1"
+    object-keys "^1.0.6"
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
+fined@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
+  dependencies:
+    expand-tilde "^2.0.2"
+    is-plain-object "^2.0.3"
+    object.defaults "^1.1.0"
+    object.pick "^1.2.0"
+    parse-filepath "^1.0.1"
+
+fisheyegl@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/fisheyegl/-/fisheyegl-0.1.2.tgz#4b7ad5705253444ad6030888a81296f5068e4972"
+  integrity sha1-S3rVcFJTRErWAwiIqBKW9QaOSXI=
+
+flagged-respawn@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
+
+font-awesome@~4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
+  integrity sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=
+
+for-in@^1.0.1, for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  dependencies:
+    for-in "^1.0.1"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+from2-string@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/from2-string/-/from2-string-1.1.0.tgz#18282b27d08a267cb3030cd2b8b4b0f212af752a"
+  integrity sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=
+  dependencies:
+    from2 "^2.0.3"
+
+from2@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+get-assigned-identifiers@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
+  integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
+
+get-pixels@~3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03"
+  integrity sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ==
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+    jpeg-js "^0.3.2"
+    mime-types "^2.0.1"
+    ndarray "^1.0.13"
+    ndarray-pack "^1.1.1"
+    node-bitmap "0.0.1"
+    omggif "^1.0.5"
+    parse-data-uri "^0.2.0"
+    pngjs "^3.3.3"
+    request "^2.44.0"
+    through "^2.3.4"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+gif-encoder@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/gif-encoder/-/gif-encoder-0.4.3.tgz#8a2b4fe8ca895a48e3a0b6cbb340a0a6a3571899"
+  integrity sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk=
+  dependencies:
+    readable-stream "~1.1.9"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+grunt-cli@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.3.2.tgz#60f12d12c1b5aae94ae3469c6b5fe24e960014e8"
+  integrity sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==
+  dependencies:
+    grunt-known-options "~1.1.0"
+    interpret "~1.1.0"
+    liftoff "~2.5.0"
+    nopt "~4.0.1"
+    v8flags "~3.1.1"
+
+grunt-known-options@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.1.tgz#6cc088107bd0219dc5d3e57d91923f469059804d"
+  integrity sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.0, has@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+heatmap.js@*:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/heatmap.js/-/heatmap.js-2.0.5.tgz#466d3b86513f5d49112a49d25700ab2730149153"
+  integrity sha1-Rm07hlE/XUkRKknSVwCrJzAUkVM=
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+iconv-lite@0.2:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
+  integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+"imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
+  version "0.9.11-rc.1"
+  resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
+
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+interpret@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+
+iota-array@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
+  integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
+
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-buffer@^1.0.2, is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^1.0.0"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+jpeg-js@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e"
+  integrity sha1-Bqr0fv7HrwsZJKWc1pWm0rXthw4=
+
+jpeg-js@^0.3.2:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.5.tgz#6fbd6cd0e49627c5a0341796c9e50c70a2aa3673"
+  integrity sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==
+
+jquery@>=1.8, jquery@^3.3.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+
+jquery@~2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
+  integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jsqr@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
+  integrity sha1-jB8Ceft8lFQqqp6K63xyLVI+oJI=
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
+
+leaflet-hash@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/leaflet-hash/-/leaflet-hash-0.2.1.tgz#c36c718347c5243033b57cb4baea26119d82c701"
+  integrity sha1-w2xxg0fFJDAztXy0uuomEZ2CxwE=
+
+leaflet-heatmap@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/leaflet-heatmap/-/leaflet-heatmap-1.0.0.tgz#83cc04249d39ed91526aeaa7d7669bdaa86d6b1f"
+  integrity sha1-g8wEJJ057ZFSauqn12ab2qhtax8=
+  dependencies:
+    heatmap.js "*"
+    leaflet "*"
+
+leaflet-providers@^1.1.17:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.7.0.tgz#b462d6abba832b2e9f1cef6ca0ab3bf76a7ca9a9"
+  integrity sha512-7gXQnILnnIGuPy8TFaSP2aACsaxdT+y2sFae4rqbK8vX9ZwTJ9+5CI5DcBB+r867PdmdRlz5rjG99yvyLWOJYg==
+
+leaflet-spin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/leaflet-spin/-/leaflet-spin-1.1.0.tgz#7298be3be9ab05b540913d84915d6347f49b1e4e"
+  integrity sha1-cpi+O+mrBbVAkT2EkV1jR/SbHk4=
+  dependencies:
+    spin.js "^2.3.1"
+
+leaflet@*, leaflet@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf"
+  integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w==
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+liftoff@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
+  integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
+  dependencies:
+    extend "^3.0.0"
+    findup-sync "^2.0.0"
+    fined "^1.0.1"
+    flagged-respawn "^1.0.0"
+    is-plain-object "^2.0.4"
+    object.map "^1.0.0"
+    rechoir "^0.6.2"
+    resolve "^1.1.7"
+
+lodash@^4.17.5:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+
+magic-string@^0.22.4:
+  version "0.22.5"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+  dependencies:
+    vlq "^0.2.2"
+
+make-iterator@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
+  dependencies:
+    kind-of "^6.0.2"
+
+map-cache@^0.2.0, map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+merge-source-map@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+  dependencies:
+    source-map "^0.5.6"
+
+micromatch@^3.0.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
+mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
+mime@^1.3.4:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
+minimist@~1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
+  integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+ndarray-fft@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ndarray-fft/-/ndarray-fft-1.0.3.tgz#dc5bba18e3ab82c997adbaebb78e79f82c93a22a"
+  integrity sha1-3Fu6GOOrgsmXrbrrt455+CyToio=
+  dependencies:
+    bit-twiddle "^1.0.2"
+    cwise "^1.0.4"
+    ndarray "^1.0.15"
+    ndarray-ops "^1.2.2"
+    typedarray-pool "^1.0.0"
+
+ndarray-gaussian-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ndarray-gaussian-filter/-/ndarray-gaussian-filter-1.0.0.tgz#b521d8f8040af70e4e5c244a3c7f06cbb358024e"
+  integrity sha1-tSHY+AQK9w5OXCRKPH8Gy7NYAk4=
+  dependencies:
+    cwise "^1.0.7"
+    dup "^1.0.0"
+    ndarray "^1.0.18"
+    ndarray-fft "^1.0.0"
+    ndarray-ops "^1.2.2"
+    next-pow-2 "^1.0.0"
+    typedarray-pool "^1.1.0"
+
+ndarray-ops@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/ndarray-ops/-/ndarray-ops-1.2.2.tgz#59e88d2c32a7eebcb1bc690fae141579557a614e"
+  integrity sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=
+  dependencies:
+    cwise-compiler "^1.0.0"
+
+ndarray-pack@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
+  integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=
+  dependencies:
+    cwise-compiler "^1.1.2"
+    ndarray "^1.0.13"
+
+ndarray@^1.0.13, ndarray@^1.0.15, ndarray@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793"
+  integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=
+  dependencies:
+    iota-array "^1.0.0"
+    is-buffer "^1.0.2"
+
+next-pow-2@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-pow-2/-/next-pow-2-1.0.0.tgz#cb5c2f1dae040c56cdd5cda1dc5c6a3a338f4367"
+  integrity sha1-y1wvHa4EDFbN1c2h3FxqOjOPQ2c=
+
+next-tick@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
+node-bitmap@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
+  integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
+
+nopt@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-inspect@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec"
+  integrity sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=
+
+object-inspect@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+
+object-keys@^1.0.6:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-keys@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
+  integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.defaults@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
+  dependencies:
+    array-each "^1.0.1"
+    array-slice "^1.0.0"
+    for-own "^1.0.0"
+    isobject "^3.0.0"
+
+object.map@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
+  dependencies:
+    for-own "^1.0.0"
+    make-iterator "^1.0.0"
+
+object.pick@^1.2.0, object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+omggif@^1.0.5:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
+  integrity sha1-3LcCTazVDFK00wPwSALJHAV8dl8=
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+optimist@0.3:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+  integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
+  dependencies:
+    wordwrap "~0.0.2"
+
+optimist@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+ora@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-2.1.0.tgz#6caf2830eb924941861ec53a173799e008b51e5b"
+  integrity sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==
+  dependencies:
+    chalk "^2.3.1"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.1.0"
+    log-symbols "^2.2.0"
+    strip-ansi "^4.0.0"
+    wcwidth "^1.0.1"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+pace@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz#d66405d5f5bc12d25441a6e26c878dbc69e77a77"
+  integrity sha1-1mQF1fW8EtJUQabibIeNvGnnenc=
+  dependencies:
+    charm "~0.1.0"
+
+parse-data-uri@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
+  integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk=
+  dependencies:
+    data-uri-to-buffer "0.0.3"
+
+parse-filepath@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
+  dependencies:
+    is-absolute "^1.0.0"
+    map-cache "^0.2.0"
+    path-root "^0.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  dependencies:
+    path-root-regex "^0.1.0"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+pngjs-nozlib@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7"
+  integrity sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c=
+
+pngjs@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
+  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
+
+polyline@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/polyline/-/polyline-0.2.0.tgz#4f2b716ca81134a6cbaa488975d236ecb1cc2840"
+  integrity sha1-TytxbKgRNKbLqkiJddI27LHMKEA=
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+psl@^1.1.24:
+  version "1.1.32"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
+  integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+quote-stream@^1.0.1, quote-stream@^1.0.2, quote-stream@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+  dependencies:
+    buffer-equal "0.0.1"
+    minimist "^1.1.3"
+    through2 "^2.0.0"
+
+quote-stream@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-0.0.0.tgz#cde29e94c409b16e19dc7098b89b6658f9721d3b"
+  integrity sha1-zeKelMQJsW4Z3HCYuJtmWPlyHTs=
+  dependencies:
+    minimist "0.0.8"
+    through2 "~0.4.1"
+
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@~1.0.17, readable-stream@~1.0.27-1, readable-stream@~1.0.33-1:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@~2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+readline-sync@^1.4.7:
+  version "1.4.9"
+  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
+  integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
+  dependencies:
+    resolve "^1.1.6"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.5.2, repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+request@^2.44.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+  dependencies:
+    path-parse "^1.0.6"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
+  dependencies:
+    align-text "^0.1.1"
+
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+save-pixels@~2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/save-pixels/-/save-pixels-2.3.4.tgz#49d349c06b8d7c0127dbf0da24b44aca5afb59fe"
+  integrity sha1-SdNJwGuNfAEn2/DaJLRKylr7Wf4=
+  dependencies:
+    contentstream "^1.0.0"
+    gif-encoder "~0.4.1"
+    jpeg-js "0.0.4"
+    ndarray "^1.0.18"
+    ndarray-ops "^1.2.2"
+    pngjs-nozlib "^1.0.0"
+    through "^2.3.4"
+
+scope-analyzer@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.0.5.tgz#72c9c6770c3e66984f84c7d3c7045998a1a7db8a"
+  integrity sha512-+U5H0417mnTEstCD5VwOYO7V4vYuSqwqjFap40ythe67bhMFL5C3UgPwyBv7KDJsqUBIKafOD57xMlh1rN7eaw==
+  dependencies:
+    array-from "^2.1.1"
+    es6-map "^0.1.5"
+    es6-set "^0.1.5"
+    es6-symbol "^3.1.1"
+    estree-is-function "^1.0.0"
+    get-assigned-identifiers "^1.1.0"
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+sexagesimal@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/sexagesimal/-/sexagesimal-0.5.0.tgz#9d815bd2bddd634b625ba6851bf8fe74a5ad3ef3"
+  integrity sha1-nYFb0r3dY0tiW6aFG/j+dKWtPvM=
+
+shallow-copy@~0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+
+shapefile@0.3:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/shapefile/-/shapefile-0.3.1.tgz#9bb9a429bd6086a0cfb03962d14cfdf420ffba12"
+  integrity sha1-m7mkKb1ghqDPsDli0Uz99CD/uhI=
+  dependencies:
+    d3-queue "1"
+    iconv-lite "0.2"
+    optimist "0.3"
+
+signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+"source-map@>= 0.1.2":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+source-map@^0.5.6, source-map@~0.5.1:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@~0.1.33:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+spin.js@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a"
+  integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho=
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+static-eval@^2.0.0, static-eval@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
+  integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+  dependencies:
+    escodegen "^1.8.1"
+
+static-eval@~0.2.0:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.4.tgz#b7d34d838937b969f9641ca07d48f8ede263ea7b"
+  integrity sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=
+  dependencies:
+    escodegen "~0.0.24"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+static-module@^1.0.0, static-module@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-1.5.0.tgz#27da9883c41a8cd09236f842f0c1ebc6edf63d86"
+  integrity sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=
+  dependencies:
+    concat-stream "~1.6.0"
+    duplexer2 "~0.0.2"
+    escodegen "~1.3.2"
+    falafel "^2.1.0"
+    has "^1.0.0"
+    object-inspect "~0.4.0"
+    quote-stream "~0.0.0"
+    readable-stream "~1.0.27-1"
+    shallow-copy "~0.0.1"
+    static-eval "~0.2.0"
+    through2 "~0.4.1"
+
+static-module@^2.2.0:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
+  dependencies:
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    falafel "^2.1.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    quote-stream "~1.0.2"
+    readable-stream "~2.3.3"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.0"
+    through2 "~2.0.3"
+
+static-module@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.3.tgz#cc2301ed3fe353e2d2a2195137013853676f9960"
+  integrity sha512-RDaMYaI5o/ym0GkCqL/PlD1Pn216omp8fY81okxZ6f6JQxWW5tptOw9reXoZX85yt/scYvbWIt6uoszeyf+/MQ==
+  dependencies:
+    acorn-node "^1.3.0"
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    readable-stream "~2.3.3"
+    scope-analyzer "^2.0.1"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.2"
+    through2 "~2.0.3"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+through2@^2.0.0, through2@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@~0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
+  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
+  dependencies:
+    readable-stream "~1.0.17"
+    xtend "~2.1.1"
+
+through@^2.3.4:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+togeojson@0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/togeojson/-/togeojson-0.13.0.tgz#0698890a0629375580f254688014657ae93be894"
+  integrity sha1-BpiJCgYpN1WA8lRogBRleuk76JQ=
+  dependencies:
+    concat-stream "~1.4.5"
+    minimist "0.0.8"
+    xmldom "~0.1.19"
+
+topojson@1.6.26:
+  version "1.6.26"
+  resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.26.tgz#365f88a5e1858ab064872d9b968496fa923857ad"
+  integrity sha1-Nl+IpeGFirBkhy2bloSW+pI4V60=
+  dependencies:
+    d3 "3"
+    d3-geo-projection "0.2"
+    d3-queue "2"
+    optimist "0.3"
+    rw "1"
+    shapefile "0.3"
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+typedarray-pool@^1.0.0, typedarray-pool@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typedarray-pool/-/typedarray-pool-1.1.0.tgz#d114f484801489f53ecab5e8088aa23044f498d9"
+  integrity sha1-0RT0hIAUifU+yrXoCIqiMET0mNk=
+  dependencies:
+    bit-twiddle "^1.0.0"
+    dup "^1.0.0"
+
+typedarray@^0.0.6, typedarray@~0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+uglify-js@^2.6.0:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+uniq@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+urify@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/urify/-/urify-2.1.1.tgz#9af4b52ebfae451b1d0cee0f605573d1b1a073bc"
+  integrity sha512-4ybbjC35yivSWm0xgIj0duAJUElBRssLxst6QSGL1HapW3zYlsXHcjslBVGwrWd89ItTon5jmiL88UPtubjp1A==
+  dependencies:
+    from2-string "^1.1.0"
+    mime "^1.3.4"
+    quote-stream "^1.0.2"
+    readable-stream "^2.0.5"
+    resolve "^1.1.7"
+    static-module "^3.0.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+v8flags@~3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
+  integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vlq@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+wellknown@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/wellknown/-/wellknown-0.4.2.tgz#9f4dfbc6f57934e0910f7e6b3f43c391162da7f3"
+  integrity sha1-n037xvV5NOCRD35rP0PDkRYtp/M=
+  dependencies:
+    concat-stream "~1.5.0"
+    minimist "~1.1.2"
+
+which@^1.2.14:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
+xmldom@~0.1.19:
+  version "0.1.27"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
+  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+
+xtend@^4.0.1, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+
+xtend@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
+  integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
+  dependencies:
+    object-keys "~0.4.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"

From 116f385f56b456b536fff8eed2bea8ee05b31e22 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 12:46:47 +0530
Subject: [PATCH 042/152] Remove error log

---
 .gitignore     |    2 +
 yarn-error.log | 2864 ------------------------------------------------
 2 files changed, 2 insertions(+), 2864 deletions(-)
 delete mode 100644 yarn-error.log

diff --git a/.gitignore b/.gitignore
index be5a8500e..6c0929875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ todo.txt
 .byebug_history
 coverage_report/
 test/reports/
+yarn-error.log
+
diff --git a/yarn-error.log b/yarn-error.log
deleted file mode 100644
index d521643cf..000000000
--- a/yarn-error.log
+++ /dev/null
@@ -1,2864 +0,0 @@
-Arguments: 
-  /usr/bin/node /usr/share/yarn/bin/yarn.js
-
-PATH: 
-  /home/k/.rvm/gems/ruby-2.4.6/bin:/home/k/.rvm/gems/ruby-2.4.6@global/bin:/home/k/.rvm/rubies/ruby-2.4.6/bin:/home/k/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-
-Yarn version: 
-  1.15.2
-
-Node version: 
-  8.10.0
-
-Platform: 
-  linux x64
-
-Trace: 
-  SyntaxError: /home/k/proj/mapknitter/package.json: Unexpected token : in JSON at position 287
-      at JSON.parse (<anonymous>)
-      at /usr/share/yarn/lib/cli.js:1625:59
-      at Generator.next (<anonymous>)
-      at step (/usr/share/yarn/lib/cli.js:304:30)
-      at /usr/share/yarn/lib/cli.js:315:13
-      at <anonymous>
-
-npm manifest: 
-  {
-    "name": "mapknitter",
-    "version": "1.0.0",
-    "main": "app/assets/javascripts/application.js",
-    "repository": "https://github.com/publiclab/mapknitter",
-    "author": "Kaustubh Nair <kaustubh.nair108@gmail.com>",
-    "license": "MIT",
-    "files": [
-      "@bower_components/leaflet-google": "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
-    ],
-    "dependencies": {
-      "@bower_components/blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
-      "@bower_components/blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
-      "@bower_components/blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
-      "@bower_components/blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
-      "@bower_components/bootstrap": "twbs/bootstrap#^4.3.1",
-      "@bower_components/cartagen": "jywarren/cartagen#*",
-      "@bower_components/exif-js": "jseidelin/exif-js#*",
-      "@bower_components/font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
-      "@bower_components/fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
-      "@bower_components/glfx-js": "jywarren/glfx.js#*",
-      "@bower_components/image-sequencer": "publiclab/image-sequencer#~1.4.0",
-      "@bower_components/ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
-      "@bower_components/jquery": "jquery/jquery-dist#^2.1.3",
-      "@bower_components/jquery-ui": "components/jqueryui#^1.12.1",
-      "@bower_components/jquery-ujs": "rails/jquery-ujs#~1.0.3",
-      "@bower_components/junction": "theleagueof/junction#*",
-      "@bower_components/leaflet": "Leaflet/Leaflet#^1.0.0",
-      "@bower_components/leaflet-dist": "vperron/leaflet-dist#0.7.x",
-      "@bower_components/leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
-      "@bower_components/leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
-      "@bower_components/leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
-      "@bower_components/leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
-      "@bower_components/leaflet-fullhash": "sagarpreet-chadha/leaflet-fullHash#*",
-      "@bower_components/leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
-      "@bower_components/leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
-      "@bower_components/leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
-      "@bower_components/leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
-      "@bower_components/leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
-      "@bower_components/modalbox": "okonet/modalbox#*",
-      "@bower_components/ol2": "openlayers/ol2#release-2.13.1",
-      "@bower_components/prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
-      "@bower_components/sparklines": "mariusGundersen/sparkline#~1.0.0",
-      "@bower_components/spin.js": "fgnass/spin.js#^2.3.1",
-      "@bower_components/webgl-distort": "jywarren/webgl-distort#*"
-    },
-    "engines": {
-      "yarn": ">= 1.0.0"
-    },
-    "scripts": {
-      "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\""
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-  # yarn lockfile v1
-  
-  
-  "@bower_components/blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1":
-    version "3.14.0"
-    resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/9f3deb2e710d39c72a988559609d9dc9a319de0b"
-  
-  "@bower_components/blueimp-file-upload@blueimp/jQuery-File-Upload#~9.8.1":
-    version "9.8.1"
-    resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/80b9f7818563dc11b8979b69df30c65f49bc1203"
-  
-  "@bower_components/blueimp-load-image@blueimp/JavaScript-Load-Image#>=1.13.0":
-    version "2.22.0"
-    resolved "https://codeload.github.com/blueimp/JavaScript-Load-Image/tar.gz/b2e6b29de05a882048e80bec0c1f1e94d65ca41a"
-  
-  "@bower_components/blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4":
-    version "2.5.4"
-    resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
-  
-  "@bower_components/bootstrap@twbs/bootstrap#^4.3.1":
-    version "4.3.1"
-    resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
-  
-  "@bower_components/cartagen@jywarren/cartagen#*":
-    version "0.0.0"
-    resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
-  
-  "@bower_components/exif-js@jseidelin/exif-js#*":
-    version "2.3.0"
-    resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
-  
-  "@bower_components/font-awesome@FortAwesome/Font-Awesome#^4.2.0":
-    version "4.7.0"
-    resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"
-  
-  "@bower_components/fontawesome@FortAwesome/Font-Awesome#~4.2.0":
-    version "4.2.0"
-    resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
-  
-  "@bower_components/glfx-js@jywarren/glfx.js#*":
-    version "0.0.1"
-    resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
-  
-  "@bower_components/image-sequencer@publiclab/image-sequencer#~1.4.0":
-    version "1.4.1"
-    resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
-    dependencies:
-      bootstrap "~3.2.0"
-      buffer "~5.0.2"
-      commander "^2.11.0"
-      data-uri-to-buffer "^2.0.0"
-      fisheyegl "^0.1.2"
-      font-awesome "~4.5.0"
-      get-pixels "~3.3.0"
-      imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
-      jquery "~2"
-      jsqr "^0.2.2"
-      lodash "^4.17.5"
-      ndarray-gaussian-filter "^1.0.0"
-      ora "^2.0.0"
-      pace "0.0.4"
-      readline-sync "^1.4.7"
-      save-pixels "~2.3.4"
-      urify "^2.1.0"
-  
-  "@bower_components/ion-rangeslider@ionDen/ion.rangeslider#~2.3.0":
-    version "2.3.0"
-    resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
-    dependencies:
-      jquery ">=1.8"
-  
-  "@bower_components/jquery-ui@components/jqueryui#^1.12.1":
-    version "1.12.1"
-    resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
-  
-  "@bower_components/jquery-ujs@rails/jquery-ujs#~1.0.3":
-    version "0.0.0"
-    resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
-  
-  "@bower_components/jquery@jquery/jquery-dist#^2.1.3":
-    version "2.2.4"
-    resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
-  
-  "@bower_components/junction@theleagueof/junction#*":
-    version "0.0.0"
-    resolved "https://codeload.github.com/theleagueof/junction/tar.gz/fb73260e86dd301b383cf6cc9ca8e726ef806535"
-  
-  "@bower_components/leaflet-dist@vperron/leaflet-dist#0.7.x":
-    version "0.0.0"
-    resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
-  
-  "@bower_components/leaflet-distortableimage@publiclab/Leaflet.DistortableImage#^0.4.3":
-    version "0.4.3"
-    resolved "https://codeload.github.com/publiclab/Leaflet.DistortableImage/tar.gz/cb1ed3875f9ad07942903a9daa778076ce5d7fd1"
-    dependencies:
-      grunt-cli "^1.2.0"
-  
-  "@bower_components/leaflet-draw@Leaflet/Leaflet.draw#0.2.4":
-    version "0.2.3"
-    resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"
-  
-  "@bower_components/leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0":
-    version "0.0.0"
-    resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
-  
-  "@bower_components/leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2":
-    version "1.1.2"
-    resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
-    dependencies:
-      jquery "^3.3.1"
-      leaflet "^1.3.1"
-      leaflet-hash "0.2.1"
-      leaflet-heatmap "1.0.0"
-      leaflet-providers "^1.1.17"
-      leaflet-spin "1.1.0"
-  
-  "@bower_components/leaflet-fullhash@sagarpreet-chadha/leaflet-fullHash#*":
-    version "0.0.0"
-    resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/104a08c4bca0ddf943d24b21d270ee4082dd9654"
-  
-  "@bower_components/leaflet-illustrate@manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7":
-    version "0.0.2"
-    resolved "https://codeload.github.com/manleyjster/Leaflet.Illustrate/tar.gz/31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7"
-  
-  "@bower_components/leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2":
-    version "0.3.4"
-    resolved "https://codeload.github.com/mapbox/leaflet-omnivore/tar.gz/7c5885376671509b6dd30f6cd2c2508f39b2f7eb"
-    dependencies:
-      brfs "1.4.3"
-      corslite "0.0.7"
-      csv2geojson "~5.0.0"
-      polyline "0.2.0"
-      togeojson "0.13.0"
-      topojson "1.6.26"
-      wellknown "0.4.2"
-  
-  "@bower_components/leaflet-providers@leaflet-extras/leaflet-providers#1.0.6":
-    version "1.0.6"
-    resolved "https://codeload.github.com/leaflet-extras/leaflet-providers/tar.gz/620d7a433b74a47b93e6fa9bf6536a384b47d9da"
-  
-  "@bower_components/leaflet-spin@makinacorpus/Leaflet.Spin#1.1.0":
-    version "1.0.0"
-    resolved "https://codeload.github.com/makinacorpus/Leaflet.Spin/tar.gz/f7c86843d24e6a6a50f94a66d8881b370fb8218f"
-    dependencies:
-      spin.js "^2.3.1"
-  
-  "@bower_components/leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0":
-    version "0.3.0"
-    resolved "https://codeload.github.com/Leaflet/Leaflet.Toolbar/tar.gz/fb935befa99d753bdd0deb0ce2cad20335783459"
-  
-  "@bower_components/leaflet@Leaflet/Leaflet#^1.0.0":
-    version "1.5.1"
-    resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
-  
-  "@bower_components/modalbox@okonet/modalbox#*":
-    version "0.0.0"
-    resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
-  
-  "@bower_components/ol2@openlayers/ol2#release-2.13.1":
-    version "0.0.0"
-    resolved "https://codeload.github.com/openlayers/ol2/tar.gz/f4a4090814f240414548e8eda55070d16f3d3901"
-  
-  "@bower_components/prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2":
-    version "0.0.0"
-    resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"
-  
-  "@bower_components/sparklines@mariusGundersen/sparkline#~1.0.0":
-    version "1.0.0"
-    resolved "https://codeload.github.com/mariusGundersen/sparkline/tar.gz/097a83f6bbb6b2d088eb125c4c848edef30ba252"
-  
-  "@bower_components/spin.js@fgnass/spin.js#^2.3.1":
-    version "2.3.2"
-    resolved "https://codeload.github.com/fgnass/spin.js/tar.gz/f0cc4b82358bee8bbb50f0fd90090bfe4d612da1"
-  
-  "@bower_components/webgl-distort@jywarren/webgl-distort#*":
-    version "0.0.1"
-    resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
-  
-  "@types/node@^8.0.7":
-    version "8.10.49"
-    resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
-    integrity sha512-YX30JVx0PvSmJ3Eqr74fYLGeBxD+C7vIL20ek+GGGLJeUbVYRUW3EzyAXpIRA0K8c8o0UWqR/GwEFYiFoz1T8w==
-  
-  abbrev@1:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-    integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-  
-  acorn-dynamic-import@^4.0.0:
-    version "4.0.0"
-    resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-    integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-  
-  acorn-node@^1.3.0:
-    version "1.7.0"
-    resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.7.0.tgz#aac6a559d27af6176b076ab6fb13c5974c213e3b"
-    integrity sha512-XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==
-    dependencies:
-      acorn "^6.1.1"
-      acorn-dynamic-import "^4.0.0"
-      acorn-walk "^6.1.1"
-      xtend "^4.0.1"
-  
-  acorn-walk@^6.1.1:
-    version "6.1.1"
-    resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
-    integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
-  
-  acorn@^5.0.0:
-    version "5.7.3"
-    resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-    integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-  
-  acorn@^6.1.1:
-    version "6.1.1"
-    resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-    integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
-  
-  ajv@^6.5.5:
-    version "6.10.0"
-    resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-    integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-    dependencies:
-      fast-deep-equal "^2.0.1"
-      fast-json-stable-stringify "^2.0.0"
-      json-schema-traverse "^0.4.1"
-      uri-js "^4.2.2"
-  
-  align-text@^0.1.1, align-text@^0.1.3:
-    version "0.1.4"
-    resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-    integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
-    dependencies:
-      kind-of "^3.0.2"
-      longest "^1.0.1"
-      repeat-string "^1.5.2"
-  
-  amdefine@>=0.0.4:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-    integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-  
-  ansi-regex@^3.0.0:
-    version "3.0.0"
-    resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-    integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-  
-  ansi-styles@^3.2.1:
-    version "3.2.1"
-    resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-    integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-    dependencies:
-      color-convert "^1.9.0"
-  
-  arr-diff@^4.0.0:
-    version "4.0.0"
-    resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-    integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-  
-  arr-flatten@^1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-    integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-  
-  arr-union@^3.1.0:
-    version "3.1.0"
-    resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-    integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-  
-  array-each@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-    integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
-  
-  array-from@^2.1.1:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
-    integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-  
-  array-slice@^1.0.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
-    integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
-  
-  array-unique@^0.3.2:
-    version "0.3.2"
-    resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-    integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-  
-  asn1@~0.2.3:
-    version "0.2.4"
-    resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-    integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-    dependencies:
-      safer-buffer "~2.1.0"
-  
-  assert-plus@1.0.0, assert-plus@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-    integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-  
-  assign-symbols@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-    integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-  
-  asynckit@^0.4.0:
-    version "0.4.0"
-    resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-    integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-  
-  atob@^2.1.1:
-    version "2.1.2"
-    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-  
-  aws-sign2@~0.7.0:
-    version "0.7.0"
-    resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-    integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-  
-  aws4@^1.8.0:
-    version "1.8.0"
-    resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-    integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
-  
-  base64-js@^1.0.2:
-    version "1.3.0"
-    resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-    integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
-  
-  base@^0.11.1:
-    version "0.11.2"
-    resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-    integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-    dependencies:
-      cache-base "^1.0.1"
-      class-utils "^0.3.5"
-      component-emitter "^1.2.1"
-      define-property "^1.0.0"
-      isobject "^3.0.1"
-      mixin-deep "^1.2.0"
-      pascalcase "^0.1.1"
-  
-  bcrypt-pbkdf@^1.0.0:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-    integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-    dependencies:
-      tweetnacl "^0.14.3"
-  
-  bit-twiddle@^1.0.0, bit-twiddle@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
-    integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
-  
-  bootstrap@~3.2.0:
-    version "3.2.0"
-    resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637"
-    integrity sha1-oHJufBLnn0oqUE+NHunyhQqD9jc=
-  
-  braces@^2.3.1:
-    version "2.3.2"
-    resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-    integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-    dependencies:
-      arr-flatten "^1.1.0"
-      array-unique "^0.3.2"
-      extend-shallow "^2.0.1"
-      fill-range "^4.0.0"
-      isobject "^3.0.1"
-      repeat-element "^1.1.2"
-      snapdragon "^0.8.1"
-      snapdragon-node "^2.0.1"
-      split-string "^3.0.2"
-      to-regex "^3.0.1"
-  
-  brfs@1.4.3:
-    version "1.4.3"
-    resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216"
-    integrity sha1-22ddb16SPm3wh/ylhZyQkKrtMhY=
-    dependencies:
-      quote-stream "^1.0.1"
-      resolve "^1.1.5"
-      static-module "^1.1.0"
-      through2 "^2.0.0"
-  
-  brfs@^1.3.0:
-    version "1.6.1"
-    resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
-    integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
-    dependencies:
-      quote-stream "^1.0.1"
-      resolve "^1.1.5"
-      static-module "^2.2.0"
-      through2 "^2.0.0"
-  
-  buffer-equal@0.0.1:
-    version "0.0.1"
-    resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
-    integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
-  
-  buffer-from@^1.0.0:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-    integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-  
-  buffer@~5.0.2:
-    version "5.0.8"
-    resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24"
-    integrity sha512-xXvjQhVNz50v2nPeoOsNqWCLGfiv4ji/gXZM28jnVwdLJxH4mFyqgqCKfaK9zf1KUbG6zTkjLOy7ou+jSMarGA==
-    dependencies:
-      base64-js "^1.0.2"
-      ieee754 "^1.1.4"
-  
-  cache-base@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-    integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-    dependencies:
-      collection-visit "^1.0.0"
-      component-emitter "^1.2.1"
-      get-value "^2.0.6"
-      has-value "^1.0.0"
-      isobject "^3.0.1"
-      set-value "^2.0.0"
-      to-object-path "^0.3.0"
-      union-value "^1.0.0"
-      unset-value "^1.0.0"
-  
-  camelcase@^1.0.2:
-    version "1.2.1"
-    resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-    integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
-  
-  caseless@~0.12.0:
-    version "0.12.0"
-    resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-    integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-  
-  center-align@^0.1.1:
-    version "0.1.3"
-    resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-    integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
-    dependencies:
-      align-text "^0.1.3"
-      lazy-cache "^1.0.3"
-  
-  chalk@^2.0.1, chalk@^2.3.1:
-    version "2.4.2"
-    resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-    integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-    dependencies:
-      ansi-styles "^3.2.1"
-      escape-string-regexp "^1.0.5"
-      supports-color "^5.3.0"
-  
-  charm@~0.1.0:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
-    integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
-  
-  class-utils@^0.3.5:
-    version "0.3.6"
-    resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-    integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-    dependencies:
-      arr-union "^3.1.0"
-      define-property "^0.2.5"
-      isobject "^3.0.0"
-      static-extend "^0.1.1"
-  
-  cli-cursor@^2.1.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-    integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-    dependencies:
-      restore-cursor "^2.0.0"
-  
-  cli-spinners@^1.1.0:
-    version "1.3.1"
-    resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
-    integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==
-  
-  cliui@^2.1.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-    integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
-    dependencies:
-      center-align "^0.1.1"
-      right-align "^0.1.1"
-      wordwrap "0.0.2"
-  
-  clone@^1.0.2:
-    version "1.0.4"
-    resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-    integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-  
-  collection-visit@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-    integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-    dependencies:
-      map-visit "^1.0.0"
-      object-visit "^1.0.0"
-  
-  color-convert@^1.9.0:
-    version "1.9.3"
-    resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-    integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-    dependencies:
-      color-name "1.1.3"
-  
-  color-name@1.1.3:
-    version "1.1.3"
-    resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-    integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-  
-  combined-stream@^1.0.6, combined-stream@~1.0.6:
-    version "1.0.8"
-    resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-    integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-    dependencies:
-      delayed-stream "~1.0.0"
-  
-  commander@^2.11.0:
-    version "2.20.0"
-    resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-    integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-  
-  component-emitter@^1.2.1:
-    version "1.3.0"
-    resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-    integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-  
-  concat-stream@~1.4.5:
-    version "1.4.11"
-    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz#1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f"
-    integrity sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==
-    dependencies:
-      inherits "~2.0.1"
-      readable-stream "~1.1.9"
-      typedarray "~0.0.5"
-  
-  concat-stream@~1.5.0, concat-stream@~1.5.1:
-    version "1.5.2"
-    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
-    integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY=
-    dependencies:
-      inherits "~2.0.1"
-      readable-stream "~2.0.0"
-      typedarray "~0.0.5"
-  
-  concat-stream@~1.6.0:
-    version "1.6.2"
-    resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-    integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-    dependencies:
-      buffer-from "^1.0.0"
-      inherits "^2.0.3"
-      readable-stream "^2.2.2"
-      typedarray "^0.0.6"
-  
-  contentstream@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/contentstream/-/contentstream-1.0.0.tgz#0bdcfa46da30464a86ce8fa7ece565410dc6f9a5"
-    integrity sha1-C9z6RtowRkqGzo+n7OVlQQ3G+aU=
-    dependencies:
-      readable-stream "~1.0.33-1"
-  
-  convert-source-map@^1.5.1:
-    version "1.6.0"
-    resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-    integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-    dependencies:
-      safe-buffer "~5.1.1"
-  
-  copy-descriptor@^0.1.0:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-    integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-  
-  core-util-is@1.0.2, core-util-is@~1.0.0:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-    integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-  
-  corslite@0.0.7:
-    version "0.0.7"
-    resolved "https://registry.yarnpkg.com/corslite/-/corslite-0.0.7.tgz#8e451db5320a7556de1ef78d9bd3566343077721"
-    integrity sha1-jkUdtTIKdVbeHveNm9NWY0MHdyE=
-  
-  csv2geojson@~5.0.0:
-    version "5.0.2"
-    resolved "https://registry.yarnpkg.com/csv2geojson/-/csv2geojson-5.0.2.tgz#abd649f2ec57689219ad4f19d333be75456b6f59"
-    integrity sha1-q9ZJ8uxXaJIZrU8Z0zO+dUVrb1k=
-    dependencies:
-      concat-stream "~1.5.1"
-      d3-dsv "1.0.1"
-      optimist "~0.6.1"
-      sexagesimal "0.5.0"
-  
-  cwise-compiler@^1.0.0, cwise-compiler@^1.1.1, cwise-compiler@^1.1.2:
-    version "1.1.3"
-    resolved "https://registry.yarnpkg.com/cwise-compiler/-/cwise-compiler-1.1.3.tgz#f4d667410e850d3a313a7d2db7b1e505bb034cc5"
-    integrity sha1-9NZnQQ6FDToxOn0tt7HlBbsDTMU=
-    dependencies:
-      uniq "^1.0.0"
-  
-  cwise-parser@^1.0.0:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/cwise-parser/-/cwise-parser-1.0.3.tgz#8e493c17d54f97cb030a9e9854bc86c9dfb354fe"
-    integrity sha1-jkk8F9VPl8sDCp6YVLyGyd+zVP4=
-    dependencies:
-      esprima "^1.0.3"
-      uniq "^1.0.0"
-  
-  cwise@^1.0.4, cwise@^1.0.7:
-    version "1.0.10"
-    resolved "https://registry.yarnpkg.com/cwise/-/cwise-1.0.10.tgz#24eee6072ebdfd6b8c6f5dadb17090b649b12bef"
-    integrity sha1-JO7mBy69/WuMb12tsXCQtkmxK+8=
-    dependencies:
-      cwise-compiler "^1.1.1"
-      cwise-parser "^1.0.0"
-      static-module "^1.0.0"
-      uglify-js "^2.6.0"
-  
-  d3-dsv@1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.1.tgz#d495347c04cb1e0d26557bbdc4775c4d11a245ea"
-    integrity sha1-1JU0fATLHg0mVXu9xHdcTRGiReo=
-    dependencies:
-      rw "1"
-  
-  d3-geo-projection@0.2:
-    version "0.2.16"
-    resolved "https://registry.yarnpkg.com/d3-geo-projection/-/d3-geo-projection-0.2.16.tgz#4994ecd1033ddb1533b6c4c5528a1c81dcc29427"
-    integrity sha1-SZTs0QM92xUztsTFUoocgdzClCc=
-    dependencies:
-      brfs "^1.3.0"
-  
-  d3-queue@1:
-    version "1.2.3"
-    resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-1.2.3.tgz#143a701cfa65fe021292f321c10d14e98abd491b"
-    integrity sha1-FDpwHPpl/gISkvMhwQ0U6Yq9SRs=
-  
-  d3-queue@2:
-    version "2.0.3"
-    resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-2.0.3.tgz#07fbda3acae5358a9c5299aaf880adf0953ed2c2"
-    integrity sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=
-  
-  d3@3:
-    version "3.5.17"
-    resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
-    integrity sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=
-  
-  d@1:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-    integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
-    dependencies:
-      es5-ext "^0.10.9"
-  
-  dashdash@^1.12.0:
-    version "1.14.1"
-    resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-    integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-    dependencies:
-      assert-plus "^1.0.0"
-  
-  data-uri-to-buffer@0.0.3:
-    version "0.0.3"
-    resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
-    integrity sha1-GK6XmmoMqZSwYlhTkW0mYruuCxo=
-  
-  data-uri-to-buffer@^2.0.0:
-    version "2.0.1"
-    resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
-    integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
-    dependencies:
-      "@types/node" "^8.0.7"
-  
-  debug@^2.2.0, debug@^2.3.3:
-    version "2.6.9"
-    resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-    integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-    dependencies:
-      ms "2.0.0"
-  
-  decamelize@^1.0.0:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-    integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-  
-  decode-uri-component@^0.2.0:
-    version "0.2.0"
-    resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-    integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-  
-  deep-is@~0.1.3:
-    version "0.1.3"
-    resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-    integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-  
-  defaults@^1.0.3:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-    integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
-    dependencies:
-      clone "^1.0.2"
-  
-  define-property@^0.2.5:
-    version "0.2.5"
-    resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-    integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-    dependencies:
-      is-descriptor "^0.1.0"
-  
-  define-property@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-    integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-    dependencies:
-      is-descriptor "^1.0.0"
-  
-  define-property@^2.0.2:
-    version "2.0.2"
-    resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-    integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-    dependencies:
-      is-descriptor "^1.0.2"
-      isobject "^3.0.1"
-  
-  delayed-stream@~1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-    integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-  
-  detect-file@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-    integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-  
-  dup@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/dup/-/dup-1.0.0.tgz#51fc5ac685f8196469df0b905e934b20af5b4029"
-    integrity sha1-UfxaxoX4GWRp3wuQXpNLIK9bQCk=
-  
-  duplexer2@~0.0.2:
-    version "0.0.2"
-    resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-    integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-    dependencies:
-      readable-stream "~1.1.9"
-  
-  duplexer2@~0.1.4:
-    version "0.1.4"
-    resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-    integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
-    dependencies:
-      readable-stream "^2.0.2"
-  
-  ecc-jsbn@~0.1.1:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-    integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-    dependencies:
-      jsbn "~0.1.0"
-      safer-buffer "^2.1.0"
-  
-  es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-    version "0.10.50"
-    resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
-    integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
-    dependencies:
-      es6-iterator "~2.0.3"
-      es6-symbol "~3.1.1"
-      next-tick "^1.0.0"
-  
-  es6-iterator@~2.0.1, es6-iterator@~2.0.3:
-    version "2.0.3"
-    resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-    integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-    dependencies:
-      d "1"
-      es5-ext "^0.10.35"
-      es6-symbol "^3.1.1"
-  
-  es6-map@^0.1.5:
-    version "0.1.5"
-    resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-    integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
-    dependencies:
-      d "1"
-      es5-ext "~0.10.14"
-      es6-iterator "~2.0.1"
-      es6-set "~0.1.5"
-      es6-symbol "~3.1.1"
-      event-emitter "~0.3.5"
-  
-  es6-set@^0.1.5, es6-set@~0.1.5:
-    version "0.1.5"
-    resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-    integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
-    dependencies:
-      d "1"
-      es5-ext "~0.10.14"
-      es6-iterator "~2.0.1"
-      es6-symbol "3.1.1"
-      event-emitter "~0.3.5"
-  
-  es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-    version "3.1.1"
-    resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-    integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
-    dependencies:
-      d "1"
-      es5-ext "~0.10.14"
-  
-  escape-string-regexp@^1.0.5:
-    version "1.0.5"
-    resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-    integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-  
-  escodegen@^1.8.1:
-    version "1.11.1"
-    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
-    integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
-    dependencies:
-      esprima "^3.1.3"
-      estraverse "^4.2.0"
-      esutils "^2.0.2"
-      optionator "^0.8.1"
-    optionalDependencies:
-      source-map "~0.6.1"
-  
-  escodegen@~0.0.24:
-    version "0.0.28"
-    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-0.0.28.tgz#0e4ff1715f328775d6cab51ac44a406cd7abffd3"
-    integrity sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=
-    dependencies:
-      esprima "~1.0.2"
-      estraverse "~1.3.0"
-    optionalDependencies:
-      source-map ">= 0.1.2"
-  
-  escodegen@~1.3.2:
-    version "1.3.3"
-    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.3.3.tgz#f024016f5a88e046fd12005055e939802e6c5f23"
-    integrity sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=
-    dependencies:
-      esprima "~1.1.1"
-      estraverse "~1.5.0"
-      esutils "~1.0.0"
-    optionalDependencies:
-      source-map "~0.1.33"
-  
-  escodegen@~1.9.0:
-    version "1.9.1"
-    resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
-    integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
-    dependencies:
-      esprima "^3.1.3"
-      estraverse "^4.2.0"
-      esutils "^2.0.2"
-      optionator "^0.8.1"
-    optionalDependencies:
-      source-map "~0.6.1"
-  
-  esprima@^1.0.3:
-    version "1.2.5"
-    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.5.tgz#0993502feaf668138325756f30f9a51feeec11e9"
-    integrity sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=
-  
-  esprima@^3.1.3:
-    version "3.1.3"
-    resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-    integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-  
-  esprima@~1.0.2:
-    version "1.0.4"
-    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
-    integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
-  
-  esprima@~1.1.1:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
-    integrity sha1-W28VR/TRAuZw4UDFCb5ncdautUk=
-  
-  estraverse@^4.2.0:
-    version "4.2.0"
-    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-    integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-  
-  estraverse@~1.3.0:
-    version "1.3.2"
-    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.3.2.tgz#37c2b893ef13d723f276d878d60d8535152a6c42"
-    integrity sha1-N8K4k+8T1yPydth41g2FNRUqbEI=
-  
-  estraverse@~1.5.0:
-    version "1.5.1"
-    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
-    integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
-  
-  estree-is-function@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz#c0adc29806d7f18a74db7df0f3b2666702e37ad2"
-    integrity sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==
-  
-  esutils@^2.0.2:
-    version "2.0.2"
-    resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-    integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-  
-  esutils@~1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
-    integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
-  
-  event-emitter@~0.3.5:
-    version "0.3.5"
-    resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-    integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
-    dependencies:
-      d "1"
-      es5-ext "~0.10.14"
-  
-  expand-brackets@^2.1.4:
-    version "2.1.4"
-    resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-    integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-    dependencies:
-      debug "^2.3.3"
-      define-property "^0.2.5"
-      extend-shallow "^2.0.1"
-      posix-character-classes "^0.1.0"
-      regex-not "^1.0.0"
-      snapdragon "^0.8.1"
-      to-regex "^3.0.1"
-  
-  expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-    version "2.0.2"
-    resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-    integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-    dependencies:
-      homedir-polyfill "^1.0.1"
-  
-  extend-shallow@^2.0.1:
-    version "2.0.1"
-    resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-    integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-    dependencies:
-      is-extendable "^0.1.0"
-  
-  extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-    version "3.0.2"
-    resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-    integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-    dependencies:
-      assign-symbols "^1.0.0"
-      is-extendable "^1.0.1"
-  
-  extend@^3.0.0, extend@~3.0.2:
-    version "3.0.2"
-    resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-    integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-  
-  extglob@^2.0.4:
-    version "2.0.4"
-    resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-    integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-    dependencies:
-      array-unique "^0.3.2"
-      define-property "^1.0.0"
-      expand-brackets "^2.1.4"
-      extend-shallow "^2.0.1"
-      fragment-cache "^0.2.1"
-      regex-not "^1.0.0"
-      snapdragon "^0.8.1"
-      to-regex "^3.0.1"
-  
-  extsprintf@1.3.0:
-    version "1.3.0"
-    resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-    integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-  
-  extsprintf@^1.2.0:
-    version "1.4.0"
-    resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-    integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-  
-  falafel@^2.1.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
-    integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
-    dependencies:
-      acorn "^5.0.0"
-      foreach "^2.0.5"
-      isarray "0.0.1"
-      object-keys "^1.0.6"
-  
-  fast-deep-equal@^2.0.1:
-    version "2.0.1"
-    resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-    integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-  
-  fast-json-stable-stringify@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-    integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-  
-  fast-levenshtein@~2.0.4:
-    version "2.0.6"
-    resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-    integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-  
-  fill-range@^4.0.0:
-    version "4.0.0"
-    resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-    integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-    dependencies:
-      extend-shallow "^2.0.1"
-      is-number "^3.0.0"
-      repeat-string "^1.6.1"
-      to-regex-range "^2.1.0"
-  
-  findup-sync@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-    integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-    dependencies:
-      detect-file "^1.0.0"
-      is-glob "^3.1.0"
-      micromatch "^3.0.4"
-      resolve-dir "^1.0.1"
-  
-  fined@^1.0.1:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
-    integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
-    dependencies:
-      expand-tilde "^2.0.2"
-      is-plain-object "^2.0.3"
-      object.defaults "^1.1.0"
-      object.pick "^1.2.0"
-      parse-filepath "^1.0.1"
-  
-  fisheyegl@^0.1.2:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/fisheyegl/-/fisheyegl-0.1.2.tgz#4b7ad5705253444ad6030888a81296f5068e4972"
-    integrity sha1-S3rVcFJTRErWAwiIqBKW9QaOSXI=
-  
-  flagged-respawn@^1.0.0:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
-    integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
-  
-  font-awesome@~4.5.0:
-    version "4.5.0"
-    resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
-    integrity sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=
-  
-  for-in@^1.0.1, for-in@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-    integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-  
-  for-own@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-    integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
-    dependencies:
-      for-in "^1.0.1"
-  
-  foreach@^2.0.5:
-    version "2.0.5"
-    resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-    integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-  
-  forever-agent@~0.6.1:
-    version "0.6.1"
-    resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-    integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-  
-  form-data@~2.3.2:
-    version "2.3.3"
-    resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-    integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-    dependencies:
-      asynckit "^0.4.0"
-      combined-stream "^1.0.6"
-      mime-types "^2.1.12"
-  
-  fragment-cache@^0.2.1:
-    version "0.2.1"
-    resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-    integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-    dependencies:
-      map-cache "^0.2.2"
-  
-  from2-string@^1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/from2-string/-/from2-string-1.1.0.tgz#18282b27d08a267cb3030cd2b8b4b0f212af752a"
-    integrity sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=
-    dependencies:
-      from2 "^2.0.3"
-  
-  from2@^2.0.3:
-    version "2.3.0"
-    resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-    integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-    dependencies:
-      inherits "^2.0.1"
-      readable-stream "^2.0.0"
-  
-  function-bind@^1.1.1:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-    integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-  
-  get-assigned-identifiers@^1.1.0:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
-    integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
-  
-  get-pixels@~3.3.0:
-    version "3.3.2"
-    resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03"
-    integrity sha512-6ar+8yPxRd1pskEcl2GSEu1La0+xYRjjnkby6AYiRDDwZ0tJbPQmHnSeH9fGLskT8kvR0OukVgtZLcsENF9YKQ==
-    dependencies:
-      data-uri-to-buffer "0.0.3"
-      jpeg-js "^0.3.2"
-      mime-types "^2.0.1"
-      ndarray "^1.0.13"
-      ndarray-pack "^1.1.1"
-      node-bitmap "0.0.1"
-      omggif "^1.0.5"
-      parse-data-uri "^0.2.0"
-      pngjs "^3.3.3"
-      request "^2.44.0"
-      through "^2.3.4"
-  
-  get-value@^2.0.3, get-value@^2.0.6:
-    version "2.0.6"
-    resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-    integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-  
-  getpass@^0.1.1:
-    version "0.1.7"
-    resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-    integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-    dependencies:
-      assert-plus "^1.0.0"
-  
-  gif-encoder@~0.4.1:
-    version "0.4.3"
-    resolved "https://registry.yarnpkg.com/gif-encoder/-/gif-encoder-0.4.3.tgz#8a2b4fe8ca895a48e3a0b6cbb340a0a6a3571899"
-    integrity sha1-iitP6MqJWkjjoLbLs0CgpqNXGJk=
-    dependencies:
-      readable-stream "~1.1.9"
-  
-  global-modules@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-    integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-    dependencies:
-      global-prefix "^1.0.1"
-      is-windows "^1.0.1"
-      resolve-dir "^1.0.0"
-  
-  global-prefix@^1.0.1:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-    integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-    dependencies:
-      expand-tilde "^2.0.2"
-      homedir-polyfill "^1.0.1"
-      ini "^1.3.4"
-      is-windows "^1.0.1"
-      which "^1.2.14"
-  
-  grunt-cli@^1.2.0:
-    version "1.3.2"
-    resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.3.2.tgz#60f12d12c1b5aae94ae3469c6b5fe24e960014e8"
-    integrity sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==
-    dependencies:
-      grunt-known-options "~1.1.0"
-      interpret "~1.1.0"
-      liftoff "~2.5.0"
-      nopt "~4.0.1"
-      v8flags "~3.1.1"
-  
-  grunt-known-options@~1.1.0:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.1.tgz#6cc088107bd0219dc5d3e57d91923f469059804d"
-    integrity sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==
-  
-  har-schema@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-    integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-  
-  har-validator@~5.1.0:
-    version "5.1.3"
-    resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-    integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
-    dependencies:
-      ajv "^6.5.5"
-      har-schema "^2.0.0"
-  
-  has-flag@^3.0.0:
-    version "3.0.0"
-    resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-    integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-  
-  has-value@^0.3.1:
-    version "0.3.1"
-    resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-    integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-    dependencies:
-      get-value "^2.0.3"
-      has-values "^0.1.4"
-      isobject "^2.0.0"
-  
-  has-value@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-    integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-    dependencies:
-      get-value "^2.0.6"
-      has-values "^1.0.0"
-      isobject "^3.0.0"
-  
-  has-values@^0.1.4:
-    version "0.1.4"
-    resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-    integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-  
-  has-values@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-    integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-    dependencies:
-      is-number "^3.0.0"
-      kind-of "^4.0.0"
-  
-  has@^1.0.0, has@^1.0.1:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-    integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-    dependencies:
-      function-bind "^1.1.1"
-  
-  heatmap.js@*:
-    version "2.0.5"
-    resolved "https://registry.yarnpkg.com/heatmap.js/-/heatmap.js-2.0.5.tgz#466d3b86513f5d49112a49d25700ab2730149153"
-    integrity sha1-Rm07hlE/XUkRKknSVwCrJzAUkVM=
-  
-  homedir-polyfill@^1.0.1:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-    integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-    dependencies:
-      parse-passwd "^1.0.0"
-  
-  http-signature@~1.2.0:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-    integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-    dependencies:
-      assert-plus "^1.0.0"
-      jsprim "^1.2.2"
-      sshpk "^1.7.0"
-  
-  iconv-lite@0.2:
-    version "0.2.11"
-    resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
-    integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
-  
-  ieee754@^1.1.4:
-    version "1.1.13"
-    resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-    integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
-  
-  "imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
-    version "0.9.11-rc.1"
-    resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
-  
-  inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-    version "2.0.3"
-    resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-    integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-  
-  ini@^1.3.4:
-    version "1.3.5"
-    resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-    integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-  
-  interpret@~1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-    integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
-  
-  iota-array@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
-    integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
-  
-  is-absolute@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-    integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-    dependencies:
-      is-relative "^1.0.0"
-      is-windows "^1.0.1"
-  
-  is-accessor-descriptor@^0.1.6:
-    version "0.1.6"
-    resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-    integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-    dependencies:
-      kind-of "^3.0.2"
-  
-  is-accessor-descriptor@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-    integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-    dependencies:
-      kind-of "^6.0.0"
-  
-  is-buffer@^1.0.2, is-buffer@^1.1.5:
-    version "1.1.6"
-    resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-    integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-  
-  is-data-descriptor@^0.1.4:
-    version "0.1.4"
-    resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-    integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-    dependencies:
-      kind-of "^3.0.2"
-  
-  is-data-descriptor@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-    integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-    dependencies:
-      kind-of "^6.0.0"
-  
-  is-descriptor@^0.1.0:
-    version "0.1.6"
-    resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-    integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-    dependencies:
-      is-accessor-descriptor "^0.1.6"
-      is-data-descriptor "^0.1.4"
-      kind-of "^5.0.0"
-  
-  is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-    integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-    dependencies:
-      is-accessor-descriptor "^1.0.0"
-      is-data-descriptor "^1.0.0"
-      kind-of "^6.0.2"
-  
-  is-extendable@^0.1.0, is-extendable@^0.1.1:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-    integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-  
-  is-extendable@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-    integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-    dependencies:
-      is-plain-object "^2.0.4"
-  
-  is-extglob@^2.1.0:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-    integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-  
-  is-glob@^3.1.0:
-    version "3.1.0"
-    resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-    integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-    dependencies:
-      is-extglob "^2.1.0"
-  
-  is-number@^3.0.0:
-    version "3.0.0"
-    resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-    integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-    dependencies:
-      kind-of "^3.0.2"
-  
-  is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-    version "2.0.4"
-    resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-    integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-    dependencies:
-      isobject "^3.0.1"
-  
-  is-relative@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-    integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-    dependencies:
-      is-unc-path "^1.0.0"
-  
-  is-typedarray@~1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-    integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-  
-  is-unc-path@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-    integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-    dependencies:
-      unc-path-regex "^0.1.2"
-  
-  is-windows@^1.0.1, is-windows@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-    integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-  
-  isarray@0.0.1:
-    version "0.0.1"
-    resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-    integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-  
-  isarray@1.0.0, isarray@~1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-    integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-  
-  isexe@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-    integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-  
-  isobject@^2.0.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-    integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-    dependencies:
-      isarray "1.0.0"
-  
-  isobject@^3.0.0, isobject@^3.0.1:
-    version "3.0.1"
-    resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-    integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-  
-  isstream@~0.1.2:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-    integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-  
-  jpeg-js@0.0.4:
-    version "0.0.4"
-    resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e"
-    integrity sha1-Bqr0fv7HrwsZJKWc1pWm0rXthw4=
-  
-  jpeg-js@^0.3.2:
-    version "0.3.5"
-    resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.5.tgz#6fbd6cd0e49627c5a0341796c9e50c70a2aa3673"
-    integrity sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==
-  
-  jquery@>=1.8, jquery@^3.3.1:
-    version "3.4.1"
-    resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-    integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
-  
-  jquery@~2:
-    version "2.2.4"
-    resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
-    integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
-  
-  jsbn@~0.1.0:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-    integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-  
-  json-schema-traverse@^0.4.1:
-    version "0.4.1"
-    resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-    integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-  
-  json-schema@0.2.3:
-    version "0.2.3"
-    resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-    integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-  
-  json-stringify-safe@~5.0.1:
-    version "5.0.1"
-    resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-    integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-  
-  jsprim@^1.2.2:
-    version "1.4.1"
-    resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-    integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-    dependencies:
-      assert-plus "1.0.0"
-      extsprintf "1.3.0"
-      json-schema "0.2.3"
-      verror "1.10.0"
-  
-  jsqr@^0.2.2:
-    version "0.2.2"
-    resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
-    integrity sha1-jB8Ceft8lFQqqp6K63xyLVI+oJI=
-  
-  kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-    version "3.2.2"
-    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-    integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-    dependencies:
-      is-buffer "^1.1.5"
-  
-  kind-of@^4.0.0:
-    version "4.0.0"
-    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-    integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-    dependencies:
-      is-buffer "^1.1.5"
-  
-  kind-of@^5.0.0:
-    version "5.1.0"
-    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-    integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-  
-  kind-of@^6.0.0, kind-of@^6.0.2:
-    version "6.0.2"
-    resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-    integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-  
-  lazy-cache@^1.0.3:
-    version "1.0.4"
-    resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-    integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-  
-  leaflet-hash@0.2.1:
-    version "0.2.1"
-    resolved "https://registry.yarnpkg.com/leaflet-hash/-/leaflet-hash-0.2.1.tgz#c36c718347c5243033b57cb4baea26119d82c701"
-    integrity sha1-w2xxg0fFJDAztXy0uuomEZ2CxwE=
-  
-  leaflet-heatmap@1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/leaflet-heatmap/-/leaflet-heatmap-1.0.0.tgz#83cc04249d39ed91526aeaa7d7669bdaa86d6b1f"
-    integrity sha1-g8wEJJ057ZFSauqn12ab2qhtax8=
-    dependencies:
-      heatmap.js "*"
-      leaflet "*"
-  
-  leaflet-providers@^1.1.17:
-    version "1.7.0"
-    resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.7.0.tgz#b462d6abba832b2e9f1cef6ca0ab3bf76a7ca9a9"
-    integrity sha512-7gXQnILnnIGuPy8TFaSP2aACsaxdT+y2sFae4rqbK8vX9ZwTJ9+5CI5DcBB+r867PdmdRlz5rjG99yvyLWOJYg==
-  
-  leaflet-spin@1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/leaflet-spin/-/leaflet-spin-1.1.0.tgz#7298be3be9ab05b540913d84915d6347f49b1e4e"
-    integrity sha1-cpi+O+mrBbVAkT2EkV1jR/SbHk4=
-    dependencies:
-      spin.js "^2.3.1"
-  
-  leaflet@*, leaflet@^1.3.1:
-    version "1.5.1"
-    resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf"
-    integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w==
-  
-  levn@~0.3.0:
-    version "0.3.0"
-    resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-    integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-    dependencies:
-      prelude-ls "~1.1.2"
-      type-check "~0.3.2"
-  
-  liftoff@~2.5.0:
-    version "2.5.0"
-    resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
-    integrity sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=
-    dependencies:
-      extend "^3.0.0"
-      findup-sync "^2.0.0"
-      fined "^1.0.1"
-      flagged-respawn "^1.0.0"
-      is-plain-object "^2.0.4"
-      object.map "^1.0.0"
-      rechoir "^0.6.2"
-      resolve "^1.1.7"
-  
-  lodash@^4.17.5:
-    version "4.17.11"
-    resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-    integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-  
-  log-symbols@^2.2.0:
-    version "2.2.0"
-    resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-    integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-    dependencies:
-      chalk "^2.0.1"
-  
-  longest@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-    integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
-  
-  magic-string@^0.22.4:
-    version "0.22.5"
-    resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
-    integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
-    dependencies:
-      vlq "^0.2.2"
-  
-  make-iterator@^1.0.0:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
-    integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-    dependencies:
-      kind-of "^6.0.2"
-  
-  map-cache@^0.2.0, map-cache@^0.2.2:
-    version "0.2.2"
-    resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-    integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-  
-  map-visit@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-    integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-    dependencies:
-      object-visit "^1.0.0"
-  
-  merge-source-map@1.0.4:
-    version "1.0.4"
-    resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
-    integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
-    dependencies:
-      source-map "^0.5.6"
-  
-  micromatch@^3.0.4:
-    version "3.1.10"
-    resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-    integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-    dependencies:
-      arr-diff "^4.0.0"
-      array-unique "^0.3.2"
-      braces "^2.3.1"
-      define-property "^2.0.2"
-      extend-shallow "^3.0.2"
-      extglob "^2.0.4"
-      fragment-cache "^0.2.1"
-      kind-of "^6.0.2"
-      nanomatch "^1.2.9"
-      object.pick "^1.3.0"
-      regex-not "^1.0.0"
-      snapdragon "^0.8.1"
-      to-regex "^3.0.2"
-  
-  mime-db@1.40.0:
-    version "1.40.0"
-    resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-    integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-  
-  mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
-    version "2.1.24"
-    resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-    integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
-    dependencies:
-      mime-db "1.40.0"
-  
-  mime@^1.3.4:
-    version "1.6.0"
-    resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-    integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-  
-  mimic-fn@^1.0.0:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-    integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-  
-  minimist@0.0.8:
-    version "0.0.8"
-    resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-    integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-  
-  minimist@^1.1.3:
-    version "1.2.0"
-    resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-    integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-  
-  minimist@~0.0.1:
-    version "0.0.10"
-    resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-    integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-  
-  minimist@~1.1.2:
-    version "1.1.3"
-    resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-    integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
-  
-  mixin-deep@^1.2.0:
-    version "1.3.1"
-    resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-    integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
-    dependencies:
-      for-in "^1.0.2"
-      is-extendable "^1.0.1"
-  
-  ms@2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-    integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-  
-  nanomatch@^1.2.9:
-    version "1.2.13"
-    resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-    integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-    dependencies:
-      arr-diff "^4.0.0"
-      array-unique "^0.3.2"
-      define-property "^2.0.2"
-      extend-shallow "^3.0.2"
-      fragment-cache "^0.2.1"
-      is-windows "^1.0.2"
-      kind-of "^6.0.2"
-      object.pick "^1.3.0"
-      regex-not "^1.0.0"
-      snapdragon "^0.8.1"
-      to-regex "^3.0.1"
-  
-  ndarray-fft@^1.0.0:
-    version "1.0.3"
-    resolved "https://registry.yarnpkg.com/ndarray-fft/-/ndarray-fft-1.0.3.tgz#dc5bba18e3ab82c997adbaebb78e79f82c93a22a"
-    integrity sha1-3Fu6GOOrgsmXrbrrt455+CyToio=
-    dependencies:
-      bit-twiddle "^1.0.2"
-      cwise "^1.0.4"
-      ndarray "^1.0.15"
-      ndarray-ops "^1.2.2"
-      typedarray-pool "^1.0.0"
-  
-  ndarray-gaussian-filter@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/ndarray-gaussian-filter/-/ndarray-gaussian-filter-1.0.0.tgz#b521d8f8040af70e4e5c244a3c7f06cbb358024e"
-    integrity sha1-tSHY+AQK9w5OXCRKPH8Gy7NYAk4=
-    dependencies:
-      cwise "^1.0.7"
-      dup "^1.0.0"
-      ndarray "^1.0.18"
-      ndarray-fft "^1.0.0"
-      ndarray-ops "^1.2.2"
-      next-pow-2 "^1.0.0"
-      typedarray-pool "^1.1.0"
-  
-  ndarray-ops@^1.2.2:
-    version "1.2.2"
-    resolved "https://registry.yarnpkg.com/ndarray-ops/-/ndarray-ops-1.2.2.tgz#59e88d2c32a7eebcb1bc690fae141579557a614e"
-    integrity sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=
-    dependencies:
-      cwise-compiler "^1.0.0"
-  
-  ndarray-pack@^1.1.1:
-    version "1.2.1"
-    resolved "https://registry.yarnpkg.com/ndarray-pack/-/ndarray-pack-1.2.1.tgz#8caebeaaa24d5ecf70ff86020637977da8ee585a"
-    integrity sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=
-    dependencies:
-      cwise-compiler "^1.1.2"
-      ndarray "^1.0.13"
-  
-  ndarray@^1.0.13, ndarray@^1.0.15, ndarray@^1.0.18:
-    version "1.0.18"
-    resolved "https://registry.yarnpkg.com/ndarray/-/ndarray-1.0.18.tgz#b60d3a73224ec555d0faa79711e502448fd3f793"
-    integrity sha1-tg06cyJOxVXQ+qeXEeUCRI/T95M=
-    dependencies:
-      iota-array "^1.0.0"
-      is-buffer "^1.0.2"
-  
-  next-pow-2@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/next-pow-2/-/next-pow-2-1.0.0.tgz#cb5c2f1dae040c56cdd5cda1dc5c6a3a338f4367"
-    integrity sha1-y1wvHa4EDFbN1c2h3FxqOjOPQ2c=
-  
-  next-tick@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
-    integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
-  
-  node-bitmap@0.0.1:
-    version "0.0.1"
-    resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
-    integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
-  
-  nopt@~4.0.1:
-    version "4.0.1"
-    resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-    integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-    dependencies:
-      abbrev "1"
-      osenv "^0.1.4"
-  
-  oauth-sign@~0.9.0:
-    version "0.9.0"
-    resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-    integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-  
-  object-copy@^0.1.0:
-    version "0.1.0"
-    resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-    integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-    dependencies:
-      copy-descriptor "^0.1.0"
-      define-property "^0.2.5"
-      kind-of "^3.0.3"
-  
-  object-inspect@~0.4.0:
-    version "0.4.0"
-    resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec"
-    integrity sha1-9RV8EWwUVbJDsG7pdwM5LFrYn+w=
-  
-  object-inspect@~1.4.0:
-    version "1.4.1"
-    resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
-    integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
-  
-  object-keys@^1.0.6:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-    integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-  
-  object-keys@~0.4.0:
-    version "0.4.0"
-    resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-    integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
-  
-  object-visit@^1.0.0:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-    integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-    dependencies:
-      isobject "^3.0.0"
-  
-  object.defaults@^1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-    integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
-    dependencies:
-      array-each "^1.0.1"
-      array-slice "^1.0.0"
-      for-own "^1.0.0"
-      isobject "^3.0.0"
-  
-  object.map@^1.0.0:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-    integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-    dependencies:
-      for-own "^1.0.0"
-      make-iterator "^1.0.0"
-  
-  object.pick@^1.2.0, object.pick@^1.3.0:
-    version "1.3.0"
-    resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-    integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-    dependencies:
-      isobject "^3.0.1"
-  
-  omggif@^1.0.5:
-    version "1.0.9"
-    resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
-    integrity sha1-3LcCTazVDFK00wPwSALJHAV8dl8=
-  
-  onetime@^2.0.0:
-    version "2.0.1"
-    resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-    integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-    dependencies:
-      mimic-fn "^1.0.0"
-  
-  optimist@0.3:
-    version "0.3.7"
-    resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
-    integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
-    dependencies:
-      wordwrap "~0.0.2"
-  
-  optimist@~0.6.1:
-    version "0.6.1"
-    resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-    integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-    dependencies:
-      minimist "~0.0.1"
-      wordwrap "~0.0.2"
-  
-  optionator@^0.8.1:
-    version "0.8.2"
-    resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-    integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
-    dependencies:
-      deep-is "~0.1.3"
-      fast-levenshtein "~2.0.4"
-      levn "~0.3.0"
-      prelude-ls "~1.1.2"
-      type-check "~0.3.2"
-      wordwrap "~1.0.0"
-  
-  ora@^2.0.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/ora/-/ora-2.1.0.tgz#6caf2830eb924941861ec53a173799e008b51e5b"
-    integrity sha512-hNNlAd3gfv/iPmsNxYoAPLvxg7HuPozww7fFonMZvL84tP6Ox5igfk5j/+a9rtJJwqMgKK+JgWsAQik5o0HTLA==
-    dependencies:
-      chalk "^2.3.1"
-      cli-cursor "^2.1.0"
-      cli-spinners "^1.1.0"
-      log-symbols "^2.2.0"
-      strip-ansi "^4.0.0"
-      wcwidth "^1.0.1"
-  
-  os-homedir@^1.0.0:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-    integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-  
-  os-tmpdir@^1.0.0:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-    integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-  
-  osenv@^0.1.4:
-    version "0.1.5"
-    resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-    integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-    dependencies:
-      os-homedir "^1.0.0"
-      os-tmpdir "^1.0.0"
-  
-  pace@0.0.4:
-    version "0.0.4"
-    resolved "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz#d66405d5f5bc12d25441a6e26c878dbc69e77a77"
-    integrity sha1-1mQF1fW8EtJUQabibIeNvGnnenc=
-    dependencies:
-      charm "~0.1.0"
-  
-  parse-data-uri@^0.2.0:
-    version "0.2.0"
-    resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
-    integrity sha1-vwTYUd1ch7CrI45dAazklLYEtMk=
-    dependencies:
-      data-uri-to-buffer "0.0.3"
-  
-  parse-filepath@^1.0.1:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-    integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-    dependencies:
-      is-absolute "^1.0.0"
-      map-cache "^0.2.0"
-      path-root "^0.1.1"
-  
-  parse-passwd@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-    integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-  
-  pascalcase@^0.1.1:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-    integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-  
-  path-parse@^1.0.6:
-    version "1.0.6"
-    resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-    integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-  
-  path-root-regex@^0.1.0:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-    integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-  
-  path-root@^0.1.1:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-    integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-    dependencies:
-      path-root-regex "^0.1.0"
-  
-  performance-now@^2.1.0:
-    version "2.1.0"
-    resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-    integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-  
-  pngjs-nozlib@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7"
-    integrity sha1-nmTWAs/pzOTZ1Zl9BodCmnPwt9c=
-  
-  pngjs@^3.3.3:
-    version "3.4.0"
-    resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
-    integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
-  
-  polyline@0.2.0:
-    version "0.2.0"
-    resolved "https://registry.yarnpkg.com/polyline/-/polyline-0.2.0.tgz#4f2b716ca81134a6cbaa488975d236ecb1cc2840"
-    integrity sha1-TytxbKgRNKbLqkiJddI27LHMKEA=
-  
-  posix-character-classes@^0.1.0:
-    version "0.1.1"
-    resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-    integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-  
-  prelude-ls@~1.1.2:
-    version "1.1.2"
-    resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-    integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-  
-  process-nextick-args@~1.0.6:
-    version "1.0.7"
-    resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-    integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-  
-  process-nextick-args@~2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-    integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-  
-  psl@^1.1.24:
-    version "1.1.32"
-    resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
-    integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
-  
-  punycode@^1.4.1:
-    version "1.4.1"
-    resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-    integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-  
-  punycode@^2.1.0:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-    integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-  
-  qs@~6.5.2:
-    version "6.5.2"
-    resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-    integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-  
-  quote-stream@^1.0.1, quote-stream@^1.0.2, quote-stream@~1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
-    integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
-    dependencies:
-      buffer-equal "0.0.1"
-      minimist "^1.1.3"
-      through2 "^2.0.0"
-  
-  quote-stream@~0.0.0:
-    version "0.0.0"
-    resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-0.0.0.tgz#cde29e94c409b16e19dc7098b89b6658f9721d3b"
-    integrity sha1-zeKelMQJsW4Z3HCYuJtmWPlyHTs=
-    dependencies:
-      minimist "0.0.8"
-      through2 "~0.4.1"
-  
-  readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
-    version "2.3.6"
-    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-    integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-    dependencies:
-      core-util-is "~1.0.0"
-      inherits "~2.0.3"
-      isarray "~1.0.0"
-      process-nextick-args "~2.0.0"
-      safe-buffer "~5.1.1"
-      string_decoder "~1.1.1"
-      util-deprecate "~1.0.1"
-  
-  readable-stream@~1.0.17, readable-stream@~1.0.27-1, readable-stream@~1.0.33-1:
-    version "1.0.34"
-    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-    integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-    dependencies:
-      core-util-is "~1.0.0"
-      inherits "~2.0.1"
-      isarray "0.0.1"
-      string_decoder "~0.10.x"
-  
-  readable-stream@~1.1.9:
-    version "1.1.14"
-    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-    integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-    dependencies:
-      core-util-is "~1.0.0"
-      inherits "~2.0.1"
-      isarray "0.0.1"
-      string_decoder "~0.10.x"
-  
-  readable-stream@~2.0.0:
-    version "2.0.6"
-    resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-    integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-    dependencies:
-      core-util-is "~1.0.0"
-      inherits "~2.0.1"
-      isarray "~1.0.0"
-      process-nextick-args "~1.0.6"
-      string_decoder "~0.10.x"
-      util-deprecate "~1.0.1"
-  
-  readline-sync@^1.4.7:
-    version "1.4.9"
-    resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
-    integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
-  
-  rechoir@^0.6.2:
-    version "0.6.2"
-    resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-    integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-    dependencies:
-      resolve "^1.1.6"
-  
-  regex-not@^1.0.0, regex-not@^1.0.2:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-    integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-    dependencies:
-      extend-shallow "^3.0.2"
-      safe-regex "^1.1.0"
-  
-  repeat-element@^1.1.2:
-    version "1.1.3"
-    resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-    integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-  
-  repeat-string@^1.5.2, repeat-string@^1.6.1:
-    version "1.6.1"
-    resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-    integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-  
-  request@^2.44.0:
-    version "2.88.0"
-    resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-    integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-    dependencies:
-      aws-sign2 "~0.7.0"
-      aws4 "^1.8.0"
-      caseless "~0.12.0"
-      combined-stream "~1.0.6"
-      extend "~3.0.2"
-      forever-agent "~0.6.1"
-      form-data "~2.3.2"
-      har-validator "~5.1.0"
-      http-signature "~1.2.0"
-      is-typedarray "~1.0.0"
-      isstream "~0.1.2"
-      json-stringify-safe "~5.0.1"
-      mime-types "~2.1.19"
-      oauth-sign "~0.9.0"
-      performance-now "^2.1.0"
-      qs "~6.5.2"
-      safe-buffer "^5.1.2"
-      tough-cookie "~2.4.3"
-      tunnel-agent "^0.6.0"
-      uuid "^3.3.2"
-  
-  resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-    integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-    dependencies:
-      expand-tilde "^2.0.0"
-      global-modules "^1.0.0"
-  
-  resolve-url@^0.2.1:
-    version "0.2.1"
-    resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-    integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-  
-  resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7:
-    version "1.11.1"
-    resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
-    integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
-    dependencies:
-      path-parse "^1.0.6"
-  
-  restore-cursor@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-    integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-    dependencies:
-      onetime "^2.0.0"
-      signal-exit "^3.0.2"
-  
-  ret@~0.1.10:
-    version "0.1.15"
-    resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-    integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-  
-  right-align@^0.1.1:
-    version "0.1.3"
-    resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-    integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
-    dependencies:
-      align-text "^0.1.1"
-  
-  rw@1:
-    version "1.3.3"
-    resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-    integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-  
-  safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-    version "5.1.2"
-    resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-    integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-  
-  safe-regex@^1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-    integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-    dependencies:
-      ret "~0.1.10"
-  
-  safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-    version "2.1.2"
-    resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-    integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-  
-  save-pixels@~2.3.4:
-    version "2.3.4"
-    resolved "https://registry.yarnpkg.com/save-pixels/-/save-pixels-2.3.4.tgz#49d349c06b8d7c0127dbf0da24b44aca5afb59fe"
-    integrity sha1-SdNJwGuNfAEn2/DaJLRKylr7Wf4=
-    dependencies:
-      contentstream "^1.0.0"
-      gif-encoder "~0.4.1"
-      jpeg-js "0.0.4"
-      ndarray "^1.0.18"
-      ndarray-ops "^1.2.2"
-      pngjs-nozlib "^1.0.0"
-      through "^2.3.4"
-  
-  scope-analyzer@^2.0.1:
-    version "2.0.5"
-    resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.0.5.tgz#72c9c6770c3e66984f84c7d3c7045998a1a7db8a"
-    integrity sha512-+U5H0417mnTEstCD5VwOYO7V4vYuSqwqjFap40ythe67bhMFL5C3UgPwyBv7KDJsqUBIKafOD57xMlh1rN7eaw==
-    dependencies:
-      array-from "^2.1.1"
-      es6-map "^0.1.5"
-      es6-set "^0.1.5"
-      es6-symbol "^3.1.1"
-      estree-is-function "^1.0.0"
-      get-assigned-identifiers "^1.1.0"
-  
-  set-value@^0.4.3:
-    version "0.4.3"
-    resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-    integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-    dependencies:
-      extend-shallow "^2.0.1"
-      is-extendable "^0.1.1"
-      is-plain-object "^2.0.1"
-      to-object-path "^0.3.0"
-  
-  set-value@^2.0.0:
-    version "2.0.0"
-    resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-    integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
-    dependencies:
-      extend-shallow "^2.0.1"
-      is-extendable "^0.1.1"
-      is-plain-object "^2.0.3"
-      split-string "^3.0.1"
-  
-  sexagesimal@0.5.0:
-    version "0.5.0"
-    resolved "https://registry.yarnpkg.com/sexagesimal/-/sexagesimal-0.5.0.tgz#9d815bd2bddd634b625ba6851bf8fe74a5ad3ef3"
-    integrity sha1-nYFb0r3dY0tiW6aFG/j+dKWtPvM=
-  
-  shallow-copy@~0.0.1:
-    version "0.0.1"
-    resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
-    integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
-  
-  shapefile@0.3:
-    version "0.3.1"
-    resolved "https://registry.yarnpkg.com/shapefile/-/shapefile-0.3.1.tgz#9bb9a429bd6086a0cfb03962d14cfdf420ffba12"
-    integrity sha1-m7mkKb1ghqDPsDli0Uz99CD/uhI=
-    dependencies:
-      d3-queue "1"
-      iconv-lite "0.2"
-      optimist "0.3"
-  
-  signal-exit@^3.0.2:
-    version "3.0.2"
-    resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-    integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-  
-  snapdragon-node@^2.0.1:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-    integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-    dependencies:
-      define-property "^1.0.0"
-      isobject "^3.0.0"
-      snapdragon-util "^3.0.1"
-  
-  snapdragon-util@^3.0.1:
-    version "3.0.1"
-    resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-    integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-    dependencies:
-      kind-of "^3.2.0"
-  
-  snapdragon@^0.8.1:
-    version "0.8.2"
-    resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-    integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-    dependencies:
-      base "^0.11.1"
-      debug "^2.2.0"
-      define-property "^0.2.5"
-      extend-shallow "^2.0.1"
-      map-cache "^0.2.2"
-      source-map "^0.5.6"
-      source-map-resolve "^0.5.0"
-      use "^3.1.0"
-  
-  source-map-resolve@^0.5.0:
-    version "0.5.2"
-    resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-    integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
-    dependencies:
-      atob "^2.1.1"
-      decode-uri-component "^0.2.0"
-      resolve-url "^0.2.1"
-      source-map-url "^0.4.0"
-      urix "^0.1.0"
-  
-  source-map-url@^0.4.0:
-    version "0.4.0"
-    resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-    integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-  
-  "source-map@>= 0.1.2":
-    version "0.7.3"
-    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-    integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-  
-  source-map@^0.5.6, source-map@~0.5.1:
-    version "0.5.7"
-    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-    integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-  
-  source-map@~0.1.33:
-    version "0.1.43"
-    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-    integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-    dependencies:
-      amdefine ">=0.0.4"
-  
-  source-map@~0.6.1:
-    version "0.6.1"
-    resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-    integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-  
-  spin.js@^2.3.1:
-    version "2.3.2"
-    resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a"
-    integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho=
-  
-  split-string@^3.0.1, split-string@^3.0.2:
-    version "3.1.0"
-    resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-    integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-    dependencies:
-      extend-shallow "^3.0.0"
-  
-  sshpk@^1.7.0:
-    version "1.16.1"
-    resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-    integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-    dependencies:
-      asn1 "~0.2.3"
-      assert-plus "^1.0.0"
-      bcrypt-pbkdf "^1.0.0"
-      dashdash "^1.12.0"
-      ecc-jsbn "~0.1.1"
-      getpass "^0.1.1"
-      jsbn "~0.1.0"
-      safer-buffer "^2.0.2"
-      tweetnacl "~0.14.0"
-  
-  static-eval@^2.0.0, static-eval@^2.0.2:
-    version "2.0.2"
-    resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
-    integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
-    dependencies:
-      escodegen "^1.8.1"
-  
-  static-eval@~0.2.0:
-    version "0.2.4"
-    resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-0.2.4.tgz#b7d34d838937b969f9641ca07d48f8ede263ea7b"
-    integrity sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=
-    dependencies:
-      escodegen "~0.0.24"
-  
-  static-extend@^0.1.1:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-    integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-    dependencies:
-      define-property "^0.2.5"
-      object-copy "^0.1.0"
-  
-  static-module@^1.0.0, static-module@^1.1.0:
-    version "1.5.0"
-    resolved "https://registry.yarnpkg.com/static-module/-/static-module-1.5.0.tgz#27da9883c41a8cd09236f842f0c1ebc6edf63d86"
-    integrity sha1-J9qYg8QajNCSNvhC8MHrxu32PYY=
-    dependencies:
-      concat-stream "~1.6.0"
-      duplexer2 "~0.0.2"
-      escodegen "~1.3.2"
-      falafel "^2.1.0"
-      has "^1.0.0"
-      object-inspect "~0.4.0"
-      quote-stream "~0.0.0"
-      readable-stream "~1.0.27-1"
-      shallow-copy "~0.0.1"
-      static-eval "~0.2.0"
-      through2 "~0.4.1"
-  
-  static-module@^2.2.0:
-    version "2.2.5"
-    resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
-    integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
-    dependencies:
-      concat-stream "~1.6.0"
-      convert-source-map "^1.5.1"
-      duplexer2 "~0.1.4"
-      escodegen "~1.9.0"
-      falafel "^2.1.0"
-      has "^1.0.1"
-      magic-string "^0.22.4"
-      merge-source-map "1.0.4"
-      object-inspect "~1.4.0"
-      quote-stream "~1.0.2"
-      readable-stream "~2.3.3"
-      shallow-copy "~0.0.1"
-      static-eval "^2.0.0"
-      through2 "~2.0.3"
-  
-  static-module@^3.0.0:
-    version "3.0.3"
-    resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.3.tgz#cc2301ed3fe353e2d2a2195137013853676f9960"
-    integrity sha512-RDaMYaI5o/ym0GkCqL/PlD1Pn216omp8fY81okxZ6f6JQxWW5tptOw9reXoZX85yt/scYvbWIt6uoszeyf+/MQ==
-    dependencies:
-      acorn-node "^1.3.0"
-      concat-stream "~1.6.0"
-      convert-source-map "^1.5.1"
-      duplexer2 "~0.1.4"
-      escodegen "~1.9.0"
-      has "^1.0.1"
-      magic-string "^0.22.4"
-      merge-source-map "1.0.4"
-      object-inspect "~1.4.0"
-      readable-stream "~2.3.3"
-      scope-analyzer "^2.0.1"
-      shallow-copy "~0.0.1"
-      static-eval "^2.0.2"
-      through2 "~2.0.3"
-  
-  string_decoder@~0.10.x:
-    version "0.10.31"
-    resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-    integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-  
-  string_decoder@~1.1.1:
-    version "1.1.1"
-    resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-    integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-    dependencies:
-      safe-buffer "~5.1.0"
-  
-  strip-ansi@^4.0.0:
-    version "4.0.0"
-    resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-    integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-    dependencies:
-      ansi-regex "^3.0.0"
-  
-  supports-color@^5.3.0:
-    version "5.5.0"
-    resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-    integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-    dependencies:
-      has-flag "^3.0.0"
-  
-  through2@^2.0.0, through2@~2.0.3:
-    version "2.0.5"
-    resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-    integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-    dependencies:
-      readable-stream "~2.3.6"
-      xtend "~4.0.1"
-  
-  through2@~0.4.1:
-    version "0.4.2"
-    resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-    integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
-    dependencies:
-      readable-stream "~1.0.17"
-      xtend "~2.1.1"
-  
-  through@^2.3.4:
-    version "2.3.8"
-    resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-    integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-  
-  to-object-path@^0.3.0:
-    version "0.3.0"
-    resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-    integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-    dependencies:
-      kind-of "^3.0.2"
-  
-  to-regex-range@^2.1.0:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-    integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-    dependencies:
-      is-number "^3.0.0"
-      repeat-string "^1.6.1"
-  
-  to-regex@^3.0.1, to-regex@^3.0.2:
-    version "3.0.2"
-    resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-    integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-    dependencies:
-      define-property "^2.0.2"
-      extend-shallow "^3.0.2"
-      regex-not "^1.0.2"
-      safe-regex "^1.1.0"
-  
-  togeojson@0.13.0:
-    version "0.13.0"
-    resolved "https://registry.yarnpkg.com/togeojson/-/togeojson-0.13.0.tgz#0698890a0629375580f254688014657ae93be894"
-    integrity sha1-BpiJCgYpN1WA8lRogBRleuk76JQ=
-    dependencies:
-      concat-stream "~1.4.5"
-      minimist "0.0.8"
-      xmldom "~0.1.19"
-  
-  topojson@1.6.26:
-    version "1.6.26"
-    resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.26.tgz#365f88a5e1858ab064872d9b968496fa923857ad"
-    integrity sha1-Nl+IpeGFirBkhy2bloSW+pI4V60=
-    dependencies:
-      d3 "3"
-      d3-geo-projection "0.2"
-      d3-queue "2"
-      optimist "0.3"
-      rw "1"
-      shapefile "0.3"
-  
-  tough-cookie@~2.4.3:
-    version "2.4.3"
-    resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-    integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-    dependencies:
-      psl "^1.1.24"
-      punycode "^1.4.1"
-  
-  tunnel-agent@^0.6.0:
-    version "0.6.0"
-    resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-    integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-    dependencies:
-      safe-buffer "^5.0.1"
-  
-  tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-    version "0.14.5"
-    resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-    integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-  
-  type-check@~0.3.2:
-    version "0.3.2"
-    resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-    integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-    dependencies:
-      prelude-ls "~1.1.2"
-  
-  typedarray-pool@^1.0.0, typedarray-pool@^1.1.0:
-    version "1.1.0"
-    resolved "https://registry.yarnpkg.com/typedarray-pool/-/typedarray-pool-1.1.0.tgz#d114f484801489f53ecab5e8088aa23044f498d9"
-    integrity sha1-0RT0hIAUifU+yrXoCIqiMET0mNk=
-    dependencies:
-      bit-twiddle "^1.0.0"
-      dup "^1.0.0"
-  
-  typedarray@^0.0.6, typedarray@~0.0.5:
-    version "0.0.6"
-    resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-    integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-  
-  uglify-js@^2.6.0:
-    version "2.8.29"
-    resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-    integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
-    dependencies:
-      source-map "~0.5.1"
-      yargs "~3.10.0"
-    optionalDependencies:
-      uglify-to-browserify "~1.0.0"
-  
-  uglify-to-browserify@~1.0.0:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-    integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
-  
-  unc-path-regex@^0.1.2:
-    version "0.1.2"
-    resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-    integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-  
-  union-value@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-    integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
-    dependencies:
-      arr-union "^3.1.0"
-      get-value "^2.0.6"
-      is-extendable "^0.1.1"
-      set-value "^0.4.3"
-  
-  uniq@^1.0.0:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-    integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-  
-  unset-value@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-    integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-    dependencies:
-      has-value "^0.3.1"
-      isobject "^3.0.0"
-  
-  uri-js@^4.2.2:
-    version "4.2.2"
-    resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-    integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-    dependencies:
-      punycode "^2.1.0"
-  
-  urify@^2.1.0:
-    version "2.1.1"
-    resolved "https://registry.yarnpkg.com/urify/-/urify-2.1.1.tgz#9af4b52ebfae451b1d0cee0f605573d1b1a073bc"
-    integrity sha512-4ybbjC35yivSWm0xgIj0duAJUElBRssLxst6QSGL1HapW3zYlsXHcjslBVGwrWd89ItTon5jmiL88UPtubjp1A==
-    dependencies:
-      from2-string "^1.1.0"
-      mime "^1.3.4"
-      quote-stream "^1.0.2"
-      readable-stream "^2.0.5"
-      resolve "^1.1.7"
-      static-module "^3.0.0"
-  
-  urix@^0.1.0:
-    version "0.1.0"
-    resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-    integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-  
-  use@^3.1.0:
-    version "3.1.1"
-    resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-    integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-  
-  util-deprecate@~1.0.1:
-    version "1.0.2"
-    resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-    integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-  
-  uuid@^3.3.2:
-    version "3.3.2"
-    resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-    integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-  
-  v8flags@~3.1.1:
-    version "3.1.3"
-    resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
-    integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
-    dependencies:
-      homedir-polyfill "^1.0.1"
-  
-  verror@1.10.0:
-    version "1.10.0"
-    resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-    integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-    dependencies:
-      assert-plus "^1.0.0"
-      core-util-is "1.0.2"
-      extsprintf "^1.2.0"
-  
-  vlq@^0.2.2:
-    version "0.2.3"
-    resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-    integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
-  
-  wcwidth@^1.0.1:
-    version "1.0.1"
-    resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-    integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
-    dependencies:
-      defaults "^1.0.3"
-  
-  wellknown@0.4.2:
-    version "0.4.2"
-    resolved "https://registry.yarnpkg.com/wellknown/-/wellknown-0.4.2.tgz#9f4dfbc6f57934e0910f7e6b3f43c391162da7f3"
-    integrity sha1-n037xvV5NOCRD35rP0PDkRYtp/M=
-    dependencies:
-      concat-stream "~1.5.0"
-      minimist "~1.1.2"
-  
-  which@^1.2.14:
-    version "1.3.1"
-    resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-    integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-    dependencies:
-      isexe "^2.0.0"
-  
-  window-size@0.1.0:
-    version "0.1.0"
-    resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-    integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-  
-  wordwrap@0.0.2:
-    version "0.0.2"
-    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-    integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
-  
-  wordwrap@~0.0.2:
-    version "0.0.3"
-    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-    integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-  
-  wordwrap@~1.0.0:
-    version "1.0.0"
-    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-    integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-  
-  xmldom@~0.1.19:
-    version "0.1.27"
-    resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-    integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
-  
-  xtend@^4.0.1, xtend@~4.0.1:
-    version "4.0.1"
-    resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-    integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-  
-  xtend@~2.1.1:
-    version "2.1.2"
-    resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-    integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
-    dependencies:
-      object-keys "~0.4.0"
-  
-  yargs@~3.10.0:
-    version "3.10.0"
-    resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-    integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
-    dependencies:
-      camelcase "^1.0.2"
-      cliui "^2.1.0"
-      decamelize "^1.0.0"
-      window-size "0.1.0"

From 75c2fef36468ad17b0075085d389cd902b64d91a Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 18:04:24 +0530
Subject: [PATCH 043/152] Fix oauth icons

---
 app/assets/stylesheets/application.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 9f8329d68..cd9eebaf4 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -14,6 +14,7 @@
  *= require leaflet-illustrate/dist/Leaflet.Illustrate.css
  *= require leaflet-toolbar/dist/leaflet.toolbar.css
  *= require leaflet-distortableimage/dist/leaflet.distortableimage.css
+ *= require fontawesome/css/font-awesome.min.css
 
  *= require style
  *= require maps

From 1f1dedd3a40728dfccfebbdaf3a53b5140873366 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 18:25:16 +0530
Subject: [PATCH 044/152] Modify package.json

---
 package.json |  68 +++++-----
 yarn.lock    | 351 +++++++++++++++++++++++++--------------------------
 2 files changed, 207 insertions(+), 212 deletions(-)

diff --git a/package.json b/package.json
index b0cb11459..cc7524b5f 100644
--- a/package.json
+++ b/package.json
@@ -9,40 +9,40 @@
     "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
   ],
   "dependencies": {
-    "@bower_components/blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
-    "@bower_components/blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
-    "@bower_components/blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
-    "@bower_components/blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
-    "@bower_components/bootstrap": "twbs/bootstrap#^4.3.1",
-    "@bower_components/cartagen": "jywarren/cartagen#*",
-    "@bower_components/exif-js": "jseidelin/exif-js#*",
-    "@bower_components/font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
-    "@bower_components/fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
-    "@bower_components/glfx-js": "jywarren/glfx.js#*",
-    "@bower_components/image-sequencer": "publiclab/image-sequencer#~1.4.0",
-    "@bower_components/ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
-    "@bower_components/jquery": "jquery/jquery-dist#^2.1.3",
-    "@bower_components/jquery-ui": "components/jqueryui#^1.12.1",
-    "@bower_components/jquery-ujs": "rails/jquery-ujs#~1.0.3",
-    "@bower_components/junction": "theleagueof/junction#*",
-    "@bower_components/leaflet": "Leaflet/Leaflet#^1.0.0",
-    "@bower_components/leaflet-dist": "vperron/leaflet-dist#0.7.x",
-    "@bower_components/leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
-    "@bower_components/leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
-    "@bower_components/leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
-    "@bower_components/leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
-    "@bower_components/leaflet-fullhash": "sagarpreet-chadha/leaflet-fullHash#*",
-    "@bower_components/leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
-    "@bower_components/leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
-    "@bower_components/leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
-    "@bower_components/leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
-    "@bower_components/leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
-    "@bower_components/modalbox": "okonet/modalbox#*",
-    "@bower_components/ol2": "openlayers/ol2#release-2.13.1",
-    "@bower_components/prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
-    "@bower_components/sparklines": "mariusGundersen/sparkline#~1.0.0",
-    "@bower_components/spin.js": "fgnass/spin.js#^2.3.1",
-    "@bower_components/webgl-distort": "jywarren/webgl-distort#*"
+    "blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
+    "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
+    "blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
+    "blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
+    "bootstrap": "twbs/bootstrap#^4.3.1",
+    "cartagen": "jywarren/cartagen#*",
+    "exif-js": "jseidelin/exif-js#*",
+    "font-awesome": "FortAwesome/Font-Awesome#^4.2.0",
+    "fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
+    "glfx-js": "jywarren/glfx.js#*",
+    "image-sequencer": "publiclab/image-sequencer#~1.4.0",
+    "ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
+    "jquery": "jquery/jquery-dist#^2.1.3",
+    "jquery-ui": "components/jqueryui#^1.12.1",
+    "jquery-ujs": "rails/jquery-ujs#~1.0.3",
+    "junction": "theleagueof/junction#*",
+    "leaflet": "Leaflet/Leaflet#^1.0.0",
+    "leaflet-dist": "vperron/leaflet-dist#0.7.x",
+    "leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.4.3",
+    "leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
+    "leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
+    "leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#^1.1.2",
+    "leaflet-fullhash": "sagarpreet-chadha/leaflet-fullHash#*",
+    "leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
+    "leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
+    "leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
+    "leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
+    "leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
+    "modalbox": "okonet/modalbox#*",
+    "ol2": "openlayers/ol2#release-2.13.1",
+    "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
+    "sparklines": "mariusGundersen/sparkline#~1.0.0",
+    "spin.js": "fgnass/spin.js#^2.3.1",
+    "webgl-distort": "jywarren/webgl-distort#*"
   },
   "engines": {
     "yarn": ">= 1.0.0"
diff --git a/yarn.lock b/yarn.lock
index 357b018f8..23015e9d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,181 +2,6 @@
 # yarn lockfile v1
 
 
-"@bower_components/blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1":
-  version "3.14.0"
-  resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/9f3deb2e710d39c72a988559609d9dc9a319de0b"
-
-"@bower_components/blueimp-file-upload@blueimp/jQuery-File-Upload#~9.8.1":
-  version "9.8.1"
-  resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/80b9f7818563dc11b8979b69df30c65f49bc1203"
-
-"@bower_components/blueimp-load-image@blueimp/JavaScript-Load-Image#>=1.13.0":
-  version "2.22.0"
-  resolved "https://codeload.github.com/blueimp/JavaScript-Load-Image/tar.gz/b2e6b29de05a882048e80bec0c1f1e94d65ca41a"
-
-"@bower_components/blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4":
-  version "2.5.4"
-  resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
-
-"@bower_components/bootstrap@twbs/bootstrap#^4.3.1":
-  version "4.3.1"
-  resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
-
-"@bower_components/cartagen@jywarren/cartagen#*":
-  version "0.0.0"
-  resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
-
-"@bower_components/exif-js@jseidelin/exif-js#*":
-  version "2.3.0"
-  resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
-
-"@bower_components/font-awesome@FortAwesome/Font-Awesome#^4.2.0":
-  version "4.7.0"
-  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"
-
-"@bower_components/fontawesome@FortAwesome/Font-Awesome#~4.2.0":
-  version "4.2.0"
-  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
-
-"@bower_components/glfx-js@jywarren/glfx.js#*":
-  version "0.0.1"
-  resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
-
-"@bower_components/image-sequencer@publiclab/image-sequencer#~1.4.0":
-  version "1.4.1"
-  resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
-  dependencies:
-    bootstrap "~3.2.0"
-    buffer "~5.0.2"
-    commander "^2.11.0"
-    data-uri-to-buffer "^2.0.0"
-    fisheyegl "^0.1.2"
-    font-awesome "~4.5.0"
-    get-pixels "~3.3.0"
-    imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
-    jquery "~2"
-    jsqr "^0.2.2"
-    lodash "^4.17.5"
-    ndarray-gaussian-filter "^1.0.0"
-    ora "^2.0.0"
-    pace "0.0.4"
-    readline-sync "^1.4.7"
-    save-pixels "~2.3.4"
-    urify "^2.1.0"
-
-"@bower_components/ion-rangeslider@ionDen/ion.rangeslider#~2.3.0":
-  version "2.3.0"
-  resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
-  dependencies:
-    jquery ">=1.8"
-
-"@bower_components/jquery-ui@components/jqueryui#^1.12.1":
-  version "1.12.1"
-  resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
-
-"@bower_components/jquery-ujs@rails/jquery-ujs#~1.0.3":
-  version "0.0.0"
-  resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
-
-"@bower_components/jquery@jquery/jquery-dist#^2.1.3":
-  version "2.2.4"
-  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
-
-"@bower_components/junction@theleagueof/junction#*":
-  version "0.0.0"
-  resolved "https://codeload.github.com/theleagueof/junction/tar.gz/fb73260e86dd301b383cf6cc9ca8e726ef806535"
-
-"@bower_components/leaflet-dist@vperron/leaflet-dist#0.7.x":
-  version "0.0.0"
-  resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
-
-"@bower_components/leaflet-distortableimage@publiclab/Leaflet.DistortableImage#^0.4.3":
-  version "0.4.3"
-  resolved "https://codeload.github.com/publiclab/Leaflet.DistortableImage/tar.gz/cb1ed3875f9ad07942903a9daa778076ce5d7fd1"
-  dependencies:
-    grunt-cli "^1.2.0"
-
-"@bower_components/leaflet-draw@Leaflet/Leaflet.draw#0.2.4":
-  version "0.2.3"
-  resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"
-
-"@bower_components/leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0":
-  version "0.0.0"
-  resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
-
-"@bower_components/leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2":
-  version "1.1.2"
-  resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
-  dependencies:
-    jquery "^3.3.1"
-    leaflet "^1.3.1"
-    leaflet-hash "0.2.1"
-    leaflet-heatmap "1.0.0"
-    leaflet-providers "^1.1.17"
-    leaflet-spin "1.1.0"
-
-"@bower_components/leaflet-fullhash@sagarpreet-chadha/leaflet-fullHash#*":
-  version "0.0.0"
-  resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/104a08c4bca0ddf943d24b21d270ee4082dd9654"
-
-"@bower_components/leaflet-illustrate@manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7":
-  version "0.0.2"
-  resolved "https://codeload.github.com/manleyjster/Leaflet.Illustrate/tar.gz/31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7"
-
-"@bower_components/leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2":
-  version "0.3.4"
-  resolved "https://codeload.github.com/mapbox/leaflet-omnivore/tar.gz/7c5885376671509b6dd30f6cd2c2508f39b2f7eb"
-  dependencies:
-    brfs "1.4.3"
-    corslite "0.0.7"
-    csv2geojson "~5.0.0"
-    polyline "0.2.0"
-    togeojson "0.13.0"
-    topojson "1.6.26"
-    wellknown "0.4.2"
-
-"@bower_components/leaflet-providers@leaflet-extras/leaflet-providers#1.0.6":
-  version "1.0.6"
-  resolved "https://codeload.github.com/leaflet-extras/leaflet-providers/tar.gz/620d7a433b74a47b93e6fa9bf6536a384b47d9da"
-
-"@bower_components/leaflet-spin@makinacorpus/Leaflet.Spin#1.1.0":
-  version "1.0.0"
-  resolved "https://codeload.github.com/makinacorpus/Leaflet.Spin/tar.gz/f7c86843d24e6a6a50f94a66d8881b370fb8218f"
-  dependencies:
-    spin.js "^2.3.1"
-
-"@bower_components/leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0":
-  version "0.3.0"
-  resolved "https://codeload.github.com/Leaflet/Leaflet.Toolbar/tar.gz/fb935befa99d753bdd0deb0ce2cad20335783459"
-
-"@bower_components/leaflet@Leaflet/Leaflet#^1.0.0":
-  version "1.5.1"
-  resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
-
-"@bower_components/modalbox@okonet/modalbox#*":
-  version "0.0.0"
-  resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
-
-"@bower_components/ol2@openlayers/ol2#release-2.13.1":
-  version "0.0.0"
-  resolved "https://codeload.github.com/openlayers/ol2/tar.gz/f4a4090814f240414548e8eda55070d16f3d3901"
-
-"@bower_components/prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2":
-  version "0.0.0"
-  resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"
-
-"@bower_components/sparklines@mariusGundersen/sparkline#~1.0.0":
-  version "1.0.0"
-  resolved "https://codeload.github.com/mariusGundersen/sparkline/tar.gz/097a83f6bbb6b2d088eb125c4c848edef30ba252"
-
-"@bower_components/spin.js@fgnass/spin.js#^2.3.1":
-  version "2.3.2"
-  resolved "https://codeload.github.com/fgnass/spin.js/tar.gz/f0cc4b82358bee8bbb50f0fd90090bfe4d612da1"
-
-"@bower_components/webgl-distort@jywarren/webgl-distort#*":
-  version "0.0.1"
-  resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
-
 "@types/node@^8.0.7":
   version "8.10.49"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.49.tgz#f331afc5efed0796798e5591d6e0ece636969b7b"
@@ -355,6 +180,26 @@ bit-twiddle@^1.0.0, bit-twiddle@^1.0.2:
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
   integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
 
+blueimp-canvas-to-blob@blueimp/JavaScript-Canvas-to-Blob#>=2.1.1:
+  version "3.14.0"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Canvas-to-Blob/tar.gz/9f3deb2e710d39c72a988559609d9dc9a319de0b"
+
+blueimp-file-upload@blueimp/jQuery-File-Upload#~9.8.1:
+  version "9.8.1"
+  resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/80b9f7818563dc11b8979b69df30c65f49bc1203"
+
+blueimp-load-image@blueimp/JavaScript-Load-Image#>=1.13.0:
+  version "2.22.0"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Load-Image/tar.gz/b2e6b29de05a882048e80bec0c1f1e94d65ca41a"
+
+blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4:
+  version "2.5.4"
+  resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
+
+bootstrap@twbs/bootstrap#^4.3.1:
+  version "4.3.1"
+  resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
+
 bootstrap@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637"
@@ -434,6 +279,10 @@ camelcase@^1.0.2:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
+cartagen@jywarren/cartagen#*:
+  version "0.0.0"
+  resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -926,6 +775,10 @@ event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+exif-js@jseidelin/exif-js#*:
+  version "2.3.0"
+  resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
+
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -1056,11 +909,19 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
+font-awesome@FortAwesome/Font-Awesome#^4.2.0:
+  version "4.7.0"
+  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a8386aae19e200ddb0f6845b5feeee5eb7013687"
+
 font-awesome@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
   integrity sha1-Hp18z31jvb5XAA4Y1RiMslV+cPg=
 
+fontawesome@FortAwesome/Font-Awesome#~4.2.0:
+  version "4.2.0"
+  resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/a65bd93d81e9e6bd5ebfa41757a4474960b973b4"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -1160,6 +1021,10 @@ gif-encoder@~0.4.1:
   dependencies:
     readable-stream "~1.1.9"
 
+glfx-js@jywarren/glfx.js#*:
+  version "0.0.1"
+  resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -1283,6 +1148,28 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
+image-sequencer@publiclab/image-sequencer#~1.4.0:
+  version "1.4.1"
+  resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
+  dependencies:
+    bootstrap "~3.2.0"
+    buffer "~5.0.2"
+    commander "^2.11.0"
+    data-uri-to-buffer "^2.0.0"
+    fisheyegl "^0.1.2"
+    font-awesome "~4.5.0"
+    get-pixels "~3.3.0"
+    imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
+    jquery "~2"
+    jsqr "^0.2.2"
+    lodash "^4.17.5"
+    ndarray-gaussian-filter "^1.0.0"
+    ora "^2.0.0"
+    pace "0.0.4"
+    readline-sync "^1.4.7"
+    save-pixels "~2.3.4"
+    urify "^2.1.0"
+
 "imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
   version "0.9.11-rc.1"
   resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
@@ -1302,6 +1189,12 @@ interpret@~1.1.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
+ion-rangeslider@ionDen/ion.rangeslider#~2.3.0:
+  version "2.3.0"
+  resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
+  dependencies:
+    jquery ">=1.8"
+
 iota-array@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
@@ -1470,11 +1363,23 @@ jpeg-js@^0.3.2:
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.5.tgz#6fbd6cd0e49627c5a0341796c9e50c70a2aa3673"
   integrity sha512-hvaExqwmQDS8O9qnZAVDXGWU43Tbu1V0wMZmjROjT11jloSgGICZpscG+P6Nyi1BVAvyu2ARRx8qmEW30sxgdQ==
 
+jquery-ui@components/jqueryui#^1.12.1:
+  version "1.12.1"
+  resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
+
+jquery-ujs@rails/jquery-ujs#~1.0.3:
+  version "0.0.0"
+  resolved "https://codeload.github.com/rails/jquery-ujs/tar.gz/7146dc96a71fda9b713f1f60fb414c699db0b3a7"
+
 jquery@>=1.8, jquery@^3.3.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
   integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
+jquery@jquery/jquery-dist#^2.1.3:
+  version "2.2.4"
+  resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/c0185ab7c75aab88762c5aae780b9d83b80eda72"
+
 jquery@~2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
@@ -1515,6 +1420,10 @@ jsqr@^0.2.2:
   resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-0.2.2.tgz#8c1f0279fb7c94542aaa9e8aeb7c722d523ea092"
   integrity sha1-jB8Ceft8lFQqqp6K63xyLVI+oJI=
 
+junction@theleagueof/junction#*:
+  version "0.0.0"
+  resolved "https://codeload.github.com/theleagueof/junction/tar.gz/fb73260e86dd301b383cf6cc9ca8e726ef806535"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -1544,6 +1453,39 @@ lazy-cache@^1.0.3:
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
+leaflet-dist@vperron/leaflet-dist#0.7.x:
+  version "0.0.0"
+  resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
+
+leaflet-distortableimage@publiclab/Leaflet.DistortableImage#^0.4.3:
+  version "0.4.3"
+  resolved "https://codeload.github.com/publiclab/Leaflet.DistortableImage/tar.gz/cb1ed3875f9ad07942903a9daa778076ce5d7fd1"
+  dependencies:
+    grunt-cli "^1.2.0"
+
+leaflet-draw@Leaflet/Leaflet.draw#0.2.4:
+  version "0.2.3"
+  resolved "https://codeload.github.com/Leaflet/Leaflet.draw/tar.gz/07b1448f4eba33982f662398988f0337ee55cc02"
+
+leaflet-easybutton@CliffCloud/Leaflet.EasyButton#1.0.0:
+  version "0.0.0"
+  resolved "https://codeload.github.com/CliffCloud/Leaflet.EasyButton/tar.gz/b379d59515acc4e9761eb1c92ea2a6e6f8b3ab1b"
+
+leaflet-environmental-layers@publiclab/leaflet-environmental-layers#^1.1.2:
+  version "1.1.2"
+  resolved "https://codeload.github.com/publiclab/leaflet-environmental-layers/tar.gz/611e3bbc6ee3d674256cab823d9ab2346b47eb09"
+  dependencies:
+    jquery "^3.3.1"
+    leaflet "^1.3.1"
+    leaflet-hash "0.2.1"
+    leaflet-heatmap "1.0.0"
+    leaflet-providers "^1.1.17"
+    leaflet-spin "1.1.0"
+
+leaflet-fullhash@sagarpreet-chadha/leaflet-fullHash#*:
+  version "0.0.0"
+  resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/104a08c4bca0ddf943d24b21d270ee4082dd9654"
+
 leaflet-hash@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/leaflet-hash/-/leaflet-hash-0.2.1.tgz#c36c718347c5243033b57cb4baea26119d82c701"
@@ -1557,11 +1499,31 @@ leaflet-heatmap@1.0.0:
     heatmap.js "*"
     leaflet "*"
 
+leaflet-illustrate@manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7:
+  version "0.0.2"
+  resolved "https://codeload.github.com/manleyjster/Leaflet.Illustrate/tar.gz/31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7"
+
+leaflet-omnivore@mapbox/leaflet-omnivore#~0.3.2:
+  version "0.3.4"
+  resolved "https://codeload.github.com/mapbox/leaflet-omnivore/tar.gz/7c5885376671509b6dd30f6cd2c2508f39b2f7eb"
+  dependencies:
+    brfs "1.4.3"
+    corslite "0.0.7"
+    csv2geojson "~5.0.0"
+    polyline "0.2.0"
+    togeojson "0.13.0"
+    topojson "1.6.26"
+    wellknown "0.4.2"
+
 leaflet-providers@^1.1.17:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.7.0.tgz#b462d6abba832b2e9f1cef6ca0ab3bf76a7ca9a9"
   integrity sha512-7gXQnILnnIGuPy8TFaSP2aACsaxdT+y2sFae4rqbK8vX9ZwTJ9+5CI5DcBB+r867PdmdRlz5rjG99yvyLWOJYg==
 
+leaflet-providers@leaflet-extras/leaflet-providers#1.0.6:
+  version "1.0.6"
+  resolved "https://codeload.github.com/leaflet-extras/leaflet-providers/tar.gz/620d7a433b74a47b93e6fa9bf6536a384b47d9da"
+
 leaflet-spin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/leaflet-spin/-/leaflet-spin-1.1.0.tgz#7298be3be9ab05b540913d84915d6347f49b1e4e"
@@ -1569,10 +1531,19 @@ leaflet-spin@1.1.0:
   dependencies:
     spin.js "^2.3.1"
 
-leaflet@*, leaflet@^1.3.1:
+leaflet-spin@makinacorpus/Leaflet.Spin#1.1.0:
+  version "1.0.0"
+  resolved "https://codeload.github.com/makinacorpus/Leaflet.Spin/tar.gz/f7c86843d24e6a6a50f94a66d8881b370fb8218f"
+  dependencies:
+    spin.js "^2.3.1"
+
+leaflet-toolbar@Leaflet/Leaflet.Toolbar#~0.3.0:
+  version "0.3.0"
+  resolved "https://codeload.github.com/Leaflet/Leaflet.Toolbar/tar.gz/fb935befa99d753bdd0deb0ce2cad20335783459"
+
+leaflet@*, leaflet@Leaflet/Leaflet#^1.0.0, leaflet@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf"
-  integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w==
+  resolved "https://codeload.github.com/Leaflet/Leaflet/tar.gz/2e3e0ffbe87f246eb76d86d2633ddd59b262830b"
 
 levn@~0.3.0:
   version "0.3.0"
@@ -1715,6 +1686,10 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+modalbox@okonet/modalbox#*:
+  version "0.0.0"
+  resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1873,6 +1848,10 @@ object.pick@^1.2.0, object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+ol2@openlayers/ol2#release-2.13.1:
+  version "0.0.0"
+  resolved "https://codeload.github.com/openlayers/ol2/tar.gz/f4a4090814f240414548e8eda55070d16f3d3901"
+
 omggif@^1.0.5:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
@@ -2032,6 +2011,10 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
   integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
+prototypejs-bower@plynchnlm/prototypejs-bower#1.7.2:
+  version "0.0.0"
+  resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/e20cd010823fcd31499788188397d1770ca9abe0"
+
 psl@^1.1.24:
   version "1.1.32"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
@@ -2369,11 +2352,19 @@ source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+sparklines@mariusGundersen/sparkline#~1.0.0:
+  version "1.0.0"
+  resolved "https://codeload.github.com/mariusGundersen/sparkline/tar.gz/097a83f6bbb6b2d088eb125c4c848edef30ba252"
+
 spin.js@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-2.3.2.tgz#6caa56d520673450fd5cfbc6971e6d0772c37a1a"
   integrity sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho=
 
+spin.js@fgnass/spin.js#^2.3.1:
+  version "2.3.2"
+  resolved "https://codeload.github.com/fgnass/spin.js/tar.gz/f0cc4b82358bee8bbb50f0fd90090bfe4d612da1"
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -2718,6 +2709,10 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webgl-distort@jywarren/webgl-distort#*:
+  version "0.0.1"
+  resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
+
 wellknown@0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/wellknown/-/wellknown-0.4.2.tgz#9f4dfbc6f57934e0910f7e6b3f43c391162da7f3"

From f7f526fd9aa130d77d866f7ae6119a763fe6e026 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 19:07:12 +0530
Subject: [PATCH 045/152] Add yarn install to start.sh

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 2c7615e1a..9fbdb6203 100755
--- a/start.sh
+++ b/start.sh
@@ -3,7 +3,7 @@
 pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
-bower install --allow-root
+yarn install --allow-root
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';

From 68385c365d8c09c77bf43afcf6fd9d28e0e92135 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 19:29:24 +0530
Subject: [PATCH 046/152] Add leaflet google

---
 app/assets/javascripts/Google.js              | 204 ++++++++++++++++++
 app/assets/javascripts/application.js         |   1 +
 app/assets/javascripts/passenger.3000.log     |  28 +++
 .../javascripts/passenger.3000.pid.lock       |   0
 4 files changed, 233 insertions(+)
 create mode 100644 app/assets/javascripts/Google.js
 create mode 100644 app/assets/javascripts/passenger.3000.log
 create mode 100644 app/assets/javascripts/passenger.3000.pid.lock

diff --git a/app/assets/javascripts/Google.js b/app/assets/javascripts/Google.js
new file mode 100644
index 000000000..c3d2c63c4
--- /dev/null
+++ b/app/assets/javascripts/Google.js
@@ -0,0 +1,204 @@
+//
+// Copied from https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js
+//
+/*
+ * Google layer using Google Maps API
+ */
+
+/* global google: true */
+
+L.Google = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	options: {
+		minZoom: 0,
+		maxZoom: 18,
+		tileSize: 256,
+		subdomains: 'abc',
+		errorTileUrl: '',
+		attribution: '',
+		opacity: 1,
+		continuousWorld: false,
+		noWrap: false,
+		mapOptions: {
+			backgroundColor: '#dddddd'
+		}
+	},
+
+	// Possible types: SATELLITE, ROADMAP, HYBRID, TERRAIN
+	initialize: function(type, options) {
+		L.Util.setOptions(this, options);
+
+		this._ready = google.maps.Map !== undefined;
+		if (!this._ready) L.Google.asyncWait.push(this);
+
+		this._type = type || 'SATELLITE';
+	},
+
+	onAdd: function(map, insertAtTheBottom) {
+		this._map = map;
+		this._insertAtTheBottom = insertAtTheBottom;
+
+		// create a container div for tiles
+		this._initContainer();
+		this._initMapObject();
+
+		// set up events
+		map.on('viewreset', this._resetCallback, this);
+
+		this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
+		map.on('move', this._update, this);
+
+		map.on('zoomanim', this._handleZoomAnim, this);
+
+		//20px instead of 1em to avoid a slight overlap with google's attribution
+		map._controlCorners.bottomright.style.marginBottom = '20px';
+
+		this._reset();
+		this._update();
+	},
+
+	onRemove: function(map) {
+		map._container.removeChild(this._container);
+
+		map.off('viewreset', this._resetCallback, this);
+
+		map.off('move', this._update, this);
+
+		map.off('zoomanim', this._handleZoomAnim, this);
+
+		map._controlCorners.bottomright.style.marginBottom = '0em';
+	},
+
+	getAttribution: function() {
+		return this.options.attribution;
+	},
+
+	setOpacity: function(opacity) {
+		this.options.opacity = opacity;
+		if (opacity < 1) {
+			L.DomUtil.setOpacity(this._container, opacity);
+		}
+	},
+
+	setElementSize: function(e, size) {
+		e.style.width = size.x + 'px';
+		e.style.height = size.y + 'px';
+	},
+
+	_initContainer: function() {
+		var tilePane = this._map._container,
+			first = tilePane.firstChild;
+
+		if (!this._container) {
+			this._container = L.DomUtil.create('div', 'leaflet-google-layer leaflet-top leaflet-left');
+			this._container.id = '_GMapContainer_' + L.Util.stamp(this);
+			this._container.style.zIndex = 'auto';
+		}
+
+		tilePane.insertBefore(this._container, first);
+
+		this.setOpacity(this.options.opacity);
+		this.setElementSize(this._container, this._map.getSize());
+	},
+
+	_initMapObject: function() {
+		if (!this._ready) return;
+		this._google_center = new google.maps.LatLng(0, 0);
+		var map = new google.maps.Map(this._container, {
+			center: this._google_center,
+			zoom: 0,
+			tilt: 0,
+			mapTypeId: google.maps.MapTypeId[this._type],
+			disableDefaultUI: true,
+			keyboardShortcuts: false,
+			draggable: false,
+			disableDoubleClickZoom: true,
+			scrollwheel: false,
+			streetViewControl: false,
+			styles: this.options.mapOptions.styles,
+			backgroundColor: this.options.mapOptions.backgroundColor
+		});
+
+		var _this = this;
+		this._reposition = google.maps.event.addListenerOnce(map, 'center_changed',
+			function() { _this.onReposition(); });
+		this._google = map;
+
+		google.maps.event.addListenerOnce(map, 'idle',
+			function() { _this._checkZoomLevels(); });
+		google.maps.event.addListenerOnce(map, 'tilesloaded',
+			function() { _this.fire('load'); });
+		//Reporting that map-object was initialized.
+		this.fire('MapObjectInitialized', { mapObject: map });
+	},
+
+	_checkZoomLevels: function() {
+		//setting the zoom level on the Google map may result in a different zoom level than the one requested
+		//(it won't go beyond the level for which they have data).
+		// verify and make sure the zoom levels on both Leaflet and Google maps are consistent
+		if (this._google.getZoom() !== this._map.getZoom()) {
+			//zoom levels are out of sync. Set the leaflet zoom level to match the google one
+			this._map.setZoom( this._google.getZoom() );
+		}
+	},
+
+	_resetCallback: function(e) {
+		this._reset(e.hard);
+	},
+
+	_reset: function(clearOldContainer) {
+		this._initContainer();
+	},
+
+	_update: function(e) {
+		if (!this._google) return;
+		this._resize();
+
+		var center = this._map.getCenter();
+		var _center = new google.maps.LatLng(center.lat, center.lng);
+
+		this._google.setCenter(_center);
+		this._google.setZoom(Math.round(this._map.getZoom()));
+
+		this._checkZoomLevels();
+	},
+
+	_resize: function() {
+		var size = this._map.getSize();
+		if (this._container.style.width === size.x &&
+				this._container.style.height === size.y)
+			return;
+		this.setElementSize(this._container, size);
+		this.onReposition();
+	},
+
+
+	_handleZoomAnim: function (e) {
+		var center = e.center;
+		var _center = new google.maps.LatLng(center.lat, center.lng);
+
+		this._google.setCenter(_center);
+		this._google.setZoom(Math.round(e.zoom));
+	},
+
+
+	onReposition: function() {
+		if (!this._google) return;
+		google.maps.event.trigger(this._google, 'resize');
+	}
+});
+
+L.Google.asyncWait = [];
+L.Google.asyncInitialize = function() {
+	var i;
+	for (i = 0; i < L.Google.asyncWait.length; i++) {
+		var o = L.Google.asyncWait[i];
+		o._ready = true;
+		if (o._container) {
+			o._initMapObject();
+			o._update();
+		}
+	}
+	L.Google.asyncWait = [];
+};
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b2e85f506..4ed2021c3 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,6 +14,7 @@
 //= require popper
 //= require jquery/dist/jquery.js
 //= require jquery-ujs/src/rails.js 
+//= require Google.js
 
 //= require bootstrap/dist/js/bootstrap.js
 
diff --git a/app/assets/javascripts/passenger.3000.log b/app/assets/javascripts/passenger.3000.log
new file mode 100644
index 000000000..fbead7914
--- /dev/null
+++ b/app/assets/javascripts/passenger.3000.log
@@ -0,0 +1,28 @@
+[ N 2019-06-10 19:28:19.6157 31147/T1 age/Wat/WatchdogMain.cpp:1366 ]: Starting Passenger watchdog...
+[ N 2019-06-10 19:28:19.6339 31150/T1 age/Cor/CoreMain.cpp:1339 ]: Starting Passenger core...
+[ N 2019-06-10 19:28:19.6341 31150/T1 age/Cor/CoreMain.cpp:256 ]: Passenger core running in multi-application mode.
+[ N 2019-06-10 19:28:19.6458 31150/T1 age/Cor/CoreMain.cpp:1014 ]: Passenger core online, PID 31150
+2019/06/10 19:28:21 [error] 31170#0: *4 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"
+[ N 2019-06-10 19:28:22.9322 31150/T5 age/Cor/SecurityUpdateChecker.h:519 ]: Security update check: no update found (next check in 24 hours)
+2019/06/10 19:28:35 [error] 31170#0: *5 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:44 [error] 31170#0: *5 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:44 [error] 31170#0: *5 open() "/home/k/proj/mapknitter/app/assets/javascripts/public/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /favicon.ico HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:45 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:46 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:46 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:47 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+2019/06/10 19:28:47 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
+
+[ N 2019-06-10 19:28:50.7491 31150/T9 age/Cor/CoreMain.cpp:671 ]: Signal received. Gracefully shutting down... (send signal 2 more time(s) to force shutdown)
+[ N 2019-06-10 19:28:50.7491 31150/T1 age/Cor/CoreMain.cpp:1245 ]: Received command to shutdown gracefully. Waiting until all clients have disconnected...
+[ N 2019-06-10 19:28:50.7492 31150/T9 Ser/Server.h:902 ]: [ServerThr.1] Freed 0 spare client objects
+[ N 2019-06-10 19:28:50.7492 31150/T9 Ser/Server.h:558 ]: [ServerThr.1] Shutdown finished
+[ N 2019-06-10 19:28:50.7492 31150/Ta Ser/Server.h:902 ]: [ServerThr.2] Freed 0 spare client objects
+[ N 2019-06-10 19:28:50.7492 31150/Td Ser/Server.h:902 ]: [ServerThr.3] Freed 0 spare client objects
+[ N 2019-06-10 19:28:50.7493 31150/Ta Ser/Server.h:558 ]: [ServerThr.2] Shutdown finished
+[ N 2019-06-10 19:28:50.7493 31150/Td Ser/Server.h:558 ]: [ServerThr.3] Shutdown finished
+[ N 2019-06-10 19:28:50.7493 31150/Te Ser/Server.h:902 ]: [ServerThr.4] Freed 0 spare client objects
+[ N 2019-06-10 19:28:50.7493 31150/Te Ser/Server.h:558 ]: [ServerThr.4] Shutdown finished
+[ N 2019-06-10 19:28:50.7495 31150/Tg Ser/Server.h:902 ]: [ApiServer] Freed 0 spare client objects
+[ N 2019-06-10 19:28:50.7495 31150/Tg Ser/Server.h:558 ]: [ApiServer] Shutdown finished
+[ N 2019-06-10 19:28:51.8649 31150/T1 age/Cor/CoreMain.cpp:1324 ]: Passenger core shutdown finished
diff --git a/app/assets/javascripts/passenger.3000.pid.lock b/app/assets/javascripts/passenger.3000.pid.lock
new file mode 100644
index 000000000..e69de29bb

From ae88815a5f28b1fa3b93df7a997c45a08cab6222 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 19:30:19 +0530
Subject: [PATCH 047/152] Remove leaflet-google from package json

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index cc7524b5f..1212d216f 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,6 @@
   "repository": "https://github.com/publiclab/mapknitter",
   "author": "Kaustubh Nair <kaustubh.nair108@gmail.com>",
   "license": "MIT",
-  "files": [
-    "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
-  ],
   "dependencies": {
     "blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
     "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",

From 49af1385572670b24611a8fd3802965a403d5816 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 19:31:44 +0530
Subject: [PATCH 048/152] remove passenger error logs

---
 app/assets/javascripts/application.js         |  2 +-
 app/assets/javascripts/passenger.3000.log     | 28 -------------------
 .../javascripts/passenger.3000.pid.lock       |  0
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 app/assets/javascripts/passenger.3000.log
 delete mode 100644 app/assets/javascripts/passenger.3000.pid.lock

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 4ed2021c3..7d40a8c44 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require popper
 //= require jquery/dist/jquery.js
 //= require jquery-ujs/src/rails.js 
-//= require Google.js
 
 //= require bootstrap/dist/js/bootstrap.js
 
@@ -23,6 +22,7 @@
 //= require leaflet-toolbar/dist/leaflet.toolbar.js
 //= require leaflet-distortableimage/dist/leaflet.distortableimage.js
 //= require leaflet-easybutton/src/easy-button.js
+//= require Google.js
 //= require sparklines/source/sparkline.js
 //= require annotations-legacy.js
 //= require glfx-js/dist/glfx.js
diff --git a/app/assets/javascripts/passenger.3000.log b/app/assets/javascripts/passenger.3000.log
deleted file mode 100644
index fbead7914..000000000
--- a/app/assets/javascripts/passenger.3000.log
+++ /dev/null
@@ -1,28 +0,0 @@
-[ N 2019-06-10 19:28:19.6157 31147/T1 age/Wat/WatchdogMain.cpp:1366 ]: Starting Passenger watchdog...
-[ N 2019-06-10 19:28:19.6339 31150/T1 age/Cor/CoreMain.cpp:1339 ]: Starting Passenger core...
-[ N 2019-06-10 19:28:19.6341 31150/T1 age/Cor/CoreMain.cpp:256 ]: Passenger core running in multi-application mode.
-[ N 2019-06-10 19:28:19.6458 31150/T1 age/Cor/CoreMain.cpp:1014 ]: Passenger core online, PID 31150
-2019/06/10 19:28:21 [error] 31170#0: *4 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "HEAD / HTTP/1.1", host: "0.0.0.0"
-[ N 2019-06-10 19:28:22.9322 31150/T5 age/Cor/SecurityUpdateChecker.h:519 ]: Security update check: no update found (next check in 24 hours)
-2019/06/10 19:28:35 [error] 31170#0: *5 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:44 [error] 31170#0: *5 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:44 [error] 31170#0: *5 open() "/home/k/proj/mapknitter/app/assets/javascripts/public/favicon.ico" failed (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET /favicon.ico HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:45 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:46 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:46 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:47 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-2019/06/10 19:28:47 [error] 31170#0: *6 "/home/k/proj/mapknitter/app/assets/javascripts/public/index.html" is not found (2: No such file or directory), client: 127.0.0.1, server: _, request: "GET / HTTP/1.1", host: "localhost:3000"
-
-[ N 2019-06-10 19:28:50.7491 31150/T9 age/Cor/CoreMain.cpp:671 ]: Signal received. Gracefully shutting down... (send signal 2 more time(s) to force shutdown)
-[ N 2019-06-10 19:28:50.7491 31150/T1 age/Cor/CoreMain.cpp:1245 ]: Received command to shutdown gracefully. Waiting until all clients have disconnected...
-[ N 2019-06-10 19:28:50.7492 31150/T9 Ser/Server.h:902 ]: [ServerThr.1] Freed 0 spare client objects
-[ N 2019-06-10 19:28:50.7492 31150/T9 Ser/Server.h:558 ]: [ServerThr.1] Shutdown finished
-[ N 2019-06-10 19:28:50.7492 31150/Ta Ser/Server.h:902 ]: [ServerThr.2] Freed 0 spare client objects
-[ N 2019-06-10 19:28:50.7492 31150/Td Ser/Server.h:902 ]: [ServerThr.3] Freed 0 spare client objects
-[ N 2019-06-10 19:28:50.7493 31150/Ta Ser/Server.h:558 ]: [ServerThr.2] Shutdown finished
-[ N 2019-06-10 19:28:50.7493 31150/Td Ser/Server.h:558 ]: [ServerThr.3] Shutdown finished
-[ N 2019-06-10 19:28:50.7493 31150/Te Ser/Server.h:902 ]: [ServerThr.4] Freed 0 spare client objects
-[ N 2019-06-10 19:28:50.7493 31150/Te Ser/Server.h:558 ]: [ServerThr.4] Shutdown finished
-[ N 2019-06-10 19:28:50.7495 31150/Tg Ser/Server.h:902 ]: [ApiServer] Freed 0 spare client objects
-[ N 2019-06-10 19:28:50.7495 31150/Tg Ser/Server.h:558 ]: [ApiServer] Shutdown finished
-[ N 2019-06-10 19:28:51.8649 31150/T1 age/Cor/CoreMain.cpp:1324 ]: Passenger core shutdown finished
diff --git a/app/assets/javascripts/passenger.3000.pid.lock b/app/assets/javascripts/passenger.3000.pid.lock
deleted file mode 100644
index e69de29bb..000000000

From b34dd84680a7e058b4d5d14041a0bbe40290c31e Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Mon, 10 Jun 2019 21:24:09 +0530
Subject: [PATCH 049/152] Fix install script

---
 install_cloud.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_cloud.sh b/install_cloud.sh
index f232a98e4..87865ba22 100755
--- a/install_cloud.sh
+++ b/install_cloud.sh
@@ -19,6 +19,6 @@ cp config/database.yml.cloud9.example config/database.yml
 cp config/config.yml.example config/config.yml
 sudo service mysql start
 rake db:setup
-sudo npm install -g bower
-bower install
+sudo npm install -g yarn
+yarn install
 echo "Done! Run the application with 'rails s -b \$IP -p \$PORT'"

From 5c0c7c74fd0452dc9937afd0460e138c89b3c4d5 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 11 Jun 2019 19:04:04 +0530
Subject: [PATCH 050/152] Remove flag

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 9fbdb6203..52e104053 100755
--- a/start.sh
+++ b/start.sh
@@ -3,7 +3,7 @@
 pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
-yarn install --allow-root
+yarn install 
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';

From 22e5312e946130c762229572d5cc80b733642b77 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 11 Jun 2019 19:38:31 +0530
Subject: [PATCH 051/152] Fix gemfile.lock

---
 .travis.yml  |  2 +-
 Gemfile.lock | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 582219317..6e91c1156 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ env:
     - TASK="CI=true TRAVIS=true rake test:integration"
     - TASK="CI=true TRAVIS=true rake test:functional"
     - TASK="CI=true TRAVIS=true rake assets:precompile"
-    - TASK="CI=true TRAVIS=true bundle exec rubocop"
+    - TASK="CI=true TRAVIS=true bundle exec rubocop
 
 script:
   - docker-compose -f docker-compose.test.yml exec web bash -lc "$TASK"
diff --git a/Gemfile.lock b/Gemfile.lock
index d06519882..94339618f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
     ansi (1.5.0)
     arel (6.0.4)
     ast (2.4.0)
-    autoprefixer-rails (9.6.0)
+    autoprefixer-rails (9.5.1.1)
       execjs
     aws-sdk (1.5.8)
       httparty (~> 0.7)
@@ -79,6 +79,7 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jaro_winkler (1.5.2)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -175,7 +176,7 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    recaptcha (5.0.0)
+    recaptcha (4.14.0)
       json
     redcarpet (3.4.0)
     ref (2.0.0)
@@ -187,13 +188,14 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.1)
+    rubocop (0.52.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -212,9 +214,9 @@ GEM
     simplecov-cobertura (1.3.1)
       simplecov (~> 0.8)
     simplecov-html (0.10.2)
-    skylight (4.1.0)
-      skylight-core (= 4.1.0)
-    skylight-core (4.1.0)
+    skylight (4.0.2)
+      skylight-core (= 4.0.2)
+    skylight-core (4.0.2)
       activesupport (>= 4.2.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -233,7 +235,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -274,7 +276,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha
   right_aws_api
-  rubocop (~> 0.52.0)
+  rubocop (~> 0.64.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass

From 5da06ceb66e0ee67d4c21a195a82cab9a403d419 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 11 Jun 2019 19:50:03 +0530
Subject: [PATCH 052/152] Fix gemfile.lock

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 94339618f..ee3e765f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.0)
+    rubocop (0.64.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

From d71d9ad64b6798fdf72b5bbf437c610d88c89248 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 11 Jun 2019 22:14:21 +0530
Subject: [PATCH 053/152] Fix login

---
 Gemfile.lock                           | 12 +++++-------
 app/controllers/sessions_controller.rb |  5 ++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ee3e765f3..5d9e6465e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,7 +79,6 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    jaro_winkler (1.5.2)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -188,14 +187,13 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.64.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -235,7 +233,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
     uuidtools (2.1.5)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -276,7 +274,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha
   right_aws_api
-  rubocop (~> 0.64.0)
+  rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 65a0f181a..1fa1eb491 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,9 +4,6 @@
 class SessionsController < ApplicationController
   # protect_from_forgery :except => [:create]
 
-  @openid_url_base = "https://publiclab.org/people/"
-  @openid_url_suffix = "/identity"
-
   def new
     if logged_in?
       redirect_to "/"
@@ -16,6 +13,8 @@ def new
   end
 
   def create
+    @openid_url_base = "https://publiclab.org/people/"
+    @openid_url_suffix = "/identity"
     back_to = params[:back_to]
     # we pass a temp username; on line 75 it'll be overwritten by the real one in PublicLab.org's response:
     open_id = "x"

From 1d1211f3a75990315ef7b10f993aee4d05315eb1 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Wed, 12 Jun 2019 22:27:34 +0530
Subject: [PATCH 054/152] Upgrade Gemfile to Rails 5.0

---
 Gemfile      |  67 +++++++++----------
 Gemfile.lock | 186 +++++++++++++++++++++++++++------------------------
 2 files changed, 131 insertions(+), 122 deletions(-)

diff --git a/Gemfile b/Gemfile
index d2dc1dd08..efb1e4e77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,77 +1,76 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 ruby '2.4.6'
-gem 'rails', '4.2.11.1'
+gem 'rails', '~> 5.0'
 gem 'rake',  '~> 12.3.2'
-gem 'skylight'
+gem 'skylight', '~> 4.0.2'
 
-gem "will_paginate", "3.1.7"
-gem 'will_paginate-bootstrap4'
-gem "friendly_id"
+gem 'will_paginate', '3.1.7'
+gem 'will_paginate-bootstrap4', '~> 0.2.2'
+gem 'friendly_id'
 gem 'popper_js', '~> 1.11', '>= 1.11.1'
-gem 'protected_attributes'
 
 # dependencies
 group :dependencies do
   gem 'mysql2', '< 0.4'
-  gem "geokit-rails", "1.1.4"
+  gem 'geokit-rails', '1.1.4'
   gem 'image_science', '1.3.0'
-  gem "recaptcha", :require => "recaptcha/rails"
-  gem "oa-openid", "0.3.2"
-  gem "ruby-openid", "~>2.5"
-  gem "open_id_authentication"
-  gem "RubyInline"
-  gem "paperclip", "~>4.3.7"
+  gem 'recaptcha', '~> 4.14.0', require: 'recaptcha/rails'
+  gem 'oa-openid', '0.3.2'
+  gem 'ruby-openid', '~>2.5'
+  gem 'open_id_authentication'
+  gem 'RubyInline', '~> 3.12.4'
+  gem 'paperclip'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
 
   # for rake image migration tasks
   # gem 'right_aws'
-  gem 'right_aws_api'
+  gem 'right_aws_api', '~> 0.3.5'
 
 
   # compiling markdown to html
-  gem "rdiscount", "2.2.0.1"
+  gem 'rdiscount', '2.2.0.1'
 
   # asset pipelining
-  gem "sprockets"#, "2.12.1"
-  gem "sass", :require => 'sass'
-  gem "autoprefixer-rails"
-  gem "uglifier"
+  gem 'sprockets', '3.7.2'
+  gem 'sass', :require => 'sass'
+  gem 'autoprefixer-rails', '~> 9.5.1.1'
+  gem 'uglifier', '~> 4.1.20'
 
 end
 
 group :test do
-  gem "rubocop", '~> 0.52.0'
-  gem 'ruby-prof'
-  gem 'rails-perftest'
-  gem 'simplecov', require: false
-  gem 'simplecov-cobertura', require: false
-  gem 'minitest'
-  gem 'minitest-reporters'
+  gem 'rubocop', '~> 0.52.0'
+  gem 'ruby-prof', '~> 0.18.0'
+  gem 'rails-perftest', '~> 0.0.7'
+  gem 'simplecov',  '~> 0.16.1', require: false
+  gem 'simplecov-cobertura', '~> 1.3.1', require: false
+  gem 'minitest', '~> 5.11.3'
+  gem 'minitest-reporters', '~> 1.3.6'
 end
 
 group :development, :test do
-  gem "byebug"
-  gem 'faker'
-  gem 'pry-rails'
+  gem 'byebug', '~> 11.0.1'
+  gem 'faker', '~> 1.9.3'
+  gem 'pry-rails', '~> 0.3.9'
 end
 
 group :development do
-  gem "jshintrb"
-  gem "therubyracer"
+  gem 'jshintrb', '~> 0.3.0'
+  gem 'therubyracer', '~> 0.12.3'
   gem 'web-console', '~> 2.0'
 end
 
 group :sqlite do
   # if you decide to use sqlite3 as the database
-  gem "sqlite3"
+  gem 'sqlite3'
 end
 
 group :passenger do
   # passenger server
-  gem "passenger"
+  gem 'passenger'
 end
 
 gem 'httparty'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d9e6465e..1ec797a4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,42 +4,49 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.2)
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      arel (~> 6.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    arel (6.0.4)
+    arel (9.0.0)
     ast (2.4.0)
     autoprefixer-rails (9.5.1.1)
       execjs
@@ -53,14 +60,12 @@ GEM
     builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
     debug_inspector (0.0.3)
     docile (1.3.1)
-    erubis (2.7.0)
+    erubi (1.8.0)
     execjs (2.7.0)
     faker (1.9.3)
       i18n (>= 0.7)
@@ -75,7 +80,7 @@ GEM
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
@@ -91,11 +96,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mimemagic (0.3.0)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -108,6 +115,7 @@ GEM
     multi_xml (0.6.0)
     mysql2 (0.3.21)
     net-http-persistent (2.9.4)
+    nio4r (2.3.1)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     oa-core (0.3.2)
@@ -117,12 +125,12 @@ GEM
       ruby-openid-apps-discovery (~> 1.2.0)
     open_id_authentication (1.3.0)
       rack-openid (~> 1.3)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
@@ -131,44 +139,42 @@ GEM
       rake (>= 0.8.1)
     popper_js (1.14.5)
     powerpack (0.1.2)
-    protected_attributes (1.1.4)
-      activemodel (>= 4.0.1, < 5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (1.6.11)
+    rack (2.0.7)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.11.1)
-      actionmailer (= 4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activerecord (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     rails-perftest (0.0.7)
-    railties (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
@@ -224,6 +230,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -240,6 +248,9 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     will_paginate (3.1.7)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
@@ -248,49 +259,48 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RubyInline
-  autoprefixer-rails
+  RubyInline (~> 3.12.4)
+  autoprefixer-rails (~> 9.5.1.1)
   aws-sdk (~> 1.5.7)
-  byebug
-  faker
+  byebug (~> 11.0.1)
+  faker (~> 1.9.3)
   friendly_id
   geokit-rails (= 1.1.4)
   httparty
   image_science (= 1.3.0)
-  jshintrb
-  minitest
-  minitest-reporters
+  jshintrb (~> 0.3.0)
+  minitest (~> 5.11.3)
+  minitest-reporters (~> 1.3.6)
   mysql2 (< 0.4)
   oa-openid (= 0.3.2)
   open_id_authentication
-  paperclip (~> 4.3.7)
+  paperclip
   passenger
   popper_js (~> 1.11, >= 1.11.1)
-  protected_attributes
-  pry-rails
-  rails (= 4.2.11.1)
-  rails-perftest
+  pry-rails (~> 0.3.9)
+  rails (~> 5.0)
+  rails-perftest (~> 0.0.7)
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
-  recaptcha
-  right_aws_api
+  recaptcha (~> 4.14.0)
+  right_aws_api (~> 0.3.5)
   rubocop (~> 0.52.0)
   ruby-openid (~> 2.5)
-  ruby-prof
+  ruby-prof (~> 0.18.0)
   sass
-  simplecov
-  simplecov-cobertura
-  skylight
-  sprockets
+  simplecov (~> 0.16.1)
+  simplecov-cobertura (~> 1.3.1)
+  skylight (~> 4.0.2)
+  sprockets (= 3.7.2)
   sqlite3
-  therubyracer
-  uglifier
+  therubyracer (~> 0.12.3)
+  uglifier (~> 4.1.20)
   web-console (~> 2.0)
   will_paginate (= 3.1.7)
-  will_paginate-bootstrap4
+  will_paginate-bootstrap4 (~> 0.2.2)
 
 RUBY VERSION
    ruby 2.4.6p354
 
 BUNDLED WITH
-   1.17.3
+   1.16.6

From 13cdef5e71b79108da25ccb3be8e289806d112b4 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Wed, 12 Jun 2019 22:31:36 +0530
Subject: [PATCH 055/152] require rake'

---
 lib/tasks/test_unit.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/test_unit.rake b/lib/tasks/test_unit.rake
index 803b8645b..8a9dd11b0 100644
--- a/lib/tasks/test_unit.rake
+++ b/lib/tasks/test_unit.rake
@@ -1,3 +1,4 @@
+require 'rake/testtask'
 # ==================== #
 
 # HOW TO RUN # 
@@ -109,4 +110,4 @@ namespace :test do
   desc "Autotask - run integration tests in parallel"
   multitask :integration_parallel => COMPUTE_INTEGRATION_TASKS
 
-end
\ No newline at end of file
+end

From c20a903cc76fba6e4b88a0e5750a781c52491b75 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Wed, 12 Jun 2019 22:45:05 +0530
Subject: [PATCH 056/152] Change config files

---
 bin/bundle                                    |  2 +-
 bin/rails                                     |  2 +-
 bin/setup                                     | 33 +++++++++-------
 bin/update                                    | 31 +++++++++++++++
 bin/yarn                                      | 11 ++++++
 config/application.rb                         |  3 ++
 config/boot.rb                                |  5 ++-
 config/cable.yml                              | 10 +++++
 config/environments/development.rb            | 10 +++++
 config/environments/production.rb             | 35 ++++++++++++++++-
 config/environments/test.rb                   | 17 +++++----
 .../application_controller_renderer.rb        |  8 ++++
 config/initializers/assets.rb                 | 10 ++++-
 .../initializers/content_security_policy.rb   | 25 ++++++++++++
 .../new_framework_defaults_5_2.rb             | 38 +++++++++++++++++++
 config/initializers/wrap_parameters.rb        |  6 +--
 config/locales/en.yml                         | 10 +++++
 config/storage.yml                            | 34 +++++++++++++++++
 18 files changed, 261 insertions(+), 29 deletions(-)
 create mode 100755 bin/update
 create mode 100755 bin/yarn
 create mode 100644 config/cable.yml
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/content_security_policy.rb
 create mode 100644 config/initializers/new_framework_defaults_5_2.rb
 create mode 100644 config/storage.yml

diff --git a/bin/bundle b/bin/bundle
index 66e9889e8..f19acf5b5 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
index 5191e6927..073966023 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/setup b/bin/setup
index acdb2c138..94fd4d797 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,29 +1,36 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end
diff --git a/bin/update b/bin/update
new file mode 100755
index 000000000..58bfaed51
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 000000000..460dd565b
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index 09d4d4575..593d6205d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,6 +27,9 @@ class Application < Rails::Application
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
+     # Initialize configuration defaults for originally generated Rails version.
+     config.load_defaults 5.0
+
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
diff --git a/config/boot.rb b/config/boot.rb
index 44358b8e4..b9e460cef 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) # Set up gems listed in the Gemfile.
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..8648dafa2
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: mapknitter_production
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1ab5e7b64..34ebff5d0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -47,4 +47,14 @@
   config.serve_static_files = true
 
   config.assets.logger = false
+   # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+# Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+  config.action_mailer.perform_caching = false
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 219f7fc32..e506a8ca9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -23,7 +23,8 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -88,4 +89,36 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+   # config.action_controller.asset_host = 'http://assets.example.com'
+ 
+   # Store uploaded files on the local file system (see config/storage.yml for options)
+   config.active_storage.service = :local
+ 
+   # Mount Action Cable outside main process or domain
+   # config.action_cable.mount_path = nil
+   # config.action_cable.url = 'wss://example.com/cable'
+   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+ 
+  config.log_tags = [ :request_id ]
+
+   # Use a real queuing backend for Active Job (and separate queues per environment)
+   # config.active_job.queue_adapter     = :resque
+   # config.active_job.queue_name_prefix = "mapknitter_#{Rails.env}"
+ 
+   config.action_mailer.perform_caching = false
+
+
+   # Use a different logger for distributed setups.
+   # require 'syslog/logger'
+   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+ 
+   if ENV["RAILS_LOG_TO_STDOUT"].present?
+     logger           = ActiveSupport::Logger.new(STDOUT)
+     logger.formatter = config.log_formatter
+     config.logger    = ActiveSupport::TaggedLogging.new(logger)
+   end
+ 
+
+
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 278bd7e91..22931ea92 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,4 @@
 Mapknitter::Application.configure do
-
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -13,9 +12,11 @@
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -27,14 +28,16 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..89d2efab2
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index f5d0ac0f0..b33c6e715 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -3,6 +3,12 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# Rails.application.config.assets.paths << Emoji.images_path
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
+
+
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 
@@ -13,4 +19,6 @@
                                                'uploads.js',
                                                'knitter.js',
                                                'annotations.js',
-                                               'maps.js']
+                                               'maps.js',
+                                               'admin.js',
+                                               'admin.css']
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 000000000..d3bcaa5ec
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb
new file mode 100644
index 000000000..c383d072b
--- /dev/null
+++ b/config/initializers/new_framework_defaults_5_2.rb
@@ -0,0 +1,38 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.2 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make Active Record use stable #cache_key alongside new #cache_version method.
+# This is needed for recyclable cache keys.
+# Rails.application.config.active_record.cache_versioning = true
+
+# Use AES-256-GCM authenticated encryption for encrypted cookies.
+# Also, embed cookie expiry in signed or encrypted cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 5.2.
+#
+# Existing cookies will be converted on read then written with the new scheme.
+# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
+
+# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
+# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
+# Rails.application.config.active_support.use_authenticated_message_encryption = true
+
+# Add default protection from forgery to ActionController::Base instead of in
+# ApplicationController.
+# Rails.application.config.action_controller.default_protect_from_forgery = true
+
+# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
+# 'f' after migrating old data.
+# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+
+# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
+# Rails.application.config.active_support.use_sha1_digests = true
+
+# Make `form_with` generate id attributes for any generated HTML tags.
+# Rails.application.config.action_view.form_with_generates_ids = true
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index b8e3fb7b6..bbfc3961b 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -5,10 +5,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+  wrap_parameters format: [:json]
 end
 
-# Disable root element in JSON for ActiveRecord objects.
+# To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
-#   self.include_root_in_json = false
+#   self.include_root_in_json = true
 # end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 065395716..decc5a857 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -16,6 +16,16 @@
 #
 # This would use the information in config/locales/es.yml.
 #
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
 # To learn more, please read the Rails Internationalization guide
 # available at http://guides.rubyonrails.org/i18n.html.
 
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 000000000..d32f76e8f
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

From 5a287720accde6acf8aa672d7db11079ed432930 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Wed, 12 Jun 2019 22:52:19 +0530
Subject: [PATCH 057/152] Add application record

---
 app/models/annotation.rb         | 2 +-
 app/models/application_record.rb | 3 +++
 app/models/comment.rb            | 2 +-
 app/models/map.rb                | 2 +-
 app/models/node.rb               | 2 +-
 app/models/tag.rb                | 2 +-
 app/models/user.rb               | 2 +-
 app/models/warpable.rb           | 2 +-
 app/models/way.rb                | 2 +-
 config/boot.rb                   | 2 +-
 10 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 app/models/application_record.rb

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index e681cb9bc..3cbf385ce 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,4 +1,4 @@
-class Annotation < ActiveRecord::Base
+class Annotation < ApplicationRecord
   include ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 000000000..10a4cba84
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 05d55677e..2d6059a71 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,4 +1,4 @@
-class Comment < ActiveRecord::Base
+class Comment < ApplicationRecord
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/map.rb b/app/models/map.rb
index d916eb70c..6d5a78fa0 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -1,4 +1,4 @@
-class Map < ActiveRecord::Base
+class Map < ApplicationRecord
   include ActiveModel::Validations
   extend FriendlyId
   friendly_id :name, use: %i(slugged static)
diff --git a/app/models/node.rb b/app/models/node.rb
index a6e3018b7..3aac4abce 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,3 +1,3 @@
-class Node < ActiveRecord::Base
+class Node < ApplicationRecord
   belongs_to :way
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 390df29ac..f465b4b25 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,4 +1,4 @@
-class Tag < ActiveRecord::Base
+class Tag < ApplicationRecord
   belongs_to :map
   belongs_to :user
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 55e036669..5d103aab6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 require 'digest/sha1'
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   has_many :maps
   has_many :tags
   has_many :comments
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 86dcc14c7..2740861e6 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,4 +1,4 @@
-class Warpable < ActiveRecord::Base
+class Warpable < ApplicationRecord
   include ActiveModel::MassAssignmentSecurity
   attr_accessible :image
   attr_accessor :src, :srcmedium # for json generation
diff --git a/app/models/way.rb b/app/models/way.rb
index 7fb80d1ed..d29acbdf9 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,4 +1,4 @@
-class Way < ActiveRecord::Base
+class Way < ApplicationRecord
   has_many :nodes, dependent: :destroy
 
   def bbox=(bbox)
diff --git a/config/boot.rb b/config/boot.rb
index b9e460cef..ec779bbf8 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+#require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

From df7b02f4cbbf5995c3c8b12cb044be384d3cfbc0 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Wed, 12 Jun 2019 23:01:49 +0530
Subject: [PATCH 058/152] Bump mysql

---
 Gemfile               | 2 +-
 Gemfile.lock          | 4 ++--
 config/application.rb | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index efb1e4e77..89cffa27a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'popper_js', '~> 1.11', '>= 1.11.1'
 
 # dependencies
 group :dependencies do
-  gem 'mysql2', '< 0.4'
+  gem 'mysql2', '< 0.6'
   gem 'geokit-rails', '1.1.4'
   gem 'image_science', '1.3.0'
   gem 'recaptcha', '~> 4.14.0', require: 'recaptcha/rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ec797a4d..9d2fe0fdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
       ruby-progressbar
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    mysql2 (0.3.21)
+    mysql2 (0.5.2)
     net-http-persistent (2.9.4)
     nio4r (2.3.1)
     nokogiri (1.10.3)
@@ -271,7 +271,7 @@ DEPENDENCIES
   jshintrb (~> 0.3.0)
   minitest (~> 5.11.3)
   minitest-reporters (~> 1.3.6)
-  mysql2 (< 0.4)
+  mysql2 (< 0.6)
   oa-openid (= 0.3.2)
   open_id_authentication
   paperclip
diff --git a/config/application.rb b/config/application.rb
index 593d6205d..04da08499 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -42,9 +42,6 @@ class Application < Rails::Application
     # parameters by using an attr_accessible or attr_protected declaration.
     # config.active_record.whitelist_attributes = true
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 

From 1c1e2c2d444d512debdb7a703de7cd065046f4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lax=20de=20Carvalho=20Alves?= <alaxallves@gmail.com>
Date: Wed, 12 Jun 2019 22:39:17 -0300
Subject: [PATCH 059/152] Local builds for Travis runners (#672)

* Using local mysql for travis

* Fix codeclimate issues

* Refactoring yamls

* Autofixing rubocop offenses and Problematic test for #578 (#667)

* Autofixing rubocop offenses

* Adding Rubocop to Travis pipelines and development branch

* Fixing maps controller test

* Fixing remaining offenses

* Fixing unit tests

* Adding docker build to travis pipelines

* Adding docker build to travis pipelines

* Staging builds in travis

* fix travis.yml

* Upgrading sintax of assets and using required gems

* Using updated version of GDAL and installing required dependencies

* Enabling cache in between builds
---
 .simplecov                                    |  9 +++-
 .travis.yml                                   | 52 ++++++++++++-------
 Gemfile                                       | 10 ++--
 Gemfile.lock                                  | 21 ++++++++
 app/assets/javascripts/application.js         |  4 +-
 .../{annotations.css => annotations.scss}     |  4 +-
 app/assets/stylesheets/application.css        | 27 ----------
 app/assets/stylesheets/application.scss       | 24 +++++++++
 .../{header.css.scss => header.scss}          |  0
 .../stylesheets/{maps.css.scss => maps.scss}  |  0
 .../{style.css.scss => style.scss}            |  0
 .../stylesheets/{uploads.css => uploads.scss} |  0
 config/database.yml.cloud9.example            | 10 ++--
 config/database.yml.example                   | 19 +++----
 config/database.yml.test.example              |  7 ---
 docker-compose.test.yml                       | 17 ------
 lib/exporter-deps.sh                          | 17 +++++-
 lib/exporter.rb                               |  5 +-
 mapknitter.test.env                           |  4 --
 test/test_helper.rb                           |  4 +-
 test/unit/exporter_test.rb                    |  2 +-
 test/unit/warpable_test.rb                    |  1 +
 22 files changed, 134 insertions(+), 103 deletions(-)
 rename app/assets/stylesheets/{annotations.css => annotations.scss} (93%)
 delete mode 100644 app/assets/stylesheets/application.css
 create mode 100644 app/assets/stylesheets/application.scss
 rename app/assets/stylesheets/{header.css.scss => header.scss} (100%)
 rename app/assets/stylesheets/{maps.css.scss => maps.scss} (100%)
 rename app/assets/stylesheets/{style.css.scss => style.scss} (100%)
 rename app/assets/stylesheets/{uploads.css => uploads.scss} (100%)
 delete mode 100644 config/database.yml.test.example
 delete mode 100644 docker-compose.test.yml
 mode change 100644 => 100755 lib/exporter-deps.sh
 delete mode 100644 mapknitter.test.env

diff --git a/.simplecov b/.simplecov
index 2bd5dffa0..e72179234 100644
--- a/.simplecov
+++ b/.simplecov
@@ -1,5 +1,3 @@
-require 'simplecov-cobertura'
-
 if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 else
@@ -7,8 +5,15 @@ else
 end
 
 SimpleCov.start 'rails' do
+  add_group 'Units', 'app/models'
+  add_group 'Functionals', 'app/controllers'
+  add_group 'Services', 'app/services'
+  add_group 'Libraries', 'lib/'
+
   add_filter '/test/'
+  add_filter '/config/'
   add_filter '/db/'
+  add_filter '/vendor/'
   add_filter '/log/'
   add_filter '/tmp/'
 end
diff --git a/.travis.yml b/.travis.yml
index 6e91c1156..f48a36eff 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,47 @@
-sudo: required
-
-language: generic
+language: ruby
+rvm:
+  - 2.4.6
 
 services:
+  - mysql
   - docker
 
+cache:
+  bundler: true
+  directories:
+   - public/lib/
+
 install:
-  - cp config/database.yml.test.example config/database.yml
+  - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
-  - docker-compose -f docker-compose.test.yml up -d --build
-  - >
-    while (! docker logs mapknitter-test | grep "Phusion Passenger Standalone web server started") > /dev/null 2>&1; do
-      echo "Waiting for start script to finish...";
-      sleep 20;
-    done; echo "Done!"
-  - docker-compose -f docker-compose.test.yml exec web bash -lc "rake db:setup || rake db:migrate"
+  - ./lib/exporter-deps.sh > /dev/null 2>&1
+  - bundle install && yarn install
+  - bundle exec rake db:setup || bundle exec rake db:migrate
 
 env:
   global:
     - RAILS_ENV=test
-  matrix:
-    - TASK="CI=true TRAVIS=true rake test:unit"
-    - TASK="CI=true TRAVIS=true rake test:integration"
-    - TASK="CI=true TRAVIS=true rake test:functional"
-    - TASK="CI=true TRAVIS=true rake assets:precompile"
-    - TASK="CI=true TRAVIS=true bundle exec rubocop
+    - CI=true
+    - TRAVIS=true
 
-script:
-  - docker-compose -f docker-compose.test.yml exec web bash -lc "$TASK"
-  - bash <(curl -s https://codecov.io/bash)
+jobs:
+  include:
+    - name: "Unit Tests"
+      script: bundle exec rake test:unit
+    - name: "Integration Tests"
+      script: bundle exec rake test:integration
+    - name: "Functional Tests"
+      script: bundle exec rake test:functional
+    - name: "Rubocop Linter"
+      script: bundle exec rubocop
+    - name: "Docker Builds"
+      script: docker build -t mapknitter .
+    # Configure this option after full yarn setup
+    # - name: "Asset Precompilation"
+    #   env:
+    #     - RAILS_ENV=production
+    #   script: bundle exec rake assets:precompile
 
 branches:
   only:
diff --git a/Gemfile b/Gemfile
index d2dc1dd08..bf053a8db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,20 +30,22 @@ group :dependencies do
   # gem 'right_aws'
   gem 'right_aws_api'
 
-
   # compiling markdown to html
   gem "rdiscount", "2.2.0.1"
 
   # asset pipelining
-  gem "sprockets"#, "2.12.1"
+  gem 'bootstrap-sass'
+  gem 'sassc-rails'
+  gem 'jquery-rails'
+  gem "sprockets"
+  gem "sprockets-rails"
   gem "sass", :require => 'sass'
   gem "autoprefixer-rails"
   gem "uglifier"
-
 end
 
 group :test do
-  gem "rubocop", '~> 0.52.0'
+  gem 'rubocop', '~> 0.52.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d9e6465e..554ee25f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,9 @@ GEM
       uuidtools (~> 2.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.4.1)
+      autoprefixer-rails (>= 5.2.1)
+      sassc (>= 2.0.0)
     builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
@@ -79,6 +82,10 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     jshintrb (0.3.0)
       execjs
       multi_json (>= 1.3)
@@ -205,6 +212,15 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
+    sassc-rails (2.1.1)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -229,6 +245,7 @@ GEM
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
+    tilt (2.0.9)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -251,12 +268,14 @@ DEPENDENCIES
   RubyInline
   autoprefixer-rails
   aws-sdk (~> 1.5.7)
+  bootstrap-sass
   byebug
   faker
   friendly_id
   geokit-rails (= 1.1.4)
   httparty
   image_science (= 1.3.0)
+  jquery-rails
   jshintrb
   minitest
   minitest-reporters
@@ -278,10 +297,12 @@ DEPENDENCIES
   ruby-openid (~> 2.5)
   ruby-prof
   sass
+  sassc-rails
   simplecov
   simplecov-cobertura
   skylight
   sprockets
+  sprockets-rails
   sqlite3
   therubyracer
   uglifier
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7d40a8c44..04ad5432d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,7 +11,9 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 
-//= require popper
+//= require_tree .
+//= require jquery
+//= require jquery-ujs
 //= require jquery/dist/jquery.js
 //= require jquery-ujs/src/rails.js 
 
diff --git a/app/assets/stylesheets/annotations.css b/app/assets/stylesheets/annotations.scss
similarity index 93%
rename from app/assets/stylesheets/annotations.css
rename to app/assets/stylesheets/annotations.scss
index c85321d3f..7760f6e54 100644
--- a/app/assets/stylesheets/annotations.css
+++ b/app/assets/stylesheets/annotations.scss
@@ -20,8 +20,8 @@
 }
 
 .leaflet-draw-toolbar a {
-  background-image: url('/assets/leaflet-illustrate/dist/images/spritesheet.png'); !important
+  background-image: url('/assets/leaflet-illustrate/dist/images/spritesheet.png') !important;
 }
 .leaflet-retina .leaflet-draw-toolbar a {
-  background-image: url('/assets/leaflet-draw/dist/images/spritesheet-2x.png'); !important
+  background-image: url('/assets/leaflet-draw/dist/images/spritesheet-2x.png') !important;
 }
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index cd9eebaf4..000000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- 
- *= require bootstrap/dist/css/bootstrap.min.css
- *= require leaflet-draw/dist/leaflet.draw.css
- *= require leaflet-illustrate/dist/Leaflet.Illustrate.css
- *= require leaflet-toolbar/dist/leaflet.toolbar.css
- *= require leaflet-distortableimage/dist/leaflet.distortableimage.css
- *= require fontawesome/css/font-awesome.min.css
-
- *= require style
- *= require maps
- *= require header
- *= require uploads
-
- *= require_self
- *= require annotations
- * require_tree .
-*/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 000000000..95c1fc950
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,24 @@
+$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
+@import "style";
+@import "maps";
+@import "header";
+@import "uploads";
+@import "annotations";
+@import "bootstrap/dist/css/bootstrap.min.css";
+@import "leaflet-draw/dist/leaflet.draw.css";
+@import "leaflet-illustrate/dist/Leaflet.Illustrate.css";
+@import "leaflet-toolbar/dist/leaflet.toolbar.css";
+@import "leaflet-distortableimage/dist/leaflet.distortableimage.css";
+@import "fontawesome/css/font-awesome.min.css";
+// /*
+//  * This is a manifest file that'll be compiled into application.css, which will include all the files
+//  * listed below.
+//  *
+//  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+//  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+//  *
+//  * You're free to add application-wide styles to this file and they'll appear at the top of the
+//  * compiled file, but it's generally better to create a new file per style scope.
+//  *
+ 
+//  */
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.scss
similarity index 100%
rename from app/assets/stylesheets/header.css.scss
rename to app/assets/stylesheets/header.scss
diff --git a/app/assets/stylesheets/maps.css.scss b/app/assets/stylesheets/maps.scss
similarity index 100%
rename from app/assets/stylesheets/maps.css.scss
rename to app/assets/stylesheets/maps.scss
diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.scss
similarity index 100%
rename from app/assets/stylesheets/style.css.scss
rename to app/assets/stylesheets/style.scss
diff --git a/app/assets/stylesheets/uploads.css b/app/assets/stylesheets/uploads.scss
similarity index 100%
rename from app/assets/stylesheets/uploads.css
rename to app/assets/stylesheets/uploads.scss
diff --git a/config/database.yml.cloud9.example b/config/database.yml.cloud9.example
index c46bb4759..f1a36e434 100644
--- a/config/database.yml.cloud9.example
+++ b/config/database.yml.cloud9.example
@@ -1,18 +1,22 @@
-development:
+default: &default
+  encoding: utf8
   adapter: mysql2
+
+development:
+  <<: *default
   username: root
   password: 
   database: mapknitter
 
 production:
-  adapter: mysql2
+  <<: *default
   host: db
   username: mapknitter
   password: mapknitter
   database: mapknitter
 
 test:
-  adapter: mysql2
+  <<: *default
   username: root
   password: 
   database: mapknittertest
diff --git a/config/database.yml.example b/config/database.yml.example
index 277488812..5202700ff 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,19 +1,20 @@
-development:
+default: &default
+  encoding: utf8
   adapter: mysql2
+
+development:
+  <<: *default
   username: 
   password: 
-  database: mapknitter
+  database: mapknitter-dev
 
 production:
-  adapter: mysql2
-  host: db
+  <<: *default
   username: mapknitter
   password: mapknitter
   database: mapknitter
 
 test:
-  adapter: mysql2
-  username: mapknitter
-  password: mapknitter
-  host: db
-  database: mapknitter
+  <<: *default
+  username: root
+  database: mapknitter-test
diff --git a/config/database.yml.test.example b/config/database.yml.test.example
deleted file mode 100644
index bf95c79f9..000000000
--- a/config/database.yml.test.example
+++ /dev/null
@@ -1,7 +0,0 @@
-test:
-  adapter: mysql2
-  host: 127.0.0.1
-  database: mapknitter-test
-  username: root
-  password:
-
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index 6de18f35f..000000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3.3'
-services:
-  db:
-    container_name: mapknitter-test-db
-    image: mysql:5.7
-    network_mode: host
-    env_file:
-      - mapknitter.test.env
-
-  web:
-    container_name: mapknitter-test
-    build: .
-    network_mode: host
-    env_file:
-      - mapknitter.test.env
-    volumes:
-      - .:/app
diff --git a/lib/exporter-deps.sh b/lib/exporter-deps.sh
old mode 100644
new mode 100755
index fb262e8ae..f65bf5969
--- a/lib/exporter-deps.sh
+++ b/lib/exporter-deps.sh
@@ -1 +1,16 @@
-sudo apt-get install gdal-bin python-gdal curl libcurl4-openssl-dev libssl-dev zip libmysqlclient-dev imagemagick ruby-rmagick libfreeimage3 libfreeimage-dev ruby-dev libmagickcore-dev libmagickwand-dev
+sudo add-apt-repository -y ppa:ubuntugis/ppa
+sudo apt-get update
+sudo apt-get install -y gdal-bin \
+                        python3-gdal \
+                        python-gdal \
+                        curl \
+                        libcurl4-openssl-dev \
+                        libssl-dev zip \
+                        libmysqlclient-dev \
+                        imagemagick \
+                        ruby-rmagick \
+                        libfreeimage3 \
+                        libfreeimage-dev \
+                        ruby-dev \
+                        libmagickcore-dev \
+                        libmagickwand-dev
diff --git a/lib/exporter.rb b/lib/exporter.rb
index bcae11dd1..e3967624d 100644
--- a/lib/exporter.rb
+++ b/lib/exporter.rb
@@ -276,9 +276,8 @@ def self.generate_composite_tiff(coords, origin, placed_warpables, slug, ordered
   # generates a tileset at root/public/tms/<slug>/
   # root is something like https://mapknitter.org
   def self.generate_tiles(key, slug, root)
-    key = "AIzaSyAOLUQngEmJv0_zcG1xkGq-CXIPpLQY8iQ" if key == "" # ugh, let's clean this up!
-    key = key || "AIzaSyAOLUQngEmJv0_zcG1xkGq-CXIPpLQY8iQ"
-    gdal2tiles = 'gdal2tiles.py -k --s_srs EPSG:3857 -t "'+slug+'" -g "'+key+'" '+root+'/public/warps/'+slug+'/'+slug+'-geo.tif '+root+'/public/tms/'+slug+"/"
+    key = "AIzaSyAOLUQngEmJv0_zcG1xkGq-CXIPpLQY8iQ" if key.blank?
+    gdal2tiles = 'gdal2tiles.py -k --s_srs EPSG:4326 -t "'+slug+'" -g "'+key+'" '+root+'/public/warps/'+slug+'/'+slug+'-geo.tif '+root+'/public/tms/'+slug+"/"
     puts gdal2tiles
     system(self.ulimit+gdal2tiles)
   end
diff --git a/mapknitter.test.env b/mapknitter.test.env
deleted file mode 100644
index 8d4d35254..000000000
--- a/mapknitter.test.env
+++ /dev/null
@@ -1,4 +0,0 @@
-MYSQL_DATABASE=mapknitter-test
-MYSQL_USER=root
-MYSQL_RANDOM_ROOT_PASSWORD=true
-RAILS_ENV=test
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 56d5f30b9..1f2772a72 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,12 +1,12 @@
-ENV["RAILS_ENV"] = "test"
 
 require 'simplecov'
-
+require 'simplecov-cobertura'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'minitest/reporters'
 MiniTest::Reporters.use! [MiniTest::Reporters::ProgressReporter.new,
                           MiniTest::Reporters::JUnitReporter.new]
+ENV["RAILS_ENV"] = "test"
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
diff --git a/test/unit/exporter_test.rb b/test/unit/exporter_test.rb
index b6d74f564..ffab0894c 100644
--- a/test/unit/exporter_test.rb
+++ b/test/unit/exporter_test.rb
@@ -19,7 +19,7 @@ class ExporterTest < ActiveSupport::TestCase
     assert Exporter.get_working_directory(w.map.slug)
     assert Exporter.warps_directory(w.map.slug)
 
-    map = Map.first
+    map = maps(:saugus)
 
     # get rid of existing geotiff
     system('rm -r public/warps/saugus-landfill-incinerator/1-geo.tif')
diff --git a/test/unit/warpable_test.rb b/test/unit/warpable_test.rb
index 7551878c8..9b96919cc 100644
--- a/test/unit/warpable_test.rb
+++ b/test/unit/warpable_test.rb
@@ -63,6 +63,7 @@ def setup
     system('touch public/warps/saugus-landfill-incinerator/folder')
     system('mkdir -p public/system/images/2/original/')
     system('cp test/fixtures/demo.png public/system/images/2/original/test.png')
+    system('cp test/fixtures/demo.png public/warps/saugus-landfill-incinerator/1-geo.tif')
     assert File.exist?('public/warps/saugus-landfill-incinerator/folder')
 
     origin = Exporter.distort_warpables(2,

From 4cd47a4ae9f076e3f3d67d31c7a60f06373b2f18 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 17:49:53 +0530
Subject: [PATCH 060/152] Test yarn for travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f48a36eff..8ff29458f 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,10 +38,10 @@ jobs:
     - name: "Docker Builds"
       script: docker build -t mapknitter .
     # Configure this option after full yarn setup
-    # - name: "Asset Precompilation"
-    #   env:
-    #     - RAILS_ENV=production
-    #   script: bundle exec rake assets:precompile
+    - name: "Asset Precompilation"
+      env:
+        - RAILS_ENV=production
+      script: bundle exec rake assets:precompile
 
 branches:
   only:

From f0297dda537b362e91e03a2b2eee222500033b91 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 18:23:15 +0530
Subject: [PATCH 061/152] Conditionalize rake db:setup for travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8ff29458f..bee780178 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - bundle exec rake db:setup || bundle exec rake db:migrate
+  - if [RAILS_ENV != production]; then bundle exec rake db:setup || bundle exec rake db:migrate fi
 
 env:
   global:

From 40ad993535455ffd9f12341f661827eeac315e84 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 18:44:45 +0530
Subject: [PATCH 062/152] Add semicolon

---
 .travis.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bee780178..1d6c50326 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,9 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - if [RAILS_ENV != production]; then bundle exec rake db:setup || bundle exec rake db:migrate fi
+  - if [[RAILS_ENV != production]]; then 
+    bundle exec rake db:setup || bundle exec rake db:migrate ;
+    fi
 
 env:
   global:
@@ -27,16 +29,16 @@ env:
 
 jobs:
   include:
-    - name: "Unit Tests"
-      script: bundle exec rake test:unit
-    - name: "Integration Tests"
-      script: bundle exec rake test:integration
-    - name: "Functional Tests"
-      script: bundle exec rake test:functional
-    - name: "Rubocop Linter"
-      script: bundle exec rubocop
-    - name: "Docker Builds"
-      script: docker build -t mapknitter .
+#   - name: "Unit Tests"
+#     script: bundle exec rake test:unit
+#   - name: "Integration Tests"
+#     script: bundle exec rake test:integration
+#   - name: "Functional Tests"
+#     script: bundle exec rake test:functional
+#   - name: "Rubocop Linter"
+#     script: bundle exec rubocop
+#   - name: "Docker Builds"
+#     script: docker build -t mapknitter .
     # Configure this option after full yarn setup
     - name: "Asset Precompilation"
       env:

From 91d082f8c1e6fddd18290c1c59903c40c0acfca0 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 18:48:56 +0530
Subject: [PATCH 063/152] Remove comment

---
 .travis.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d6c50326..7bc7763cf 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,17 +29,16 @@ env:
 
 jobs:
   include:
-#   - name: "Unit Tests"
-#     script: bundle exec rake test:unit
-#   - name: "Integration Tests"
-#     script: bundle exec rake test:integration
-#   - name: "Functional Tests"
-#     script: bundle exec rake test:functional
-#   - name: "Rubocop Linter"
-#     script: bundle exec rubocop
-#   - name: "Docker Builds"
-#     script: docker build -t mapknitter .
-    # Configure this option after full yarn setup
+    - name: "Unit Tests"
+      script: bundle exec rake test:unit
+    - name: "Integration Tests"
+      script: bundle exec rake test:integration
+    - name: "Functional Tests"
+      script: bundle exec rake test:functional
+    - name: "Rubocop Linter"
+      script: bundle exec rubocop
+    - name: "Docker Builds"
+      script: docker build -t mapknitter .
     - name: "Asset Precompilation"
       env:
         - RAILS_ENV=production

From 0607a4fbdf279d0a423a859d4084e6ed41d06a5b Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 19:06:49 +0530
Subject: [PATCH 064/152] modify database.yml

---
 .travis.yml                 | 2 +-
 config/database.yml.example | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7bc7763cf..03195f7fb 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - if [[RAILS_ENV != production]]; then 
+  - if [ $RAILS_ENV != 'production' ]; then
     bundle exec rake db:setup || bundle exec rake db:migrate ;
     fi
 
diff --git a/config/database.yml.example b/config/database.yml.example
index 5202700ff..36f04f5ba 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -10,8 +10,8 @@ development:
 
 production:
   <<: *default
-  username: mapknitter
-  password: mapknitter
+  username: root
+  password: 
   database: mapknitter
 
 test:

From a3e7ff81f445ad41830b2da572a48508c02b8643 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 19:31:37 +0530
Subject: [PATCH 065/152] Migrate seperately

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03195f7fb..3507e46fc 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,12 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - if [ $RAILS_ENV != 'production' ]; then
-    bundle exec rake db:setup || bundle exec rake db:migrate ;
+  - if [ $RAILS_ENV == 'production' ]; then
+      bundle exec rake db:create; 
+    else
+      bundle exec rake db:setup;
     fi
+  - bundle exec rake db:migrate
 
 env:
   global:

From 525eb1a7667eadea967163955d6e62917795b354 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 13 Jun 2019 19:49:28 +0530
Subject: [PATCH 066/152] Run create only for production

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3507e46fc..dc829fd54 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,8 @@ install:
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rake db:create; 
     else
-      bundle exec rake db:setup;
+      bundle exec rake db:setup || bundle exec rake db:migrate;
     fi
-  - bundle exec rake db:migrate
 
 env:
   global:

From 4fb5be374dfa544430f1578298c8623994719709 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 11:40:46 -0300
Subject: [PATCH 067/152] Locking newer Rails v

---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0eb5c599a..731f0e83a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 ruby '2.4.6'
-gem 'rails', '~> 5.0'
+gem 'rails', '~> 5.2.3'
 gem 'rake',  '~> 12.3.2'
 gem 'skylight', '~> 4.0.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 84bcec1ad..d843a2701 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,7 +297,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
-  rails (~> 5.0)
+  rails (~> 5.2.3)
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)

From d058ce34fd432dc807761ceb7005a71f9131a8db Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 12:10:35 -0300
Subject: [PATCH 068/152] Running update task

---
 config/application.rb                     |  1 -
 config/boot.rb                            |  2 +-
 config/environment.rb                     |  4 +-
 config/environments/development.rb        | 59 ++++++++------
 config/environments/production.rb         | 95 +++++++++--------------
 config/environments/test.rb               |  2 +-
 config/initializers/assets.rb             | 38 ++++-----
 config/initializers/cookies_serializer.rb |  2 +
 8 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 04da08499..6dc5a2ea1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,5 +1,4 @@
 require File.expand_path('../boot', __FILE__)
-
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
diff --git a/config/boot.rb b/config/boot.rb
index ec779bbf8..b9e460cef 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
-#require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/environment.rb b/config/environment.rb
index 99fb29737..426333bb4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
-Mapknitter::Application.initialize!
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 34ebff5d0..57a39dea5 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-Mapknitter::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -9,23 +9,29 @@
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
 
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
 
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
 
-  # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+    config.cache_store = :null_store
+  end
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
@@ -36,25 +42,34 @@
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
   # Do not compress assets
   config.assets.compress = false
-
   # Expands the lines which load the assets
+  config.assets.logger = false
   config.assets.debug = true#false
+
   config.serve_static_files = true
 
-  config.assets.logger = false
-   # Suppress logger output for asset requests.
+  # Suppress logger output for asset requests.
   config.assets.quiet = true
 
 # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  config.action_mailer.perform_caching = false
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e506a8ca9..a963d8cd9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,6 @@
-Mapknitter::Application.configure do
+require 'uglifier'
 
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
@@ -15,19 +16,16 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
@@ -37,18 +35,23 @@
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-  config.assets.precompile += ['tags.js',
-                               'uploads.js',
-                               'knitter.js',
-                               'annotations.js',
-                               'maps.js']
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
@@ -57,25 +60,20 @@
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "mapknitter_#{Rails.env}"
+
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.delivery_method = :sendmail
-  config.action_mailer.sendmail_settings = {
-    location: '/usr/sbin/sendmail',
-    arguments: '-i'
-  }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
@@ -87,38 +85,21 @@
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
+  config.action_mailer.delivery_method = :sendmail
+  config.action_mailer.sendmail_settings = {
+    location: '/usr/sbin/sendmail',
+    arguments: '-i'
+  }
+  
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-   # config.action_controller.asset_host = 'http://assets.example.com'
- 
-   # Store uploaded files on the local file system (see config/storage.yml for options)
-   config.active_storage.service = :local
- 
-   # Mount Action Cable outside main process or domain
-   # config.action_cable.mount_path = nil
-   # config.action_cable.url = 'wss://example.com/cable'
-   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
- 
-  config.log_tags = [ :request_id ]
-
-   # Use a real queuing backend for Active Job (and separate queues per environment)
-   # config.active_job.queue_adapter     = :resque
-   # config.active_job.queue_name_prefix = "mapknitter_#{Rails.env}"
- 
-   config.action_mailer.perform_caching = false
-
-
-   # Use a different logger for distributed setups.
-   # require 'syslog/logger'
-   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
- 
-   if ENV["RAILS_LOG_TO_STDOUT"].present?
-     logger           = ActiveSupport::Logger.new(STDOUT)
-     logger.formatter = config.log_formatter
-     config.logger    = ActiveSupport::TaggedLogging.new(logger)
-   end
- 
-
-
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 22931ea92..0a38fd3ce 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-Mapknitter::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index b33c6e715..4be23540c 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,24 +1,26 @@
 # Be sure to restart your server when you modify this file.
 
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.configure do
+    # Version of your assets, change this if you want to expire all your assets.
+    config.assets.version = '1.0'
 
-# Rails.application.config.assets.paths << Emoji.images_path
-# Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
+    # Add additional assets to the asset load path.
+    # Rails.application.config.assets.paths << Emoji.images_path
+    # Add Yarn node_modules folder to the asset load path.
+    config.assets.paths << Rails.root.join('public/lib')
 
+    config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
+    config.assets.precompile += ['tags.js',
+                               'uploads.js',
+                               'knitter.js',
+                               'annotations.js',
+                               'maps.js',
+                               'admin.js',
+                               'admin.css']
 
 
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += ['tags.js',
-                                               'uploads.js',
-                                               'knitter.js',
-                                               'annotations.js',
-                                               'maps.js',
-                                               'admin.js',
-                                               'admin.css']
+    # Precompile additional assets.
+    # application.js, application.css, and all non-JS/CSS in the app/assets
+    # folder are already added.
+    # Rails.application.config.assets.precompile += %w( admin.js admin.css )
+end
\ No newline at end of file
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 54516e3f2..f51a497e1 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
 Rails.application.config.action_dispatch.cookies_serializer = :hybrid

From d90db0eb4a3e4a575c3e51dcee637d097396c354 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 14:17:28 -0300
Subject: [PATCH 069/152] Adding missing bootsnap gem

---
 Gemfile      | 1 +
 Gemfile.lock | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Gemfile b/Gemfile
index 731f0e83a..56c5407ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :dependencies do
   gem 'open_id_authentication'
   gem 'RubyInline', '~> 3.12.4'
   gem 'paperclip'
+  gem 'bootsnap', '~> 1.4.4'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index d843a2701..67c5269bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,6 +57,8 @@ GEM
       uuidtools (~> 2.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
+    bootsnap (1.4.4)
+      msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -118,6 +120,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.5.2)
@@ -279,6 +282,7 @@ DEPENDENCIES
   RubyInline (~> 3.12.4)
   autoprefixer-rails (~> 9.5.1.1)
   aws-sdk (~> 1.5.7)
+  bootsnap (~> 1.4.4)
   bootstrap-sass
   byebug (~> 11.0.1)
   faker (~> 1.9.3)

From 65455370eb6815b234ec0fbe422e83ebc2fa468a Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 14:29:11 -0300
Subject: [PATCH 070/152] Fixing missing database

---
 .travis.yml                 | 3 ++-
 config/database.yml.example | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc829fd54..b2e46256f 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,9 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
+  - mysql -e "CREATE DATABASE mapknitter; CREATE DATABASE mapknitter_test;"
   - if [ $RAILS_ENV == 'production' ]; then
-      bundle exec rake db:create; 
+      bundle exec rake db:schema:load;
     else
       bundle exec rake db:setup || bundle exec rake db:migrate;
     fi
diff --git a/config/database.yml.example b/config/database.yml.example
index 36f04f5ba..f4b84d743 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,12 +1,13 @@
 default: &default
   encoding: utf8
   adapter: mysql2
+  host: 127.0.0.1
 
 development:
   <<: *default
   username: 
   password: 
-  database: mapknitter-dev
+  database: mapknitter_dev
 
 production:
   <<: *default
@@ -16,5 +17,6 @@ production:
 
 test:
   <<: *default
-  username: root
-  database: mapknitter-test
+  username:
+  password:
+  database: mapknitter_test

From 24bd1f7d72ab84ba694208a200f93246d4c8f5dd Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 16:08:14 -0300
Subject: [PATCH 071/152] Adding missing listen gem

---
 Gemfile      | 1 +
 Gemfile.lock | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Gemfile b/Gemfile
index 56c5407ab..80850b6bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ group :dependencies do
   gem 'RubyInline', '~> 3.12.4'
   gem 'paperclip'
   gem 'bootsnap', '~> 1.4.4'
+  gem 'listen', '~> 3.1.5'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 67c5269bc..2e0ddefce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,6 +100,10 @@ GEM
     json (1.8.6)
     libv8 (3.16.14.19)
     libxml-ruby (3.1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -216,6 +220,7 @@ GEM
       ruby-openid (>= 2.1.7)
     ruby-prof (0.18.0)
     ruby-progressbar (1.10.1)
+    ruby_dep (1.5.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -292,6 +297,7 @@ DEPENDENCIES
   image_science (= 1.3.0)
   jquery-rails
   jshintrb (~> 0.3.0)
+  listen (~> 3.1.5)
   minitest
   minitest-reporters
   mysql2 (< 0.6)

From e60bb8357e1a39994ac4ec278d10bb9c3dbe0cac Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 16:09:01 -0300
Subject: [PATCH 072/152] Fixing schema example version

---
 db/schema.rb         |   2 +-
 db/schema.rb.example | 223 ++++++++++++++++++++++---------------------
 2 files changed, 113 insertions(+), 112 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 4772d9b03..220d6e9d8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -158,4 +158,4 @@
     t.text     "body",        limit: 65535
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/schema.rb.example b/db/schema.rb.example
index 6a46422dd..220d6e9d8 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -9,152 +9,153 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150715162314) do
+ActiveRecord::Schema.define(version: 20190420025012) do
 
-  create_table "annotations", :force => true do |t|
-    t.integer  "map_id"
-    t.integer  "user_id"
-    t.string   "annotation_type"
-    t.string   "text"
-    t.string   "style"
-    t.string   "coordinates"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+  create_table "annotations", force: :cascade do |t|
+    t.integer  "map_id",          limit: 4
+    t.integer  "user_id",         limit: 4
+    t.string   "annotation_type", limit: 255
+    t.string   "text",            limit: 255
+    t.string   "style",           limit: 255
+    t.string   "coordinates",     limit: 255
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
   end
 
-  create_table "comments", :force => true do |t|
-    t.string   "user_id"
-    t.string   "body"
-    t.integer  "map_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "comments", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "body",       limit: 255
+    t.integer  "map_id",     limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
-  create_table "exports", :force => true do |t|
-    t.integer  "map_id",       :default => 0
-    t.integer  "size",         :default => 0
-    t.integer  "width",        :default => 0
-    t.integer  "height",       :default => 0
-    t.float    "cm_per_pixel", :default => 0.0
-    t.string   "status",       :default => "none"
-    t.boolean  "tms",          :default => false
-    t.boolean  "jpg",          :default => false
-    t.boolean  "geotiff",      :default => false
+  create_table "exports", force: :cascade do |t|
+    t.integer  "map_id",       limit: 4,     default: 0
+    t.integer  "size",         limit: 4,     default: 0
+    t.integer  "width",        limit: 4,     default: 0
+    t.integer  "height",       limit: 4,     default: 0
+    t.float    "cm_per_pixel", limit: 24,    default: 0.0
+    t.string   "status",       limit: 255,   default: "none"
+    t.boolean  "tms",                        default: false
+    t.boolean  "jpg",                        default: false
+    t.boolean  "geotiff",                    default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "zip",          :default => false,    :null => false
-    t.text     "bands_string",                       :null => false
-    t.string   "export_type",  :default => "normal", :null => false
-    t.integer  "user_id",      :default => 0
+    t.boolean  "zip",                        default: false,    null: false
+    t.text     "bands_string", limit: 65535,                    null: false
+    t.string   "export_type",  limit: 255,   default: "normal", null: false
+    t.integer  "user_id",      limit: 4,     default: 0
+    t.string   "export_url",   limit: 255
   end
 
-  create_table "maps", :force => true do |t|
-    t.string   "name",                                             :default => ""
-    t.decimal  "lat",              :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",              :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "version",                                          :default => 1
-    t.string   "password",                                         :default => ""
-    t.text     "styles"
+  create_table "maps", force: :cascade do |t|
+    t.string   "name",             limit: 255,                             default: ""
+    t.decimal  "lat",                            precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                            precision: 20, scale: 10, default: 0.0
+    t.integer  "version",          limit: 4,                               default: 1
+    t.string   "password",         limit: 255,                             default: ""
+    t.text     "styles",           limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "description"
-    t.string   "author",                                           :default => "anonymous"
-    t.decimal  "zoom",             :precision => 15, :scale => 10, :default => 2.0
-    t.string   "location",                                         :default => ""
-    t.string   "static_data",                                      :default => ""
-    t.boolean  "vectors",                                          :default => false,       :null => false
-    t.string   "tiles",                                            :default => "google",    :null => false
-    t.string   "email",                                            :default => "",          :null => false
-    t.boolean  "archived",                                         :default => false,       :null => false
-    t.text     "tile_url"
-    t.text     "tile_layer"
-    t.string   "license",                                          :default => "copyright"
-    t.integer  "user_id",                                          :default => 0
-    t.boolean  "anon_annotatable",                                 :default => false
-    t.string   "slug"
+    t.text     "description",      limit: 65535
+    t.string   "author",           limit: 255,                             default: "anonymous"
+    t.decimal  "zoom",                           precision: 15, scale: 10, default: 2.0
+    t.string   "location",         limit: 255,                             default: ""
+    t.string   "static_data",      limit: 255,                             default: ""
+    t.boolean  "vectors",                                                  default: false,       null: false
+    t.string   "tiles",            limit: 255,                             default: "google",    null: false
+    t.string   "email",            limit: 255,                             default: "",          null: false
+    t.boolean  "archived",                                                 default: false,       null: false
+    t.text     "tile_url",         limit: 65535
+    t.text     "tile_layer",       limit: 65535
+    t.string   "license",          limit: 255,                             default: "copyright"
+    t.integer  "user_id",          limit: 4,                               default: 0
+    t.boolean  "anon_annotatable",                                         default: false
+    t.string   "slug",             limit: 255
   end
 
-  add_index "maps", ["slug"], :name => "index_maps_on_slug", :unique => true
+  add_index "maps", ["slug"], name: "index_maps_on_slug", unique: true, using: :btree
 
-  create_table "nodes", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat",         :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",         :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "way_id",                                      :default => 0
-    t.integer  "order",                                       :default => 0
+  create_table "nodes", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat",                       precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                       precision: 20, scale: 10, default: 0.0
+    t.integer  "way_id",      limit: 4,                               default: 0
+    t.integer  "order",       limit: 4,                               default: 0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.integer  "map_id",                                      :default => 0
-    t.integer  "way_order",                                   :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.integer  "way_order",   limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
-  create_table "tags", :force => true do |t|
-    t.string   "user_id"
-    t.string   "name"
-    t.integer  "map_id"
-    t.integer  "warpable_id"
+  create_table "tags", force: :cascade do |t|
+    t.string   "user_id",     limit: 255
+    t.string   "name",        limit: 255
+    t.integer  "map_id",      limit: 4
+    t.integer  "warpable_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tags", ["map_id"], :name => "index_tags_on_map_id"
-  add_index "tags", ["user_id"], :name => "index_tags_on_user_id"
-  add_index "tags", ["warpable_id"], :name => "index_tags_on_warpable_id"
+  add_index "tags", ["map_id"], name: "index_tags_on_map_id", using: :btree
+  add_index "tags", ["user_id"], name: "index_tags_on_user_id", using: :btree
+  add_index "tags", ["warpable_id"], name: "index_tags_on_warpable_id", using: :btree
 
-  create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 40
-    t.string   "name",                      :limit => 100, :default => ""
-    t.string   "email",                     :limit => 100
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
-    t.string   "identity_url"
-    t.string   "role",                      :limit => 40,  :default => "basic"
+  create_table "users", force: :cascade do |t|
+    t.string   "login",                     limit: 40
+    t.string   "name",                      limit: 100, default: ""
+    t.string   "email",                     limit: 100
+    t.string   "crypted_password",          limit: 40
+    t.string   "salt",                      limit: 40
+    t.string   "identity_url",              limit: 255
+    t.string   "role",                      limit: 40,  default: "basic"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "remember_token",            :limit => 40
+    t.string   "remember_token",            limit: 40
     t.datetime "remember_token_expires_at"
   end
 
-  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
 
-  create_table "warpables", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "image_content_type"
-    t.string   "image_file_name"
-    t.string   "thumbnail"
-    t.integer  "image_file_size"
-    t.integer  "width"
-    t.integer  "height"
+  create_table "warpables", force: :cascade do |t|
+    t.integer  "parent_id",          limit: 4
+    t.string   "image_content_type", limit: 255
+    t.string   "image_file_name",    limit: 255
+    t.string   "thumbnail",          limit: 255
+    t.integer  "image_file_size",    limit: 4
+    t.integer  "width",              limit: 4
+    t.integer  "height",             limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "map_id",             :default => 0
-    t.string   "nodes",              :default => ""
-    t.boolean  "locked",             :default => false, :null => false
-    t.boolean  "deleted",            :default => false, :null => false
-    t.text     "history",                               :null => false
-    t.float    "cm_per_pixel",       :default => 0.0,   :null => false
+    t.integer  "map_id",             limit: 4,     default: 0
+    t.string   "nodes",              limit: 255,   default: ""
+    t.boolean  "locked",                           default: false, null: false
+    t.boolean  "deleted",                          default: false, null: false
+    t.text     "history",            limit: 65535,                 null: false
+    t.float    "cm_per_pixel",       limit: 24,    default: 0.0,   null: false
   end
 
-  create_table "ways", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lat2",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon2",        :precision => 20, :scale => 10, :default => 0.0
+  create_table "ways", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lat2",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon2",                      precision: 20, scale: 10, default: 0.0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.boolean  "complete",                                    :default => true
-    t.integer  "map_id",                                      :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.boolean  "complete",                                            default: true
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
-end
+end
\ No newline at end of file

From 6bedcc1b7c9a12d11de98a9fe0f477139a6062f4 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 13 Jun 2019 16:09:19 -0300
Subject: [PATCH 073/152] Fixing migration versions

---
 db/migrate/20090309034933_create_tweets.rb                      | 2 +-
 db/migrate/20090309220337_create_messages.rb                    | 2 +-
 db/migrate/20090323162902_add_message_id.rb                     | 2 +-
 db/migrate/20090605191716_create_nodes.rb                       | 2 +-
 db/migrate/20090605201606_create_ways.rb                        | 2 +-
 db/migrate/20090611170805_create_sms.rb                         | 2 +-
 db/migrate/20090611204112_add_name_desc_nodes_ways.rb           | 2 +-
 db/migrate/20090611205227_change_lat_lon_types.rb               | 2 +-
 db/migrate/20090612011846_add_way_complete.rb                   | 2 +-
 db/migrate/20091016214109_create_maps.rb                        | 2 +-
 db/migrate/20100301013330_create_warpables.rb                   | 2 +-
 db/migrate/20100306184916_add_map_id.rb                         | 2 +-
 db/migrate/20100308193343_add_map_description_author.rb         | 2 +-
 db/migrate/20100310191643_add_warper_data.rb                    | 2 +-
 db/migrate/20100316142953_zoom_to_float.rb                      | 2 +-
 db/migrate/20100330233734_add_location.rb                       | 2 +-
 db/migrate/20100404061203_add_warpable_lock.rb                  | 2 +-
 db/migrate/20100505153420_add_warpable_deleted.rb               | 2 +-
 db/migrate/20100531175725_create_warps.rb                       | 2 +-
 db/migrate/20100614190507_add_warp_map_id.rb                    | 2 +-
 db/migrate/20100709061039_add_static_data_maps.rb               | 2 +-
 db/migrate/20100731141421_add_warps_additional_fields.rb        | 2 +-
 db/migrate/20101014151404_add_vectors_tiles.rb                  | 2 +-
 db/migrate/20110701105813_change_map_tile_default.rb            | 2 +-
 db/migrate/20110813004143_change_map_vector_default.rb          | 2 +-
 ...0916060555_cleanup_knitter_add_map_archive_and_user_email.rb | 2 +-
 db/migrate/20111005211631_add_zip_warpable_res_history.rb       | 2 +-
 db/migrate/20111006153011_add_map_tile_url.rb                   | 2 +-
 db/migrate/20120104164144_add_export_type_bands.rb              | 2 +-
 db/migrate/20120229164021_add_license.rb                        | 2 +-
 db/migrate/20120525201148_create_users.rb                       | 2 +-
 db/migrate/20120525215158_add_user_role_default.rb              | 2 +-
 db/migrate/20120601185008_remove_identity_url_limit.rb          | 2 +-
 db/migrate/20120701165519_create_tags.rb                        | 2 +-
 db/migrate/20130113164917_add_node_map_id.rb                    | 2 +-
 db/migrate/20130124160539_add_way_order.rb                      | 2 +-
 db/migrate/20130128184718_add_node_and_way_body.rb              | 2 +-
 db/migrate/20130605202555_add_map_anonymously_annotatable.rb    | 2 +-
 db/migrate/20140811184901_add_tag_index.rb                      | 2 +-
 db/migrate/20140811185342_create_comments.rb                    | 2 +-
 db/migrate/20140902182631_create_annotations.rb                 | 2 +-
 db/migrate/20140902201706_rename_annotation_type.rb             | 2 +-
 db/migrate/20141103164503_change_warpable_columns.rb            | 2 +-
 db/migrate/20141104184417_change_openid_identity_urls.rb        | 2 +-
 db/migrate/20150117041411_add_slug_field_to_maps.rb             | 2 +-
 ...50117041704_move_current_values_in_map_name_to_slug_field.rb | 2 +-
 db/migrate/20150715162314_change_map_null.rb                    | 2 +-
 db/migrate/20190420025012_add_remote_url_to_exports.rb          | 2 +-
 48 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/db/migrate/20090309034933_create_tweets.rb b/db/migrate/20090309034933_create_tweets.rb
index 89acd7baf..15865229c 100644
--- a/db/migrate/20090309034933_create_tweets.rb
+++ b/db/migrate/20090309034933_create_tweets.rb
@@ -1,4 +1,4 @@
-class CreateTweets < ActiveRecord::Migration
+class CreateTweets < ActiveRecord::Migration[5.2]
   def self.up
     create_table :tweets do |t|
 
diff --git a/db/migrate/20090309220337_create_messages.rb b/db/migrate/20090309220337_create_messages.rb
index 5ddc555bd..3cb3848ec 100644
--- a/db/migrate/20090309220337_create_messages.rb
+++ b/db/migrate/20090309220337_create_messages.rb
@@ -1,4 +1,4 @@
-class CreateMessages < ActiveRecord::Migration
+class CreateMessages < ActiveRecord::Migration[5.2]
   def self.up
     create_table :messages do |t|
       t.string :author
diff --git a/db/migrate/20090323162902_add_message_id.rb b/db/migrate/20090323162902_add_message_id.rb
index 8588293c4..a7fd5882f 100644
--- a/db/migrate/20090323162902_add_message_id.rb
+++ b/db/migrate/20090323162902_add_message_id.rb
@@ -1,4 +1,4 @@
-class AddMessageId < ActiveRecord::Migration
+class AddMessageId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :keyvalues, :message_id, :integer, :default => 0
   end
diff --git a/db/migrate/20090605191716_create_nodes.rb b/db/migrate/20090605191716_create_nodes.rb
index ee0b41645..149b1fc18 100644
--- a/db/migrate/20090605191716_create_nodes.rb
+++ b/db/migrate/20090605191716_create_nodes.rb
@@ -1,4 +1,4 @@
-class CreateNodes < ActiveRecord::Migration
+class CreateNodes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :nodes do |t|
       t.string :color, :default => 'red'
diff --git a/db/migrate/20090605201606_create_ways.rb b/db/migrate/20090605201606_create_ways.rb
index f2f97ea19..72111b1b1 100644
--- a/db/migrate/20090605201606_create_ways.rb
+++ b/db/migrate/20090605201606_create_ways.rb
@@ -1,4 +1,4 @@
-class CreateWays < ActiveRecord::Migration
+class CreateWays < ActiveRecord::Migration[5.2]
   def self.up
     create_table :ways do |t|
       t.string :color, :default => 'red'
diff --git a/db/migrate/20090611170805_create_sms.rb b/db/migrate/20090611170805_create_sms.rb
index ffc9b50d8..d653a2269 100644
--- a/db/migrate/20090611170805_create_sms.rb
+++ b/db/migrate/20090611170805_create_sms.rb
@@ -1,4 +1,4 @@
-class CreateSms < ActiveRecord::Migration
+class CreateSms < ActiveRecord::Migration[5.2]
   def self.up
     # create_table "frontline_actions_triggers", :id => false, :force => true do |t|
     #   t.integer "action_id"
diff --git a/db/migrate/20090611204112_add_name_desc_nodes_ways.rb b/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
index 6b0f39950..7f09f57de 100644
--- a/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
+++ b/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
@@ -1,4 +1,4 @@
-class AddNameDescNodesWays < ActiveRecord::Migration
+class AddNameDescNodesWays < ActiveRecord::Migration[5.2]
   def self.up
     add_column :ways, :name, :string, :default => ""
     add_column :ways, :description, :string, :default => ""
diff --git a/db/migrate/20090611205227_change_lat_lon_types.rb b/db/migrate/20090611205227_change_lat_lon_types.rb
index f586e0b1c..952038a8e 100644
--- a/db/migrate/20090611205227_change_lat_lon_types.rb
+++ b/db/migrate/20090611205227_change_lat_lon_types.rb
@@ -1,4 +1,4 @@
-class ChangeLatLonTypes < ActiveRecord::Migration
+class ChangeLatLonTypes < ActiveRecord::Migration[5.2]
   def self.up
   	drop_table :ways
   	drop_table :nodes
diff --git a/db/migrate/20090612011846_add_way_complete.rb b/db/migrate/20090612011846_add_way_complete.rb
index 5ec563608..80f6708e3 100644
--- a/db/migrate/20090612011846_add_way_complete.rb
+++ b/db/migrate/20090612011846_add_way_complete.rb
@@ -1,4 +1,4 @@
-class AddWayComplete < ActiveRecord::Migration
+class AddWayComplete < ActiveRecord::Migration[5.2]
   def self.up
     add_column :ways, :complete, :boolean, :default => true
   end
diff --git a/db/migrate/20091016214109_create_maps.rb b/db/migrate/20091016214109_create_maps.rb
index d0dd25b39..55688a4ce 100644
--- a/db/migrate/20091016214109_create_maps.rb
+++ b/db/migrate/20091016214109_create_maps.rb
@@ -1,4 +1,4 @@
-class CreateMaps < ActiveRecord::Migration
+class CreateMaps < ActiveRecord::Migration[5.2]
   def self.up
     create_table :maps do |t|
       t.string :name, :default => ''
diff --git a/db/migrate/20100301013330_create_warpables.rb b/db/migrate/20100301013330_create_warpables.rb
index f0b157399..76d3acdde 100644
--- a/db/migrate/20100301013330_create_warpables.rb
+++ b/db/migrate/20100301013330_create_warpables.rb
@@ -1,4 +1,4 @@
-class CreateWarpables < ActiveRecord::Migration
+class CreateWarpables < ActiveRecord::Migration[5.2]
   def self.up
     create_table :warpables do |t|
       t.column :parent_id,  :integer
diff --git a/db/migrate/20100306184916_add_map_id.rb b/db/migrate/20100306184916_add_map_id.rb
index b4d92d8f8..1c585b638 100644
--- a/db/migrate/20100306184916_add_map_id.rb
+++ b/db/migrate/20100306184916_add_map_id.rb
@@ -1,4 +1,4 @@
-class AddMapId < ActiveRecord::Migration
+class AddMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :map_id, :integer, :default => 0
   end
diff --git a/db/migrate/20100308193343_add_map_description_author.rb b/db/migrate/20100308193343_add_map_description_author.rb
index aa963e37f..274c871dd 100644
--- a/db/migrate/20100308193343_add_map_description_author.rb
+++ b/db/migrate/20100308193343_add_map_description_author.rb
@@ -1,4 +1,4 @@
-class AddMapDescriptionAuthor < ActiveRecord::Migration
+class AddMapDescriptionAuthor < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :description, :text, :default => ''
     add_column :maps, :author, :string, :default => 'anonymous'
diff --git a/db/migrate/20100310191643_add_warper_data.rb b/db/migrate/20100310191643_add_warper_data.rb
index f19115b8c..62611f85b 100644
--- a/db/migrate/20100310191643_add_warper_data.rb
+++ b/db/migrate/20100310191643_add_warper_data.rb
@@ -1,4 +1,4 @@
-class AddWarperData < ActiveRecord::Migration
+class AddWarperData < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :nodes, :string, :default => ''
   end
diff --git a/db/migrate/20100316142953_zoom_to_float.rb b/db/migrate/20100316142953_zoom_to_float.rb
index 05c9715a5..a3a0288b5 100644
--- a/db/migrate/20100316142953_zoom_to_float.rb
+++ b/db/migrate/20100316142953_zoom_to_float.rb
@@ -1,4 +1,4 @@
-class ZoomToFloat < ActiveRecord::Migration
+class ZoomToFloat < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :maps, :zoom
     add_column :maps, :zoom, :decimal, :precision => 15, :scale => 10,  :default => 2
diff --git a/db/migrate/20100330233734_add_location.rb b/db/migrate/20100330233734_add_location.rb
index efd42ac0f..b9abc6996 100644
--- a/db/migrate/20100330233734_add_location.rb
+++ b/db/migrate/20100330233734_add_location.rb
@@ -1,4 +1,4 @@
-class AddLocation < ActiveRecord::Migration
+class AddLocation < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :location, :string, :default => ''
   end
diff --git a/db/migrate/20100404061203_add_warpable_lock.rb b/db/migrate/20100404061203_add_warpable_lock.rb
index 9d1dac195..434629939 100644
--- a/db/migrate/20100404061203_add_warpable_lock.rb
+++ b/db/migrate/20100404061203_add_warpable_lock.rb
@@ -1,4 +1,4 @@
-class AddWarpableLock < ActiveRecord::Migration
+class AddWarpableLock < ActiveRecord::Migration[5.2]
   def self.up 
     add_column :warpables, :locked, :boolean, :default => false, :null => false
   end
diff --git a/db/migrate/20100505153420_add_warpable_deleted.rb b/db/migrate/20100505153420_add_warpable_deleted.rb
index 47d5de9e6..e865431ba 100644
--- a/db/migrate/20100505153420_add_warpable_deleted.rb
+++ b/db/migrate/20100505153420_add_warpable_deleted.rb
@@ -1,4 +1,4 @@
-class AddWarpableDeleted < ActiveRecord::Migration
+class AddWarpableDeleted < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :deleted, :boolean, :default => false, :null => false
   end
diff --git a/db/migrate/20100531175725_create_warps.rb b/db/migrate/20100531175725_create_warps.rb
index faada095d..ae8f5d1fd 100644
--- a/db/migrate/20100531175725_create_warps.rb
+++ b/db/migrate/20100531175725_create_warps.rb
@@ -1,4 +1,4 @@
-class CreateWarps < ActiveRecord::Migration
+class CreateWarps < ActiveRecord::Migration[5.2]
   def self.up
     create_table :warps do |t|
       t.integer :parent_id
diff --git a/db/migrate/20100614190507_add_warp_map_id.rb b/db/migrate/20100614190507_add_warp_map_id.rb
index 9f3a5e2f8..fd90481ae 100644
--- a/db/migrate/20100614190507_add_warp_map_id.rb
+++ b/db/migrate/20100614190507_add_warp_map_id.rb
@@ -1,4 +1,4 @@
-class AddWarpMapId < ActiveRecord::Migration
+class AddWarpMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warps, :map_id, :integer, :default => 0, :null => false
     add_column :warps, :warpable_id, :integer, :default => 0, :null => false
diff --git a/db/migrate/20100709061039_add_static_data_maps.rb b/db/migrate/20100709061039_add_static_data_maps.rb
index b033cda3b..162e6a7b8 100644
--- a/db/migrate/20100709061039_add_static_data_maps.rb
+++ b/db/migrate/20100709061039_add_static_data_maps.rb
@@ -1,4 +1,4 @@
-class AddStaticDataMaps < ActiveRecord::Migration
+class AddStaticDataMaps < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :static_data, :string, :default => ''
   end
diff --git a/db/migrate/20100731141421_add_warps_additional_fields.rb b/db/migrate/20100731141421_add_warps_additional_fields.rb
index b4d8cfcb0..82429d2ba 100644
--- a/db/migrate/20100731141421_add_warps_additional_fields.rb
+++ b/db/migrate/20100731141421_add_warps_additional_fields.rb
@@ -1,4 +1,4 @@
-class AddWarpsAdditionalFields < ActiveRecord::Migration
+class AddWarpsAdditionalFields < ActiveRecord::Migration[5.2]
   def self.up
     drop_table :warps
     create_table :exports do |t|
diff --git a/db/migrate/20101014151404_add_vectors_tiles.rb b/db/migrate/20101014151404_add_vectors_tiles.rb
index d29cc1d1e..c1726b58d 100644
--- a/db/migrate/20101014151404_add_vectors_tiles.rb
+++ b/db/migrate/20101014151404_add_vectors_tiles.rb
@@ -1,4 +1,4 @@
-class AddVectorsTiles < ActiveRecord::Migration
+class AddVectorsTiles < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :vectors, :boolean, :default => true, :null => false
     add_column :maps, :tiles, :string, :default => '', :null => false
diff --git a/db/migrate/20110701105813_change_map_tile_default.rb b/db/migrate/20110701105813_change_map_tile_default.rb
index c4cfb0680..c5cde0963 100644
--- a/db/migrate/20110701105813_change_map_tile_default.rb
+++ b/db/migrate/20110701105813_change_map_tile_default.rb
@@ -1,4 +1,4 @@
-class ChangeMapTileDefault < ActiveRecord::Migration
+class ChangeMapTileDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:maps, :tiles, "google")
   end
diff --git a/db/migrate/20110813004143_change_map_vector_default.rb b/db/migrate/20110813004143_change_map_vector_default.rb
index 24233c365..d9bd6cfbd 100644
--- a/db/migrate/20110813004143_change_map_vector_default.rb
+++ b/db/migrate/20110813004143_change_map_vector_default.rb
@@ -1,4 +1,4 @@
-class ChangeMapVectorDefault < ActiveRecord::Migration
+class ChangeMapVectorDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:maps, :vectors, false)
   end
diff --git a/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb b/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
index 66929045d..6ee14a666 100644
--- a/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
+++ b/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
@@ -1,4 +1,4 @@
-class CleanupKnitterAddMapArchiveAndUserEmail < ActiveRecord::Migration
+class CleanupKnitterAddMapArchiveAndUserEmail < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :email, :string, :default => "", :null => false
     add_column :maps, :archived, :boolean, :default => false, :null => false
diff --git a/db/migrate/20111005211631_add_zip_warpable_res_history.rb b/db/migrate/20111005211631_add_zip_warpable_res_history.rb
index 3aa796b1e..eb2520cca 100644
--- a/db/migrate/20111005211631_add_zip_warpable_res_history.rb
+++ b/db/migrate/20111005211631_add_zip_warpable_res_history.rb
@@ -1,4 +1,4 @@
-class AddZipWarpableResHistory < ActiveRecord::Migration
+class AddZipWarpableResHistory < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :history, :text, :default => "", :null => false
     add_column :warpables, :cm_per_pixel, :float, :default => 0, :null => false
diff --git a/db/migrate/20111006153011_add_map_tile_url.rb b/db/migrate/20111006153011_add_map_tile_url.rb
index b915968f0..2034f0f96 100644
--- a/db/migrate/20111006153011_add_map_tile_url.rb
+++ b/db/migrate/20111006153011_add_map_tile_url.rb
@@ -1,4 +1,4 @@
-class AddMapTileUrl < ActiveRecord::Migration
+class AddMapTileUrl < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :tile_url, :text, :default => "", :null => false
     add_column :maps, :tile_layer, :text, :default => "", :null => false
diff --git a/db/migrate/20120104164144_add_export_type_bands.rb b/db/migrate/20120104164144_add_export_type_bands.rb
index 199bd4107..572efea6c 100644
--- a/db/migrate/20120104164144_add_export_type_bands.rb
+++ b/db/migrate/20120104164144_add_export_type_bands.rb
@@ -1,4 +1,4 @@
-class AddExportTypeBands < ActiveRecord::Migration
+class AddExportTypeBands < ActiveRecord::Migration[5.2]
   def self.up
     add_column :exports, :bands_string, :text, :default => "", :null => false
     add_column :exports, :export_type, :string, :default => "normal", :null => false
diff --git a/db/migrate/20120229164021_add_license.rb b/db/migrate/20120229164021_add_license.rb
index 878d4e257..264ee34dc 100644
--- a/db/migrate/20120229164021_add_license.rb
+++ b/db/migrate/20120229164021_add_license.rb
@@ -1,4 +1,4 @@
-class AddLicense < ActiveRecord::Migration
+class AddLicense < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :license, :string, :default => 'copyright'
   end
diff --git a/db/migrate/20120525201148_create_users.rb b/db/migrate/20120525201148_create_users.rb
index e4f11da29..5ff54a0b0 100644
--- a/db/migrate/20120525201148_create_users.rb
+++ b/db/migrate/20120525201148_create_users.rb
@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[5.2]
   def self.up
     create_table "users", :force => true do |t|
       t.string   :login,                     :limit => 40
diff --git a/db/migrate/20120525215158_add_user_role_default.rb b/db/migrate/20120525215158_add_user_role_default.rb
index 637b26eb7..cf41cb86a 100644
--- a/db/migrate/20120525215158_add_user_role_default.rb
+++ b/db/migrate/20120525215158_add_user_role_default.rb
@@ -1,4 +1,4 @@
-class AddUserRoleDefault < ActiveRecord::Migration
+class AddUserRoleDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:users, :role, "basic")
   end
diff --git a/db/migrate/20120601185008_remove_identity_url_limit.rb b/db/migrate/20120601185008_remove_identity_url_limit.rb
index 9d558b49b..822e21f2c 100644
--- a/db/migrate/20120601185008_remove_identity_url_limit.rb
+++ b/db/migrate/20120601185008_remove_identity_url_limit.rb
@@ -1,4 +1,4 @@
-class RemoveIdentityUrlLimit < ActiveRecord::Migration
+class RemoveIdentityUrlLimit < ActiveRecord::Migration[5.2]
   def self.up
     change_column :users, :identity_url, :string, :limit => 255
   end
diff --git a/db/migrate/20120701165519_create_tags.rb b/db/migrate/20120701165519_create_tags.rb
index c2938bba2..37c7467ec 100644
--- a/db/migrate/20120701165519_create_tags.rb
+++ b/db/migrate/20120701165519_create_tags.rb
@@ -1,4 +1,4 @@
-class CreateTags < ActiveRecord::Migration
+class CreateTags < ActiveRecord::Migration[5.2]
   def self.up
     create_table :tags do |t|
       t.string :user_id
diff --git a/db/migrate/20130113164917_add_node_map_id.rb b/db/migrate/20130113164917_add_node_map_id.rb
index 63eb584d6..6058876f8 100644
--- a/db/migrate/20130113164917_add_node_map_id.rb
+++ b/db/migrate/20130113164917_add_node_map_id.rb
@@ -1,4 +1,4 @@
-class AddNodeMapId < ActiveRecord::Migration
+class AddNodeMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :map_id, :integer, :default => 0
     add_column :ways, :map_id, :integer, :default => 0
diff --git a/db/migrate/20130124160539_add_way_order.rb b/db/migrate/20130124160539_add_way_order.rb
index 8d084d6a8..afd989761 100644
--- a/db/migrate/20130124160539_add_way_order.rb
+++ b/db/migrate/20130124160539_add_way_order.rb
@@ -1,4 +1,4 @@
-class AddWayOrder < ActiveRecord::Migration
+class AddWayOrder < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :way_order, :integer, :default => 0
   end
diff --git a/db/migrate/20130128184718_add_node_and_way_body.rb b/db/migrate/20130128184718_add_node_and_way_body.rb
index 7a0d13070..dd91eb697 100644
--- a/db/migrate/20130128184718_add_node_and_way_body.rb
+++ b/db/migrate/20130128184718_add_node_and_way_body.rb
@@ -1,4 +1,4 @@
-class AddNodeAndWayBody < ActiveRecord::Migration
+class AddNodeAndWayBody < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :body, :text
     add_column :ways, :body, :text
diff --git a/db/migrate/20130605202555_add_map_anonymously_annotatable.rb b/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
index ef5f01f23..37a2906bb 100644
--- a/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
+++ b/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
@@ -1,4 +1,4 @@
-class AddMapAnonymouslyAnnotatable < ActiveRecord::Migration
+class AddMapAnonymouslyAnnotatable < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :anon_annotatable, :boolean, :default => false
   end
diff --git a/db/migrate/20140811184901_add_tag_index.rb b/db/migrate/20140811184901_add_tag_index.rb
index fbc6cff1e..28c273e09 100644
--- a/db/migrate/20140811184901_add_tag_index.rb
+++ b/db/migrate/20140811184901_add_tag_index.rb
@@ -1,4 +1,4 @@
-class AddTagIndex < ActiveRecord::Migration
+class AddTagIndex < ActiveRecord::Migration[5.2]
   def self.up
   	add_index :tags, :map_id
   	add_index :tags, :warpable_id
diff --git a/db/migrate/20140811185342_create_comments.rb b/db/migrate/20140811185342_create_comments.rb
index aea70043b..36a5b1fb9 100644
--- a/db/migrate/20140811185342_create_comments.rb
+++ b/db/migrate/20140811185342_create_comments.rb
@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[5.2]
   def self.up
     create_table :comments do |t|
       t.string :user_id
diff --git a/db/migrate/20140902182631_create_annotations.rb b/db/migrate/20140902182631_create_annotations.rb
index 0dbe8471e..9be8d2ea8 100644
--- a/db/migrate/20140902182631_create_annotations.rb
+++ b/db/migrate/20140902182631_create_annotations.rb
@@ -1,4 +1,4 @@
-class CreateAnnotations < ActiveRecord::Migration
+class CreateAnnotations < ActiveRecord::Migration[5.2]
   def self.up
     create_table :annotations do |t|
       t.integer :map_id
diff --git a/db/migrate/20140902201706_rename_annotation_type.rb b/db/migrate/20140902201706_rename_annotation_type.rb
index 26bd9bd3d..b657ff5eb 100644
--- a/db/migrate/20140902201706_rename_annotation_type.rb
+++ b/db/migrate/20140902201706_rename_annotation_type.rb
@@ -1,4 +1,4 @@
-class RenameAnnotationType < ActiveRecord::Migration
+class RenameAnnotationType < ActiveRecord::Migration[5.2]
   def self.up
     rename_column :annotations, :type, :annotation_type
   end
diff --git a/db/migrate/20141103164503_change_warpable_columns.rb b/db/migrate/20141103164503_change_warpable_columns.rb
index aa22ccff0..dd9d97d0c 100644
--- a/db/migrate/20141103164503_change_warpable_columns.rb
+++ b/db/migrate/20141103164503_change_warpable_columns.rb
@@ -1,4 +1,4 @@
-class ChangeWarpableColumns < ActiveRecord::Migration
+class ChangeWarpableColumns < ActiveRecord::Migration[5.2]
   def up
     rename_column(:warpables, :filename, :image_file_name)
     rename_column(:warpables, :content_type, :image_content_type)
diff --git a/db/migrate/20141104184417_change_openid_identity_urls.rb b/db/migrate/20141104184417_change_openid_identity_urls.rb
index 941426cc9..b079ffce8 100644
--- a/db/migrate/20141104184417_change_openid_identity_urls.rb
+++ b/db/migrate/20141104184417_change_openid_identity_urls.rb
@@ -1,4 +1,4 @@
-class ChangeOpenidIdentityUrls < ActiveRecord::Migration
+class ChangeOpenidIdentityUrls < ActiveRecord::Migration[5.2]
   def up
 
     users = User.find :all
diff --git a/db/migrate/20150117041411_add_slug_field_to_maps.rb b/db/migrate/20150117041411_add_slug_field_to_maps.rb
index 023037296..4cd5072a8 100644
--- a/db/migrate/20150117041411_add_slug_field_to_maps.rb
+++ b/db/migrate/20150117041411_add_slug_field_to_maps.rb
@@ -1,4 +1,4 @@
-class AddSlugFieldToMaps < ActiveRecord::Migration
+class AddSlugFieldToMaps < ActiveRecord::Migration[5.2]
   def change
     # There are some duplicate maps, but none have images, so we can delete dupes that don't have images. 
     dupes = []
diff --git a/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb b/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
index 5b3ad170a..6bb1a01a2 100644
--- a/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
+++ b/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
@@ -1,4 +1,4 @@
-class MoveCurrentValuesInMapNameToSlugField < ActiveRecord::Migration
+class MoveCurrentValuesInMapNameToSlugField < ActiveRecord::Migration[5.2]
   def up
   	execute "UPDATE maps m SET m.slug = m.name"
   end
diff --git a/db/migrate/20150715162314_change_map_null.rb b/db/migrate/20150715162314_change_map_null.rb
index 1ddd7e990..c4d25fec9 100644
--- a/db/migrate/20150715162314_change_map_null.rb
+++ b/db/migrate/20150715162314_change_map_null.rb
@@ -1,4 +1,4 @@
-class ChangeMapNull < ActiveRecord::Migration
+class ChangeMapNull < ActiveRecord::Migration[5.2]
   def up
     change_column_null :maps, :tile_url,   true
     change_column_null :maps, :tile_layer, true
diff --git a/db/migrate/20190420025012_add_remote_url_to_exports.rb b/db/migrate/20190420025012_add_remote_url_to_exports.rb
index ac9a0bc68..53a1859a0 100644
--- a/db/migrate/20190420025012_add_remote_url_to_exports.rb
+++ b/db/migrate/20190420025012_add_remote_url_to_exports.rb
@@ -1,4 +1,4 @@
-class AddRemoteUrlToExports < ActiveRecord::Migration
+class AddRemoteUrlToExports < ActiveRecord::Migration[5.2]
   def change
     add_column :exports, :export_url, :string
   end

From 2c746c154aea8ee2139720f7f6d1d9207d561454 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 16:57:39 -0300
Subject: [PATCH 074/152] Updating dependencies for Rails 5

---
 Gemfile      | 13 +++++++++----
 Gemfile.lock | 35 ++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 80850b6bb..82cd099ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ group :dependencies do
   gem 'RubyInline', '~> 3.12.4'
   gem 'paperclip'
   gem 'bootsnap', '~> 1.4.4'
-  gem 'listen', '~> 3.1.5'
+  gem 'turbolinks', '~> 5'
+  gem 'mini_magick', '~> 4.8'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
@@ -50,6 +51,7 @@ group :test do
   gem 'rubocop', '~> 0.52.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
   gem 'minitest'
@@ -57,20 +59,23 @@ group :test do
 end
 
 group :development, :test do
-  gem 'byebug', '~> 11.0.1'
+  gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
   gem 'faker', '~> 1.9.3'
   gem 'pry-rails', '~> 0.3.9'
 end
 
 group :development do
   gem 'jshintrb', '~> 0.3.0'
-  gem 'therubyracer', '~> 0.12.3'
+  gem 'mini_racer', platforms: :ruby
+  gem 'listen', '~> 3.1.5'
   gem 'web-console', '~> 2.0'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :sqlite do
   # if you decide to use sqlite3 as the database
-  gem 'sqlite3'
+  # gem 'sqlite3'
 end
 
 group :passenger do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e0ddefce..cf7b7daa7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
-    jquery-rails (4.3.3)
+    jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -98,7 +98,7 @@ GEM
       multi_json (>= 1.3)
       rake
     json (1.8.6)
-    libv8 (3.16.14.19)
+    libv8 (7.3.492.27.1)
     libxml-ruby (3.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -116,8 +116,11 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mimemagic (0.3.3)
+    mini_magick (4.9.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
+    mini_racer (0.2.6)
+      libv8 (>= 6.9.411)
     minitest (5.11.3)
     minitest-reporters (1.3.6)
       ansi
@@ -177,6 +180,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -198,7 +205,6 @@ GEM
     recaptcha (4.14.0)
       json
     redcarpet (3.4.0)
-    ref (2.0.0)
     right_aws_api (0.3.5)
       right_cloud_api_base (>= 0.2.6)
     right_cloud_api_base (0.2.6)
@@ -229,7 +235,7 @@ GEM
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
-    sassc-rails (2.1.1)
+    sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
@@ -246,6 +252,10 @@ GEM
       skylight-core (= 4.0.2)
     skylight-core (4.0.2)
       activesupport (>= 4.2.0)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -253,15 +263,14 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
+    turbolinks (5.2.0)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -298,6 +307,8 @@ DEPENDENCIES
   jquery-rails
   jshintrb (~> 0.3.0)
   listen (~> 3.1.5)
+  mini_magick (~> 4.8)
+  mini_racer
   minitest
   minitest-reporters
   mysql2 (< 0.6)
@@ -308,6 +319,7 @@ DEPENDENCIES
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
   rails (~> 5.2.3)
+  rails-controller-testing
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
@@ -321,10 +333,11 @@ DEPENDENCIES
   simplecov
   simplecov-cobertura
   skylight (~> 4.0.2)
+  spring
+  spring-watcher-listen (~> 2.0.0)
   sprockets (= 3.7.2)
   sprockets-rails
-  sqlite3
-  therubyracer (~> 0.12.3)
+  turbolinks (~> 5)
   uglifier (~> 4.1.20)
   web-console (~> 2.0)
   will_paginate (= 3.1.7)
@@ -334,4 +347,4 @@ RUBY VERSION
    ruby 2.4.6p354
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

From 88b3c8a88dd1bcf2ae105fd1f79a6d2be5c096af Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 17:00:58 -0300
Subject: [PATCH 075/152] Adding ApplicationMailer abstraction

---
 app/mailers/application_mailer.rb | 5 +++++
 app/mailers/comment_mailer.rb     | 2 +-
 app/views/layouts/mailer.html.erb | 8 ++++++++
 app/views/layouts/mailer.text.erb | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 000000000..da892a160
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,5 @@
+class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+ end
+  
\ No newline at end of file
diff --git a/app/mailers/comment_mailer.rb b/app/mailers/comment_mailer.rb
index cb369928a..7a4e0902b 100644
--- a/app/mailers/comment_mailer.rb
+++ b/app/mailers/comment_mailer.rb
@@ -1,4 +1,4 @@
-class CommentMailer < ActionMailer::Base
+class CommentMailer < ApplicationMailer
   default from: "do-not-reply@mapknitter.org"
 
   # CommentMailer.notify_of_comment(user,self).deliver
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 000000000..cb2589829
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>/* Email styles need to be inline */</style>
+  </head>
+  <body><%= yield %></body>
+</html>
\ No newline at end of file
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 000000000..cd9bb66dd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
\ No newline at end of file

From 17f8e8839b11c643404bcc7284e950bda5b5f399 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 17:01:39 -0300
Subject: [PATCH 076/152] Adding required initializers

---
 .../active_record_belongs_to_required_by_default.rb         | 1 +
 config/spring.rb                                            | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 config/initializers/active_record_belongs_to_required_by_default.rb
 create mode 100644 config/spring.rb

diff --git a/config/initializers/active_record_belongs_to_required_by_default.rb b/config/initializers/active_record_belongs_to_required_by_default.rb
new file mode 100644
index 000000000..16e252ab8
--- /dev/null
+++ b/config/initializers/active_record_belongs_to_required_by_default.rb
@@ -0,0 +1 @@
+Rails.application.config.active_record.belongs_to_required_by_default = true
\ No newline at end of file
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..b54a862a0
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }
\ No newline at end of file

From 463fd8dff135250ec996d3de20e3b98a148c8b89 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 17:04:04 -0300
Subject: [PATCH 077/152] Prefer require_relative instead of full path

---
 Rakefile              | 4 ++--
 config.ru             | 2 +-
 config/application.rb | 4 ++--
 test/test_helper.rb   | 8 ++------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Rakefile b/Rakefile
index ffd116932..b3fe3d210 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 # Load all the rake tasks from the "tasks" folder.
 task_dir = File.expand_path("../tasks", __FILE__)
@@ -9,4 +9,4 @@ Dir["#{task_dir}/**/*.rake"].each do |task_file|
   load task_file
 end
 
-Mapknitter::Application.load_tasks
\ No newline at end of file
+Rails.application.load_tasks
\ No newline at end of file
diff --git a/config.ru b/config.ru
index 2b2ae190a..afac488a9 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
 run Mapknitter::Application
diff --git a/config/application.rb b/config/application.rb
index 6dc5a2ea1..653e04541 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
@@ -27,7 +27,7 @@ class Application < Rails::Application
     config.encoding = "utf-8"
 
      # Initialize configuration defaults for originally generated Rails version.
-     config.load_defaults 5.0
+     config.load_defaults 5.2
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1f2772a72..6566a735f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,8 +1,8 @@
 
+require_relative '../config/environment'
+require 'rails/test_help'
 require 'simplecov'
 require 'simplecov-cobertura'
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
 require 'minitest/reporters'
 MiniTest::Reporters.use! [MiniTest::Reporters::ProgressReporter.new,
                           MiniTest::Reporters::JUnitReporter.new]
@@ -10,11 +10,7 @@
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
   fixtures :all
-
   # Add more helper methods to be used by all tests here...
   include ApplicationHelper
 end

From 154f8b5dba41641275d079d265f35f499d0f1d06 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 17:08:56 -0300
Subject: [PATCH 078/152] Making associations not required by default

---
 app/models/annotation.rb           | 4 ++--
 app/models/comment.rb              | 4 ++--
 app/models/export.rb               | 6 +++---
 app/models/map.rb                  | 2 +-
 app/models/node.rb                 | 2 +-
 app/models/tag.rb                  | 4 ++--
 app/models/warpable.rb             | 4 ++--
 config/database.yml.example        | 1 +
 config/environments/development.rb | 2 ++
 9 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 3cbf385ce..800357a33 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,7 +1,7 @@
 class Annotation < ApplicationRecord
   include ActiveModel::MassAssignmentSecurity
-  belongs_to :map
-  belongs_to :user
+  belongs_to :map, optional: true
+  belongs_to :user,optional: true
 
   attr_accessible :annotation_type, :coordinates, :text, :style
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 2d6059a71..a7a327bc3 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,6 +1,6 @@
 class Comment < ApplicationRecord
-  belongs_to :map
-  belongs_to :user
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   validates_presence_of :body, :user_id, :map_id
 
diff --git a/app/models/export.rb b/app/models/export.rb
index 94fbce007..7ab3431d0 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -1,6 +1,6 @@
-class Export < ActiveRecord::Base
-  belongs_to :map
-  belongs_to :user
+class Export < ApplicationRecord
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   # currently exporting?
   def running?
diff --git a/app/models/map.rb b/app/models/map.rb
index 6d5a78fa0..ebc3568b9 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -20,7 +20,7 @@ class Map < ApplicationRecord
   has_many :tags, dependent: :destroy
   has_many :comments, dependent: :destroy
   has_many :annotations, dependent: :destroy
-  belongs_to :user
+  belongs_to :user, optional: true
 
   has_many :warpables
   scope :active, -> { where(archived: false) }
diff --git a/app/models/node.rb b/app/models/node.rb
index 3aac4abce..85f7777db 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,3 +1,3 @@
 class Node < ApplicationRecord
-  belongs_to :way
+  belongs_to :way, optional: true
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f465b4b25..2a298824e 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,6 +1,6 @@
 class Tag < ApplicationRecord
-  belongs_to :map
-  belongs_to :user
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   validates_presence_of :name, on: :create, message: "can't be blank"
   validates_presence_of :user_id, on: :create, message: "can't be blank"
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 2740861e6..5631086b7 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -15,8 +15,8 @@ class Warpable < ApplicationRecord
 
   validates_attachment_content_type :image, content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"]
 
-  belongs_to :map
-  belongs_to :user
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   # overriding JSON formatting for Leaflet.DistortableImage
   def as_json(options = {})
diff --git a/config/database.yml.example b/config/database.yml.example
index f4b84d743..5433ddd5b 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -2,6 +2,7 @@ default: &default
   encoding: utf8
   adapter: mysql2
   host: 127.0.0.1
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
 
 development:
   <<: *default
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 57a39dea5..d4ca60dce 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -30,6 +30,8 @@
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local
 
+  config.action_mailer.perform_caching = false
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 

From bccec1bdba854e3da12ef1f751a1df390659c868 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 17:55:11 -0300
Subject: [PATCH 079/152] Regenerating schema file

---
 .travis.yml                              | 18 +++++----
 Gemfile.lock                             |  2 +
 app/models/warpable.rb                   |  8 +++-
 config/initializers/column_definition.rb | 14 +++----
 config/initializers/duration.rb          | 48 ------------------------
 5 files changed, 26 insertions(+), 64 deletions(-)
 delete mode 100644 config/initializers/duration.rb

diff --git a/.travis.yml b/.travis.yml
index b2e46256f..37712e06e 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,12 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - mysql -e "CREATE DATABASE mapknitter; CREATE DATABASE mapknitter_test;"
+  - mysql -e "CREATE DATABASE mapknitter_dev; CREATE DATABASE mapknitter_test;"
+  - rails db:create
   - if [ $RAILS_ENV == 'production' ]; then
-      bundle exec rake db:schema:load;
+      bundle exec rails db:schema:load;
     else
-      bundle exec rake db:setup || bundle exec rake db:migrate;
+      bundle exec rails db:setup || bundle exec rails db:migrate;
     fi
 
 env:
@@ -30,14 +31,17 @@ env:
     - CI=true
     - TRAVIS=true
 
+# FIXME - Later change 'test/unit' and 'test/funcional' folders 
+# to 'test/unit' and 'test/funcional', respectively
+
 jobs:
   include:
     - name: "Unit Tests"
-      script: bundle exec rake test:unit
+      script: bundle exec rails test:unit
     - name: "Integration Tests"
-      script: bundle exec rake test:integration
+      script: bundle exec rails test:integration
     - name: "Functional Tests"
-      script: bundle exec rake test:functional
+      script: bundle exec rails test:functional
     - name: "Rubocop Linter"
       script: bundle exec rubocop
     - name: "Docker Builds"
@@ -45,7 +49,7 @@ jobs:
     - name: "Asset Precompilation"
       env:
         - RAILS_ENV=production
-      script: bundle exec rake assets:precompile
+      script: bundle exec rails assets:precompile
 
 branches:
   only:
diff --git a/Gemfile.lock b/Gemfile.lock
index cf7b7daa7..b4bb2c5d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -263,6 +263,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
@@ -337,6 +338,7 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   sprockets (= 3.7.2)
   sprockets-rails
+  sqlite3
   turbolinks (~> 5)
   uglifier (~> 4.1.20)
   web-console (~> 2.0)
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 5631086b7..88433dc39 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,6 +1,10 @@
 class Warpable < ApplicationRecord
-  include ActiveModel::MassAssignmentSecurity
-  attr_accessible :image
+
+  # FIXME - We should start using strong parameters here in favor of this below
+  # include ActiveModel::MassAssignmentSecurity
+  # attr_accessible :image
+
+  attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs
diff --git a/config/initializers/column_definition.rb b/config/initializers/column_definition.rb
index feca93639..501e955b1 100644
--- a/config/initializers/column_definition.rb
+++ b/config/initializers/column_definition.rb
@@ -11,15 +11,15 @@
 
 # or, alternatively, 
 
-# This can also be removed if DEFAULT NULL is removed from all columns;
-# Read more at https://github.com/publiclab/mapknitter/pull/323
+  # # This can also be removed if DEFAULT NULL is removed from all columns;
+  # # Read more at https://github.com/publiclab/mapknitter/pull/323
 
 class ActiveRecord::ConnectionAdapters::ColumnDefinition
 
-  if ActiveRecord::Base.connection.adapter_name != 'sqlite3' && ActiveRecord::Base.connection.adapter_name != 'SQLite'
-    def sql_type
-      type.to_sym == :primary_key ? 'int(11) auto_increment PRIMARY KEY' : base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
-    end 
-  end 
+  #   if ActiveRecord::Base.connection.adapter_name != 'sqlite3' && ActiveRecord::Base.connection.adapter_name != 'SQLite'
+  #     def sql_type
+  #       type.to_sym == :primary_key ? 'int(11) auto_increment PRIMARY KEY' : base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
+  #     end 
+  #   end 
 
 end
diff --git a/config/initializers/duration.rb b/config/initializers/duration.rb
deleted file mode 100644
index ac6e2f581..000000000
--- a/config/initializers/duration.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# this is a customization created to bridge incompatabilities when upgrading Ruby 2.1.2
-# to 2.4.4 with Rails 3.2. 
-
-# explanation
-# There's a fundamental asymmetry in how operators work in Ruby - 
-# `1 * 1.second` dispatches -> * on Integer. 
-# `1.second * 1` dispatches -> * on Duration -> throws error 'Duration can't be coerced into Integer'
-
-# the source code for Rails 3.2 puts duration second: https://github.com/rails/rails/blob/v3.2.22.5/activesupport/lib/active_support/core_ext/numeric/time.rb
-
-# the solution: the order of multiplication has to be swtiched, and Duration put first. 
-
-# this code can be removed with ActiveSupport v.5.0.3: https://github.com/rails/rails/blob/v5.0.3/activesupport/lib/active_support/core_ext/numeric/time.rb
-# (Rails 5)
-
-class Numeric
-  def days
-    ActiveSupport::Duration.new(24.hours * self, [[:days, self]])
-  end
-  alias :day :days
-
-  def weeks
-    ActiveSupport::Duration.new(7.days * self, [[:days, self * 7]])
-  end
-  alias :week :weeks
-
-  def fortnights
-    ActiveSupport::Duration.new(2.weeks * self, [[:days, self * 14]])
-  end
-  alias :fortnight :fortnights
-end
-
-# source code: https://github.com/rails/rails/blob/v3.2.22.5/activesupport/lib/active_support/core_ext/integer/time.rb
-
-# fixed as of ActiveSupport v.4.1.2 https://github.com/rails/rails/blob/v4.1.12/activesupport/lib/active_support/core_ext/integer/time.rb
-# (Rails 4)
-
-class Integer
-  def months
-    ActiveSupport::Duration.new(30.days * self, [[:months, self]])
-  end
-  alias :month :months
-
-  def years
-    ActiveSupport::Duration.new(365.25.days * self, [[:years, self]])
-  end
-  alias :year :years
-end
\ No newline at end of file

From f678d95ab3d2b45e122d5f1271d88a97d2f689f7 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 19 Jun 2019 18:08:47 -0300
Subject: [PATCH 080/152] Hotfixing MassAssigment

---
 app/models/annotation.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 800357a33..5c61b71cf 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,9 +1,11 @@
 class Annotation < ApplicationRecord
-  include ActiveModel::MassAssignmentSecurity
+  
+  # FIXME - We should start using strong parameters here in favor of this below  
+  # include ActiveModel::MassAssignmentSecurity
   belongs_to :map, optional: true
   belongs_to :user,optional: true
 
-  attr_accessible :annotation_type, :coordinates, :text, :style
+  attr_accessor :annotation_type, :coordinates, :text, :style
 
   serialize :coordinates, Array
   serialize :style, Hash

From f39d4683f9491cb9b3c24a4e2328a716949e50d8 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 20 Jun 2019 15:26:13 +0530
Subject: [PATCH 081/152] Upgrade web-console, remove mysql adapter override

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 16 +++++++--------
 app/controllers/annotations_controller.rb |  4 ++--
 app/controllers/application_controller.rb |  2 +-
 app/controllers/feeds_controller.rb       |  2 +-
 app/controllers/maps_controller.rb        |  4 ++--
 app/controllers/tags_controller.rb        |  2 +-
 config/initializers/column_definition.rb  | 25 -----------------------
 8 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100644 config/initializers/column_definition.rb

diff --git a/Gemfile b/Gemfile
index 80850b6bb..4573ec8fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ end
 group :development do
   gem 'jshintrb', '~> 0.3.0'
   gem 'therubyracer', '~> 0.12.3'
-  gem 'web-console', '~> 2.0'
+  gem 'web-console'
 end
 
 group :sqlite do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e0ddefce..046a8d3c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,8 +55,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
+    bindex (0.7.0)
     bootsnap (1.4.4)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
@@ -68,7 +67,6 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
-    debug_inspector (0.0.3)
     docile (1.3.2)
     erubi (1.8.0)
     execjs (2.7.0)
@@ -268,11 +266,11 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     uuidtools (2.1.5)
-    web-console (2.3.0)
-      activemodel (>= 4.0)
-      binding_of_caller (>= 0.7.2)
-      railties (>= 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -326,7 +324,7 @@ DEPENDENCIES
   sqlite3
   therubyracer (~> 0.12.3)
   uglifier (~> 4.1.20)
-  web-console (~> 2.0)
+  web-console
   will_paginate (= 3.1.7)
   will_paginate-bootstrap4 (~> 0.2.2)
 
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 88019d3f7..45c90b924 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -1,8 +1,8 @@
 require 'json'
 
 class AnnotationsController < ApplicationController
-  # before_filter :require_user, :except => [ :index, :show ]
-  before_filter :find_map
+  # before_action :require_user, :except => [ :index, :show ]
+  before_action :find_map
 
   def index
     render file: 'annotations/index.json.erb', content_type: 'application/json'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 06862c217..4d4bf7521 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
 
   helper :all # include all helpers, all the time
 
-  before_filter :current_user
+  before_action :current_user
   helper_method :logged_in?, :current_location
 
   def current_user
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 392051d23..12740d81e 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -1,5 +1,5 @@
 class FeedsController < ApplicationController
-  before_filter :query, only: %i(clean license)
+  before_action :query, only: %i(clean license)
 
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 66b2cbbc9..7fa9de0e4 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -3,8 +3,8 @@
 class MapsController < ApplicationController
   protect_from_forgery except: :export
 
-  before_filter :require_login, only: %i(edit update destroy)
-  before_filter :find_map, only: %i(show annotate embed edit update images destroy archive)
+  before_action :require_login, only: %i(edit update destroy)
+  before_action :find_map, only: %i(show annotate embed edit update images destroy archive)
 
   layout 'knitter2'
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index b3bf053c2..aeb1f937c 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,5 +1,5 @@
 class TagsController < ApplicationController
-  before_filter :require_login, only: %i(edit update destroy)
+  before_action :require_login, only: %i(edit update destroy)
 
   def create
     @map = Map.find_by(slug: params[:map_id])
diff --git a/config/initializers/column_definition.rb b/config/initializers/column_definition.rb
deleted file mode 100644
index feca93639..000000000
--- a/config/initializers/column_definition.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# prior to MySQL5.7, MySQL would silently convert a column that is part of a primary key and is
-# DEFAULT NULL into NOT NULL with a default value of 0 (non standard behavior and not a recommended 
-# practice) As of MySQL 5.7, this column is converted to NOT NULL, but without a default value, 
-# throwing an error.
-
-# the below customization both prevents that error and standardizes all of the DBs primary key data 
-# with a SQL compliant syntax. All the primary keys will be sequential numbers starting from 1. 
-
-# Plese keep in mind the compatability of this initializer with your db - if you do not want
-# all of your primary keys to be sequential numbers then you can customize this function further 
-
-# or, alternatively, 
-
-# This can also be removed if DEFAULT NULL is removed from all columns;
-# Read more at https://github.com/publiclab/mapknitter/pull/323
-
-class ActiveRecord::ConnectionAdapters::ColumnDefinition
-
-  if ActiveRecord::Base.connection.adapter_name != 'sqlite3' && ActiveRecord::Base.connection.adapter_name != 'SQLite'
-    def sql_type
-      type.to_sym == :primary_key ? 'int(11) auto_increment PRIMARY KEY' : base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
-    end 
-  end 
-
-end

From c1837f1115e68f499bc6277ae665cd0b093a3eee Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 20 Jun 2019 15:31:18 +0530
Subject: [PATCH 082/152] Remove attr_accessible

---
 app/models/annotation.rb | 3 +--
 app/models/user.rb       | 2 +-
 app/models/warpable.rb   | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 3cbf385ce..c81b6c2fc 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,9 +1,8 @@
 class Annotation < ApplicationRecord
-  include ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
-  attr_accessible :annotation_type, :coordinates, :text, :style
+  attr_accessor :annotation_type, :coordinates, :text, :style
 
   serialize :coordinates, Array
   serialize :style, Hash
diff --git a/app/models/user.rb b/app/models/user.rb
index 5d103aab6..060d1513a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ApplicationRecord
   validates_length_of       :email, within: 6..100 # r@a.wk
   validates_uniqueness_of   :email
 
-  # HACK: HACK HACK -- how to do attr_accessible from here?
+  # HACK: HACK HACK -- how to do attr_accessor from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
 
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 2740861e6..4a79f67fe 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,6 +1,5 @@
 class Warpable < ApplicationRecord
-  include ActiveModel::MassAssignmentSecurity
-  attr_accessible :image
+  attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs

From cfca3ce1d5c74f328f04cd471003085b8bb31012 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 20 Jun 2019 15:33:50 +0530
Subject: [PATCH 083/152] Add rails-controller-testing gem

---
 Gemfile      | 1 +
 Gemfile.lock | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 4573ec8fb..281f96bf8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,6 +50,7 @@ group :test do
   gem 'rubocop', '~> 0.52.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
   gem 'minitest'
diff --git a/Gemfile.lock b/Gemfile.lock
index 046a8d3c5..2c46188a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,6 +175,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -306,6 +310,7 @@ DEPENDENCIES
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
   rails (~> 5.2.3)
+  rails-controller-testing
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)

From 47ce35a9072a00fbb584844ecd80d25ea65019f1 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 20 Jun 2019 16:15:37 +0530
Subject: [PATCH 084/152] Follow new syntax for tests

---
 app/models/annotation.rb                      |  3 +
 .../functional/annotations_controller_test.rb |  8 +--
 test/functional/comments_controller_test.rb   | 48 ++++++++--------
 test/functional/export_controller_test.rb     | 22 ++++----
 test/functional/feeds_controller_test.rb      | 10 ++--
 test/functional/images_controller_test.rb     | 16 +++---
 test/functional/maps_controller_test.rb       | 55 ++++++++++---------
 test/functional/sessions_controller_test.rb   |  4 +-
 test/functional/tags_controller_test.rb       | 10 ++--
 test/functional/users_controller_test.rb      |  2 +-
 test/functional/utility_controller_test.rb    | 11 ++--
 11 files changed, 98 insertions(+), 91 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index c81b6c2fc..f99bad9c6 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,4 +1,7 @@
 class Annotation < ApplicationRecord
+
+  # FIXME - We should start using strong parameters here in favor of this below
+  # include ActiveModel::MassAssignmentSecurity
   belongs_to :map
   belongs_to :user
 
diff --git a/test/functional/annotations_controller_test.rb b/test/functional/annotations_controller_test.rb
index ea259ef1c..deec0dec7 100644
--- a/test/functional/annotations_controller_test.rb
+++ b/test/functional/annotations_controller_test.rb
@@ -15,14 +15,14 @@ def teardown; end
     session[:user_id] = 1
     post :create,
          format: :json,
-         map_id: 1,
+         params: {map_id: 1,
          annotation: {
            properties: {
              annotation_type: 'polyline',
              textContent: 'Some cool text'
            },
            geometry: { coordinates: [10, 33] }
-         }
+         }}
 
     @map.reload
     assert_response 302
@@ -34,14 +34,14 @@ def teardown; end
     before_count = @map.annotations.count
     post :create,
          format: :json,
-         map_id: 1,
+         params: { map_id: 1,
          annotation: {
            properties: {
              annotation_type: 'polyline',
              textContent: 'Some cool text'
            },
            geometry: { coordinates: [10, 33] }
-         }
+         }}
 
     @map.reload
     assert_response 302
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index b8dd69c39..c5142b18b 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -16,10 +16,10 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         map_id: @map.slug,
+         params: { map_id: @map.slug,
          comment: {
            user_id: 1
-         })
+         }})
 
     assert_response :success
     assert_equal before_count, Comment.count
@@ -30,10 +30,10 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert_not_equal before_count, Comment.count
@@ -45,11 +45,11 @@ def teardown
     session[:user_id] = 4
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         comment: {
           map_id: @map.id,
           body: "I'm gonna troll you!"
-        })
+        }})
 
     # refresh the object
     @comment.reload
@@ -63,11 +63,11 @@ def teardown
     session[:user_id] = 3
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         map_id: @map.slug,
         comment: {
           body: "I'm gonna troll you!"
-        })
+        }})
 
     @comment.reload
 
@@ -81,11 +81,11 @@ def teardown
     @comment = comments(:one)
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         map_id: @map.slug,
         comment: {
           body: "I'm gonna troll you!"
-        })
+        }})
 
     @comment.reload
 
@@ -101,8 +101,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_not_equal before_count, Comment.count
@@ -115,8 +115,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_equal before_count, Comment.count
@@ -128,8 +128,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_equal before_count, Comment.count
@@ -141,10 +141,10 @@ def teardown
     session[:user_id] = @user.id
 
     post(:create,
-         comment: {
+         params: { comment: {
            map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert_not @emails.collect(&:to).include?([@user.email])
@@ -155,10 +155,10 @@ def teardown
     session[:user_id] = 3
 
     post(:create,
-         comment: {
+         params: { comment: {
       map_id: @map.id,
       body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert @emails.collect(&:to).include?([@user.email])
@@ -172,18 +172,18 @@ def teardown
     session[:user_id] = @chris.id
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     session[:user_id] = @joshua.id
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "Yeah we'll see!"
-         })
+         }})
 
     assert_response :success
     assert @emails.collect(&:to).include?([@chris.email])
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index d67b3cb96..d75ec1dd7 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -21,7 +21,7 @@ def teardown
     system('mkdir -p public/warps/cubbon-park')
     system('cp test/fixtures/demo.png  public/warps/cubbon-park/cubbon-park.jpg')
 
-    get :jpg, id: map.slug
+    get :jpg, params: { id: map.slug}
     assert_response :success
     assert_includes 'image/jpeg', response.content_type
   end
@@ -31,13 +31,13 @@ def teardown
     system('mkdir -p public/warps/cubbon-park')
     system('cp test/fixtures/demo.png public/warps/cubbon-park/cubbon-park-geo.tif')
 
-    get :geotiff, id: map.slug
+    get :geotiff, params: { id: map.slug}
     assert_response :success
     assert_includes 'image/tiff', response.content_type
   end
 
   test 'should not cancel if not logged in' do
-    get :cancel, id: @map.id
+    get :cancel, params: { id: @map.id}
     assert_response :success
     assert_equal 'You must be logged in to export, unless the map is anonymous.', @response.body
     assert assigns[:map]
@@ -47,7 +47,7 @@ def teardown
 
   test 'should cancel export' do
     session[:user_id] = 1
-    get :cancel, id: @map.id
+    get :cancel, params: { id: @map.id}
     assert_response :success
     assert_equal 'cancelled', @response.body
     assert assigns[:map]
@@ -55,33 +55,33 @@ def teardown
 
   test 'should redirect after cancelling' do
     session[:user_id] = 1
-    get :cancel, id: @map.id, exports: 'cess'
+    get :cancel, params: { id: @map.id, exports: 'cess'}
     assert_response :redirect
     assert flash.present?
     assert_redirected_to '/exports'
   end
 
   test 'should display export progress' do
-    get :progress, id: @map.id
+    get :progress, params: { id: @map.id}
     assert_response :success
     assert_equal 'export not running', @response.body
     assert_equal 'text/plain', @response.content_type
   end
 
   test 'should display progress with no export' do
-    get :progress, id: 4
+    get :progress, params: { id: 4}
     assert_response :success
     assert_equal 'export has not been run', @response.body
   end
 
   test 'should display progress completed' do
-    get :progress, id: 2
+    get :progress, params: { id: 2}
     assert_response :success
     assert_equal 'complete', @response.body
   end
 
   test 'should display progress failed' do
-    get :progress, id: 3
+    get :progress, params: { id: 3}
     assert_response :success
     assert_equal 'export failed', @response.body
   end
@@ -89,13 +89,13 @@ def teardown
   # does not test the exporter client
   test 'should display export status' do
     session[:user_id] = 1
-    get :status, id: @map.id
+    get :status, params: { id: @map.id}
     assert_response :success
   end
 
   test 'should display error if no export' do
     session[:user_id] = 1
-    get :status, id: 4
+    get :status, params: { id: 4}
     assert_response :success
     # assert_equal { status: 'export has not been run' }.to_json, @response.body
   end
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 6074acbab..5cd69fecb 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -29,13 +29,13 @@ def setup
   end
 
   test "should get clean feed with moderators links" do
-    get :all, :moderators => 'true'
+    get :all, params: { :moderators => 'true'}
     assert_response :success
     assert_not_nil :maps
   end
 
   test "should get license feed" do
-    get :license, :id => "publicdomain"
+    get :license, params: { :id => "publicdomain"}
     assert_response :success
     assert_not_nil :maps
     assert_equal 'application/xml', @response.content_type
@@ -43,7 +43,7 @@ def setup
   end
 
   test "should get author feed" do
-    get :author, :id => "quentin"
+    get :author, params: { :id => "quentin"}
     assert_response :success
     assert_not_nil :maps
     assert_equal 'application/xml', @response.content_type
@@ -51,7 +51,7 @@ def setup
   end
 
   test "should get tag feed" do
-    get :tag, id: 'nice'
+    get :tag, params: { id: 'nice'}
     assert_response :success
     assert_not_nil :tag
     assert_not_nil :maps
@@ -59,7 +59,7 @@ def setup
   end
 
   test 'rescues if tag not present' do
-    get :tag, id: 'cess'
+    get :tag, params: { id: 'cess'}
     assert_equal 'text/plain', @response.content_type
     assert_equal 'No maps with tag cess', @response.body
   end
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 5e7d427ab..d499d5b95 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -14,14 +14,14 @@ def teardown
   end
 
   test 'fetch locally should redirect to url' do
-    get :fetch, url: '/maps'
+    get :fetch, params: { url: '/maps'}
     assert_response :redirect
     assert_redirected_to '/maps'
   end
 
   def fetch_in_production
     Rails.stub(:env, ActiveSupport::StringInquirer.new('production')) do
-      get :fetch, url: '/maps'
+      get :fetch, params: { url: '/maps'}
       assert_response :success
       assert_equal data, response.body
       assert_equal 'text/html', response.content_type
@@ -31,20 +31,20 @@ def fetch_in_production
   test 'create uploads an image' do
     before_count = Warpable.count
 
-    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
+    post :create, params: { map_id: @map.slug, uploaded_data: @uploaded_data}
     assert_response :success
     assert_equal before_count + 1, Warpable.count
   end
 
   test 'should return correct status and type on create' do
-    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
+    post :create, params: { map_id: @map.slug, uploaded_data: @uploaded_data}
 
     assert_equal 200, response.status
     assert_equal "text/html", response.content_type
   end
 
   test 'should show the image' do
-    get :show, id: @warp.id, format: 'json'
+    get :show, params: { id: @warp.id, format: 'json'}
     json_response = JSON.parse(response.body)
     assert_equal @warp.id, json_response["id"]
     assert_response :success
@@ -53,20 +53,20 @@ def fetch_in_production
   test 'should update an image' do
     session[:user_id] = 1
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
-    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
+    patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points}
     assert_not_nil @warp.nodes
     assert_equal "text/html", response.content_type
   end
 
   test 'correct user should destroy an image' do
     session[:user_id] = 1
-    delete :destroy, id: @warp.id
+    delete :destroy, params: { id: @warp.id}
     assert_response :redirect
     assert_redirected_to "/maps/#{@map.slug}"
   end
 
   test 'redirects to login if attempt destroy and not logged in' do
-    delete :destroy, id: @warp.id
+    delete :destroy, params: { id: @warp.id}
     assert_response :redirect
     assert_redirected_to '/login'
     assert_not_nil flash[:error]
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index a26156c76..cf5ed40f6 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -13,7 +13,8 @@ def teardown
 
   test 'should display image url for maps by region' do
     get :region,
-        { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60, format: :json }
+        params: { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60},
+        format: :json
 
     image_urls = []
     @map.warpables.each do |warpable|
@@ -61,7 +62,7 @@ def teardown
   end
 
   test 'should search for maps by name' do
-    get :search, q: 'Saugus'
+    get :search, params: { q: 'Saugus'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -70,7 +71,7 @@ def teardown
   end
 
   test 'should search for maps by location' do
-    get :search, q: 'India'
+    get :search, params: { q: 'India'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -79,7 +80,7 @@ def teardown
   end
 
   test 'should search for maps by description' do
-    get :search, q: 'a park'
+    get :search, params: { q: 'a park'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -90,13 +91,13 @@ def teardown
   test 'should create map if logged in' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
            name: 'Coal terminal map',
            slug: 'coal-terminal',
            location: 'London',
            lat: 42.43823313018592,
            lon: -70.9849190711975
-         })
+         }})
     @map = assigns(:map)
 
     assert_response 302
@@ -108,13 +109,13 @@ def teardown
 
   test 'should create map if not logged in' do
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
            name: 'Coal terminal map',
            slug: 'coal-terminal',
            location: 'London',
            lat: 42.43823313018592,
            lon: -70.9849190711975
-         })
+         }})
     @map = assigns(:map)
 
     assert_redirected_to '/maps/' + @map.slug
@@ -128,13 +129,13 @@ def teardown
     before_count = Map.count
     user = users(:quentin)
     session[:user_id] = user.id
-    post :create, map: {
+    post :create, params: { map: {
       name: 'Yaya Center',
       slug: 'yaya-center',
       location: 'Nairobi',
       lat: -0.3030988,
       lon: 36.080026
-    }
+    }}
     @map = assigns(:map)
 
     assert_redirected_to '/maps/' + @map.slug
@@ -148,10 +149,10 @@ def teardown
     skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
       name: 'Coal terminal map',
       slug: 'coal-terminal'
-    })
+    }})
     @map = assigns(:map)
 
     assert_not @map.save
@@ -164,7 +165,7 @@ def teardown
   test 'should not delete map if not owner' do
     session[:user_id] = 3
     before_count = Map.count
-    post(:destroy, id: @map.slug)
+    post(:destroy, params: { id: @map.slug})
 
     assert_redirected_to '/maps/' + @map.slug
     assert_equal flash[:error], 'Only admins or map owners may delete maps.'
@@ -174,7 +175,7 @@ def teardown
   test 'should delete map if owner' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:destroy, id: @map.slug)
+    post(:destroy, params: { id: @map.slug})
 
     assert_redirected_to '/'
     assert_not_equal before_count, Map.count
@@ -182,14 +183,14 @@ def teardown
   end
 
   test "should get show" do
-    get(:show, id: @map.slug)
+    get(:show, params: { id: @map.slug})
     assert_response :success
     assert_not_nil assigns(:map)
   end
 
   test 'should archive map' do
     session[:user_id] = 1
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug})
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
@@ -198,7 +199,7 @@ def teardown
 
   test 'should not archive map without enough permissions' do
     session[:user_id] = 3
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug})
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
@@ -208,7 +209,7 @@ def teardown
   test 'should update map' do
     session[:user_id] = 1
     put(:update,
-        id: @map.slug,
+        params: { id: @map.slug,
         map: {
           name: 'Schrute farms',
           location: 'USA',
@@ -216,7 +217,7 @@ def teardown
           lon: -74,
           description: 'A really green farm'
         },
-        tags: 'beets bears')
+        tags: 'beets bears'})
     @map.reload
 
     assert_redirected_to "/maps/#{@map.slug}"
@@ -229,12 +230,12 @@ def teardown
   end
 
   test 'should not update unless logged in' do
-    put :update, id: 2, map: { name: 'Street 5'}
+    put :update, params: { id: 2, map: { name: 'Street 5'}}
     assert_redirected_to '/login?back_to=/maps/2'
   end
 
   test 'should display maps by region' do
-    get :region, { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60 }
+    get :region, params: { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60 }
     @maps = assigns(:maps)
 
     assert_response :success
@@ -242,19 +243,19 @@ def teardown
   end
 
   test 'should annotate maps' do
-    get :annotate, id: @map.slug
+    get :annotate, params: { id: @map.slug}
     assert_response :success
     assigns(:annotations) == true
   end
 
   test 'embed' do
-    get :embed, id: @map.slug
+    get :embed, params: { id: @map.slug}
     assert_response :success
     assert_template :show
   end
 
   test 'it returns the images' do
-    get :images, id: @map.slug
+    get :images, params: { id: @map.slug}
     assert_response :success
     assert_equal 'application/json', response.content_type
   end
@@ -262,7 +263,7 @@ def teardown
   def export_if_logged_in
     Rails.stub(:env, ActiveSupport::StringInquirer.new('development')) do
       session[:user_id] = 1
-      post :export, id: @map.id, resolution: 5
+      post :export, params: { id: @map.id, resolution: 5}
       assert_response :success
       assert_equal 'complete', @response.body
     end
@@ -271,13 +272,13 @@ def export_if_logged_in
   def export_anonmymous_map
     Rails.stub(:env, ActiveSupport::StringInquirer.new('development')) do
       map = maps(:cubbon)
-      post :export, id: map.id, resolution: 5
+      post :export, params: { id: map.id, resolution: 5}
       assert_response :success
     end
   end
 
   test 'returns the exports' do
-    get :exports, id: @map.id
+    get :exports, params: { id: @map.id}
     assert_response :success
   end
 
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 98da1b9dd..26b78f271 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -27,7 +27,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   test 'successful local login' do
     system('cp config/config.yml.example config/config.yml')
-    get :local, login: 'quentin'
+    get :local, params: { login: 'quentin'}
     assert_response :redirect
     assert flash[:success].present?
     assert_not_nil session[:user_id]
@@ -36,7 +36,7 @@ class SessionsControllerTest < ActionController::TestCase
   end
 
   test 'unsuccessful local login' do
-    get :local, login: 'cess'
+    get :local, params: { login: 'cess'}
     assert_response :redirect
     assert flash[:error].present?
     assert_nil session[:user_id]
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 90a325700..d3c275f9d 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -9,31 +9,31 @@ def setup
 
   test "should create tag" do
     session[:user_id] = 1 # log in
-    post(:create, :map_id => @map.slug, :tags => "test,nice")
+    post(:create, params: { :map_id => @map.slug, :tags => "test,nice"})
     assert_response :redirect
   end
 
   test "should get tag show page" do
-    get :show, :id => "nice"
+    get :show, params: {id: "nice"} 
     assert_response :success
     assert_not_nil :maps, :tag
   end
 
   test "should redirect to login when not logged in" do
-    post :create, map_id: @map.slug, tags: "test,nice"
+    post :create, params: { map_id: @map.slug, tags: "test,nice"}
     assert_redirected_to "/login?back_to=/maps/#{@map.slug}"
     assert flash.present?
   end
 
   test 'should destroy a tag' do
     session[:user_id] = 1
-    delete :destroy, id: @tag
+    delete :destroy, params: { id: @tag}
     assert flash[:notice].present?
     assert_redirected_to @tag.map
   end
 
   test 'should redirect destroy when not logged in' do
-    delete :destroy, id: @tag
+    delete :destroy, params: { id: @tag}
     assert_response :redirect
     assert flash.present?
   end
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index d9bdd61f0..d38e1d61c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -19,7 +19,7 @@ def setup
   end
 
   test "should get profile" do
-    get(:profile, id: @user.login)
+    get(:profile, params: {id: @user.login} )
     assert_response :success
     assert_not_nil :user
   end
diff --git a/test/functional/utility_controller_test.rb b/test/functional/utility_controller_test.rb
index 87ae42f9f..c929329d5 100644
--- a/test/functional/utility_controller_test.rb
+++ b/test/functional/utility_controller_test.rb
@@ -5,10 +5,13 @@
 class UtilityControllerTest < ActionController::TestCase
   test 'should translate tms format' do
     get(:tms_alt,
-        id: 1,
-        x: 10,
-        y: 30,
-        z: 40)
+        params: {
+          id: 1,
+          x: 10,
+          y: 30,
+          z: 40
+        }
+       )
 
     y = 2**40.to_i - 30.to_i - 1
     assert_redirected_to "/tms/1/40/10/#{y}.png"

From ca9a118daea10077c1fdd9d94e5dfa3c37d8cbb8 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 20 Jun 2019 16:32:33 +0530
Subject: [PATCH 085/152] Remove extra web-console from gemfile

---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 26bba4c9e..c2a2cb207 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,6 @@ end
 group :development do
   gem 'jshintrb', '~> 0.3.0'
   gem 'therubyracer', '~> 0.12.3'
-  gem 'web-console'
   gem 'mini_racer', platforms: :ruby
   gem 'listen', '~> 3.1.5'
   gem 'web-console', '~> 2.0'

From d86282c5a19d6fb850a08749da8621b82669eee0 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 21 Jun 2019 10:15:15 -0300
Subject: [PATCH 086/152] Regenerating lock file

---
 Gemfile      |  1 -
 Gemfile.lock | 43 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c2a2cb207..0bc0e8a7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,6 @@ end
 
 group :development do
   gem 'jshintrb', '~> 0.3.0'
-  gem 'therubyracer', '~> 0.12.3'
   gem 'mini_racer', platforms: :ruby
   gem 'listen', '~> 3.1.5'
   gem 'web-console', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e15c388fc..94aa7fd98 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,8 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bindex (0.7.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
     bootsnap (1.4.4)
       msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
@@ -67,11 +68,18 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
+    debug_inspector (0.0.3)
     docile (1.3.2)
+    equatable (0.6.0)
     erubi (1.8.0)
     execjs (2.7.0)
-    faker (1.9.3)
+    faker (1.9.4)
       i18n (>= 0.7)
+      pastel (~> 0.7.2)
+      thor (~> 0.20.0)
+      tty-pager (~> 0.12.0)
+      tty-screen (~> 0.6.5)
+      tty-tree (~> 0.3.0)
     ffi (1.11.1)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)
@@ -125,7 +133,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     mysql2 (0.5.2)
@@ -152,6 +160,9 @@ GEM
     passenger (6.0.2)
       rack
       rake (>= 0.8.1)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     popper_js (1.14.5)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -262,11 +273,24 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
+    strings (0.1.5)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
+    tty-color (0.5.0)
+    tty-pager (0.12.1)
+      strings (~> 0.1.4)
+      tty-screen (~> 0.6)
+      tty-which (~> 0.4)
+    tty-screen (0.6.5)
+    tty-tree (0.3.0)
+    tty-which (0.4.1)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -275,12 +299,13 @@ GEM
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
+    unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
-      bindex (>= 0.4.0)
-      railties (>= 5.0)
+    web-console (2.3.0)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -339,7 +364,7 @@ DEPENDENCIES
   sqlite3
   turbolinks (~> 5)
   uglifier (~> 4.1.20)
-  web-console
+  web-console (~> 2.0)
   will_paginate (= 3.1.7)
   will_paginate-bootstrap4 (~> 0.2.2)
 

From 616f1fe3d24655dc589fd61260045212f52d5631 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 21 Jun 2019 10:43:05 -0300
Subject: [PATCH 087/152] Fixing rubocop offenses and bundler version

---
 Gemfile.lock                      | 2 +-
 app/mailers/application_mailer.rb | 5 ++---
 app/models/annotation.rb          | 5 ++---
 app/models/warpable.rb            | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 94aa7fd98..b3908a308 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -372,4 +372,4 @@ RUBY VERSION
    ruby 2.4.6p354
 
 BUNDLED WITH
-   2.0.2
+   1.17.3
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index da892a160..00655e720 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,5 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+  default from: 'from@example.com'
+  layout 'mailer'
  end
-  
\ No newline at end of file
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 5c61b71cf..cba78ff2b 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,9 +1,8 @@
 class Annotation < ApplicationRecord
-  
-  # FIXME - We should start using strong parameters here in favor of this below  
+  # FIXME: - We should start using strong parameters here in favor of this below
   # include ActiveModel::MassAssignmentSecurity
   belongs_to :map, optional: true
-  belongs_to :user,optional: true
+  belongs_to :user, optional: true
 
   attr_accessor :annotation_type, :coordinates, :text, :style
 
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 88433dc39..29021b57b 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,6 +1,5 @@
 class Warpable < ApplicationRecord
-
-  # FIXME - We should start using strong parameters here in favor of this below
+  # FIXME: - We should start using strong parameters here in favor of this below
   # include ActiveModel::MassAssignmentSecurity
   # attr_accessible :image
 

From 2495a8a520a15a9c221d0863741b1f3a7a4b5175 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 21 Jun 2019 12:25:20 -0300
Subject: [PATCH 088/152] Using correct Paperclip class as in
 https://github.com/rails/rails/issues/26404#issuecomment-502129936

---
 Gemfile                                   | 2 +-
 Gemfile.lock                              | 2 +-
 test/functional/images_controller_test.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0bc0e8a7f..d5a31157c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ group :dependencies do
   gem 'ruby-openid', '~>2.5'
   gem 'open_id_authentication'
   gem 'RubyInline', '~> 3.12.4'
-  gem 'paperclip'
+  gem 'paperclip', '~> 6.1.0'
   gem 'bootsnap', '~> 1.4.4'
   gem 'turbolinks', '~> 5'
   gem 'mini_magick', '~> 4.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index b3908a308..f0ab07535 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -338,7 +338,7 @@ DEPENDENCIES
   mysql2 (< 0.6)
   oa-openid (= 0.3.2)
   open_id_authentication
-  paperclip
+  paperclip (~> 6.1.0)
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index d499d5b95..b936dc8ec 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -7,7 +7,7 @@ def setup
     @warp = warpables(:one)
 
     @file ||= File.open(File.expand_path(Rails.root + 'test/fixtures/demo.png', __FILE__))
-    @uploaded_data = ActionDispatch::Http::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
+    @uploaded_data = Rack::Test::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
   end
 
   def teardown

From b2fdaea3389f2fccf3695c2e6702e74606e8c2ce Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 25 Jun 2019 10:38:44 +0530
Subject: [PATCH 089/152] Fix images functional tests

---
 test/functional/images_controller_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index b936dc8ec..033d538b1 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -6,8 +6,9 @@ def setup
     @map = maps(:saugus)
     @warp = warpables(:one)
 
-    @file ||= File.open(File.expand_path(Rails.root + 'test/fixtures/demo.png', __FILE__))
-    @uploaded_data = Rack::Test::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
+    file_location = Rails.root + 'test/fixtures/demo.png'
+    @file ||= File.open(File.expand_path(file_location,  __FILE__))
+    @uploaded_data = Rack::Test::UploadedFile.new(file_location, File.basename(@file), "image/png")
   end
 
   def teardown

From 03bcfd379dc4f3ba003c7b0a97f3dbdc2c3cb335 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 25 Jun 2019 10:59:01 +0530
Subject: [PATCH 090/152] images controller test typecast to string

---
 test/functional/images_controller_test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 033d538b1..23d6524f6 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -7,8 +7,7 @@ def setup
     @warp = warpables(:one)
 
     file_location = Rails.root + 'test/fixtures/demo.png'
-    @file ||= File.open(File.expand_path(file_location,  __FILE__))
-    @uploaded_data = Rack::Test::UploadedFile.new(file_location, File.basename(@file), "image/png")
+    @uploaded_data = Rack::Test::UploadedFile.new(file_location.to_s, 'demo.png', "image/png")
   end
 
   def teardown

From 672fabd9a5465358492452409c7544ecce2ddd33 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 25 Jun 2019 11:09:38 +0530
Subject: [PATCH 091/152] Fix rails logger

---
 app/controllers/export_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 231f18d6c..2def4b577 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -17,7 +17,7 @@ def logger
     if params[:action] == 'progress'
       nil
     else
-      RAILS_DEFAULT_LOGGER
+      Rails.logger
     end
   end
 

From a146edb8e0857a939da72f5ec7c0f79a9ef1328d Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Tue, 25 Jun 2019 11:42:45 +0530
Subject: [PATCH 092/152] Fix map tests

---
 test/functional/maps_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index cf5ed40f6..0c51baa22 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -39,7 +39,7 @@ def teardown
 
   test 'should not display archived maps' do
     session[:user_id] = 1
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug } )
     get :index
     @maps = assigns(:maps)
 

From 3a10c73c197149e9d6c4cb00851840f2237777ba Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 11:49:37 -0300
Subject: [PATCH 093/152] Bumping rubocop version

---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5a31157c..cb674886e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ group :dependencies do
 end
 
 group :test do
-  gem 'rubocop', '~> 0.52.0'
+  gem 'rubocop', '~> 0.70.0'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'rails-controller-testing'
diff --git a/Gemfile.lock b/Gemfile.lock
index f0ab07535..d84364a48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,6 +95,7 @@ GEM
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jaro_winkler (1.5.3)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -164,7 +165,6 @@ GEM
       equatable (~> 0.6)
       tty-color (~> 0.5)
     popper_js (1.14.5)
-    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -222,13 +222,13 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.1)
+    rubocop (0.70.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -349,7 +349,7 @@ DEPENDENCIES
   rdiscount (= 2.2.0.1)
   recaptcha (~> 4.14.0)
   right_aws_api (~> 0.3.5)
-  rubocop (~> 0.52.0)
+  rubocop (~> 0.70.0)
   ruby-openid (~> 2.5)
   ruby-prof
   sass

From e2e17e5bfc6fc4f0c551dbaacba3ddc3178a969f Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 16:31:44 -0300
Subject: [PATCH 094/152] Autofixing rubocop offenses

---
 app/controllers/annotations_controller.rb |  6 +++---
 app/controllers/images_controller.rb      |  4 ++--
 app/controllers/users_controller.rb       |  2 +-
 app/helpers/application_helper.rb         |  4 ++--
 app/models/export.rb                      |  4 ++--
 app/models/map.rb                         | 18 +++++++++---------
 app/models/warpable.rb                    | 12 ++++++------
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 45c90b924..0a0f780ff 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-      coordinates: geojson[:geometry][:coordinates],
-      text: geojson[:properties][:textContent],
-      style: geojson[:properties][:style])
+                      coordinates: geojson[:geometry][:coordinates],
+                      text: geojson[:properties][:textContent],
+                      style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 5ca999c4e..af14b8ec7 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -1,8 +1,8 @@
 require 'open-uri'
 class ImagesController < ApplicationController
   rescue_from Errno::ENOENT, Errno::ETIMEDOUT,
-    OpenURI::HTTPError, Timeout::Error,
-    with: :url_upload_not_found
+              OpenURI::HTTPError, Timeout::Error,
+              with: :url_upload_not_found
   protect_from_forgery except: %i(update delete)
   # Convert model to json without including root name. Eg. 'warpable'
   ActiveRecord::Base.include_root_in_json = false
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 40601a191..5dc4f187f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -30,6 +30,6 @@ def sort_direction
 
   def user_params
     params.require(:user).permit(:login, :email, :name,
-      :password, :password_confirmation)
+                                 :password, :password_confirmation)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3bad0e562..5d8039ef9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -41,8 +41,8 @@ def errors_for(object, message = nil)
   # see https://github.com/rails/jquery-ujs/wiki/Manual-installing-and-Rails-2
   def csrf_meta_tags
     if protect_against_forgery?
-      out = %(<meta name="csrf-param" content="%s"/>\n) # rubocop:disable Style/FormatStringToken
-      out << %(<meta name="csrf-token" content="%s"/>) # rubocop:disable Style/FormatStringToken
+      out = %(<meta name="csrf-param" content="%s"/>\n)
+      out << %(<meta name="csrf-token" content="%s"/>)
       format(out, Rack::Utils.escape_html(request_forgery_protection_token), Rack::Utils.escape_html(form_authenticity_token))
     end
   end
diff --git a/app/models/export.rb b/app/models/export.rb
index 7ab3431d0..07365476e 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,12 +52,12 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-      (DateTime.now - 24.hours).to_s(:db)).count
+                 (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-      (DateTime.now - 24.hours).to_s(:db))
+                 (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 2872e3487..d5ab92360 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -140,7 +140,7 @@ def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
     Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-      id, lat - dist, lat + dist, lon - dist, lon + dist)
+              id, lat - dist, lat + dist, lon - dist, lon + dist)
       .limit(10)
   end
 
@@ -230,14 +230,14 @@ def run_export(user, resolution)
     new_export = Export.new(map_id: id) unless export
 
     Exporter.run_export(user,
-      resolution,
-      export || new_export,
-      id,
-      slug,
-      Rails.root.to_s,
-      average_scale,
-      placed_warpables,
-      key)
+                        resolution,
+                        export || new_export,
+                        id,
+                        slug,
+                        Rails.root.to_s,
+                        average_scale,
+                        placed_warpables,
+                        key)
   end
 
   def after_create
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 29021b57b..f21187f3b 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -9,12 +9,12 @@ class Warpable < ApplicationRecord
   # Paperclip; config and production/development specific configs
   # in /config/initializers/paperclip.rb
   has_attached_file :image,
-    s3_protocol: 'https',
-    styles: {
-      medium: "500x375",
-      small: "240x180",
-      thumb: "100x100>"
-    }
+                    s3_protocol: 'https',
+                    styles: {
+                      medium: "500x375",
+                      small: "240x180",
+                      thumb: "100x100>"
+                    }
 
   validates_attachment_content_type :image, content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"]
 

From 1340e4d05d63f07cfb2d9d88b78de8ee0f73411d Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 16:51:02 -0300
Subject: [PATCH 095/152] Including performance cop to rubocop

---
 .rubocop.yml | 2 ++
 Gemfile      | 1 +
 Gemfile.lock | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 709769f4d..9d1f9dc76 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+require: rubocop-performance
+
 # Start with Spotifys style guide as a base then customize from there
 inherit_from:
   - .rubocop_shopify_styleguide.yml
diff --git a/Gemfile b/Gemfile
index cb674886e..9ece4d749 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ end
 
 group :test do
   gem 'rubocop', '~> 0.70.0'
+  gem 'rubocop-performance'
   gem 'ruby-prof'
   gem 'rails-perftest'
   gem 'rails-controller-testing'
diff --git a/Gemfile.lock b/Gemfile.lock
index d84364a48..6b42e6d0e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -229,6 +229,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
@@ -350,6 +352,7 @@ DEPENDENCIES
   recaptcha (~> 4.14.0)
   right_aws_api (~> 0.3.5)
   rubocop (~> 0.70.0)
+  rubocop-performance
   ruby-openid (~> 2.5)
   ruby-prof
   sass

From 37efb69f89fefa487142b2162ed8220c9382da76 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 18:18:39 -0300
Subject: [PATCH 096/152] Refactoring deprecated routing and secret_token

---
 config/initializers/secret_token.rb |   2 +-
 config/routes.rb                    | 115 ++++++++++++++--------------
 2 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index b7bba1a47..cf23dc7a0 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Mapknitter::Application.config.secret_token = 'asdfjdasgaisaolghrwiohrkahguilboiwelkxwbranjkl'
+Mapknitter::Application.config.secret_key_base = 'asdfjdasgaisaolghrwiohrkahguilboiwelkxwbranjkl'
diff --git a/config/routes.rb b/config/routes.rb
index 2cd514153..0c8dfee22 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,76 +1,82 @@
 Mapknitter::Application.routes.draw do
 
-  root :to => 'maps#index'
+  root to: 'maps#index'
 
-  get 'front-page' => 'front_ui#index'
-  get 'mappers' => 'front_ui#nearby_mappers'
-  post "save_location" => 'front_ui#save_location'
-  get 'about' => 'front_ui#about'
-  get 'all_maps' => 'front_ui#all_maps'
+  get 'front-page', to: 'front_ui#index'
+  get 'mappers', to: 'front_ui#nearby_mappers'
+  post 'save_location', to: 'front_ui#save_location'
+  get 'about', to: 'front_ui#about'
+  get 'all_maps', to: 'front_ui#all_maps'
 
-  get 'external_url_test' => 'export#external_url_test'
-  get 'local/:login' => 'sessions#local'
-  get 'logout' => 'sessions#logout'
-  get 'login' => 'sessions#new'
-  get 'register' => 'users#create'
-  get 'signup' => 'users#new'
+  get 'external_url_test', to: 'export#external_url_test'
+  get 'local/:login', to: 'sessions#local'
+  get 'logout', to: 'sessions#logout'
+  get 'login', to: 'sessions#new'
+  get 'register', to: 'users#create'
+  get 'signup', to: 'users#new'
 
   # since rails 3.2, we use this to log in:
-  get 'sessions/create' => 'sessions#create'
+  get 'sessions/create', to: 'sessions#create'
 
   resources :users, :sessions, :maps
 
   # redirect legacy route:
   get 'tag/:id', to: redirect('/tags/%{id}')
-  get 'tags/:id' => 'tags#show'
+  get 'tags/:id', to: 'tags#show'
 
   # Registered user pages:
-  get 'profile' => 'users#profile', :id => 0
-  get 'profile/:id' => 'users#profile'
-  get 'dashboard' => 'users#dashboard'
+  get 'profile', to: 'users#profile', id: 0
+  get 'profile/:id', to: 'users#profile'
+  get 'dashboard', to: 'users#dashboard'
 
-  get 'authors' => 'users#index'
+  get 'authors', to: 'users#index'
 
-  get 'feeds/all' => 'feeds#all', :format => 'rss'
-  get 'feeds/license/:id' => 'feeds#license', :format => 'rss'
-  get 'feeds/author/:id' => 'feeds#author', :format => 'rss'
-  get 'feeds/tag/:id' => 'feeds#tag', :format => 'rss'
+  get 'feeds/all', to: 'feeds#all', format: 'rss'
+  get 'feeds/license/:id', to: 'feeds#license', format: 'rss'
+  get 'feeds/author/:id', to: 'feeds#author', format: 'rss'
+  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss'
 
-  get 'tms/:id/alt/:z/:x/:y.png' => 'utility#tms_alt'
-  get 'tms/:id/' => 'utility#tms_info'
-  get 'tms/:id/alt/' => 'utility#tms_info'
+  get 'tms/:id/alt/:z/:x/:y.png', to: 'utility#tms_alt'
+  get 'tms/:id/', to: 'utility#tms_info'
+  get 'tms/:id/alt/', to: 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
-  get 'map/map' => 'maps#map'
-  get 'search/:id' => 'maps#search'
-  get 'search' => 'maps#search'
-  get 'map/archive/:id' => 'maps#archive'
-  get 'map/region/:id' => 'maps#region'
-  get 'map/license/:id' => 'maps#license'
-  get 'maps/featured' => 'maps#featured'
+  get 'map/map', to: 'maps#map'
+  get 'search/:id', to: 'maps#search'
+  get 'search', to: 'maps#search'
+  get 'map/archive/:id', to: 'maps#archive'
+  get 'map/region/:id', to: 'maps#region'
+  get 'map/license/:id', to: 'maps#license'
+  get 'maps/featured', to: 'maps#featured'
   get 'map/view/:id', to: redirect('/maps/%{id}') # legacy
-  get 'maps/:id/annotate' => 'maps#annotate'
-  get 'maps/exports/:id' => 'maps#exports'
-  get 'maps/:id/warpables' => 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
-  post 'maps/:map_id/warpables' => 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
-  get 'export/progress/:id' => 'export#progress'
-  get 'export/status/:id' => 'export#status'
-  get 'exports' => 'export#index'
+  get 'maps/:id/annotate', to: 'maps#annotate'
+  get 'maps/exports/:id', to: 'maps#exports'
+  get 'maps/:id/warpables', to: 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
+  post 'maps/:map_id/warpables', to: 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
+  get 'export/progress/:id', to: 'export#progress'
+  get 'export/status/:id', to: 'export#status'
+  get 'exports', to: 'export#index'
   get 'map/:id', to: redirect('/maps/%{id}')
-  get 'embed/:id' => 'maps#embed'
-  post 'maps/export/:id' => 'maps#export'
-  post 'maps/:id' => 'maps#export'
+  get 'embed/:id', to: 'maps#embed'
+  post 'maps/export/:id', to: 'maps#export'
+  post 'maps/:id', to: 'maps#export'
 
-  get 'import/:name' => 'images#import' # this was for auto-adding images via URL
-  post 'export/:action/:id' => 'export'
+  get 'import/:name', to: 'images#import' # this was for auto-adding images via URL
+
+  namespace 'export' do
+    %w(index logger jpg geotiff cancel 
+    progress status external_url_test).each do |action|
+      post action + "/:id", action: action
+    end
+  end
 
   # make these resourceful after renaming warpables to images
-  post 'images/create/:id' => 'images#create' # used?
-  post 'warper/update' => 'images#update' # legacy for cartagen.js
-  post 'images/update' => 'images#update'
-  post 'images/delete/:id' => 'images#delete'
-  delete 'maps/:map_id/warpables/:id' => 'images#destroy' #legacy, will be resourceful
-  delete 'images/:id' => 'images#destroy' #legacy, will be resourceful
+  post 'images/create/:id', to: 'images#create' # used?
+  post 'warper/update', to: 'images#update' # legacy for cartagen.js
+  post 'images/update', to: 'images#update'
+  post 'images/delete/:id', to: 'images#delete'
+  delete 'maps/:map_id/warpables/:id', to: 'images#destroy' #legacy, will be resourceful
+  delete 'images/:id', to: 'images#destroy' #legacy, will be resourceful
 
   # RESTful API
   resources :maps do
@@ -83,13 +89,6 @@
     end
   end
 
-  # See how all your routes lay out with 'rake routes'
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  get ':controller/:action'
-  get ':controller/:action/:id'
-  get ':controller/:action.:format'
-  get ':controller/:action/:id.:format'
+  # See how all your routes lay out with 'rails routes'
 
 end

From d81e8e0f2ee6ef0a2a0899afc34322ef72dbe054 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 18:33:36 -0300
Subject: [PATCH 097/152] Fixing routes for feed controller

---
 config/routes.rb                         | 9 +++++----
 test/functional/feeds_controller_test.rb | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 0c8dfee22..54a9f84b7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,10 +31,11 @@
 
   get 'authors', to: 'users#index'
 
-  get 'feeds/all', to: 'feeds#all', format: 'rss'
-  get 'feeds/license/:id', to: 'feeds#license', format: 'rss'
-  get 'feeds/author/:id', to: 'feeds#author', format: 'rss'
-  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss'
+  resources :feeds
+  get 'feeds/all', to: 'feeds#all', format: 'rss', as: 'all'
+  get 'feeds/license/:id', to: 'feeds#license', format: 'rss', as: 'license'
+  get 'feeds/author/:id', to: 'feeds#author', format: 'rss', as: 'author'
+  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss', as: 'tag'
 
   get 'tms/:id/alt/:z/:x/:y.png', to: 'utility#tms_alt'
   get 'tms/:id/', to: 'utility#tms_info'
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 5cd69fecb..398e8d853 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -29,7 +29,7 @@ def setup
   end
 
   test "should get clean feed with moderators links" do
-    get :all, params: { :moderators => 'true'}
+    get :all, params: { moderators: 'true'}
     assert_response :success
     assert_not_nil :maps
   end

From 87bb313e27cfb25dd6348fdd52e818a11b1862b9 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 27 Jun 2019 19:36:05 -0300
Subject: [PATCH 098/152] Using correct routes for RSS builder

---
 .travis.yml                              |  1 -
 app/views/feeds/all.builder              |  2 +-
 app/views/feeds/author.builder           |  2 +-
 app/views/feeds/clean.builder            |  2 +-
 app/views/feeds/license.builder          |  2 +-
 app/views/feeds/tag.builder              |  2 +-
 config/routes.rb                         | 10 +++++-----
 test/functional/feeds_controller_test.rb |  4 ++++
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37712e06e..24028b46c 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ install:
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
   - mysql -e "CREATE DATABASE mapknitter_dev; CREATE DATABASE mapknitter_test;"
-  - rails db:create
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rails db:schema:load;
     else
diff --git a/app/views/feeds/all.builder b/app/views/feeds/all.builder
index 760a02c18..d4d36d0d3 100644
--- a/app/views/feeds/all.builder
+++ b/app/views/feeds/all.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'all'
    xml.description "Recently posted maps at MapKnitter.org, a Public Lab open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/author.builder b/app/views/feeds/author.builder
index 7fca6154f..67057ff9f 100644
--- a/app/views/feeds/author.builder
+++ b/app/views/feeds/author.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Maps by "+params[:id]+" at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'author'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/clean.builder b/app/views/feeds/clean.builder
index 36a2d114d..e05be36f6 100644
--- a/app/views/feeds/clean.builder
+++ b/app/views/feeds/clean.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'clean'
    xml.description "Recently posted maps at MapKnitter.org, a Public Lab open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/license.builder b/app/views/feeds/license.builder
index 829abbafe..244f54ae8 100644
--- a/app/views/feeds/license.builder
+++ b/app/views/feeds/license.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'license'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/tag.builder b/app/views/feeds/tag.builder
index 829abbafe..bf50efe89 100644
--- a/app/views/feeds/tag.builder
+++ b/app/views/feeds/tag.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'tag'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/config/routes.rb b/config/routes.rb
index 54a9f84b7..87421441e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,11 +31,11 @@
 
   get 'authors', to: 'users#index'
 
-  resources :feeds
-  get 'feeds/all', to: 'feeds#all', format: 'rss', as: 'all'
-  get 'feeds/license/:id', to: 'feeds#license', format: 'rss', as: 'license'
-  get 'feeds/author/:id', to: 'feeds#author', format: 'rss', as: 'author'
-  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss', as: 'tag'
+  get 'feeds/all', to: 'feeds#all', format: 'rss'
+  get 'feeds/clean', to: 'feeds#clean', format: 'rss'
+  get 'feeds/license/:id', to: 'feeds#license', format: 'rss'
+  get 'feeds/author/:id', to: 'feeds#author', format: 'rss'
+  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss'
 
   get 'tms/:id/alt/:z/:x/:y.png', to: 'utility#tms_alt'
   get 'tms/:id/', to: 'utility#tms_info'
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 398e8d853..05bb78d6e 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -19,6 +19,8 @@ def setup
     get :all
     assert_response :success
     assert_not_nil :maps
+    assert_equal 'application/xml', @response.content_type
+    assert_template 'feeds/all'
   end
 
   test 'get clean' do
@@ -32,6 +34,8 @@ def setup
     get :all, params: { moderators: 'true'}
     assert_response :success
     assert_not_nil :maps
+    assert_equal 'application/xml', @response.content_type
+    assert_template 'feeds/all'
   end
 
   test "should get license feed" do

From a5726c79dff02843a4a550b51de3fcf16bc0fb06 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 28 Jun 2019 10:43:12 -0300
Subject: [PATCH 099/152] Fixing missing routes

---
 .travis.yml      |  6 ++++--
 config/routes.rb | 50 +++++++++++++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24028b46c..da818df91 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle install && yarn install
-  - mysql -e "CREATE DATABASE mapknitter_dev; CREATE DATABASE mapknitter_test;"
+  - mysql -e "CREATE DATABASE mapknitter_test;"
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rails db:schema:load;
     else
@@ -48,7 +48,9 @@ jobs:
     - name: "Asset Precompilation"
       env:
         - RAILS_ENV=production
-      script: bundle exec rails assets:precompile
+      script:
+        - mysql -e "CREATE DATABASE mapknitter;"
+        - bundle exec rails assets:precompile
 
 branches:
   only:
diff --git a/config/routes.rb b/config/routes.rb
index 87421441e..698873b59 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,10 +4,11 @@
 
   get 'front-page', to: 'front_ui#index'
   get 'mappers', to: 'front_ui#nearby_mappers'
-  post 'save_location', to: 'front_ui#save_location'
   get 'about', to: 'front_ui#about'
   get 'all_maps', to: 'front_ui#all_maps'
 
+  post 'save_location', to: 'front_ui#save_location'
+
   get 'external_url_test', to: 'export#external_url_test'
   get 'local/:login', to: 'sessions#local'
   get 'logout', to: 'sessions#logout'
@@ -18,11 +19,10 @@
   # since rails 3.2, we use this to log in:
   get 'sessions/create', to: 'sessions#create'
 
-  resources :users, :sessions, :maps
+  resources :users, :sessions, :maps, :images, :comments, :tags
 
   # redirect legacy route:
   get 'tag/:id', to: redirect('/tags/%{id}')
-  get 'tags/:id', to: 'tags#show'
 
   # Registered user pages:
   get 'profile', to: 'users#profile', id: 0
@@ -31,39 +31,52 @@
 
   get 'authors', to: 'users#index'
 
-  get 'feeds/all', to: 'feeds#all', format: 'rss'
-  get 'feeds/clean', to: 'feeds#clean', format: 'rss'
-  get 'feeds/license/:id', to: 'feeds#license', format: 'rss'
-  get 'feeds/author/:id', to: 'feeds#author', format: 'rss'
-  get 'feeds/tag/:id', to: 'feeds#tag', format: 'rss'
+  get 'images/:url', to: 'images#fetch'
 
   get 'tms/:id/alt/:z/:x/:y.png', to: 'utility#tms_alt'
   get 'tms/:id/', to: 'utility#tms_info'
   get 'tms/:id/alt/', to: 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
-  get 'map/map', to: 'maps#map'
   get 'search/:id', to: 'maps#search'
   get 'search', to: 'maps#search'
-  get 'map/archive/:id', to: 'maps#archive'
-  get 'map/region/:id', to: 'maps#region'
-  get 'map/license/:id', to: 'maps#license'
-  get 'maps/featured', to: 'maps#featured'
-  get 'map/view/:id', to: redirect('/maps/%{id}') # legacy
-  get 'maps/:id/annotate', to: 'maps#annotate'
-  get 'maps/exports/:id', to: 'maps#exports'
   get 'maps/:id/warpables', to: 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
-  post 'maps/:map_id/warpables', to: 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
+  get 'maps/view/:id', to: redirect('/maps/%{id}') # legacy
   get 'export/progress/:id', to: 'export#progress'
   get 'export/status/:id', to: 'export#status'
   get 'exports', to: 'export#index'
   get 'map/:id', to: redirect('/maps/%{id}')
   get 'embed/:id', to: 'maps#embed'
+  post 'maps/:map_id/warpables', to: 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
   post 'maps/export/:id', to: 'maps#export'
   post 'maps/:id', to: 'maps#export'
 
   get 'import/:name', to: 'images#import' # this was for auto-adding images via URL
 
+  namespace 'feeds' do
+    %w(all clean).each do |action|
+      get action, action: action, format: 'rss'
+    end
+
+    %w(license author tag).each do |action|
+      get action + "/:id", action: action, format: 'rss'
+    end
+  end
+
+  namespace 'maps' do
+    %w(map featured region license).each do |action|
+      get action, action: action
+    end
+
+    %w(archive exports).each do |action|
+      get action + "/:id", action: action
+    end
+
+    %w(annotate warpables).each do |action|
+      get "/:id/" + action, action: action
+    end
+  end
+
   namespace 'export' do
     %w(index logger jpg geotiff cancel 
     progress status external_url_test).each do |action|
@@ -72,10 +85,7 @@
   end
 
   # make these resourceful after renaming warpables to images
-  post 'images/create/:id', to: 'images#create' # used?
   post 'warper/update', to: 'images#update' # legacy for cartagen.js
-  post 'images/update', to: 'images#update'
-  post 'images/delete/:id', to: 'images#delete'
   delete 'maps/:map_id/warpables/:id', to: 'images#destroy' #legacy, will be resourceful
   delete 'images/:id', to: 'images#destroy' #legacy, will be resourceful
 

From b0b1dc0bfea6dc041719de38b6e2ba8d4f118cd2 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 28 Jun 2019 11:10:24 -0300
Subject: [PATCH 100/152] Fixing travis bundler and yarn cache

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da818df91..bcd3cec65 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,17 @@ services:
   - docker
 
 cache:
-  bundler: true
   directories:
-   - public/lib/
+   - $PWD/public/lib/
+   - $PWD/vendor/bundle
 
 install:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
-  - bundle install && yarn install
-  - mysql -e "CREATE DATABASE mapknitter_test;"
+  - bundle install --path vendor/bundle && yarn install
+  - mysql -e "CREATE DATABASE mapknitter_test; CREATE DATABASE mapknitter;"
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rails db:schema:load;
     else

From 6cfd543f7dffc17de5d1bd7269d6212ea91526e6 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 28 Jun 2019 12:23:20 -0300
Subject: [PATCH 101/152] Fixing bundle path

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bcd3cec65..bd936274e 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 2.4.6
 
@@ -9,15 +10,15 @@ services:
 cache:
   directories:
    - $PWD/public/lib/
-   - $PWD/vendor/bundle
+   - $PWD/vendor/.bundle/
 
 install:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
-  - bundle install --path vendor/bundle && yarn install
-  - mysql -e "CREATE DATABASE mapknitter_test; CREATE DATABASE mapknitter;"
+  - bundle install --path vendor/.bundle/ && yarn install
+  - mysql -e "CREATE DATABASE mapknitter_test;"
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rails db:schema:load;
     else

From 4fa14f2c69fb88c800b36a05970f9822d7ba35d4 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 28 Jun 2019 22:47:47 -0300
Subject: [PATCH 102/152] Splitting bundle and yarn verifications

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd936274e..8b34a15b3 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,9 @@ install:
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
-  - bundle install --path vendor/.bundle/ && yarn install
-  - mysql -e "CREATE DATABASE mapknitter_test;"
+  - bundle check --path vendor/.bundle/ || bundle install --path vendor/.bundle/
+  - yarn check || yarn install
+  - mysql -e "CREATE DATABASE mapknitter_test; CREATE DATABASE mapknitter;"
   - if [ $RAILS_ENV == 'production' ]; then
       bundle exec rails db:schema:load;
     else
@@ -50,7 +51,6 @@ jobs:
       env:
         - RAILS_ENV=production
       script:
-        - mysql -e "CREATE DATABASE mapknitter;"
         - bundle exec rails assets:precompile
 
 branches:
@@ -58,4 +58,3 @@ branches:
     - main
     - unstable
     - development
-

From d5ed24a79e45d3f9d04abd3c2c7f05c7250815bf Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 2 Jul 2019 14:08:38 -0300
Subject: [PATCH 103/152] Autofixing rubocop offenses

---
 app/controllers/annotations_controller.rb |  6 +++---
 app/controllers/images_controller.rb      |  4 ++--
 app/controllers/users_controller.rb       |  2 +-
 app/helpers/application_helper.rb         |  4 ++--
 app/models/export.rb                      |  4 ++--
 app/models/map.rb                         | 18 +++++++++---------
 app/models/warpable.rb                    | 12 ++++++------
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index 88019d3f7..b27494903 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -36,9 +36,9 @@ def update
     return if @annotation.user_id.nil? || current_user.can_edit?(@annotation)
 
     Annotation.update(@annotation.id,
-      coordinates: geojson[:geometry][:coordinates],
-      text: geojson[:properties][:textContent],
-      style: geojson[:properties][:style])
+                      coordinates: geojson[:geometry][:coordinates],
+                      text: geojson[:properties][:textContent],
+                      style: geojson[:properties][:style])
     render file: 'annotations/update.json.erb',
       content_type: 'application/json'
   end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 5ca999c4e..af14b8ec7 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -1,8 +1,8 @@
 require 'open-uri'
 class ImagesController < ApplicationController
   rescue_from Errno::ENOENT, Errno::ETIMEDOUT,
-    OpenURI::HTTPError, Timeout::Error,
-    with: :url_upload_not_found
+              OpenURI::HTTPError, Timeout::Error,
+              with: :url_upload_not_found
   protect_from_forgery except: %i(update delete)
   # Convert model to json without including root name. Eg. 'warpable'
   ActiveRecord::Base.include_root_in_json = false
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 40601a191..5dc4f187f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -30,6 +30,6 @@ def sort_direction
 
   def user_params
     params.require(:user).permit(:login, :email, :name,
-      :password, :password_confirmation)
+                                 :password, :password_confirmation)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3bad0e562..5d8039ef9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -41,8 +41,8 @@ def errors_for(object, message = nil)
   # see https://github.com/rails/jquery-ujs/wiki/Manual-installing-and-Rails-2
   def csrf_meta_tags
     if protect_against_forgery?
-      out = %(<meta name="csrf-param" content="%s"/>\n) # rubocop:disable Style/FormatStringToken
-      out << %(<meta name="csrf-token" content="%s"/>) # rubocop:disable Style/FormatStringToken
+      out = %(<meta name="csrf-param" content="%s"/>\n)
+      out << %(<meta name="csrf-token" content="%s"/>)
       format(out, Rack::Utils.escape_html(request_forgery_protection_token), Rack::Utils.escape_html(form_authenticity_token))
     end
   end
diff --git a/app/models/export.rb b/app/models/export.rb
index 94fbce007..57099f612 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -52,12 +52,12 @@ def self.histogram_cm_per_pixel_in_tens
 
   def self.export_count
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-      (DateTime.now - 24.hours).to_s(:db)).count
+                 (DateTime.now - 24.hours).to_s(:db)).count
   end
 
   # all exports currently running
   def self.exporting
     Export.where('status != "failed" AND status != "complete" AND status != "none" AND updated_at > ?',
-      (DateTime.now - 24.hours).to_s(:db))
+                 (DateTime.now - 24.hours).to_s(:db))
   end
 end
diff --git a/app/models/map.rb b/app/models/map.rb
index 861d7e2d7..b687bda71 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -144,7 +144,7 @@ def nearby_maps(dist)
     return [] if lat.to_f == 0.0 || lon.to_f == 0.0
 
     Map.where('id != ? AND lat > ? AND lat < ? AND lon > ? AND lon < ?',
-      id, lat - dist, lat + dist, lon - dist, lon + dist)
+              id, lat - dist, lat + dist, lon - dist, lon + dist)
       .limit(10)
   end
 
@@ -234,14 +234,14 @@ def run_export(user, resolution)
     new_export = Export.new(map_id: id) unless export
 
     Exporter.run_export(user,
-      resolution,
-      export || new_export,
-      id,
-      slug,
-      Rails.root.to_s,
-      average_scale,
-      placed_warpables,
-      key)
+                        resolution,
+                        export || new_export,
+                        id,
+                        slug,
+                        Rails.root.to_s,
+                        average_scale,
+                        placed_warpables,
+                        key)
   end
 
   def after_create
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 86dcc14c7..b225b51ea 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -6,12 +6,12 @@ class Warpable < ActiveRecord::Base
   # Paperclip; config and production/development specific configs
   # in /config/initializers/paperclip.rb
   has_attached_file :image,
-    s3_protocol: 'https',
-    styles: {
-      medium: "500x375",
-      small: "240x180",
-      thumb: "100x100>"
-    }
+                    s3_protocol: 'https',
+                    styles: {
+                      medium: "500x375",
+                      small: "240x180",
+                      thumb: "100x100>"
+                    }
 
   validates_attachment_content_type :image, content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"]
 

From 6cf32f7e6a47df09f1064120307b473c77087bc7 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 3 Jul 2019 12:41:26 -0300
Subject: [PATCH 104/152] Fixing prod host for travis, private class usage and
 rubocop offenses

---
 .travis.yml                            | 4 +++-
 app/controllers/front_ui_controller.rb | 8 +++++---
 app/helpers/front_ui_helper.rb         | 3 +--
 config/database.yml.example            | 2 +-
 mapknitter.env                         | 1 +
 test/unit/user_test.rb                 | 7 ++++++-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b34a15b3..f6a51e967 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,10 @@ install:
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle check --path vendor/.bundle/ || bundle install --path vendor/.bundle/
   - yarn check || yarn install
-  - mysql -e "CREATE DATABASE mapknitter_test; CREATE DATABASE mapknitter;"
   - if [ $RAILS_ENV == 'production' ]; then
+      mysql -e "CREATE DATABASE mapknitter;";
+      mysql -e "CREATE USER 'mapknitter'@'%' IDENTIFIED BY 'mapknitter';";
+      mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'mapknitter'@'%';";
       bundle exec rails db:schema:load;
     else
       bundle exec rails db:setup || bundle exec rails db:migrate;
diff --git a/app/controllers/front_ui_controller.rb b/app/controllers/front_ui_controller.rb
index a34b7a8ad..a41b4f540 100644
--- a/app/controllers/front_ui_controller.rb
+++ b/app/controllers/front_ui_controller.rb
@@ -8,9 +8,11 @@ def index
     @maps = Map.new_maps.first(4)
     @unpaginated = true
     # TODO: these could use optimization but are better than prev:
-    tag = Tag.where(name: 'featured').first # note that this is not a join table but the .maps method still works
-    @mappers = User.where(login: tag.maps.collect(&:author)) if tag
-    @mappers ||= []
+    @mappers = if Tag.where(name: 'featured').first
+                 User.where(login: tag.maps.collect(&:author))
+               else
+                 []
+               end
   end
 
   def all_maps
diff --git a/app/helpers/front_ui_helper.rb b/app/helpers/front_ui_helper.rb
index 5a4976030..c58fd7a23 100644
--- a/app/helpers/front_ui_helper.rb
+++ b/app/helpers/front_ui_helper.rb
@@ -1,7 +1,6 @@
 module FrontUiHelper
   def profile_image(author)
-    img = author&.warpables&.last&.image&.url
-    img ||= "/images/yarn.png"
+    author&.warpables&.last&.image&.url || "/images/yarn.png"
   end
 
   def anonymous(maps)
diff --git a/config/database.yml.example b/config/database.yml.example
index 396933d29..6f196c70d 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -14,7 +14,7 @@ production:
   adapter: mysql2
   encoding: utf8
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  host: db
+  host: <%= ENV.fetch("MYSQL_HOST") { '127.0.0.1' } %>
   username: mapknitter
   password: mapknitter
   database: mapknitter
diff --git a/mapknitter.env b/mapknitter.env
index eb1a7a8ca..b88791f34 100644
--- a/mapknitter.env
+++ b/mapknitter.env
@@ -2,4 +2,5 @@ MYSQL_DATABASE=mapknitter
 MYSQL_USER=mapknitter
 MYSQL_PASSWORD=mapknitter
 MYSQL_RANDOM_ROOT_PASSWORD=true
+MYSQL_HOST=db
 RAILS_ENV=production
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 1612c84db..4821c931c 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -43,7 +43,12 @@ class UserTest < ActiveSupport::TestCase
     user = users(:quentin)
     map_images = user.maps.map(&:warpables)
 
-    assert_equal Warpable::ActiveRecord_Associations_CollectionProxy, user.warpables.class
+    map_images.flatten.each do |image|
+      user.warpables.each do |warpable|
+        assert_equal image.class, warpable.class
+      end
+    end
+
     assert_equal map_images.flatten, user.warpables
   end
 

From 18436ae53827156c734d6db750f255d4ddcef9c4 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 4 Jul 2019 00:29:09 +0530
Subject: [PATCH 105/152] Upgrade to Rails 5.2 (#685)

* Upgrade Gemfile to Rails 5.0

* require rake'

* Change config files

* Add application record

* Bump mysql

* Locking newer Rails v

* Running update task

* Adding missing bootsnap gem

* Fixing missing database

* Adding missing listen gem

* Fixing schema example version

* Fixing migration versions

* Updating dependencies for Rails 5

* Adding ApplicationMailer abstraction

* Adding required initializers

* Prefer require_relative instead of full path

* Making associations not required by default

* Regenerating schema file

* Hotfixing MassAssigment

* Upgrade web-console, remove mysql adapter override

* Remove attr_accessible

* Add rails-controller-testing gem

* Follow new syntax for tests

* Remove extra web-console from gemfile

* Regenerating lock file

* Fixing rubocop offenses and bundler version

* Using correct Paperclip class as in https://github.com/rails/rails/issues/26404#issuecomment-502129936

* Fix images functional tests

* images controller test typecast to string

* Fix rails logger

* Fix map tests

* Bumping rubocop version

* Autofixing rubocop offenses

* Including performance cop to rubocop

* Refactoring deprecated routing and secret_token

* Fixing routes for feed controller

* Using correct routes for RSS builder

* Fixing missing routes

* Fixing travis bundler and yarn cache

* Fixing bundle path

* Splitting bundle and yarn verifications

* Fixing prod host for travis, private class usage and rubocop offenses
---
 .rubocop.yml                                  |   2 +
 .travis.yml                                   |  28 +-
 Gemfile                                       |  64 +++--
 Gemfile.lock                                  | 239 ++++++++++--------
 Rakefile                                      |   4 +-
 app/controllers/annotations_controller.rb     |   4 +-
 app/controllers/application_controller.rb     |   2 +-
 app/controllers/export_controller.rb          |   2 +-
 app/controllers/feeds_controller.rb           |   2 +-
 app/controllers/front_ui_controller.rb        |   8 +-
 app/controllers/maps_controller.rb            |   4 +-
 app/controllers/tags_controller.rb            |   2 +-
 app/helpers/front_ui_helper.rb                |   3 +-
 app/mailers/application_mailer.rb             |   4 +
 app/mailers/comment_mailer.rb                 |   2 +-
 app/models/annotation.rb                      |  11 +-
 app/models/application_record.rb              |   3 +
 app/models/comment.rb                         |   6 +-
 app/models/export.rb                          |   6 +-
 app/models/map.rb                             |   4 +-
 app/models/node.rb                            |   4 +-
 app/models/tag.rb                             |   6 +-
 app/models/user.rb                            |   4 +-
 app/models/warpable.rb                        |  13 +-
 app/models/way.rb                             |   2 +-
 app/views/feeds/all.builder                   |   2 +-
 app/views/feeds/author.builder                |   2 +-
 app/views/feeds/clean.builder                 |   2 +-
 app/views/feeds/license.builder               |   2 +-
 app/views/feeds/tag.builder                   |   2 +-
 app/views/layouts/mailer.html.erb             |   8 +
 app/views/layouts/mailer.text.erb             |   1 +
 bin/bundle                                    |   2 +-
 bin/rails                                     |   2 +-
 bin/setup                                     |  33 ++-
 bin/update                                    |  31 +++
 bin/yarn                                      |  11 +
 config.ru                                     |   2 +-
 config/application.rb                         |   9 +-
 config/boot.rb                                |   5 +-
 config/cable.yml                              |  10 +
 config/database.yml.example                   |   6 +-
 config/environment.rb                         |   4 +-
 config/environments/development.rb            |  63 +++--
 config/environments/production.rb             |  64 +++--
 config/environments/test.rb                   |  19 +-
 ...e_record_belongs_to_required_by_default.rb |   1 +
 .../application_controller_renderer.rb        |   8 +
 config/initializers/assets.rb                 |  36 ++-
 config/initializers/column_definition.rb      |  14 +-
 .../initializers/content_security_policy.rb   |  25 ++
 config/initializers/cookies_serializer.rb     |   2 +
 config/initializers/duration.rb               |  48 ----
 .../new_framework_defaults_5_2.rb             |  38 +++
 config/initializers/secret_token.rb           |   2 +-
 config/initializers/wrap_parameters.rb        |   6 +-
 config/locales/en.yml                         |  10 +
 config/routes.rb                              | 134 +++++-----
 config/spring.rb                              |   6 +
 config/storage.yml                            |  34 +++
 db/migrate/20090309034933_create_tweets.rb    |   2 +-
 db/migrate/20090309220337_create_messages.rb  |   2 +-
 db/migrate/20090323162902_add_message_id.rb   |   2 +-
 db/migrate/20090605191716_create_nodes.rb     |   2 +-
 db/migrate/20090605201606_create_ways.rb      |   2 +-
 db/migrate/20090611170805_create_sms.rb       |   2 +-
 ...20090611204112_add_name_desc_nodes_ways.rb |   2 +-
 .../20090611205227_change_lat_lon_types.rb    |   2 +-
 db/migrate/20090612011846_add_way_complete.rb |   2 +-
 db/migrate/20091016214109_create_maps.rb      |   2 +-
 db/migrate/20100301013330_create_warpables.rb |   2 +-
 db/migrate/20100306184916_add_map_id.rb       |   2 +-
 ...100308193343_add_map_description_author.rb |   2 +-
 db/migrate/20100310191643_add_warper_data.rb  |   2 +-
 db/migrate/20100316142953_zoom_to_float.rb    |   2 +-
 db/migrate/20100330233734_add_location.rb     |   2 +-
 .../20100404061203_add_warpable_lock.rb       |   2 +-
 .../20100505153420_add_warpable_deleted.rb    |   2 +-
 db/migrate/20100531175725_create_warps.rb     |   2 +-
 db/migrate/20100614190507_add_warp_map_id.rb  |   2 +-
 .../20100709061039_add_static_data_maps.rb    |   2 +-
 ...00731141421_add_warps_additional_fields.rb |   2 +-
 .../20101014151404_add_vectors_tiles.rb       |   2 +-
 .../20110701105813_change_map_tile_default.rb |   2 +-
 ...0110813004143_change_map_vector_default.rb |   2 +-
 ..._knitter_add_map_archive_and_user_email.rb |   2 +-
 ...1005211631_add_zip_warpable_res_history.rb |   2 +-
 db/migrate/20111006153011_add_map_tile_url.rb |   2 +-
 .../20120104164144_add_export_type_bands.rb   |   2 +-
 db/migrate/20120229164021_add_license.rb      |   2 +-
 db/migrate/20120525201148_create_users.rb     |   2 +-
 .../20120525215158_add_user_role_default.rb   |   2 +-
 ...0120601185008_remove_identity_url_limit.rb |   2 +-
 db/migrate/20120701165519_create_tags.rb      |   2 +-
 db/migrate/20130113164917_add_node_map_id.rb  |   2 +-
 db/migrate/20130124160539_add_way_order.rb    |   2 +-
 .../20130128184718_add_node_and_way_body.rb   |   2 +-
 ...5202555_add_map_anonymously_annotatable.rb |   2 +-
 db/migrate/20140811184901_add_tag_index.rb    |   2 +-
 db/migrate/20140811185342_create_comments.rb  |   2 +-
 .../20140902182631_create_annotations.rb      |   2 +-
 .../20140902201706_rename_annotation_type.rb  |   2 +-
 .../20141103164503_change_warpable_columns.rb |   2 +-
 ...41104184417_change_openid_identity_urls.rb |   2 +-
 .../20150117041411_add_slug_field_to_maps.rb  |   2 +-
 ...urrent_values_in_map_name_to_slug_field.rb |   2 +-
 db/migrate/20150715162314_change_map_null.rb  |   2 +-
 ...0190420025012_add_remote_url_to_exports.rb |   2 +-
 db/schema.rb                                  | 161 ++++++++++++
 db/schema.rb.example                          | 223 ++++++++--------
 lib/tasks/test_unit.rake                      |   3 +-
 mapknitter.env                                |   1 +
 .../functional/annotations_controller_test.rb |   8 +-
 test/functional/comments_controller_test.rb   |  48 ++--
 test/functional/export_controller_test.rb     |  22 +-
 test/functional/feeds_controller_test.rb      |  14 +-
 test/functional/images_controller_test.rb     |  20 +-
 test/functional/maps_controller_test.rb       |  57 +++--
 test/functional/sessions_controller_test.rb   |   4 +-
 test/functional/tags_controller_test.rb       |  10 +-
 test/functional/users_controller_test.rb      |   2 +-
 test/functional/utility_controller_test.rb    |  11 +-
 test/test_helper.rb                           |   8 +-
 test/unit/user_test.rb                        |   7 +-
 124 files changed, 1109 insertions(+), 659 deletions(-)
 create mode 100644 app/mailers/application_mailer.rb
 create mode 100644 app/models/application_record.rb
 create mode 100644 app/views/layouts/mailer.html.erb
 create mode 100644 app/views/layouts/mailer.text.erb
 create mode 100755 bin/update
 create mode 100755 bin/yarn
 create mode 100644 config/cable.yml
 create mode 100644 config/initializers/active_record_belongs_to_required_by_default.rb
 create mode 100644 config/initializers/application_controller_renderer.rb
 create mode 100644 config/initializers/content_security_policy.rb
 delete mode 100644 config/initializers/duration.rb
 create mode 100644 config/initializers/new_framework_defaults_5_2.rb
 create mode 100644 config/spring.rb
 create mode 100644 config/storage.yml
 create mode 100644 db/schema.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 709769f4d..9d1f9dc76 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+require: rubocop-performance
+
 # Start with Spotifys style guide as a base then customize from there
 inherit_from:
   - .rubocop_shopify_styleguide.yml
diff --git a/.travis.yml b/.travis.yml
index dc829fd54..f6a51e967 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 2.4.6
 
@@ -7,20 +8,24 @@ services:
   - docker
 
 cache:
-  bundler: true
   directories:
-   - public/lib/
+   - $PWD/public/lib/
+   - $PWD/vendor/.bundle/
 
 install:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
-  - bundle install && yarn install
+  - bundle check --path vendor/.bundle/ || bundle install --path vendor/.bundle/
+  - yarn check || yarn install
   - if [ $RAILS_ENV == 'production' ]; then
-      bundle exec rake db:create; 
+      mysql -e "CREATE DATABASE mapknitter;";
+      mysql -e "CREATE USER 'mapknitter'@'%' IDENTIFIED BY 'mapknitter';";
+      mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'mapknitter'@'%';";
+      bundle exec rails db:schema:load;
     else
-      bundle exec rake db:setup || bundle exec rake db:migrate;
+      bundle exec rails db:setup || bundle exec rails db:migrate;
     fi
 
 env:
@@ -29,14 +34,17 @@ env:
     - CI=true
     - TRAVIS=true
 
+# FIXME - Later change 'test/unit' and 'test/funcional' folders 
+# to 'test/unit' and 'test/funcional', respectively
+
 jobs:
   include:
     - name: "Unit Tests"
-      script: bundle exec rake test:unit
+      script: bundle exec rails test:unit
     - name: "Integration Tests"
-      script: bundle exec rake test:integration
+      script: bundle exec rails test:integration
     - name: "Functional Tests"
-      script: bundle exec rake test:functional
+      script: bundle exec rails test:functional
     - name: "Rubocop Linter"
       script: bundle exec rubocop
     - name: "Docker Builds"
@@ -44,11 +52,11 @@ jobs:
     - name: "Asset Precompilation"
       env:
         - RAILS_ENV=production
-      script: bundle exec rake assets:precompile
+      script:
+        - bundle exec rails assets:precompile
 
 branches:
   only:
     - main
     - unstable
     - development
-
diff --git a/Gemfile b/Gemfile
index 26ac423e8..f8f9c3ab3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,54 +1,59 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 ruby '2.4.6'
-gem 'rails', '4.2.11.1'
+gem 'rails', '~> 5.2.3'
 gem 'rake',  '~> 12.3.2'
 gem 'tzinfo-data'
 gem 'skylight'
 
-gem "will_paginate", "3.1.7"
-gem 'will_paginate-bootstrap4'
-gem "friendly_id"
+gem 'will_paginate', '3.1.7'
+gem 'will_paginate-bootstrap4', '~> 0.2.2'
+gem 'friendly_id'
 gem 'popper_js', '~> 1.11', '>= 1.11.1'
-gem 'protected_attributes'
 
 # dependencies
 group :dependencies do
-  gem 'mysql2', '< 0.4'
-  gem "geokit-rails", "1.1.4"
+  gem 'mysql2', '< 0.6'
+  gem 'geokit-rails', '1.1.4'
   gem 'image_science', '1.3.0'
-  gem "recaptcha", :require => "recaptcha/rails"
-  gem "oa-openid", "0.3.2"
-  gem "ruby-openid", "~>2.5"
-  gem "open_id_authentication"
-  gem "RubyInline"
-  gem "paperclip", "~>4.3.7"
+  gem 'recaptcha', '~> 4.14.0', require: 'recaptcha/rails'
+  gem 'oa-openid', '0.3.2'
+  gem 'ruby-openid', '~>2.5'
+  gem 'open_id_authentication'
+  gem 'RubyInline', '~> 3.12.4'
+  gem 'paperclip', '~> 6.1.0'
+  gem 'bootsnap', '~> 1.4.4'
+  gem 'turbolinks', '~> 5'
+  gem 'mini_magick', '~> 4.8'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
 
   # for rake image migration tasks
   # gem 'right_aws'
-  gem 'right_aws_api'
+  gem 'right_aws_api', '~> 0.3.5'
 
   # compiling markdown to html
-  gem "rdiscount", "2.2.0.1"
+  gem 'rdiscount', '2.2.0.1'
 
   # asset pipelining
   gem 'bootstrap-sass'
   gem 'sassc-rails'
   gem 'jquery-rails'
-  gem "sprockets"
+  gem 'sprockets', '3.7.2'
   gem "sprockets-rails"
-  gem "sass", :require => 'sass'
-  gem "autoprefixer-rails"
-  gem "uglifier"
+  gem 'sass', require: 'sass'
+  gem 'autoprefixer-rails', '~> 9.5.1.1'
+  gem 'uglifier', '~> 4.1.20'
+
 end
 
 group :test do
-  gem 'rubocop', '~> 0.52.0'
+  gem 'rubocop', '~> 0.70.0'
+  gem 'rubocop-performance'
   gem 'ruby-prof'
   gem 'rails-perftest'
+  gem 'rails-controller-testing'
   gem 'simplecov', require: false
   gem 'codecov', require: false
   gem 'minitest'
@@ -56,25 +61,28 @@ group :test do
 end
 
 group :development, :test do
-  gem "byebug"
-  gem 'faker'
-  gem 'pry-rails'
+  gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
+  gem 'faker', '~> 1.9.3'
+  gem 'pry-rails', '~> 0.3.9'
 end
 
 group :development do
-  gem "jshintrb"
-  gem "therubyracer"
+  gem 'jshintrb', '~> 0.3.0'
+  gem 'mini_racer', platforms: :ruby
+  gem 'listen', '~> 3.1.5'
   gem 'web-console', '~> 3.3'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :sqlite do
   # if you decide to use sqlite3 as the database
-  gem "sqlite3"
+  gem 'sqlite3'
 end
 
 group :passenger do
   # passenger server
-  gem "passenger"
+  gem 'passenger'
 end
 
 gem 'httparty'
diff --git a/Gemfile.lock b/Gemfile.lock
index 96d1185b4..6a9dae479 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,58 +4,66 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.2)
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      arel (~> 6.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    arel (6.0.4)
+    arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (9.6.0)
+    autoprefixer-rails (9.5.1.1)
       execjs
     aws-sdk (1.5.8)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    bindex (0.7.0)
+    bootsnap (1.4.4)
+      msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.3)
     byebug (11.0.1)
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     codecov (0.1.14)
       json
       simplecov
@@ -63,10 +71,9 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
-    debug_inspector (0.0.3)
     docile (1.3.2)
     equatable (0.6.1)
-    erubis (2.7.0)
+    erubi (1.8.0)
     execjs (2.7.0)
     faker (1.9.4)
       i18n (>= 0.7)
@@ -86,10 +93,11 @@ GEM
     httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     image_science (1.3.0)
       RubyInline (~> 3.9)
+    jaro_winkler (1.5.3)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -99,30 +107,41 @@ GEM
       multi_json (>= 1.3)
       rake
     json (1.8.6)
-    libv8 (3.16.14.19)
+    libv8 (7.3.492.27.1)
     libxml-ruby (3.1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mimemagic (0.3.0)
+    mimemagic (0.3.3)
+    mini_magick (4.9.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
+    mini_racer (0.2.6)
+      libv8 (>= 6.9.411)
     minitest (5.11.3)
     minitest-reporters (1.3.6)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    msgpack (1.3.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    mysql2 (0.3.21)
+    mysql2 (0.5.2)
     net-http-persistent (2.9.4)
+    nio4r (2.3.1)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     oa-core (0.3.2)
@@ -132,12 +151,12 @@ GEM
       ruby-openid-apps-discovery (~> 1.2.0)
     open_id_authentication (1.3.0)
       rack-openid (~> 1.3)
-    paperclip (4.3.7)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
+    paperclip (6.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       mime-types
-      mimemagic (= 0.3.0)
+      mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
@@ -148,55 +167,55 @@ GEM
       equatable (~> 0.6)
       tty-color (~> 0.5)
     popper_js (1.14.5)
-    powerpack (0.1.2)
-    protected_attributes (1.1.4)
-      activemodel (>= 4.0.1, < 5.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    rack (1.6.11)
+    rack (2.0.7)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.11.1)
-      actionmailer (= 4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activerecord (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     rails-perftest (0.0.7)
-    railties (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    recaptcha (5.0.0)
+    recaptcha (4.14.0)
       json
     redcarpet (3.4.0)
-    ref (2.0.0)
     right_aws_api (0.3.5)
       right_cloud_api_base (>= 0.2.6)
     right_cloud_api_base (0.2.6)
@@ -205,19 +224,22 @@ GEM
       net-http-persistent (~> 2.9)
       redcarpet (>= 3.0.0)
       ruby-hmac (>= 0.4.0)
-    rubocop (0.52.1)
+    rubocop (0.70.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
     ruby-hmac (0.4.0)
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
     ruby-prof (0.18.0)
     ruby-progressbar (1.10.1)
+    ruby_dep (1.5.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -241,6 +263,10 @@ GEM
       skylight-core (= 4.1.2)
     skylight-core (4.1.2)
       activesupport (>= 4.2.0)
+    spring (2.1.0)
+    spring-watcher-listen (2.0.1)
+      listen (>= 2.7, < 4.0)
+      spring (>= 1.2, < 3.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -254,9 +280,8 @@ GEM
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
@@ -268,6 +293,9 @@ GEM
     tty-screen (0.6.5)
     tty-tree (0.3.0)
     tty-which (0.4.1)
+    turbolinks (5.2.0)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.1)
@@ -278,10 +306,14 @@ GEM
     unicode_utils (1.4.0)
     url (0.3.2)
     uuidtools (2.1.5)
-    web-console (3.3.0)
-      activemodel (>= 4.2)
-      debug_inspector
-      railties (>= 4.2)
+    web-console (3.7.0)
+      actionview (>= 5.0)
+      activemodel (>= 5.0)
+      bindex (>= 0.4.0)
+      railties (>= 5.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     will_paginate (3.1.7)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
@@ -290,51 +322,58 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RubyInline
-  autoprefixer-rails
+  RubyInline (~> 3.12.4)
+  autoprefixer-rails (~> 9.5.1.1)
   aws-sdk (~> 1.5.7)
+  bootsnap (~> 1.4.4)
   bootstrap-sass
-  byebug
+  byebug (~> 11.0.1)
   codecov
-  faker
+  faker (~> 1.9.3)
   friendly_id
   geokit-rails (= 1.1.4)
   httparty
   image_science (= 1.3.0)
   jquery-rails
-  jshintrb
+  jshintrb (~> 0.3.0)
+  listen (~> 3.1.5)
+  mini_magick (~> 4.8)
+  mini_racer
   minitest
   minitest-reporters
-  mysql2 (< 0.4)
+  mysql2 (< 0.6)
   oa-openid (= 0.3.2)
   open_id_authentication
-  paperclip (~> 4.3.7)
+  paperclip (~> 6.1.0)
   passenger
   popper_js (~> 1.11, >= 1.11.1)
-  protected_attributes
-  pry-rails
-  rails (= 4.2.11.1)
+  pry-rails (~> 0.3.9)
+  rails (~> 5.2.3)
+  rails-controller-testing
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
-  recaptcha
-  right_aws_api
-  rubocop (~> 0.52.0)
+  recaptcha (~> 4.14.0)
+  right_aws_api (~> 0.3.5)
+  rubocop (~> 0.70.0)
+  rubocop-performance
   ruby-openid (~> 2.5)
   ruby-prof
   sass
   sassc-rails
   simplecov
   skylight
-  sprockets
+  spring
+  spring-watcher-listen (~> 2.0.0)
+  sprockets (= 3.7.2)
   sprockets-rails
   sqlite3
-  therubyracer
+  turbolinks (~> 5)
   tzinfo-data
-  uglifier
+  uglifier (~> 4.1.20)
   web-console (~> 3.3)
   will_paginate (= 3.1.7)
-  will_paginate-bootstrap4
+  will_paginate-bootstrap4 (~> 0.2.2)
 
 RUBY VERSION
    ruby 2.4.6p354
diff --git a/Rakefile b/Rakefile
index ffd116932..b3fe3d210 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 # Load all the rake tasks from the "tasks" folder.
 task_dir = File.expand_path("../tasks", __FILE__)
@@ -9,4 +9,4 @@ Dir["#{task_dir}/**/*.rake"].each do |task_file|
   load task_file
 end
 
-Mapknitter::Application.load_tasks
\ No newline at end of file
+Rails.application.load_tasks
\ No newline at end of file
diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index b27494903..0a0f780ff 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -1,8 +1,8 @@
 require 'json'
 
 class AnnotationsController < ApplicationController
-  # before_filter :require_user, :except => [ :index, :show ]
-  before_filter :find_map
+  # before_action :require_user, :except => [ :index, :show ]
+  before_action :find_map
 
   def index
     render file: 'annotations/index.json.erb', content_type: 'application/json'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 06862c217..4d4bf7521 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
 
   helper :all # include all helpers, all the time
 
-  before_filter :current_user
+  before_action :current_user
   helper_method :logged_in?, :current_location
 
   def current_user
diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 231f18d6c..2def4b577 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -17,7 +17,7 @@ def logger
     if params[:action] == 'progress'
       nil
     else
-      RAILS_DEFAULT_LOGGER
+      Rails.logger
     end
   end
 
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 392051d23..12740d81e 100644
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -1,5 +1,5 @@
 class FeedsController < ApplicationController
-  before_filter :query, only: %i(clean license)
+  before_action :query, only: %i(clean license)
 
   def all
     # (Warpable.all + Map.all).sort_by(&:created_at)
diff --git a/app/controllers/front_ui_controller.rb b/app/controllers/front_ui_controller.rb
index a34b7a8ad..a41b4f540 100644
--- a/app/controllers/front_ui_controller.rb
+++ b/app/controllers/front_ui_controller.rb
@@ -8,9 +8,11 @@ def index
     @maps = Map.new_maps.first(4)
     @unpaginated = true
     # TODO: these could use optimization but are better than prev:
-    tag = Tag.where(name: 'featured').first # note that this is not a join table but the .maps method still works
-    @mappers = User.where(login: tag.maps.collect(&:author)) if tag
-    @mappers ||= []
+    @mappers = if Tag.where(name: 'featured').first
+                 User.where(login: tag.maps.collect(&:author))
+               else
+                 []
+               end
   end
 
   def all_maps
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 66b2cbbc9..7fa9de0e4 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -3,8 +3,8 @@
 class MapsController < ApplicationController
   protect_from_forgery except: :export
 
-  before_filter :require_login, only: %i(edit update destroy)
-  before_filter :find_map, only: %i(show annotate embed edit update images destroy archive)
+  before_action :require_login, only: %i(edit update destroy)
+  before_action :find_map, only: %i(show annotate embed edit update images destroy archive)
 
   layout 'knitter2'
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index b3bf053c2..aeb1f937c 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,5 +1,5 @@
 class TagsController < ApplicationController
-  before_filter :require_login, only: %i(edit update destroy)
+  before_action :require_login, only: %i(edit update destroy)
 
   def create
     @map = Map.find_by(slug: params[:map_id])
diff --git a/app/helpers/front_ui_helper.rb b/app/helpers/front_ui_helper.rb
index 5a4976030..c58fd7a23 100644
--- a/app/helpers/front_ui_helper.rb
+++ b/app/helpers/front_ui_helper.rb
@@ -1,7 +1,6 @@
 module FrontUiHelper
   def profile_image(author)
-    img = author&.warpables&.last&.image&.url
-    img ||= "/images/yarn.png"
+    author&.warpables&.last&.image&.url || "/images/yarn.png"
   end
 
   def anonymous(maps)
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
new file mode 100644
index 000000000..00655e720
--- /dev/null
+++ b/app/mailers/application_mailer.rb
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+ end
diff --git a/app/mailers/comment_mailer.rb b/app/mailers/comment_mailer.rb
index cb369928a..7a4e0902b 100644
--- a/app/mailers/comment_mailer.rb
+++ b/app/mailers/comment_mailer.rb
@@ -1,4 +1,4 @@
-class CommentMailer < ActionMailer::Base
+class CommentMailer < ApplicationMailer
   default from: "do-not-reply@mapknitter.org"
 
   # CommentMailer.notify_of_comment(user,self).deliver
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index e681cb9bc..cba78ff2b 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,9 +1,10 @@
-class Annotation < ActiveRecord::Base
-  include ActiveModel::MassAssignmentSecurity
-  belongs_to :map
-  belongs_to :user
+class Annotation < ApplicationRecord
+  # FIXME: - We should start using strong parameters here in favor of this below
+  # include ActiveModel::MassAssignmentSecurity
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
-  attr_accessible :annotation_type, :coordinates, :text, :style
+  attr_accessor :annotation_type, :coordinates, :text, :style
 
   serialize :coordinates, Array
   serialize :style, Hash
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 000000000..10a4cba84
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 05d55677e..a7a327bc3 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,6 +1,6 @@
-class Comment < ActiveRecord::Base
-  belongs_to :map
-  belongs_to :user
+class Comment < ApplicationRecord
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   validates_presence_of :body, :user_id, :map_id
 
diff --git a/app/models/export.rb b/app/models/export.rb
index 57099f612..07365476e 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -1,6 +1,6 @@
-class Export < ActiveRecord::Base
-  belongs_to :map
-  belongs_to :user
+class Export < ApplicationRecord
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   # currently exporting?
   def running?
diff --git a/app/models/map.rb b/app/models/map.rb
index b687bda71..2bd9d6c3a 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -1,4 +1,4 @@
-class Map < ActiveRecord::Base
+class Map < ApplicationRecord
   include ActiveModel::Validations
   extend FriendlyId
   friendly_id :name, use: %i(slugged static)
@@ -20,7 +20,7 @@ class Map < ActiveRecord::Base
   has_many :tags, dependent: :destroy
   has_many :comments, dependent: :destroy
   has_many :annotations, dependent: :destroy
-  belongs_to :user
+  belongs_to :user, optional: true
 
   has_many :warpables
   scope :active, -> { where(archived: false) }
diff --git a/app/models/node.rb b/app/models/node.rb
index a6e3018b7..85f7777db 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,3 +1,3 @@
-class Node < ActiveRecord::Base
-  belongs_to :way
+class Node < ApplicationRecord
+  belongs_to :way, optional: true
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 390df29ac..2a298824e 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,6 +1,6 @@
-class Tag < ActiveRecord::Base
-  belongs_to :map
-  belongs_to :user
+class Tag < ApplicationRecord
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   validates_presence_of :name, on: :create, message: "can't be blank"
   validates_presence_of :user_id, on: :create, message: "can't be blank"
diff --git a/app/models/user.rb b/app/models/user.rb
index 0274d6bdd..d40a02ca0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 require 'digest/sha1'
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   has_many :maps
   has_many :tags
   has_many :comments
@@ -16,7 +16,7 @@ class User < ActiveRecord::Base
   validates_length_of       :email, within: 6..100 # r@a.wk
   validates_uniqueness_of   :email
 
-  # HACK: HACK HACK -- how to do attr_accessible from here?
+  # HACK: HACK HACK -- how to do attr_accessor from here?
   # prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
 
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index b225b51ea..f21187f3b 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,6 +1,9 @@
-class Warpable < ActiveRecord::Base
-  include ActiveModel::MassAssignmentSecurity
-  attr_accessible :image
+class Warpable < ApplicationRecord
+  # FIXME: - We should start using strong parameters here in favor of this below
+  # include ActiveModel::MassAssignmentSecurity
+  # attr_accessible :image
+
+  attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation
 
   # Paperclip; config and production/development specific configs
@@ -15,8 +18,8 @@ class Warpable < ActiveRecord::Base
 
   validates_attachment_content_type :image, content_type: ["image/jpg", "image/jpeg", "image/png", "image/gif"]
 
-  belongs_to :map
-  belongs_to :user
+  belongs_to :map, optional: true
+  belongs_to :user, optional: true
 
   # overriding JSON formatting for Leaflet.DistortableImage
   def as_json(options = {})
diff --git a/app/models/way.rb b/app/models/way.rb
index 7fb80d1ed..d29acbdf9 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,4 +1,4 @@
-class Way < ActiveRecord::Base
+class Way < ApplicationRecord
   has_many :nodes, dependent: :destroy
 
   def bbox=(bbox)
diff --git a/app/views/feeds/all.builder b/app/views/feeds/all.builder
index 760a02c18..d4d36d0d3 100644
--- a/app/views/feeds/all.builder
+++ b/app/views/feeds/all.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'all'
    xml.description "Recently posted maps at MapKnitter.org, a Public Lab open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/author.builder b/app/views/feeds/author.builder
index 7fca6154f..67057ff9f 100644
--- a/app/views/feeds/author.builder
+++ b/app/views/feeds/author.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Maps by "+params[:id]+" at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'author'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/clean.builder b/app/views/feeds/clean.builder
index 36a2d114d..e05be36f6 100644
--- a/app/views/feeds/clean.builder
+++ b/app/views/feeds/clean.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'clean'
    xml.description "Recently posted maps at MapKnitter.org, a Public Lab open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/license.builder b/app/views/feeds/license.builder
index 829abbafe..244f54ae8 100644
--- a/app/views/feeds/license.builder
+++ b/app/views/feeds/license.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'license'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/feeds/tag.builder b/app/views/feeds/tag.builder
index 829abbafe..bf50efe89 100644
--- a/app/views/feeds/tag.builder
+++ b/app/views/feeds/tag.builder
@@ -4,7 +4,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
  xml.channel do
 
    xml.title       "Recent maps at MapKnitter.org"
-   xml.link        url_for :only_path => false, :controller => 'spectrums'
+   xml.link        url_for only_path: false, controller: 'feeds', action: 'tag'
    xml.description "Recently posted maps at MapKnitter.org, a Public Laboratory open source research initiative"
 
    @maps.each do |map|
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 000000000..cb2589829
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>/* Email styles need to be inline */</style>
+  </head>
+  <body><%= yield %></body>
+</html>
\ No newline at end of file
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 000000000..cd9bb66dd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
\ No newline at end of file
diff --git a/bin/bundle b/bin/bundle
index 66e9889e8..f19acf5b5 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
index 5191e6927..073966023 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/setup b/bin/setup
index acdb2c138..94fd4d797 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,29 +1,36 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end
diff --git a/bin/update b/bin/update
new file mode 100755
index 000000000..58bfaed51
--- /dev/null
+++ b/bin/update
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end
diff --git a/bin/yarn b/bin/yarn
new file mode 100755
index 000000000..460dd565b
--- /dev/null
+++ b/bin/yarn
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end
diff --git a/config.ru b/config.ru
index 2b2ae190a..afac488a9 100644
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
 run Mapknitter::Application
diff --git a/config/application.rb b/config/application.rb
index 09d4d4575..653e04541 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,5 +1,4 @@
-require File.expand_path('../boot', __FILE__)
-
+require_relative 'boot'
 require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
@@ -27,6 +26,9 @@ class Application < Rails::Application
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
+     # Initialize configuration defaults for originally generated Rails version.
+     config.load_defaults 5.2
+
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
@@ -39,9 +41,6 @@ class Application < Rails::Application
     # parameters by using an attr_accessible or attr_protected declaration.
     # config.active_record.whitelist_attributes = true
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     # Enable the asset pipeline
     config.assets.enabled = true
 
diff --git a/config/boot.rb b/config/boot.rb
index 44358b8e4..b9e460cef 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) # Set up gems listed in the Gemfile.
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 000000000..8648dafa2
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: mapknitter_production
diff --git a/config/database.yml.example b/config/database.yml.example
index 0607fcd1d..6f196c70d 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -6,15 +6,15 @@ default: &default
 
 development:
   <<: *default
-  username:
-  password:
+  username: 
+  password: 
   database: mapknitter_dev
 
 production:
   adapter: mysql2
   encoding: utf8
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  host: db
+  host: <%= ENV.fetch("MYSQL_HOST") { '127.0.0.1' } %>
   username: mapknitter
   password: mapknitter
   database: mapknitter
diff --git a/config/environment.rb b/config/environment.rb
index 99fb29737..426333bb4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
-Mapknitter::Application.initialize!
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1ab5e7b64..d4ca60dce 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-Mapknitter::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -9,23 +9,31 @@
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
 
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
 
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
 
-  # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+    config.cache_store = :null_store
+  end
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  config.action_mailer.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
@@ -36,15 +44,34 @@
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
 
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
   # Do not compress assets
   config.assets.compress = false
-
   # Expands the lines which load the assets
+  config.assets.logger = false
   config.assets.debug = true#false
+
   config.serve_static_files = true
 
-  config.assets.logger = false
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+# Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 219f7fc32..a963d8cd9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,6 @@
-Mapknitter::Application.configure do
+require 'uglifier'
 
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
@@ -15,18 +16,16 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
@@ -36,18 +35,23 @@
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-  config.assets.precompile += ['tags.js',
-                               'uploads.js',
-                               'knitter.js',
-                               'annotations.js',
-                               'maps.js']
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain
+  # config.action_cable.mount_path = nil
+  # config.action_cable.url = 'wss://example.com/cable'
+  # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
+
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
@@ -56,25 +60,20 @@
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.log_tags = [ :request_id ]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # config.active_job.queue_adapter     = :resque
+  # config.active_job.queue_name_prefix = "mapknitter_#{Rails.env}"
+
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.delivery_method = :sendmail
-  config.action_mailer.sendmail_settings = {
-    location: '/usr/sbin/sendmail',
-    arguments: '-i'
-  }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
@@ -86,6 +85,21 @@
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
+  config.action_mailer.delivery_method = :sendmail
+  config.action_mailer.sendmail_settings = {
+    location: '/usr/sbin/sendmail',
+    arguments: '-i'
+  }
+  
+  # Use a different logger for distributed setups.
+  # require 'syslog/logger'
+  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  end
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 278bd7e91..0a38fd3ce 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,4 @@
-Mapknitter::Application.configure do
-
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -13,9 +12,11 @@
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -27,14 +28,16 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
+  config.action_mailer.perform_caching = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
diff --git a/config/initializers/active_record_belongs_to_required_by_default.rb b/config/initializers/active_record_belongs_to_required_by_default.rb
new file mode 100644
index 000000000..16e252ab8
--- /dev/null
+++ b/config/initializers/active_record_belongs_to_required_by_default.rb
@@ -0,0 +1 @@
+Rails.application.config.active_record.belongs_to_required_by_default = true
\ No newline at end of file
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
new file mode 100644
index 000000000..89d2efab2
--- /dev/null
+++ b/config/initializers/application_controller_renderer.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index b666a7c43..aa1ca5174 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,17 +1,27 @@
 # Be sure to restart your server when you modify this file.
 
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-Rails.application.config.assets.precompile += %w[*.png *.jpg *.jpeg *.gif *.svg]
+Rails.application.configure do
+    # Version of your assets, change this if you want to expire all your assets.
+    config.assets.version = '1.0'
+    config.assets.precompile += %w[*.png *.jpg *.jpeg *.gif]
 
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
+    # Add additional assets to the asset load path.
+    # Rails.application.config.assets.paths << Emoji.images_path
+    # Add Yarn node_modules folder to the asset load path.
+    config.assets.paths << Rails.root.join('public/lib')
 
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += ['tags.js',
-                                               'uploads.js',
-                                               'knitter.js',
-                                               'annotations.js',
-                                               'maps.js']
+    config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
+    config.assets.precompile += ['tags.js',
+                               'uploads.js',
+                               'knitter.js',
+                               'annotations.js',
+                               'maps.js',
+                               'admin.js',
+                               'admin.css']
+
+
+    # Precompile additional assets.
+    # application.js, application.css, and all non-JS/CSS in the app/assets
+    # folder are already added.
+    # Rails.application.config.assets.precompile += %w( admin.js admin.css )
+end
\ No newline at end of file
diff --git a/config/initializers/column_definition.rb b/config/initializers/column_definition.rb
index feca93639..501e955b1 100644
--- a/config/initializers/column_definition.rb
+++ b/config/initializers/column_definition.rb
@@ -11,15 +11,15 @@
 
 # or, alternatively, 
 
-# This can also be removed if DEFAULT NULL is removed from all columns;
-# Read more at https://github.com/publiclab/mapknitter/pull/323
+  # # This can also be removed if DEFAULT NULL is removed from all columns;
+  # # Read more at https://github.com/publiclab/mapknitter/pull/323
 
 class ActiveRecord::ConnectionAdapters::ColumnDefinition
 
-  if ActiveRecord::Base.connection.adapter_name != 'sqlite3' && ActiveRecord::Base.connection.adapter_name != 'SQLite'
-    def sql_type
-      type.to_sym == :primary_key ? 'int(11) auto_increment PRIMARY KEY' : base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
-    end 
-  end 
+  #   if ActiveRecord::Base.connection.adapter_name != 'sqlite3' && ActiveRecord::Base.connection.adapter_name != 'SQLite'
+  #     def sql_type
+  #       type.to_sym == :primary_key ? 'int(11) auto_increment PRIMARY KEY' : base.type_to_sql(type.to_sym, limit, precision, scale) rescue type
+  #     end 
+  #   end 
 
 end
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 000000000..d3bcaa5ec
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 54516e3f2..f51a497e1 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
 Rails.application.config.action_dispatch.cookies_serializer = :hybrid
diff --git a/config/initializers/duration.rb b/config/initializers/duration.rb
deleted file mode 100644
index ac6e2f581..000000000
--- a/config/initializers/duration.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# this is a customization created to bridge incompatabilities when upgrading Ruby 2.1.2
-# to 2.4.4 with Rails 3.2. 
-
-# explanation
-# There's a fundamental asymmetry in how operators work in Ruby - 
-# `1 * 1.second` dispatches -> * on Integer. 
-# `1.second * 1` dispatches -> * on Duration -> throws error 'Duration can't be coerced into Integer'
-
-# the source code for Rails 3.2 puts duration second: https://github.com/rails/rails/blob/v3.2.22.5/activesupport/lib/active_support/core_ext/numeric/time.rb
-
-# the solution: the order of multiplication has to be swtiched, and Duration put first. 
-
-# this code can be removed with ActiveSupport v.5.0.3: https://github.com/rails/rails/blob/v5.0.3/activesupport/lib/active_support/core_ext/numeric/time.rb
-# (Rails 5)
-
-class Numeric
-  def days
-    ActiveSupport::Duration.new(24.hours * self, [[:days, self]])
-  end
-  alias :day :days
-
-  def weeks
-    ActiveSupport::Duration.new(7.days * self, [[:days, self * 7]])
-  end
-  alias :week :weeks
-
-  def fortnights
-    ActiveSupport::Duration.new(2.weeks * self, [[:days, self * 14]])
-  end
-  alias :fortnight :fortnights
-end
-
-# source code: https://github.com/rails/rails/blob/v3.2.22.5/activesupport/lib/active_support/core_ext/integer/time.rb
-
-# fixed as of ActiveSupport v.4.1.2 https://github.com/rails/rails/blob/v4.1.12/activesupport/lib/active_support/core_ext/integer/time.rb
-# (Rails 4)
-
-class Integer
-  def months
-    ActiveSupport::Duration.new(30.days * self, [[:months, self]])
-  end
-  alias :month :months
-
-  def years
-    ActiveSupport::Duration.new(365.25.days * self, [[:years, self]])
-  end
-  alias :year :years
-end
\ No newline at end of file
diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb
new file mode 100644
index 000000000..c383d072b
--- /dev/null
+++ b/config/initializers/new_framework_defaults_5_2.rb
@@ -0,0 +1,38 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 5.2 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Make Active Record use stable #cache_key alongside new #cache_version method.
+# This is needed for recyclable cache keys.
+# Rails.application.config.active_record.cache_versioning = true
+
+# Use AES-256-GCM authenticated encryption for encrypted cookies.
+# Also, embed cookie expiry in signed or encrypted cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 5.2.
+#
+# Existing cookies will be converted on read then written with the new scheme.
+# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
+
+# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
+# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
+# Rails.application.config.active_support.use_authenticated_message_encryption = true
+
+# Add default protection from forgery to ActionController::Base instead of in
+# ApplicationController.
+# Rails.application.config.action_controller.default_protect_from_forgery = true
+
+# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
+# 'f' after migrating old data.
+# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+
+# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
+# Rails.application.config.active_support.use_sha1_digests = true
+
+# Make `form_with` generate id attributes for any generated HTML tags.
+# Rails.application.config.action_view.form_with_generates_ids = true
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index b7bba1a47..cf23dc7a0 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Mapknitter::Application.config.secret_token = 'asdfjdasgaisaolghrwiohrkahguilboiwelkxwbranjkl'
+Mapknitter::Application.config.secret_key_base = 'asdfjdasgaisaolghrwiohrkahguilboiwelkxwbranjkl'
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index b8e3fb7b6..bbfc3961b 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -5,10 +5,10 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+  wrap_parameters format: [:json]
 end
 
-# Disable root element in JSON for ActiveRecord objects.
+# To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
-#   self.include_root_in_json = false
+#   self.include_root_in_json = true
 # end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 065395716..decc5a857 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -16,6 +16,16 @@
 #
 # This would use the information in config/locales/es.yml.
 #
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
 # To learn more, please read the Rails Internationalization guide
 # available at http://guides.rubyonrails.org/i18n.html.
 
diff --git a/config/routes.rb b/config/routes.rb
index 727f6518c..f36cdc4c8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,78 +1,95 @@
 Mapknitter::Application.routes.draw do
 
-  root :to => 'front_ui#index'
+  root to: 'front_ui#index'
 
+  get 'front-page', to: 'front_ui#index'
+  get 'mappers', to: 'front_ui#nearby_mappers'
+  get 'about', to: 'front_ui#about'
+  post 'save_location' => 'front_ui#save_location'
+  get 'all_maps', to: 'front_ui#all_maps'
   get 'legacy' => 'maps#index' # remove once new front page is stable
-  get 'front-page' => 'front_ui#index'
-  get 'mappers' => 'front_ui#nearby_mappers'
-  get 'gallery' => 'front_ui#gallery'
-  post "save_location" => 'front_ui#save_location'
-  get 'about' => 'front_ui#about'
-  get 'all_maps' => 'front_ui#all_maps'
-
-  get 'external_url_test' => 'export#external_url_test'
-  get 'local/:login' => 'sessions#local'
-  get 'logout' => 'sessions#logout'
-  get 'login' => 'sessions#new'
-  get 'register' => 'users#create'
-  get 'signup' => 'users#new'
+
+  post 'save_location', to: 'front_ui#save_location'
+
+  get 'external_url_test', to: 'export#external_url_test'
+  get 'local/:login', to: 'sessions#local'
+  get 'logout', to: 'sessions#logout'
+  get 'login', to: 'sessions#new'
+  get 'register', to: 'users#create'
+  get 'signup', to: 'users#new'
 
   # since rails 3.2, we use this to log in:
-  get 'sessions/create' => 'sessions#create'
+  get 'sessions/create', to: 'sessions#create'
 
-  resources :users, :sessions, :maps
+  resources :users, :sessions, :maps, :images, :comments, :tags
 
   # redirect legacy route:
   get 'tag/:id', to: redirect('/tags/%{id}')
-  get 'tags/:id' => 'tags#show'
 
   # Registered user pages:
-  get 'profile' => 'users#profile', :id => 0
-  get 'profile/:id' => 'users#profile'
-  get 'dashboard' => 'users#dashboard'
+  get 'profile', to: 'users#profile', id: 0
+  get 'profile/:id', to: 'users#profile'
+  get 'dashboard', to: 'users#dashboard'
 
-  get 'authors' => 'users#index'
+  get 'authors', to: 'users#index'
 
-  get 'feeds/all' => 'feeds#all', :format => 'rss'
-  get 'feeds/license/:id' => 'feeds#license', :format => 'rss'
-  get 'feeds/author/:id' => 'feeds#author', :format => 'rss'
-  get 'feeds/tag/:id' => 'feeds#tag', :format => 'rss'
+  get 'images/:url', to: 'images#fetch'
 
-  get 'tms/:id/alt/:z/:x/:y.png' => 'utility#tms_alt'
-  get 'tms/:id/' => 'utility#tms_info'
-  get 'tms/:id/alt/' => 'utility#tms_info'
+  get 'tms/:id/alt/:z/:x/:y.png', to: 'utility#tms_alt'
+  get 'tms/:id/', to: 'utility#tms_info'
+  get 'tms/:id/alt/', to: 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
-  get 'map/map' => 'maps#map'
-  get 'search/:id' => 'maps#search'
-  get 'search' => 'maps#search'
-  get 'map/archive/:id' => 'maps#archive'
-  get 'map/region/:id' => 'maps#region'
-  get 'map/license/:id' => 'maps#license'
-  get 'maps/featured' => 'maps#featured'
-  get 'map/view/:id', to: redirect('/maps/%{id}') # legacy
-  get 'maps/:id/annotate' => 'maps#annotate'
-  get 'maps/exports/:id' => 'maps#exports'
-  get 'maps/:id/warpables' => 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
-  post 'maps/:map_id/warpables' => 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
-  get 'export/progress/:id' => 'export#progress'
-  get 'export/status/:id' => 'export#status'
-  get 'exports' => 'export#index'
+  get 'search/:id', to: 'maps#search'
+  get 'search', to: 'maps#search'
+  get 'maps/:id/warpables', to: 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
+  get 'maps/view/:id', to: redirect('/maps/%{id}') # legacy
+  get 'export/progress/:id', to: 'export#progress'
+  get 'export/status/:id', to: 'export#status'
+  get 'exports', to: 'export#index'
   get 'map/:id', to: redirect('/maps/%{id}')
-  get 'embed/:id' => 'maps#embed'
-  post 'maps/export/:id' => 'maps#export'
-  post 'maps/:id' => 'maps#export'
+  get 'embed/:id', to: 'maps#embed'
+  post 'maps/:map_id/warpables', to: 'images#create' # deprecate this in favor of resourceful route below; this is just to override maps/:id
+  post 'maps/export/:id', to: 'maps#export'
+  post 'maps/:id', to: 'maps#export'
+
+  get 'import/:name', to: 'images#import' # this was for auto-adding images via URL
+
+  namespace 'feeds' do
+    %w(all clean).each do |action|
+      get action, action: action, format: 'rss'
+    end
+
+    %w(license author tag).each do |action|
+      get action + "/:id", action: action, format: 'rss'
+    end
+  end
+
+  namespace 'maps' do
+    %w(map featured region license).each do |action|
+      get action, action: action
+    end
+
+    %w(archive exports).each do |action|
+      get action + "/:id", action: action
+    end
 
-  get 'import/:name' => 'images#import' # this was for auto-adding images via URL
-  post 'export/:action/:id' => 'export'
+    %w(annotate warpables).each do |action|
+      get "/:id/" + action, action: action
+    end
+  end
+
+  namespace 'export' do
+    %w(index logger jpg geotiff cancel 
+    progress status external_url_test).each do |action|
+      post action + "/:id", action: action
+    end
+  end
 
   # make these resourceful after renaming warpables to images
-  post 'images/create/:id' => 'images#create' # used?
-  post 'warper/update' => 'images#update' # legacy for cartagen.js
-  post 'images/update' => 'images#update'
-  post 'images/delete/:id' => 'images#delete'
-  delete 'maps/:map_id/warpables/:id' => 'images#destroy' #legacy, will be resourceful
-  delete 'images/:id' => 'images#destroy' #legacy, will be resourceful
+  post 'warper/update', to: 'images#update' # legacy for cartagen.js
+  delete 'maps/:map_id/warpables/:id', to: 'images#destroy' #legacy, will be resourceful
+  delete 'images/:id', to: 'images#destroy' #legacy, will be resourceful
 
   # RESTful API
   resources :maps do
@@ -85,13 +102,6 @@
     end
   end
 
-  # See how all your routes lay out with 'rake routes'
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  get ':controller/:action'
-  get ':controller/:action/:id'
-  get ':controller/:action.:format'
-  get ':controller/:action/:id.:format'
+  # See how all your routes lay out with 'rails routes'
 
 end
diff --git a/config/spring.rb b/config/spring.rb
new file mode 100644
index 000000000..b54a862a0
--- /dev/null
+++ b/config/spring.rb
@@ -0,0 +1,6 @@
+%w[
+  .ruby-version
+  .rbenv-vars
+  tmp/restart.txt
+  tmp/caching-dev.txt
+].each { |path| Spring.watch(path) }
\ No newline at end of file
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 000000000..d32f76e8f
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20090309034933_create_tweets.rb b/db/migrate/20090309034933_create_tweets.rb
index 89acd7baf..15865229c 100644
--- a/db/migrate/20090309034933_create_tweets.rb
+++ b/db/migrate/20090309034933_create_tweets.rb
@@ -1,4 +1,4 @@
-class CreateTweets < ActiveRecord::Migration
+class CreateTweets < ActiveRecord::Migration[5.2]
   def self.up
     create_table :tweets do |t|
 
diff --git a/db/migrate/20090309220337_create_messages.rb b/db/migrate/20090309220337_create_messages.rb
index 5ddc555bd..3cb3848ec 100644
--- a/db/migrate/20090309220337_create_messages.rb
+++ b/db/migrate/20090309220337_create_messages.rb
@@ -1,4 +1,4 @@
-class CreateMessages < ActiveRecord::Migration
+class CreateMessages < ActiveRecord::Migration[5.2]
   def self.up
     create_table :messages do |t|
       t.string :author
diff --git a/db/migrate/20090323162902_add_message_id.rb b/db/migrate/20090323162902_add_message_id.rb
index 8588293c4..a7fd5882f 100644
--- a/db/migrate/20090323162902_add_message_id.rb
+++ b/db/migrate/20090323162902_add_message_id.rb
@@ -1,4 +1,4 @@
-class AddMessageId < ActiveRecord::Migration
+class AddMessageId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :keyvalues, :message_id, :integer, :default => 0
   end
diff --git a/db/migrate/20090605191716_create_nodes.rb b/db/migrate/20090605191716_create_nodes.rb
index ee0b41645..149b1fc18 100644
--- a/db/migrate/20090605191716_create_nodes.rb
+++ b/db/migrate/20090605191716_create_nodes.rb
@@ -1,4 +1,4 @@
-class CreateNodes < ActiveRecord::Migration
+class CreateNodes < ActiveRecord::Migration[5.2]
   def self.up
     create_table :nodes do |t|
       t.string :color, :default => 'red'
diff --git a/db/migrate/20090605201606_create_ways.rb b/db/migrate/20090605201606_create_ways.rb
index f2f97ea19..72111b1b1 100644
--- a/db/migrate/20090605201606_create_ways.rb
+++ b/db/migrate/20090605201606_create_ways.rb
@@ -1,4 +1,4 @@
-class CreateWays < ActiveRecord::Migration
+class CreateWays < ActiveRecord::Migration[5.2]
   def self.up
     create_table :ways do |t|
       t.string :color, :default => 'red'
diff --git a/db/migrate/20090611170805_create_sms.rb b/db/migrate/20090611170805_create_sms.rb
index ffc9b50d8..d653a2269 100644
--- a/db/migrate/20090611170805_create_sms.rb
+++ b/db/migrate/20090611170805_create_sms.rb
@@ -1,4 +1,4 @@
-class CreateSms < ActiveRecord::Migration
+class CreateSms < ActiveRecord::Migration[5.2]
   def self.up
     # create_table "frontline_actions_triggers", :id => false, :force => true do |t|
     #   t.integer "action_id"
diff --git a/db/migrate/20090611204112_add_name_desc_nodes_ways.rb b/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
index 6b0f39950..7f09f57de 100644
--- a/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
+++ b/db/migrate/20090611204112_add_name_desc_nodes_ways.rb
@@ -1,4 +1,4 @@
-class AddNameDescNodesWays < ActiveRecord::Migration
+class AddNameDescNodesWays < ActiveRecord::Migration[5.2]
   def self.up
     add_column :ways, :name, :string, :default => ""
     add_column :ways, :description, :string, :default => ""
diff --git a/db/migrate/20090611205227_change_lat_lon_types.rb b/db/migrate/20090611205227_change_lat_lon_types.rb
index f586e0b1c..952038a8e 100644
--- a/db/migrate/20090611205227_change_lat_lon_types.rb
+++ b/db/migrate/20090611205227_change_lat_lon_types.rb
@@ -1,4 +1,4 @@
-class ChangeLatLonTypes < ActiveRecord::Migration
+class ChangeLatLonTypes < ActiveRecord::Migration[5.2]
   def self.up
   	drop_table :ways
   	drop_table :nodes
diff --git a/db/migrate/20090612011846_add_way_complete.rb b/db/migrate/20090612011846_add_way_complete.rb
index 5ec563608..80f6708e3 100644
--- a/db/migrate/20090612011846_add_way_complete.rb
+++ b/db/migrate/20090612011846_add_way_complete.rb
@@ -1,4 +1,4 @@
-class AddWayComplete < ActiveRecord::Migration
+class AddWayComplete < ActiveRecord::Migration[5.2]
   def self.up
     add_column :ways, :complete, :boolean, :default => true
   end
diff --git a/db/migrate/20091016214109_create_maps.rb b/db/migrate/20091016214109_create_maps.rb
index d0dd25b39..55688a4ce 100644
--- a/db/migrate/20091016214109_create_maps.rb
+++ b/db/migrate/20091016214109_create_maps.rb
@@ -1,4 +1,4 @@
-class CreateMaps < ActiveRecord::Migration
+class CreateMaps < ActiveRecord::Migration[5.2]
   def self.up
     create_table :maps do |t|
       t.string :name, :default => ''
diff --git a/db/migrate/20100301013330_create_warpables.rb b/db/migrate/20100301013330_create_warpables.rb
index f0b157399..76d3acdde 100644
--- a/db/migrate/20100301013330_create_warpables.rb
+++ b/db/migrate/20100301013330_create_warpables.rb
@@ -1,4 +1,4 @@
-class CreateWarpables < ActiveRecord::Migration
+class CreateWarpables < ActiveRecord::Migration[5.2]
   def self.up
     create_table :warpables do |t|
       t.column :parent_id,  :integer
diff --git a/db/migrate/20100306184916_add_map_id.rb b/db/migrate/20100306184916_add_map_id.rb
index b4d92d8f8..1c585b638 100644
--- a/db/migrate/20100306184916_add_map_id.rb
+++ b/db/migrate/20100306184916_add_map_id.rb
@@ -1,4 +1,4 @@
-class AddMapId < ActiveRecord::Migration
+class AddMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :map_id, :integer, :default => 0
   end
diff --git a/db/migrate/20100308193343_add_map_description_author.rb b/db/migrate/20100308193343_add_map_description_author.rb
index aa963e37f..274c871dd 100644
--- a/db/migrate/20100308193343_add_map_description_author.rb
+++ b/db/migrate/20100308193343_add_map_description_author.rb
@@ -1,4 +1,4 @@
-class AddMapDescriptionAuthor < ActiveRecord::Migration
+class AddMapDescriptionAuthor < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :description, :text, :default => ''
     add_column :maps, :author, :string, :default => 'anonymous'
diff --git a/db/migrate/20100310191643_add_warper_data.rb b/db/migrate/20100310191643_add_warper_data.rb
index f19115b8c..62611f85b 100644
--- a/db/migrate/20100310191643_add_warper_data.rb
+++ b/db/migrate/20100310191643_add_warper_data.rb
@@ -1,4 +1,4 @@
-class AddWarperData < ActiveRecord::Migration
+class AddWarperData < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :nodes, :string, :default => ''
   end
diff --git a/db/migrate/20100316142953_zoom_to_float.rb b/db/migrate/20100316142953_zoom_to_float.rb
index 05c9715a5..a3a0288b5 100644
--- a/db/migrate/20100316142953_zoom_to_float.rb
+++ b/db/migrate/20100316142953_zoom_to_float.rb
@@ -1,4 +1,4 @@
-class ZoomToFloat < ActiveRecord::Migration
+class ZoomToFloat < ActiveRecord::Migration[5.2]
   def self.up
     remove_column :maps, :zoom
     add_column :maps, :zoom, :decimal, :precision => 15, :scale => 10,  :default => 2
diff --git a/db/migrate/20100330233734_add_location.rb b/db/migrate/20100330233734_add_location.rb
index efd42ac0f..b9abc6996 100644
--- a/db/migrate/20100330233734_add_location.rb
+++ b/db/migrate/20100330233734_add_location.rb
@@ -1,4 +1,4 @@
-class AddLocation < ActiveRecord::Migration
+class AddLocation < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :location, :string, :default => ''
   end
diff --git a/db/migrate/20100404061203_add_warpable_lock.rb b/db/migrate/20100404061203_add_warpable_lock.rb
index 9d1dac195..434629939 100644
--- a/db/migrate/20100404061203_add_warpable_lock.rb
+++ b/db/migrate/20100404061203_add_warpable_lock.rb
@@ -1,4 +1,4 @@
-class AddWarpableLock < ActiveRecord::Migration
+class AddWarpableLock < ActiveRecord::Migration[5.2]
   def self.up 
     add_column :warpables, :locked, :boolean, :default => false, :null => false
   end
diff --git a/db/migrate/20100505153420_add_warpable_deleted.rb b/db/migrate/20100505153420_add_warpable_deleted.rb
index 47d5de9e6..e865431ba 100644
--- a/db/migrate/20100505153420_add_warpable_deleted.rb
+++ b/db/migrate/20100505153420_add_warpable_deleted.rb
@@ -1,4 +1,4 @@
-class AddWarpableDeleted < ActiveRecord::Migration
+class AddWarpableDeleted < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :deleted, :boolean, :default => false, :null => false
   end
diff --git a/db/migrate/20100531175725_create_warps.rb b/db/migrate/20100531175725_create_warps.rb
index faada095d..ae8f5d1fd 100644
--- a/db/migrate/20100531175725_create_warps.rb
+++ b/db/migrate/20100531175725_create_warps.rb
@@ -1,4 +1,4 @@
-class CreateWarps < ActiveRecord::Migration
+class CreateWarps < ActiveRecord::Migration[5.2]
   def self.up
     create_table :warps do |t|
       t.integer :parent_id
diff --git a/db/migrate/20100614190507_add_warp_map_id.rb b/db/migrate/20100614190507_add_warp_map_id.rb
index 9f3a5e2f8..fd90481ae 100644
--- a/db/migrate/20100614190507_add_warp_map_id.rb
+++ b/db/migrate/20100614190507_add_warp_map_id.rb
@@ -1,4 +1,4 @@
-class AddWarpMapId < ActiveRecord::Migration
+class AddWarpMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warps, :map_id, :integer, :default => 0, :null => false
     add_column :warps, :warpable_id, :integer, :default => 0, :null => false
diff --git a/db/migrate/20100709061039_add_static_data_maps.rb b/db/migrate/20100709061039_add_static_data_maps.rb
index b033cda3b..162e6a7b8 100644
--- a/db/migrate/20100709061039_add_static_data_maps.rb
+++ b/db/migrate/20100709061039_add_static_data_maps.rb
@@ -1,4 +1,4 @@
-class AddStaticDataMaps < ActiveRecord::Migration
+class AddStaticDataMaps < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :static_data, :string, :default => ''
   end
diff --git a/db/migrate/20100731141421_add_warps_additional_fields.rb b/db/migrate/20100731141421_add_warps_additional_fields.rb
index b4d8cfcb0..82429d2ba 100644
--- a/db/migrate/20100731141421_add_warps_additional_fields.rb
+++ b/db/migrate/20100731141421_add_warps_additional_fields.rb
@@ -1,4 +1,4 @@
-class AddWarpsAdditionalFields < ActiveRecord::Migration
+class AddWarpsAdditionalFields < ActiveRecord::Migration[5.2]
   def self.up
     drop_table :warps
     create_table :exports do |t|
diff --git a/db/migrate/20101014151404_add_vectors_tiles.rb b/db/migrate/20101014151404_add_vectors_tiles.rb
index d29cc1d1e..c1726b58d 100644
--- a/db/migrate/20101014151404_add_vectors_tiles.rb
+++ b/db/migrate/20101014151404_add_vectors_tiles.rb
@@ -1,4 +1,4 @@
-class AddVectorsTiles < ActiveRecord::Migration
+class AddVectorsTiles < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :vectors, :boolean, :default => true, :null => false
     add_column :maps, :tiles, :string, :default => '', :null => false
diff --git a/db/migrate/20110701105813_change_map_tile_default.rb b/db/migrate/20110701105813_change_map_tile_default.rb
index c4cfb0680..c5cde0963 100644
--- a/db/migrate/20110701105813_change_map_tile_default.rb
+++ b/db/migrate/20110701105813_change_map_tile_default.rb
@@ -1,4 +1,4 @@
-class ChangeMapTileDefault < ActiveRecord::Migration
+class ChangeMapTileDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:maps, :tiles, "google")
   end
diff --git a/db/migrate/20110813004143_change_map_vector_default.rb b/db/migrate/20110813004143_change_map_vector_default.rb
index 24233c365..d9bd6cfbd 100644
--- a/db/migrate/20110813004143_change_map_vector_default.rb
+++ b/db/migrate/20110813004143_change_map_vector_default.rb
@@ -1,4 +1,4 @@
-class ChangeMapVectorDefault < ActiveRecord::Migration
+class ChangeMapVectorDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:maps, :vectors, false)
   end
diff --git a/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb b/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
index 66929045d..6ee14a666 100644
--- a/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
+++ b/db/migrate/20110916060555_cleanup_knitter_add_map_archive_and_user_email.rb
@@ -1,4 +1,4 @@
-class CleanupKnitterAddMapArchiveAndUserEmail < ActiveRecord::Migration
+class CleanupKnitterAddMapArchiveAndUserEmail < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :email, :string, :default => "", :null => false
     add_column :maps, :archived, :boolean, :default => false, :null => false
diff --git a/db/migrate/20111005211631_add_zip_warpable_res_history.rb b/db/migrate/20111005211631_add_zip_warpable_res_history.rb
index 3aa796b1e..eb2520cca 100644
--- a/db/migrate/20111005211631_add_zip_warpable_res_history.rb
+++ b/db/migrate/20111005211631_add_zip_warpable_res_history.rb
@@ -1,4 +1,4 @@
-class AddZipWarpableResHistory < ActiveRecord::Migration
+class AddZipWarpableResHistory < ActiveRecord::Migration[5.2]
   def self.up
     add_column :warpables, :history, :text, :default => "", :null => false
     add_column :warpables, :cm_per_pixel, :float, :default => 0, :null => false
diff --git a/db/migrate/20111006153011_add_map_tile_url.rb b/db/migrate/20111006153011_add_map_tile_url.rb
index b915968f0..2034f0f96 100644
--- a/db/migrate/20111006153011_add_map_tile_url.rb
+++ b/db/migrate/20111006153011_add_map_tile_url.rb
@@ -1,4 +1,4 @@
-class AddMapTileUrl < ActiveRecord::Migration
+class AddMapTileUrl < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :tile_url, :text, :default => "", :null => false
     add_column :maps, :tile_layer, :text, :default => "", :null => false
diff --git a/db/migrate/20120104164144_add_export_type_bands.rb b/db/migrate/20120104164144_add_export_type_bands.rb
index 199bd4107..572efea6c 100644
--- a/db/migrate/20120104164144_add_export_type_bands.rb
+++ b/db/migrate/20120104164144_add_export_type_bands.rb
@@ -1,4 +1,4 @@
-class AddExportTypeBands < ActiveRecord::Migration
+class AddExportTypeBands < ActiveRecord::Migration[5.2]
   def self.up
     add_column :exports, :bands_string, :text, :default => "", :null => false
     add_column :exports, :export_type, :string, :default => "normal", :null => false
diff --git a/db/migrate/20120229164021_add_license.rb b/db/migrate/20120229164021_add_license.rb
index 878d4e257..264ee34dc 100644
--- a/db/migrate/20120229164021_add_license.rb
+++ b/db/migrate/20120229164021_add_license.rb
@@ -1,4 +1,4 @@
-class AddLicense < ActiveRecord::Migration
+class AddLicense < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :license, :string, :default => 'copyright'
   end
diff --git a/db/migrate/20120525201148_create_users.rb b/db/migrate/20120525201148_create_users.rb
index e4f11da29..5ff54a0b0 100644
--- a/db/migrate/20120525201148_create_users.rb
+++ b/db/migrate/20120525201148_create_users.rb
@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[5.2]
   def self.up
     create_table "users", :force => true do |t|
       t.string   :login,                     :limit => 40
diff --git a/db/migrate/20120525215158_add_user_role_default.rb b/db/migrate/20120525215158_add_user_role_default.rb
index 637b26eb7..cf41cb86a 100644
--- a/db/migrate/20120525215158_add_user_role_default.rb
+++ b/db/migrate/20120525215158_add_user_role_default.rb
@@ -1,4 +1,4 @@
-class AddUserRoleDefault < ActiveRecord::Migration
+class AddUserRoleDefault < ActiveRecord::Migration[5.2]
   def self.up
     change_column_default(:users, :role, "basic")
   end
diff --git a/db/migrate/20120601185008_remove_identity_url_limit.rb b/db/migrate/20120601185008_remove_identity_url_limit.rb
index 9d558b49b..822e21f2c 100644
--- a/db/migrate/20120601185008_remove_identity_url_limit.rb
+++ b/db/migrate/20120601185008_remove_identity_url_limit.rb
@@ -1,4 +1,4 @@
-class RemoveIdentityUrlLimit < ActiveRecord::Migration
+class RemoveIdentityUrlLimit < ActiveRecord::Migration[5.2]
   def self.up
     change_column :users, :identity_url, :string, :limit => 255
   end
diff --git a/db/migrate/20120701165519_create_tags.rb b/db/migrate/20120701165519_create_tags.rb
index c2938bba2..37c7467ec 100644
--- a/db/migrate/20120701165519_create_tags.rb
+++ b/db/migrate/20120701165519_create_tags.rb
@@ -1,4 +1,4 @@
-class CreateTags < ActiveRecord::Migration
+class CreateTags < ActiveRecord::Migration[5.2]
   def self.up
     create_table :tags do |t|
       t.string :user_id
diff --git a/db/migrate/20130113164917_add_node_map_id.rb b/db/migrate/20130113164917_add_node_map_id.rb
index 63eb584d6..6058876f8 100644
--- a/db/migrate/20130113164917_add_node_map_id.rb
+++ b/db/migrate/20130113164917_add_node_map_id.rb
@@ -1,4 +1,4 @@
-class AddNodeMapId < ActiveRecord::Migration
+class AddNodeMapId < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :map_id, :integer, :default => 0
     add_column :ways, :map_id, :integer, :default => 0
diff --git a/db/migrate/20130124160539_add_way_order.rb b/db/migrate/20130124160539_add_way_order.rb
index 8d084d6a8..afd989761 100644
--- a/db/migrate/20130124160539_add_way_order.rb
+++ b/db/migrate/20130124160539_add_way_order.rb
@@ -1,4 +1,4 @@
-class AddWayOrder < ActiveRecord::Migration
+class AddWayOrder < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :way_order, :integer, :default => 0
   end
diff --git a/db/migrate/20130128184718_add_node_and_way_body.rb b/db/migrate/20130128184718_add_node_and_way_body.rb
index 7a0d13070..dd91eb697 100644
--- a/db/migrate/20130128184718_add_node_and_way_body.rb
+++ b/db/migrate/20130128184718_add_node_and_way_body.rb
@@ -1,4 +1,4 @@
-class AddNodeAndWayBody < ActiveRecord::Migration
+class AddNodeAndWayBody < ActiveRecord::Migration[5.2]
   def self.up
     add_column :nodes, :body, :text
     add_column :ways, :body, :text
diff --git a/db/migrate/20130605202555_add_map_anonymously_annotatable.rb b/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
index ef5f01f23..37a2906bb 100644
--- a/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
+++ b/db/migrate/20130605202555_add_map_anonymously_annotatable.rb
@@ -1,4 +1,4 @@
-class AddMapAnonymouslyAnnotatable < ActiveRecord::Migration
+class AddMapAnonymouslyAnnotatable < ActiveRecord::Migration[5.2]
   def self.up
     add_column :maps, :anon_annotatable, :boolean, :default => false
   end
diff --git a/db/migrate/20140811184901_add_tag_index.rb b/db/migrate/20140811184901_add_tag_index.rb
index fbc6cff1e..28c273e09 100644
--- a/db/migrate/20140811184901_add_tag_index.rb
+++ b/db/migrate/20140811184901_add_tag_index.rb
@@ -1,4 +1,4 @@
-class AddTagIndex < ActiveRecord::Migration
+class AddTagIndex < ActiveRecord::Migration[5.2]
   def self.up
   	add_index :tags, :map_id
   	add_index :tags, :warpable_id
diff --git a/db/migrate/20140811185342_create_comments.rb b/db/migrate/20140811185342_create_comments.rb
index aea70043b..36a5b1fb9 100644
--- a/db/migrate/20140811185342_create_comments.rb
+++ b/db/migrate/20140811185342_create_comments.rb
@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[5.2]
   def self.up
     create_table :comments do |t|
       t.string :user_id
diff --git a/db/migrate/20140902182631_create_annotations.rb b/db/migrate/20140902182631_create_annotations.rb
index 0dbe8471e..9be8d2ea8 100644
--- a/db/migrate/20140902182631_create_annotations.rb
+++ b/db/migrate/20140902182631_create_annotations.rb
@@ -1,4 +1,4 @@
-class CreateAnnotations < ActiveRecord::Migration
+class CreateAnnotations < ActiveRecord::Migration[5.2]
   def self.up
     create_table :annotations do |t|
       t.integer :map_id
diff --git a/db/migrate/20140902201706_rename_annotation_type.rb b/db/migrate/20140902201706_rename_annotation_type.rb
index 26bd9bd3d..b657ff5eb 100644
--- a/db/migrate/20140902201706_rename_annotation_type.rb
+++ b/db/migrate/20140902201706_rename_annotation_type.rb
@@ -1,4 +1,4 @@
-class RenameAnnotationType < ActiveRecord::Migration
+class RenameAnnotationType < ActiveRecord::Migration[5.2]
   def self.up
     rename_column :annotations, :type, :annotation_type
   end
diff --git a/db/migrate/20141103164503_change_warpable_columns.rb b/db/migrate/20141103164503_change_warpable_columns.rb
index aa22ccff0..dd9d97d0c 100644
--- a/db/migrate/20141103164503_change_warpable_columns.rb
+++ b/db/migrate/20141103164503_change_warpable_columns.rb
@@ -1,4 +1,4 @@
-class ChangeWarpableColumns < ActiveRecord::Migration
+class ChangeWarpableColumns < ActiveRecord::Migration[5.2]
   def up
     rename_column(:warpables, :filename, :image_file_name)
     rename_column(:warpables, :content_type, :image_content_type)
diff --git a/db/migrate/20141104184417_change_openid_identity_urls.rb b/db/migrate/20141104184417_change_openid_identity_urls.rb
index 941426cc9..b079ffce8 100644
--- a/db/migrate/20141104184417_change_openid_identity_urls.rb
+++ b/db/migrate/20141104184417_change_openid_identity_urls.rb
@@ -1,4 +1,4 @@
-class ChangeOpenidIdentityUrls < ActiveRecord::Migration
+class ChangeOpenidIdentityUrls < ActiveRecord::Migration[5.2]
   def up
 
     users = User.find :all
diff --git a/db/migrate/20150117041411_add_slug_field_to_maps.rb b/db/migrate/20150117041411_add_slug_field_to_maps.rb
index 023037296..4cd5072a8 100644
--- a/db/migrate/20150117041411_add_slug_field_to_maps.rb
+++ b/db/migrate/20150117041411_add_slug_field_to_maps.rb
@@ -1,4 +1,4 @@
-class AddSlugFieldToMaps < ActiveRecord::Migration
+class AddSlugFieldToMaps < ActiveRecord::Migration[5.2]
   def change
     # There are some duplicate maps, but none have images, so we can delete dupes that don't have images. 
     dupes = []
diff --git a/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb b/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
index 5b3ad170a..6bb1a01a2 100644
--- a/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
+++ b/db/migrate/20150117041704_move_current_values_in_map_name_to_slug_field.rb
@@ -1,4 +1,4 @@
-class MoveCurrentValuesInMapNameToSlugField < ActiveRecord::Migration
+class MoveCurrentValuesInMapNameToSlugField < ActiveRecord::Migration[5.2]
   def up
   	execute "UPDATE maps m SET m.slug = m.name"
   end
diff --git a/db/migrate/20150715162314_change_map_null.rb b/db/migrate/20150715162314_change_map_null.rb
index 1ddd7e990..c4d25fec9 100644
--- a/db/migrate/20150715162314_change_map_null.rb
+++ b/db/migrate/20150715162314_change_map_null.rb
@@ -1,4 +1,4 @@
-class ChangeMapNull < ActiveRecord::Migration
+class ChangeMapNull < ActiveRecord::Migration[5.2]
   def up
     change_column_null :maps, :tile_url,   true
     change_column_null :maps, :tile_layer, true
diff --git a/db/migrate/20190420025012_add_remote_url_to_exports.rb b/db/migrate/20190420025012_add_remote_url_to_exports.rb
index ac9a0bc68..53a1859a0 100644
--- a/db/migrate/20190420025012_add_remote_url_to_exports.rb
+++ b/db/migrate/20190420025012_add_remote_url_to_exports.rb
@@ -1,4 +1,4 @@
-class AddRemoteUrlToExports < ActiveRecord::Migration
+class AddRemoteUrlToExports < ActiveRecord::Migration[5.2]
   def change
     add_column :exports, :export_url, :string
   end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..220d6e9d8
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,161 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20190420025012) do
+
+  create_table "annotations", force: :cascade do |t|
+    t.integer  "map_id",          limit: 4
+    t.integer  "user_id",         limit: 4
+    t.string   "annotation_type", limit: 255
+    t.string   "text",            limit: 255
+    t.string   "style",           limit: 255
+    t.string   "coordinates",     limit: 255
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
+  end
+
+  create_table "comments", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "body",       limit: 255
+    t.integer  "map_id",     limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  create_table "exports", force: :cascade do |t|
+    t.integer  "map_id",       limit: 4,     default: 0
+    t.integer  "size",         limit: 4,     default: 0
+    t.integer  "width",        limit: 4,     default: 0
+    t.integer  "height",       limit: 4,     default: 0
+    t.float    "cm_per_pixel", limit: 24,    default: 0.0
+    t.string   "status",       limit: 255,   default: "none"
+    t.boolean  "tms",                        default: false
+    t.boolean  "jpg",                        default: false
+    t.boolean  "geotiff",                    default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "zip",                        default: false,    null: false
+    t.text     "bands_string", limit: 65535,                    null: false
+    t.string   "export_type",  limit: 255,   default: "normal", null: false
+    t.integer  "user_id",      limit: 4,     default: 0
+    t.string   "export_url",   limit: 255
+  end
+
+  create_table "maps", force: :cascade do |t|
+    t.string   "name",             limit: 255,                             default: ""
+    t.decimal  "lat",                            precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                            precision: 20, scale: 10, default: 0.0
+    t.integer  "version",          limit: 4,                               default: 1
+    t.string   "password",         limit: 255,                             default: ""
+    t.text     "styles",           limit: 65535
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "description",      limit: 65535
+    t.string   "author",           limit: 255,                             default: "anonymous"
+    t.decimal  "zoom",                           precision: 15, scale: 10, default: 2.0
+    t.string   "location",         limit: 255,                             default: ""
+    t.string   "static_data",      limit: 255,                             default: ""
+    t.boolean  "vectors",                                                  default: false,       null: false
+    t.string   "tiles",            limit: 255,                             default: "google",    null: false
+    t.string   "email",            limit: 255,                             default: "",          null: false
+    t.boolean  "archived",                                                 default: false,       null: false
+    t.text     "tile_url",         limit: 65535
+    t.text     "tile_layer",       limit: 65535
+    t.string   "license",          limit: 255,                             default: "copyright"
+    t.integer  "user_id",          limit: 4,                               default: 0
+    t.boolean  "anon_annotatable",                                         default: false
+    t.string   "slug",             limit: 255
+  end
+
+  add_index "maps", ["slug"], name: "index_maps_on_slug", unique: true, using: :btree
+
+  create_table "nodes", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat",                       precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                       precision: 20, scale: 10, default: 0.0
+    t.integer  "way_id",      limit: 4,                               default: 0
+    t.integer  "order",       limit: 4,                               default: 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.integer  "way_order",   limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
+  end
+
+  create_table "tags", force: :cascade do |t|
+    t.string   "user_id",     limit: 255
+    t.string   "name",        limit: 255
+    t.integer  "map_id",      limit: 4
+    t.integer  "warpable_id", limit: 4
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tags", ["map_id"], name: "index_tags_on_map_id", using: :btree
+  add_index "tags", ["user_id"], name: "index_tags_on_user_id", using: :btree
+  add_index "tags", ["warpable_id"], name: "index_tags_on_warpable_id", using: :btree
+
+  create_table "users", force: :cascade do |t|
+    t.string   "login",                     limit: 40
+    t.string   "name",                      limit: 100, default: ""
+    t.string   "email",                     limit: 100
+    t.string   "crypted_password",          limit: 40
+    t.string   "salt",                      limit: 40
+    t.string   "identity_url",              limit: 255
+    t.string   "role",                      limit: 40,  default: "basic"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "remember_token",            limit: 40
+    t.datetime "remember_token_expires_at"
+  end
+
+  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
+
+  create_table "warpables", force: :cascade do |t|
+    t.integer  "parent_id",          limit: 4
+    t.string   "image_content_type", limit: 255
+    t.string   "image_file_name",    limit: 255
+    t.string   "thumbnail",          limit: 255
+    t.integer  "image_file_size",    limit: 4
+    t.integer  "width",              limit: 4
+    t.integer  "height",             limit: 4
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "map_id",             limit: 4,     default: 0
+    t.string   "nodes",              limit: 255,   default: ""
+    t.boolean  "locked",                           default: false, null: false
+    t.boolean  "deleted",                          default: false, null: false
+    t.text     "history",            limit: 65535,                 null: false
+    t.float    "cm_per_pixel",       limit: 24,    default: 0.0,   null: false
+  end
+
+  create_table "ways", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lat2",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon2",                      precision: 20, scale: 10, default: 0.0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.boolean  "complete",                                            default: true
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
+  end
+
+end
\ No newline at end of file
diff --git a/db/schema.rb.example b/db/schema.rb.example
index 6a46422dd..220d6e9d8 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -9,152 +9,153 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150715162314) do
+ActiveRecord::Schema.define(version: 20190420025012) do
 
-  create_table "annotations", :force => true do |t|
-    t.integer  "map_id"
-    t.integer  "user_id"
-    t.string   "annotation_type"
-    t.string   "text"
-    t.string   "style"
-    t.string   "coordinates"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+  create_table "annotations", force: :cascade do |t|
+    t.integer  "map_id",          limit: 4
+    t.integer  "user_id",         limit: 4
+    t.string   "annotation_type", limit: 255
+    t.string   "text",            limit: 255
+    t.string   "style",           limit: 255
+    t.string   "coordinates",     limit: 255
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
   end
 
-  create_table "comments", :force => true do |t|
-    t.string   "user_id"
-    t.string   "body"
-    t.integer  "map_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "comments", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "body",       limit: 255
+    t.integer  "map_id",     limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
-  create_table "exports", :force => true do |t|
-    t.integer  "map_id",       :default => 0
-    t.integer  "size",         :default => 0
-    t.integer  "width",        :default => 0
-    t.integer  "height",       :default => 0
-    t.float    "cm_per_pixel", :default => 0.0
-    t.string   "status",       :default => "none"
-    t.boolean  "tms",          :default => false
-    t.boolean  "jpg",          :default => false
-    t.boolean  "geotiff",      :default => false
+  create_table "exports", force: :cascade do |t|
+    t.integer  "map_id",       limit: 4,     default: 0
+    t.integer  "size",         limit: 4,     default: 0
+    t.integer  "width",        limit: 4,     default: 0
+    t.integer  "height",       limit: 4,     default: 0
+    t.float    "cm_per_pixel", limit: 24,    default: 0.0
+    t.string   "status",       limit: 255,   default: "none"
+    t.boolean  "tms",                        default: false
+    t.boolean  "jpg",                        default: false
+    t.boolean  "geotiff",                    default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "zip",          :default => false,    :null => false
-    t.text     "bands_string",                       :null => false
-    t.string   "export_type",  :default => "normal", :null => false
-    t.integer  "user_id",      :default => 0
+    t.boolean  "zip",                        default: false,    null: false
+    t.text     "bands_string", limit: 65535,                    null: false
+    t.string   "export_type",  limit: 255,   default: "normal", null: false
+    t.integer  "user_id",      limit: 4,     default: 0
+    t.string   "export_url",   limit: 255
   end
 
-  create_table "maps", :force => true do |t|
-    t.string   "name",                                             :default => ""
-    t.decimal  "lat",              :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",              :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "version",                                          :default => 1
-    t.string   "password",                                         :default => ""
-    t.text     "styles"
+  create_table "maps", force: :cascade do |t|
+    t.string   "name",             limit: 255,                             default: ""
+    t.decimal  "lat",                            precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                            precision: 20, scale: 10, default: 0.0
+    t.integer  "version",          limit: 4,                               default: 1
+    t.string   "password",         limit: 255,                             default: ""
+    t.text     "styles",           limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "description"
-    t.string   "author",                                           :default => "anonymous"
-    t.decimal  "zoom",             :precision => 15, :scale => 10, :default => 2.0
-    t.string   "location",                                         :default => ""
-    t.string   "static_data",                                      :default => ""
-    t.boolean  "vectors",                                          :default => false,       :null => false
-    t.string   "tiles",                                            :default => "google",    :null => false
-    t.string   "email",                                            :default => "",          :null => false
-    t.boolean  "archived",                                         :default => false,       :null => false
-    t.text     "tile_url"
-    t.text     "tile_layer"
-    t.string   "license",                                          :default => "copyright"
-    t.integer  "user_id",                                          :default => 0
-    t.boolean  "anon_annotatable",                                 :default => false
-    t.string   "slug"
+    t.text     "description",      limit: 65535
+    t.string   "author",           limit: 255,                             default: "anonymous"
+    t.decimal  "zoom",                           precision: 15, scale: 10, default: 2.0
+    t.string   "location",         limit: 255,                             default: ""
+    t.string   "static_data",      limit: 255,                             default: ""
+    t.boolean  "vectors",                                                  default: false,       null: false
+    t.string   "tiles",            limit: 255,                             default: "google",    null: false
+    t.string   "email",            limit: 255,                             default: "",          null: false
+    t.boolean  "archived",                                                 default: false,       null: false
+    t.text     "tile_url",         limit: 65535
+    t.text     "tile_layer",       limit: 65535
+    t.string   "license",          limit: 255,                             default: "copyright"
+    t.integer  "user_id",          limit: 4,                               default: 0
+    t.boolean  "anon_annotatable",                                         default: false
+    t.string   "slug",             limit: 255
   end
 
-  add_index "maps", ["slug"], :name => "index_maps_on_slug", :unique => true
+  add_index "maps", ["slug"], name: "index_maps_on_slug", unique: true, using: :btree
 
-  create_table "nodes", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat",         :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon",         :precision => 20, :scale => 10, :default => 0.0
-    t.integer  "way_id",                                      :default => 0
-    t.integer  "order",                                       :default => 0
+  create_table "nodes", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat",                       precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon",                       precision: 20, scale: 10, default: 0.0
+    t.integer  "way_id",      limit: 4,                               default: 0
+    t.integer  "order",       limit: 4,                               default: 0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.integer  "map_id",                                      :default => 0
-    t.integer  "way_order",                                   :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.integer  "way_order",   limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
-  create_table "tags", :force => true do |t|
-    t.string   "user_id"
-    t.string   "name"
-    t.integer  "map_id"
-    t.integer  "warpable_id"
+  create_table "tags", force: :cascade do |t|
+    t.string   "user_id",     limit: 255
+    t.string   "name",        limit: 255
+    t.integer  "map_id",      limit: 4
+    t.integer  "warpable_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "tags", ["map_id"], :name => "index_tags_on_map_id"
-  add_index "tags", ["user_id"], :name => "index_tags_on_user_id"
-  add_index "tags", ["warpable_id"], :name => "index_tags_on_warpable_id"
+  add_index "tags", ["map_id"], name: "index_tags_on_map_id", using: :btree
+  add_index "tags", ["user_id"], name: "index_tags_on_user_id", using: :btree
+  add_index "tags", ["warpable_id"], name: "index_tags_on_warpable_id", using: :btree
 
-  create_table "users", :force => true do |t|
-    t.string   "login",                     :limit => 40
-    t.string   "name",                      :limit => 100, :default => ""
-    t.string   "email",                     :limit => 100
-    t.string   "crypted_password",          :limit => 40
-    t.string   "salt",                      :limit => 40
-    t.string   "identity_url"
-    t.string   "role",                      :limit => 40,  :default => "basic"
+  create_table "users", force: :cascade do |t|
+    t.string   "login",                     limit: 40
+    t.string   "name",                      limit: 100, default: ""
+    t.string   "email",                     limit: 100
+    t.string   "crypted_password",          limit: 40
+    t.string   "salt",                      limit: 40
+    t.string   "identity_url",              limit: 255
+    t.string   "role",                      limit: 40,  default: "basic"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "remember_token",            :limit => 40
+    t.string   "remember_token",            limit: 40
     t.datetime "remember_token_expires_at"
   end
 
-  add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+  add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
 
-  create_table "warpables", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "image_content_type"
-    t.string   "image_file_name"
-    t.string   "thumbnail"
-    t.integer  "image_file_size"
-    t.integer  "width"
-    t.integer  "height"
+  create_table "warpables", force: :cascade do |t|
+    t.integer  "parent_id",          limit: 4
+    t.string   "image_content_type", limit: 255
+    t.string   "image_file_name",    limit: 255
+    t.string   "thumbnail",          limit: 255
+    t.integer  "image_file_size",    limit: 4
+    t.integer  "width",              limit: 4
+    t.integer  "height",             limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "map_id",             :default => 0
-    t.string   "nodes",              :default => ""
-    t.boolean  "locked",             :default => false, :null => false
-    t.boolean  "deleted",            :default => false, :null => false
-    t.text     "history",                               :null => false
-    t.float    "cm_per_pixel",       :default => 0.0,   :null => false
+    t.integer  "map_id",             limit: 4,     default: 0
+    t.string   "nodes",              limit: 255,   default: ""
+    t.boolean  "locked",                           default: false, null: false
+    t.boolean  "deleted",                          default: false, null: false
+    t.text     "history",            limit: 65535,                 null: false
+    t.float    "cm_per_pixel",       limit: 24,    default: 0.0,   null: false
   end
 
-  create_table "ways", :force => true do |t|
-    t.string   "color",                                       :default => "red"
-    t.string   "author",                                      :default => "anonymous"
-    t.decimal  "lat1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lat2",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon1",        :precision => 20, :scale => 10, :default => 0.0
-    t.decimal  "lon2",        :precision => 20, :scale => 10, :default => 0.0
+  create_table "ways", force: :cascade do |t|
+    t.string   "color",       limit: 255,                             default: "red"
+    t.string   "author",      limit: 255,                             default: "anonymous"
+    t.decimal  "lat1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lat2",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon1",                      precision: 20, scale: 10, default: 0.0
+    t.decimal  "lon2",                      precision: 20, scale: 10, default: 0.0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name",                                        :default => ""
-    t.string   "description",                                 :default => ""
-    t.boolean  "complete",                                    :default => true
-    t.integer  "map_id",                                      :default => 0
-    t.text     "body"
+    t.string   "name",        limit: 255,                             default: ""
+    t.string   "description", limit: 255,                             default: ""
+    t.boolean  "complete",                                            default: true
+    t.integer  "map_id",      limit: 4,                               default: 0
+    t.text     "body",        limit: 65535
   end
 
-end
+end
\ No newline at end of file
diff --git a/lib/tasks/test_unit.rake b/lib/tasks/test_unit.rake
index 803b8645b..8a9dd11b0 100644
--- a/lib/tasks/test_unit.rake
+++ b/lib/tasks/test_unit.rake
@@ -1,3 +1,4 @@
+require 'rake/testtask'
 # ==================== #
 
 # HOW TO RUN # 
@@ -109,4 +110,4 @@ namespace :test do
   desc "Autotask - run integration tests in parallel"
   multitask :integration_parallel => COMPUTE_INTEGRATION_TASKS
 
-end
\ No newline at end of file
+end
diff --git a/mapknitter.env b/mapknitter.env
index eb1a7a8ca..b88791f34 100644
--- a/mapknitter.env
+++ b/mapknitter.env
@@ -2,4 +2,5 @@ MYSQL_DATABASE=mapknitter
 MYSQL_USER=mapknitter
 MYSQL_PASSWORD=mapknitter
 MYSQL_RANDOM_ROOT_PASSWORD=true
+MYSQL_HOST=db
 RAILS_ENV=production
diff --git a/test/functional/annotations_controller_test.rb b/test/functional/annotations_controller_test.rb
index ea259ef1c..deec0dec7 100644
--- a/test/functional/annotations_controller_test.rb
+++ b/test/functional/annotations_controller_test.rb
@@ -15,14 +15,14 @@ def teardown; end
     session[:user_id] = 1
     post :create,
          format: :json,
-         map_id: 1,
+         params: {map_id: 1,
          annotation: {
            properties: {
              annotation_type: 'polyline',
              textContent: 'Some cool text'
            },
            geometry: { coordinates: [10, 33] }
-         }
+         }}
 
     @map.reload
     assert_response 302
@@ -34,14 +34,14 @@ def teardown; end
     before_count = @map.annotations.count
     post :create,
          format: :json,
-         map_id: 1,
+         params: { map_id: 1,
          annotation: {
            properties: {
              annotation_type: 'polyline',
              textContent: 'Some cool text'
            },
            geometry: { coordinates: [10, 33] }
-         }
+         }}
 
     @map.reload
     assert_response 302
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index b8dd69c39..c5142b18b 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -16,10 +16,10 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         map_id: @map.slug,
+         params: { map_id: @map.slug,
          comment: {
            user_id: 1
-         })
+         }})
 
     assert_response :success
     assert_equal before_count, Comment.count
@@ -30,10 +30,10 @@ def teardown
     before_count = Comment.count
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert_not_equal before_count, Comment.count
@@ -45,11 +45,11 @@ def teardown
     session[:user_id] = 4
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         comment: {
           map_id: @map.id,
           body: "I'm gonna troll you!"
-        })
+        }})
 
     # refresh the object
     @comment.reload
@@ -63,11 +63,11 @@ def teardown
     session[:user_id] = 3
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         map_id: @map.slug,
         comment: {
           body: "I'm gonna troll you!"
-        })
+        }})
 
     @comment.reload
 
@@ -81,11 +81,11 @@ def teardown
     @comment = comments(:one)
 
     put(:update,
-        id: @comment.id,
+        params: { id: @comment.id,
         map_id: @map.slug,
         comment: {
           body: "I'm gonna troll you!"
-        })
+        }})
 
     @comment.reload
 
@@ -101,8 +101,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_not_equal before_count, Comment.count
@@ -115,8 +115,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_equal before_count, Comment.count
@@ -128,8 +128,8 @@ def teardown
     before_count = Comment.count
 
     delete(:destroy,
-           id: @comment.id,
-           map_id: @map.slug)
+           params: { id: @comment.id,
+           map_id: @map.slug})
 
     assert_redirected_to "/maps/" + @map.slug
     assert_equal before_count, Comment.count
@@ -141,10 +141,10 @@ def teardown
     session[:user_id] = @user.id
 
     post(:create,
-         comment: {
+         params: { comment: {
            map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert_not @emails.collect(&:to).include?([@user.email])
@@ -155,10 +155,10 @@ def teardown
     session[:user_id] = 3
 
     post(:create,
-         comment: {
+         params: { comment: {
       map_id: @map.id,
       body: "I'm gonna troll you!"
-         })
+         }})
 
     assert_response :success
     assert @emails.collect(&:to).include?([@user.email])
@@ -172,18 +172,18 @@ def teardown
     session[:user_id] = @chris.id
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "I'm gonna troll you!"
-         })
+         }})
 
     session[:user_id] = @joshua.id
 
     post(:create,
-         comment: {
+         params: { comment: {
          map_id: @map.id,
            body: "Yeah we'll see!"
-         })
+         }})
 
     assert_response :success
     assert @emails.collect(&:to).include?([@chris.email])
diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb
index d67b3cb96..d75ec1dd7 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/functional/export_controller_test.rb
@@ -21,7 +21,7 @@ def teardown
     system('mkdir -p public/warps/cubbon-park')
     system('cp test/fixtures/demo.png  public/warps/cubbon-park/cubbon-park.jpg')
 
-    get :jpg, id: map.slug
+    get :jpg, params: { id: map.slug}
     assert_response :success
     assert_includes 'image/jpeg', response.content_type
   end
@@ -31,13 +31,13 @@ def teardown
     system('mkdir -p public/warps/cubbon-park')
     system('cp test/fixtures/demo.png public/warps/cubbon-park/cubbon-park-geo.tif')
 
-    get :geotiff, id: map.slug
+    get :geotiff, params: { id: map.slug}
     assert_response :success
     assert_includes 'image/tiff', response.content_type
   end
 
   test 'should not cancel if not logged in' do
-    get :cancel, id: @map.id
+    get :cancel, params: { id: @map.id}
     assert_response :success
     assert_equal 'You must be logged in to export, unless the map is anonymous.', @response.body
     assert assigns[:map]
@@ -47,7 +47,7 @@ def teardown
 
   test 'should cancel export' do
     session[:user_id] = 1
-    get :cancel, id: @map.id
+    get :cancel, params: { id: @map.id}
     assert_response :success
     assert_equal 'cancelled', @response.body
     assert assigns[:map]
@@ -55,33 +55,33 @@ def teardown
 
   test 'should redirect after cancelling' do
     session[:user_id] = 1
-    get :cancel, id: @map.id, exports: 'cess'
+    get :cancel, params: { id: @map.id, exports: 'cess'}
     assert_response :redirect
     assert flash.present?
     assert_redirected_to '/exports'
   end
 
   test 'should display export progress' do
-    get :progress, id: @map.id
+    get :progress, params: { id: @map.id}
     assert_response :success
     assert_equal 'export not running', @response.body
     assert_equal 'text/plain', @response.content_type
   end
 
   test 'should display progress with no export' do
-    get :progress, id: 4
+    get :progress, params: { id: 4}
     assert_response :success
     assert_equal 'export has not been run', @response.body
   end
 
   test 'should display progress completed' do
-    get :progress, id: 2
+    get :progress, params: { id: 2}
     assert_response :success
     assert_equal 'complete', @response.body
   end
 
   test 'should display progress failed' do
-    get :progress, id: 3
+    get :progress, params: { id: 3}
     assert_response :success
     assert_equal 'export failed', @response.body
   end
@@ -89,13 +89,13 @@ def teardown
   # does not test the exporter client
   test 'should display export status' do
     session[:user_id] = 1
-    get :status, id: @map.id
+    get :status, params: { id: @map.id}
     assert_response :success
   end
 
   test 'should display error if no export' do
     session[:user_id] = 1
-    get :status, id: 4
+    get :status, params: { id: 4}
     assert_response :success
     # assert_equal { status: 'export has not been run' }.to_json, @response.body
   end
diff --git a/test/functional/feeds_controller_test.rb b/test/functional/feeds_controller_test.rb
index 6074acbab..05bb78d6e 100644
--- a/test/functional/feeds_controller_test.rb
+++ b/test/functional/feeds_controller_test.rb
@@ -19,6 +19,8 @@ def setup
     get :all
     assert_response :success
     assert_not_nil :maps
+    assert_equal 'application/xml', @response.content_type
+    assert_template 'feeds/all'
   end
 
   test 'get clean' do
@@ -29,13 +31,15 @@ def setup
   end
 
   test "should get clean feed with moderators links" do
-    get :all, :moderators => 'true'
+    get :all, params: { moderators: 'true'}
     assert_response :success
     assert_not_nil :maps
+    assert_equal 'application/xml', @response.content_type
+    assert_template 'feeds/all'
   end
 
   test "should get license feed" do
-    get :license, :id => "publicdomain"
+    get :license, params: { :id => "publicdomain"}
     assert_response :success
     assert_not_nil :maps
     assert_equal 'application/xml', @response.content_type
@@ -43,7 +47,7 @@ def setup
   end
 
   test "should get author feed" do
-    get :author, :id => "quentin"
+    get :author, params: { :id => "quentin"}
     assert_response :success
     assert_not_nil :maps
     assert_equal 'application/xml', @response.content_type
@@ -51,7 +55,7 @@ def setup
   end
 
   test "should get tag feed" do
-    get :tag, id: 'nice'
+    get :tag, params: { id: 'nice'}
     assert_response :success
     assert_not_nil :tag
     assert_not_nil :maps
@@ -59,7 +63,7 @@ def setup
   end
 
   test 'rescues if tag not present' do
-    get :tag, id: 'cess'
+    get :tag, params: { id: 'cess'}
     assert_equal 'text/plain', @response.content_type
     assert_equal 'No maps with tag cess', @response.body
   end
diff --git a/test/functional/images_controller_test.rb b/test/functional/images_controller_test.rb
index 5e7d427ab..23d6524f6 100644
--- a/test/functional/images_controller_test.rb
+++ b/test/functional/images_controller_test.rb
@@ -6,22 +6,22 @@ def setup
     @map = maps(:saugus)
     @warp = warpables(:one)
 
-    @file ||= File.open(File.expand_path(Rails.root + 'test/fixtures/demo.png', __FILE__))
-    @uploaded_data = ActionDispatch::Http::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
+    file_location = Rails.root + 'test/fixtures/demo.png'
+    @uploaded_data = Rack::Test::UploadedFile.new(file_location.to_s, 'demo.png', "image/png")
   end
 
   def teardown
   end
 
   test 'fetch locally should redirect to url' do
-    get :fetch, url: '/maps'
+    get :fetch, params: { url: '/maps'}
     assert_response :redirect
     assert_redirected_to '/maps'
   end
 
   def fetch_in_production
     Rails.stub(:env, ActiveSupport::StringInquirer.new('production')) do
-      get :fetch, url: '/maps'
+      get :fetch, params: { url: '/maps'}
       assert_response :success
       assert_equal data, response.body
       assert_equal 'text/html', response.content_type
@@ -31,20 +31,20 @@ def fetch_in_production
   test 'create uploads an image' do
     before_count = Warpable.count
 
-    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
+    post :create, params: { map_id: @map.slug, uploaded_data: @uploaded_data}
     assert_response :success
     assert_equal before_count + 1, Warpable.count
   end
 
   test 'should return correct status and type on create' do
-    post :create, map_id: @map.slug, uploaded_data: @uploaded_data
+    post :create, params: { map_id: @map.slug, uploaded_data: @uploaded_data}
 
     assert_equal 200, response.status
     assert_equal "text/html", response.content_type
   end
 
   test 'should show the image' do
-    get :show, id: @warp.id, format: 'json'
+    get :show, params: { id: @warp.id, format: 'json'}
     json_response = JSON.parse(response.body)
     assert_equal @warp.id, json_response["id"]
     assert_response :success
@@ -53,20 +53,20 @@ def fetch_in_production
   test 'should update an image' do
     session[:user_id] = 1
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
-    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
+    patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points}
     assert_not_nil @warp.nodes
     assert_equal "text/html", response.content_type
   end
 
   test 'correct user should destroy an image' do
     session[:user_id] = 1
-    delete :destroy, id: @warp.id
+    delete :destroy, params: { id: @warp.id}
     assert_response :redirect
     assert_redirected_to "/maps/#{@map.slug}"
   end
 
   test 'redirects to login if attempt destroy and not logged in' do
-    delete :destroy, id: @warp.id
+    delete :destroy, params: { id: @warp.id}
     assert_response :redirect
     assert_redirected_to '/login'
     assert_not_nil flash[:error]
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index a26156c76..0c51baa22 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -13,7 +13,8 @@ def teardown
 
   test 'should display image url for maps by region' do
     get :region,
-        { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60, format: :json }
+        params: { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60},
+        format: :json
 
     image_urls = []
     @map.warpables.each do |warpable|
@@ -38,7 +39,7 @@ def teardown
 
   test 'should not display archived maps' do
     session[:user_id] = 1
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug } )
     get :index
     @maps = assigns(:maps)
 
@@ -61,7 +62,7 @@ def teardown
   end
 
   test 'should search for maps by name' do
-    get :search, q: 'Saugus'
+    get :search, params: { q: 'Saugus'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -70,7 +71,7 @@ def teardown
   end
 
   test 'should search for maps by location' do
-    get :search, q: 'India'
+    get :search, params: { q: 'India'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -79,7 +80,7 @@ def teardown
   end
 
   test 'should search for maps by description' do
-    get :search, q: 'a park'
+    get :search, params: { q: 'a park'}
     @maps = assigns(:maps)
 
     assert_response :success
@@ -90,13 +91,13 @@ def teardown
   test 'should create map if logged in' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
            name: 'Coal terminal map',
            slug: 'coal-terminal',
            location: 'London',
            lat: 42.43823313018592,
            lon: -70.9849190711975
-         })
+         }})
     @map = assigns(:map)
 
     assert_response 302
@@ -108,13 +109,13 @@ def teardown
 
   test 'should create map if not logged in' do
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
            name: 'Coal terminal map',
            slug: 'coal-terminal',
            location: 'London',
            lat: 42.43823313018592,
            lon: -70.9849190711975
-         })
+         }})
     @map = assigns(:map)
 
     assert_redirected_to '/maps/' + @map.slug
@@ -128,13 +129,13 @@ def teardown
     before_count = Map.count
     user = users(:quentin)
     session[:user_id] = user.id
-    post :create, map: {
+    post :create, params: { map: {
       name: 'Yaya Center',
       slug: 'yaya-center',
       location: 'Nairobi',
       lat: -0.3030988,
       lon: 36.080026
-    }
+    }}
     @map = assigns(:map)
 
     assert_redirected_to '/maps/' + @map.slug
@@ -148,10 +149,10 @@ def teardown
     skip 'images and warpable naming contradicts with rails naming convention'
     session[:user_id] = 1
     before_count = Map.count
-    post(:create, map: {
+    post(:create, params: { map: {
       name: 'Coal terminal map',
       slug: 'coal-terminal'
-    })
+    }})
     @map = assigns(:map)
 
     assert_not @map.save
@@ -164,7 +165,7 @@ def teardown
   test 'should not delete map if not owner' do
     session[:user_id] = 3
     before_count = Map.count
-    post(:destroy, id: @map.slug)
+    post(:destroy, params: { id: @map.slug})
 
     assert_redirected_to '/maps/' + @map.slug
     assert_equal flash[:error], 'Only admins or map owners may delete maps.'
@@ -174,7 +175,7 @@ def teardown
   test 'should delete map if owner' do
     session[:user_id] = 1
     before_count = Map.count
-    post(:destroy, id: @map.slug)
+    post(:destroy, params: { id: @map.slug})
 
     assert_redirected_to '/'
     assert_not_equal before_count, Map.count
@@ -182,14 +183,14 @@ def teardown
   end
 
   test "should get show" do
-    get(:show, id: @map.slug)
+    get(:show, params: { id: @map.slug})
     assert_response :success
     assert_not_nil assigns(:map)
   end
 
   test 'should archive map' do
     session[:user_id] = 1
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug})
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
@@ -198,7 +199,7 @@ def teardown
 
   test 'should not archive map without enough permissions' do
     session[:user_id] = 3
-    get(:archive, id: @map.slug)
+    get(:archive, params: { id: @map.slug})
     @map.reload
 
     assert_redirected_to '/?_=' + Time.now.to_i.to_s
@@ -208,7 +209,7 @@ def teardown
   test 'should update map' do
     session[:user_id] = 1
     put(:update,
-        id: @map.slug,
+        params: { id: @map.slug,
         map: {
           name: 'Schrute farms',
           location: 'USA',
@@ -216,7 +217,7 @@ def teardown
           lon: -74,
           description: 'A really green farm'
         },
-        tags: 'beets bears')
+        tags: 'beets bears'})
     @map.reload
 
     assert_redirected_to "/maps/#{@map.slug}"
@@ -229,12 +230,12 @@ def teardown
   end
 
   test 'should not update unless logged in' do
-    put :update, id: 2, map: { name: 'Street 5'}
+    put :update, params: { id: 2, map: { name: 'Street 5'}}
     assert_redirected_to '/login?back_to=/maps/2'
   end
 
   test 'should display maps by region' do
-    get :region, { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60 }
+    get :region, params: { minlat: 40, maxlat: 50, minlon: -80, maxlon: -60 }
     @maps = assigns(:maps)
 
     assert_response :success
@@ -242,19 +243,19 @@ def teardown
   end
 
   test 'should annotate maps' do
-    get :annotate, id: @map.slug
+    get :annotate, params: { id: @map.slug}
     assert_response :success
     assigns(:annotations) == true
   end
 
   test 'embed' do
-    get :embed, id: @map.slug
+    get :embed, params: { id: @map.slug}
     assert_response :success
     assert_template :show
   end
 
   test 'it returns the images' do
-    get :images, id: @map.slug
+    get :images, params: { id: @map.slug}
     assert_response :success
     assert_equal 'application/json', response.content_type
   end
@@ -262,7 +263,7 @@ def teardown
   def export_if_logged_in
     Rails.stub(:env, ActiveSupport::StringInquirer.new('development')) do
       session[:user_id] = 1
-      post :export, id: @map.id, resolution: 5
+      post :export, params: { id: @map.id, resolution: 5}
       assert_response :success
       assert_equal 'complete', @response.body
     end
@@ -271,13 +272,13 @@ def export_if_logged_in
   def export_anonmymous_map
     Rails.stub(:env, ActiveSupport::StringInquirer.new('development')) do
       map = maps(:cubbon)
-      post :export, id: map.id, resolution: 5
+      post :export, params: { id: map.id, resolution: 5}
       assert_response :success
     end
   end
 
   test 'returns the exports' do
-    get :exports, id: @map.id
+    get :exports, params: { id: @map.id}
     assert_response :success
   end
 
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 98da1b9dd..26b78f271 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -27,7 +27,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   test 'successful local login' do
     system('cp config/config.yml.example config/config.yml')
-    get :local, login: 'quentin'
+    get :local, params: { login: 'quentin'}
     assert_response :redirect
     assert flash[:success].present?
     assert_not_nil session[:user_id]
@@ -36,7 +36,7 @@ class SessionsControllerTest < ActionController::TestCase
   end
 
   test 'unsuccessful local login' do
-    get :local, login: 'cess'
+    get :local, params: { login: 'cess'}
     assert_response :redirect
     assert flash[:error].present?
     assert_nil session[:user_id]
diff --git a/test/functional/tags_controller_test.rb b/test/functional/tags_controller_test.rb
index 90a325700..d3c275f9d 100644
--- a/test/functional/tags_controller_test.rb
+++ b/test/functional/tags_controller_test.rb
@@ -9,31 +9,31 @@ def setup
 
   test "should create tag" do
     session[:user_id] = 1 # log in
-    post(:create, :map_id => @map.slug, :tags => "test,nice")
+    post(:create, params: { :map_id => @map.slug, :tags => "test,nice"})
     assert_response :redirect
   end
 
   test "should get tag show page" do
-    get :show, :id => "nice"
+    get :show, params: {id: "nice"} 
     assert_response :success
     assert_not_nil :maps, :tag
   end
 
   test "should redirect to login when not logged in" do
-    post :create, map_id: @map.slug, tags: "test,nice"
+    post :create, params: { map_id: @map.slug, tags: "test,nice"}
     assert_redirected_to "/login?back_to=/maps/#{@map.slug}"
     assert flash.present?
   end
 
   test 'should destroy a tag' do
     session[:user_id] = 1
-    delete :destroy, id: @tag
+    delete :destroy, params: { id: @tag}
     assert flash[:notice].present?
     assert_redirected_to @tag.map
   end
 
   test 'should redirect destroy when not logged in' do
-    delete :destroy, id: @tag
+    delete :destroy, params: { id: @tag}
     assert_response :redirect
     assert flash.present?
   end
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index d9bdd61f0..d38e1d61c 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -19,7 +19,7 @@ def setup
   end
 
   test "should get profile" do
-    get(:profile, id: @user.login)
+    get(:profile, params: {id: @user.login} )
     assert_response :success
     assert_not_nil :user
   end
diff --git a/test/functional/utility_controller_test.rb b/test/functional/utility_controller_test.rb
index 87ae42f9f..c929329d5 100644
--- a/test/functional/utility_controller_test.rb
+++ b/test/functional/utility_controller_test.rb
@@ -5,10 +5,13 @@
 class UtilityControllerTest < ActionController::TestCase
   test 'should translate tms format' do
     get(:tms_alt,
-        id: 1,
-        x: 10,
-        y: 30,
-        z: 40)
+        params: {
+          id: 1,
+          x: 10,
+          y: 30,
+          z: 40
+        }
+       )
 
     y = 2**40.to_i - 30.to_i - 1
     assert_redirected_to "/tms/1/40/10/#{y}.png"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e796f422e..cf0daa4af 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,7 @@
 
-require 'simplecov'
-require File.expand_path('../../config/environment', __FILE__)
+require_relative '../config/environment'
 require 'rails/test_help'
+require 'simplecov'
 require 'minitest/reporters'
 MiniTest::Reporters.use! [MiniTest::Reporters::ProgressReporter.new,
                           MiniTest::Reporters::JUnitReporter.new]
@@ -9,11 +9,7 @@
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
   fixtures :all
-
   # Add more helper methods to be used by all tests here...
   include ApplicationHelper
 end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 1612c84db..4821c931c 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -43,7 +43,12 @@ class UserTest < ActiveSupport::TestCase
     user = users(:quentin)
     map_images = user.maps.map(&:warpables)
 
-    assert_equal Warpable::ActiveRecord_Associations_CollectionProxy, user.warpables.class
+    map_images.flatten.each do |image|
+      user.warpables.each do |warpable|
+        assert_equal image.class, warpable.class
+      end
+    end
+
     assert_equal map_images.flatten, user.warpables
   end
 

From 297bcb087faf5b595ad750e98dc2c2feccff1eb6 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 3 Jul 2019 16:38:54 -0300
Subject: [PATCH 106/152] Enforcing params usage on get method

---
 test/functional/maps_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 54fbec9d1..a3abe40fb 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -91,7 +91,7 @@ def teardown
   end
 
   test 'query should be at least 3 chars long' do
-    get :search, q: 'ce'
+    get :search, params: { q: 'ce' }
     msg = 'Invalid Query: non white-space character count is less than 3'
 
     assert_response :success

From e3f3c9ddaf1f9d45458ba1d7cdd055701d4dbd16 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Wed, 3 Jul 2019 16:45:33 -0300
Subject: [PATCH 107/152] Using correct folder names to Rails >5 conventions

---
 .travis.yml                                   |  11 +-
 lib/tasks/test_unit.rake                      | 113 ------------------
 test/{functional => controllers}/.gitkeep     |   0
 .../annotations_controller_test.rb            |   0
 .../comments_controller_test.rb               |   0
 .../export_controller_test.rb                 |   0
 .../feeds_controller_test.rb                  |   0
 .../front_ui_controller_test.rb               |   0
 .../images_controller_test.rb                 |   0
 .../maps_controller_test.rb                   |   0
 .../sessions_controller_test.rb               |   0
 .../tags_controller_test.rb                   |   0
 .../users_controller_test.rb                  |   0
 .../utility_controller_test.rb                |   0
 test/{unit => models}/.gitkeep                |   0
 test/{unit => models}/annotation_test.rb      |   0
 test/{unit => models}/comment_test.rb         |   0
 test/{unit => models}/export_test.rb          |   0
 test/{unit => models}/exporter_test.rb        |   0
 .../helpers/front_ui_helper_test.rb           |   0
 test/{unit => models}/map_test.rb             |   0
 test/{unit => models}/node_test.rb            |   0
 test/{unit => models}/tag_test.rb             |   0
 test/{unit => models}/user_test.rb            |   0
 test/{unit => models}/warpable_test.rb        |   0
 25 files changed, 4 insertions(+), 120 deletions(-)
 delete mode 100644 lib/tasks/test_unit.rake
 rename test/{functional => controllers}/.gitkeep (100%)
 rename test/{functional => controllers}/annotations_controller_test.rb (100%)
 rename test/{functional => controllers}/comments_controller_test.rb (100%)
 rename test/{functional => controllers}/export_controller_test.rb (100%)
 rename test/{functional => controllers}/feeds_controller_test.rb (100%)
 rename test/{functional => controllers}/front_ui_controller_test.rb (100%)
 rename test/{functional => controllers}/images_controller_test.rb (100%)
 rename test/{functional => controllers}/maps_controller_test.rb (100%)
 rename test/{functional => controllers}/sessions_controller_test.rb (100%)
 rename test/{functional => controllers}/tags_controller_test.rb (100%)
 rename test/{functional => controllers}/users_controller_test.rb (100%)
 rename test/{functional => controllers}/utility_controller_test.rb (100%)
 rename test/{unit => models}/.gitkeep (100%)
 rename test/{unit => models}/annotation_test.rb (100%)
 rename test/{unit => models}/comment_test.rb (100%)
 rename test/{unit => models}/export_test.rb (100%)
 rename test/{unit => models}/exporter_test.rb (100%)
 rename test/{unit => models}/helpers/front_ui_helper_test.rb (100%)
 rename test/{unit => models}/map_test.rb (100%)
 rename test/{unit => models}/node_test.rb (100%)
 rename test/{unit => models}/tag_test.rb (100%)
 rename test/{unit => models}/user_test.rb (100%)
 rename test/{unit => models}/warpable_test.rb (100%)

diff --git a/.travis.yml b/.travis.yml
index f6a51e967..a99cc8c70 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,17 +34,14 @@ env:
     - CI=true
     - TRAVIS=true
 
-# FIXME - Later change 'test/unit' and 'test/funcional' folders 
-# to 'test/unit' and 'test/funcional', respectively
-
 jobs:
   include:
-    - name: "Unit Tests"
-      script: bundle exec rails test:unit
+    - name: "Models Tests"
+      script: bundle exec rails test:models
     - name: "Integration Tests"
       script: bundle exec rails test:integration
-    - name: "Functional Tests"
-      script: bundle exec rails test:functional
+    - name: "Controllers Tests"
+      script: bundle exec rails test:controllers
     - name: "Rubocop Linter"
       script: bundle exec rubocop
     - name: "Docker Builds"
diff --git a/lib/tasks/test_unit.rake b/lib/tasks/test_unit.rake
deleted file mode 100644
index 8a9dd11b0..000000000
--- a/lib/tasks/test_unit.rake
+++ /dev/null
@@ -1,113 +0,0 @@
-require 'rake/testtask'
-# ==================== #
-
-# HOW TO RUN # 
-
-# You can find all rake tasks, both those that come built-in with rake / rails and custom created ones, 
-# by running `rake --tasks`. Note you might need to set up repo configurations before you are able to run this. 
-
-# `rake --tasks`, shows two columns: the name of the rake task (functions as the CLI command to run the task) and the 
-# description (what the task does). All the tasks created in this file start with "Autotask" in the description
-# for easy reference. You can also find the commands (or command patterns for collections) commented above their respective tasks below.
-
-# TEST STRUCTURE # 
-
-# Currently, you can 
-# 1) run all unit, functional, and integration tests together. 
-# 2) run only unit, functional, or integration tests (files within the corresponding folder can be run concurrently or one a time).
-# 3) Last, you can run separate test files within the unit, functional, and integration test folders.
-
-# If proper naming convention is followed, tasks are autogenerated for individual testing files added to the unit, functional, and 
-# integration folders (see creation of 'COMPUTE' arrays below).
-
-# ==================== #
-
-namespace :test do
-
-  # command: rake test:all
-  # run unit, functional, and integration test folders (one folder at a time, in the order indicated in the pattern below)
-  Rake::TestTask.new do |t|
-    t.name = "all"
-    t.description = "Autotask - run unit, functional, and integration tests"
-    t.libs << "test"
-    t.pattern = FileList["test/unit/*_test.rb", "test/functional/*_test.rb", "test/integration/*_test.rb"]
-    t.warning = false
-    t.verbose = true
-  end
-
-  # command pattern: rake test:unit_test_file.rb
-  # autogenerates a rake task for every test file added to test/unit
-  COMPUTE_UNIT_TASKS = []
-    Dir.glob("test/unit/*_test.rb").each do |task|
-    collection = task.gsub(/test\/unit\//, "")
-    Rake::TestTask.new(:"#{collection}") do |t|
-      t.libs << "test"
-      t.description = "Autotask - run unit tests - #{collection}"
-      t.pattern = FileList["test/unit/#{collection}"]
-      t.warning = false
-      t.verbose = true
-    end
-    COMPUTE_UNIT_TASKS << "#{collection}"
-  end
-
-  # command: rake test:unit 
-  # run all unit test files (one file at a time in alphabetical order)
-  desc "Autotask - run unit tests"
-  task :unit => COMPUTE_UNIT_TASKS
-
-  # command: rake test:unit_parallel
-  # run all unit test files concurrently (one file at a time, order is not guaranteed)
-  desc "Autotask - run unit tests in parallel"
-  multitask :unit_parallel => COMPUTE_UNIT_TASKS
-
-  # command pattern: rake test:functional_test_file.rb  
-  # autogenerates a rake task for every test file added to test/functional
-  COMPUTE_FUNCTIONAL_TASKS = []
-  Dir.glob("test/functional/*_test.rb").each do |task|
-    collection = task.gsub(/test\/functional\//, "")
-    Rake::TestTask.new(:"#{collection}") do |t|
-      t.libs << "test"
-      t.description = "Autotask - run functional tests - #{collection}"
-      t.pattern = FileList["test/functional/#{collection}"]
-      t.warning = false
-      t.verbose = true
-    end
-    COMPUTE_FUNCTIONAL_TASKS << "#{collection}"
-  end
-
-  # command: rake test:functional 
-  # run all functional test files
-  desc "Autotask - run functional tests"
-  task :functional => COMPUTE_FUNCTIONAL_TASKS
-
-  # command: rake test:functional_parallel
-  # run all functional test files concurrently
-  desc "Autotask - run functional tests in parallel"
-  multitask :functional_parallel => COMPUTE_FUNCTIONAL_TASKS
-
-  # command pattern: rake test:integration_test_file.rb
-  # autogenerates a rake task for every test file added to test/integration
-  COMPUTE_INTEGRATION_TASKS = []
-  Dir.glob("test/integration/*_test.rb").each do |task|
-    collection = task.gsub(/test\/integration\//, "")
-    Rake::TestTask.new(:"#{collection}") do |t|
-      t.libs << "test"
-      t.description = "Autotask - run integration tests - #{collection}"
-      t.pattern = FileList["test/integration/#{collection}"]
-      t.warning = false
-      t.verbose = true
-    end
-    COMPUTE_INTEGRATION_TASKS << "#{collection}"
-  end
-
-  # command: rake test:integration
-  # run all integration test files
-  desc "Autotask - run integration tests"
-  task :integration => COMPUTE_INTEGRATION_TASKS
-
-  # command: rake test:integration_parallel
-  # run all integration test files concurrently
-  desc "Autotask - run integration tests in parallel"
-  multitask :integration_parallel => COMPUTE_INTEGRATION_TASKS
-
-end
diff --git a/test/functional/.gitkeep b/test/controllers/.gitkeep
similarity index 100%
rename from test/functional/.gitkeep
rename to test/controllers/.gitkeep
diff --git a/test/functional/annotations_controller_test.rb b/test/controllers/annotations_controller_test.rb
similarity index 100%
rename from test/functional/annotations_controller_test.rb
rename to test/controllers/annotations_controller_test.rb
diff --git a/test/functional/comments_controller_test.rb b/test/controllers/comments_controller_test.rb
similarity index 100%
rename from test/functional/comments_controller_test.rb
rename to test/controllers/comments_controller_test.rb
diff --git a/test/functional/export_controller_test.rb b/test/controllers/export_controller_test.rb
similarity index 100%
rename from test/functional/export_controller_test.rb
rename to test/controllers/export_controller_test.rb
diff --git a/test/functional/feeds_controller_test.rb b/test/controllers/feeds_controller_test.rb
similarity index 100%
rename from test/functional/feeds_controller_test.rb
rename to test/controllers/feeds_controller_test.rb
diff --git a/test/functional/front_ui_controller_test.rb b/test/controllers/front_ui_controller_test.rb
similarity index 100%
rename from test/functional/front_ui_controller_test.rb
rename to test/controllers/front_ui_controller_test.rb
diff --git a/test/functional/images_controller_test.rb b/test/controllers/images_controller_test.rb
similarity index 100%
rename from test/functional/images_controller_test.rb
rename to test/controllers/images_controller_test.rb
diff --git a/test/functional/maps_controller_test.rb b/test/controllers/maps_controller_test.rb
similarity index 100%
rename from test/functional/maps_controller_test.rb
rename to test/controllers/maps_controller_test.rb
diff --git a/test/functional/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
similarity index 100%
rename from test/functional/sessions_controller_test.rb
rename to test/controllers/sessions_controller_test.rb
diff --git a/test/functional/tags_controller_test.rb b/test/controllers/tags_controller_test.rb
similarity index 100%
rename from test/functional/tags_controller_test.rb
rename to test/controllers/tags_controller_test.rb
diff --git a/test/functional/users_controller_test.rb b/test/controllers/users_controller_test.rb
similarity index 100%
rename from test/functional/users_controller_test.rb
rename to test/controllers/users_controller_test.rb
diff --git a/test/functional/utility_controller_test.rb b/test/controllers/utility_controller_test.rb
similarity index 100%
rename from test/functional/utility_controller_test.rb
rename to test/controllers/utility_controller_test.rb
diff --git a/test/unit/.gitkeep b/test/models/.gitkeep
similarity index 100%
rename from test/unit/.gitkeep
rename to test/models/.gitkeep
diff --git a/test/unit/annotation_test.rb b/test/models/annotation_test.rb
similarity index 100%
rename from test/unit/annotation_test.rb
rename to test/models/annotation_test.rb
diff --git a/test/unit/comment_test.rb b/test/models/comment_test.rb
similarity index 100%
rename from test/unit/comment_test.rb
rename to test/models/comment_test.rb
diff --git a/test/unit/export_test.rb b/test/models/export_test.rb
similarity index 100%
rename from test/unit/export_test.rb
rename to test/models/export_test.rb
diff --git a/test/unit/exporter_test.rb b/test/models/exporter_test.rb
similarity index 100%
rename from test/unit/exporter_test.rb
rename to test/models/exporter_test.rb
diff --git a/test/unit/helpers/front_ui_helper_test.rb b/test/models/helpers/front_ui_helper_test.rb
similarity index 100%
rename from test/unit/helpers/front_ui_helper_test.rb
rename to test/models/helpers/front_ui_helper_test.rb
diff --git a/test/unit/map_test.rb b/test/models/map_test.rb
similarity index 100%
rename from test/unit/map_test.rb
rename to test/models/map_test.rb
diff --git a/test/unit/node_test.rb b/test/models/node_test.rb
similarity index 100%
rename from test/unit/node_test.rb
rename to test/models/node_test.rb
diff --git a/test/unit/tag_test.rb b/test/models/tag_test.rb
similarity index 100%
rename from test/unit/tag_test.rb
rename to test/models/tag_test.rb
diff --git a/test/unit/user_test.rb b/test/models/user_test.rb
similarity index 100%
rename from test/unit/user_test.rb
rename to test/models/user_test.rb
diff --git a/test/unit/warpable_test.rb b/test/models/warpable_test.rb
similarity index 100%
rename from test/unit/warpable_test.rb
rename to test/models/warpable_test.rb

From 553d8ea41c0c1cfca1252a143bd7073cbe55cc9a Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Sat, 6 Jul 2019 17:02:28 -0300
Subject: [PATCH 108/152] Enforcing params wrapping and adding missing front_ui
 route

---
 app/controllers/front_ui_controller.rb     | 1 +
 config/routes.rb                           | 3 ++-
 test/controllers/export_controller_test.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/front_ui_controller.rb b/app/controllers/front_ui_controller.rb
index f32546997..7582c8f93 100644
--- a/app/controllers/front_ui_controller.rb
+++ b/app/controllers/front_ui_controller.rb
@@ -21,6 +21,7 @@ def all_maps
 
   def nearby_mappers
     return unless current_location.present?
+
     lat = session[:lat]
     lon = session[:lon]
     @nearby_maps = Map.maps_nearby(lat: lat, lon: lon, dist: 10)
diff --git a/config/routes.rb b/config/routes.rb
index 451e987e2..8f4ba2ca2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,6 +40,7 @@
   get 'tms/:id/alt/', to: 'utility#tms_info'
 
   # once we have string-based ids, reorganize these around 'maps' and resourceful routing
+  get 'gallery', to: 'front_ui#gallery'
   get 'search/:id', to: 'maps#search'
   get 'search', to: 'maps#search'
   get 'maps/:id/warpables', to: 'maps#images' # deprecate this in favor of resourceful route below; this is just to override maps/:id
@@ -67,7 +68,7 @@
   end
 
   namespace 'maps' do
-    %w(map featured).each do |action|
+    %w(map featured region license).each do |action|
       get action, action: action
     end
 
diff --git a/test/controllers/export_controller_test.rb b/test/controllers/export_controller_test.rb
index b4ab02ce0..1e4600f25 100644
--- a/test/controllers/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -18,7 +18,7 @@ def teardown
 
   test 'create returns json' do
     url = 'https://example.json/12345/status.json'
-    post :create, status_url: url
+    post :create, params: { status_url: url }
     assert_equal url, Export.last.export_url
   end
 

From 3b1f578c14ce0f94fa3f1bc3590bfad8043ccd8b Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 11 Jul 2019 17:50:47 -0300
Subject: [PATCH 109/152] Precompiling assets before serving

---
 start.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index 58478ee61..ca702c986 100755
--- a/start.sh
+++ b/start.sh
@@ -3,12 +3,11 @@
 pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
-yarn check || yarn install
+rake assets:precompile
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';
 	rm $pidfile;
 fi
 
-#bundle exec /usr/local/bundle/bin/passenger start
 bundle exec passenger start

From b57356d2697d827694dcdfa4634a3cfe4fc7a370 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 12 Jul 2019 10:20:17 -0300
Subject: [PATCH 110/152] Improving Jenkins startup script

---
 Makefile | 2 +-
 start.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a071d4400..cddb85b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,4 @@ deploy-container:
 
 redeploy-container:
 	docker-compose up --force-recreate -d
-	docker-compose exec -T web bash -l -c "sleep 10 && rake db:migrate && rake assets:precompile"
+	while ! docker logs mapknitter | grep "web server started"; do echo "Serving Mapknitter"; sleep 10; done;
diff --git a/start.sh b/start.sh
index ca702c986..ef5133500 100755
--- a/start.sh
+++ b/start.sh
@@ -3,6 +3,7 @@
 pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
+rails db:migrate
 rake assets:precompile
 
 if [ -f $pidfile ] ; then

From 63b0a89a419dbd748cb7bd50dd3e58668ef31f63 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 14:07:02 -0300
Subject: [PATCH 111/152] Using supported docker yaml version by Jenkins

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 00007c466..e11ed81ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.5'
+version: '3.3'
 services:
   db:
     container_name: database

From 5678f71e6d8a637e3ad4d21b43ab5b8cdfdccede Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:39:54 -0300
Subject: [PATCH 112/152] Adding task to check database existance

---
 lib/tasks/db.rake | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 lib/tasks/db.rake

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
new file mode 100644
index 000000000..7015511d7
--- /dev/null
+++ b/lib/tasks/db.rake
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+namespace :db do
+  desc "Checks whether the database exists or not"
+  task :exists do
+    begin
+    # Tries to initialize the application.
+    # It will fail if the database does not exist
+    Rake::Task["environment"].invoke
+    ActiveRecord::Base.connection
+    puts "There is a database"
+    rescue StandardError
+      puts "There is NOT a database"
+      exit 1
+    else
+      exit 0
+    end
+  end
+end
\ No newline at end of file

From 43d86e1486640b239e3ae195a8b8b762266edb92 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:41:28 -0300
Subject: [PATCH 113/152] Improving start script

---
 start.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index ef5133500..22b4dc27b 100755
--- a/start.sh
+++ b/start.sh
@@ -2,9 +2,23 @@
 
 pidfile=/app/tmp/pids/server.pid
 
+bump_database(){
+	bundle exec rails db:schema:load || bundle exec rails db:migrate
+}
+
 bundle check || bundle install
-rails db:migrate
-rake assets:precompile
+
+if bundle exec rails db:exists; then
+	>&2 echo "Database exists, only migrating it..."
+	bundle exec rails db:migrate
+else
+	>&2 echo "Database doesn't exist, creating and migrating it..."
+	bundle exec rails db:create
+	bump_database
+fi
+
+bundle exec rails assets:precompile
+
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';

From 658d4ea9e274c52bf5b31e935c5804179bfc3cfb Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:42:05 -0300
Subject: [PATCH 114/152] Improving Makefile's recipes and target

---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cddb85b9f..8a2185b12 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,21 @@ export COMPOSE_HTTP_TIMEOUT=360
 build:
 	cp config/database.yml.example config/database.yml
 	cp config/amazon_s3.yml.example config/amazon_s3.yml
+	cp config/config.yml.example config/config.yml
 	cp db/schema.rb.example db/schema.rb
 	docker-compose down --remove-orphans
 	docker-compose build
 
 deploy-container:
-	docker-compose run --rm web bash -l -c "sleep 10 && bower install --allow-root && rake db:setup && rake db:migrate && rake assets:precompile"
 	docker-compose up -d
-	docker-compose exec -T web bash -l -c "sleep 10 && rake db:setup && rake db:migrate && rake assets:precompile"
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;
 
 redeploy-container:
 	docker-compose up --force-recreate -d
-	while ! docker logs mapknitter | grep "web server started"; do echo "Serving Mapknitter"; sleep 10; done;
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;

From 1c61d3ac3aaa600868aa35e3eb96df9dc2c742aa Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:39:54 -0300
Subject: [PATCH 115/152] Adding task to check database existance

---
 lib/tasks/db.rake | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 lib/tasks/db.rake

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
new file mode 100644
index 000000000..7015511d7
--- /dev/null
+++ b/lib/tasks/db.rake
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+namespace :db do
+  desc "Checks whether the database exists or not"
+  task :exists do
+    begin
+    # Tries to initialize the application.
+    # It will fail if the database does not exist
+    Rake::Task["environment"].invoke
+    ActiveRecord::Base.connection
+    puts "There is a database"
+    rescue StandardError
+      puts "There is NOT a database"
+      exit 1
+    else
+      exit 0
+    end
+  end
+end
\ No newline at end of file

From 381704c6bd8f317bb62529a0a10c75c2f26b1660 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:41:28 -0300
Subject: [PATCH 116/152] Improving start script

---
 start.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index ef5133500..22b4dc27b 100755
--- a/start.sh
+++ b/start.sh
@@ -2,9 +2,23 @@
 
 pidfile=/app/tmp/pids/server.pid
 
+bump_database(){
+	bundle exec rails db:schema:load || bundle exec rails db:migrate
+}
+
 bundle check || bundle install
-rails db:migrate
-rake assets:precompile
+
+if bundle exec rails db:exists; then
+	>&2 echo "Database exists, only migrating it..."
+	bundle exec rails db:migrate
+else
+	>&2 echo "Database doesn't exist, creating and migrating it..."
+	bundle exec rails db:create
+	bump_database
+fi
+
+bundle exec rails assets:precompile
+
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';

From 85bb1ebf15448b3254ac9357fc588262e11a78a5 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:42:05 -0300
Subject: [PATCH 117/152] Improving Makefile's recipes and target

---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cddb85b9f..8a2185b12 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,21 @@ export COMPOSE_HTTP_TIMEOUT=360
 build:
 	cp config/database.yml.example config/database.yml
 	cp config/amazon_s3.yml.example config/amazon_s3.yml
+	cp config/config.yml.example config/config.yml
 	cp db/schema.rb.example db/schema.rb
 	docker-compose down --remove-orphans
 	docker-compose build
 
 deploy-container:
-	docker-compose run --rm web bash -l -c "sleep 10 && bower install --allow-root && rake db:setup && rake db:migrate && rake assets:precompile"
 	docker-compose up -d
-	docker-compose exec -T web bash -l -c "sleep 10 && rake db:setup && rake db:migrate && rake assets:precompile"
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;
 
 redeploy-container:
 	docker-compose up --force-recreate -d
-	while ! docker logs mapknitter | grep "web server started"; do echo "Serving Mapknitter"; sleep 10; done;
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;

From 431164dcb4d3c8271146d8f7c5e95e1e9f6830b5 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 15 Jul 2019 15:42:05 -0300
Subject: [PATCH 118/152] Improving Makefile's recipes and target

---
 Makefile | 12 +++++++++---
 start.sh |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cddb85b9f..8a2185b12 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,21 @@ export COMPOSE_HTTP_TIMEOUT=360
 build:
 	cp config/database.yml.example config/database.yml
 	cp config/amazon_s3.yml.example config/amazon_s3.yml
+	cp config/config.yml.example config/config.yml
 	cp db/schema.rb.example db/schema.rb
 	docker-compose down --remove-orphans
 	docker-compose build
 
 deploy-container:
-	docker-compose run --rm web bash -l -c "sleep 10 && bower install --allow-root && rake db:setup && rake db:migrate && rake assets:precompile"
 	docker-compose up -d
-	docker-compose exec -T web bash -l -c "sleep 10 && rake db:setup && rake db:migrate && rake assets:precompile"
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;
 
 redeploy-container:
 	docker-compose up --force-recreate -d
-	while ! docker logs mapknitter | grep "web server started"; do echo "Serving Mapknitter"; sleep 10; done;
+	while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;
diff --git a/start.sh b/start.sh
index 22b4dc27b..3df11f748 100755
--- a/start.sh
+++ b/start.sh
@@ -10,7 +10,9 @@ bundle check || bundle install
 
 if bundle exec rails db:exists; then
 	>&2 echo "Database exists, only migrating it..."
-	bundle exec rails db:migrate
+	# bundle exec rails db:migrate
+	bundle exec rails db:reset DISABLE_DATABASE_ENVIRONMENT_CHECK=1
+	DISABLE_DATABASE_ENVIRONMENT_CHECK=1 bump_database
 else
 	>&2 echo "Database doesn't exist, creating and migrating it..."
 	bundle exec rails db:create

From 8d8568630977cc84d4cece23faa5b2494793e511 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 16 Jul 2019 09:40:07 -0300
Subject: [PATCH 119/152] Patching
 https://github.com/publiclab/mapknitter/pull/803

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c7a01100a..08a6a35ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,10 @@ COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y npm
 RUN npm install -g yarn
 
+# See https://github.com/instructure/canvas-lms/issues/1404#issuecomment-461023483 and
+# https://github.com/publiclab/mapknitter/pull/803
+RUN git config --global url."https://".insteadOf git://
+
 # Install bundle of gems
 # Add the Rails app
 COPY . /app/

From d91554e257b3ce154193a99f96a4bf3c14957bd8 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 16 Jul 2019 09:55:57 -0300
Subject: [PATCH 120/152] Improving Jenkins setup

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 72270ca97..7be3086f7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,13 @@ deploy-container:
 
 redeploy-container:
 	docker-compose down --remove-orphans
-	docker volume rm -f mapknitter_yarn_cache mapknitter_bundle_cache
 	docker-compose up --force-recreate -d
-	docker exec -it -e DISABLE_DATABASE_ENVIRONMENT_CHECK=1mapknitter bash -lc\
-												"bundle exec rails db:reset && \
-												 bundle exec rails db:migrate"
 	while ! docker logs mapknitter | grep "web server started"; do\
 		echo "Serving Mapknitter";\
 		sleep 10;\
 	done;
+	docker exec -e DISABLE_DATABASE_ENVIRONMENT_CHECK=1 mapknitter bash -lc \
+												"bundle exec rails db:drop && \
+												 bundle exec rails db:create && \
+												 bundle exec rails db:schema:load && \
+												 bundle exec rails db:migrate"

From f4005d0414257eed7a167ca850cdcdeab72729d1 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Sat, 20 Jul 2019 08:38:03 +0530
Subject: [PATCH 121/152] Fix map loading

---
 .codecov.yml                             | 2 +-
 app/assets/javascripts/mapknitter/Map.js | 4 ++--
 app/views/map/leaflet.html.erb           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.codecov.yml b/.codecov.yml
index 3d16b5685..e34163dbd 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -8,4 +8,4 @@ comment:
 coverage:
   status:
     project: off    #turned off due to inconsistencies in reporting
-    patch: on
+    patch: off
diff --git a/app/assets/javascripts/mapknitter/Map.js b/app/assets/javascripts/mapknitter/Map.js
index c3d4fb373..0e71296b8 100644
--- a/app/assets/javascripts/mapknitter/Map.js
+++ b/app/assets/javascripts/mapknitter/Map.js
@@ -485,8 +485,8 @@ MapKnitter.Map = MapKnitter.Class.extend({
     // reset change state string:
     img._corner_state = JSON.stringify(img._corners)
     // send save request
-    $.ajax('/images/update', {
-      type: 'POST',
+    $.ajax('/images', {
+      type: 'PATCH',
       data: {
         warpable_id: img.warpable_id,
         locked: (img.editing._mode == 'lock'),
diff --git a/app/views/map/leaflet.html.erb b/app/views/map/leaflet.html.erb
index 25611958c..1440855b2 100644
--- a/app/views/map/leaflet.html.erb
+++ b/app/views/map/leaflet.html.erb
@@ -83,8 +83,8 @@
       });
       img.mk_id = <%= warpable.id %>
       img.onDeselect = function() {
-        $.ajax('/images/update',{
-          type: 'POST',
+        $.ajax('/images',{
+          type: 'PATCH',
           data: {
             warpable_id: this.mk_id,
             locked: this.locked,

From 58bc692d6552e6ed9b742cbeb30e3e654ab693b6 Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Thu, 25 Jul 2019 07:41:26 -0400
Subject: [PATCH 122/152] h

---
 app/assets/javascripts/application.js   | 1 +
 app/assets/stylesheets/application.scss | 2 ++
 app/views/maps/index.html.erb           | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 72f372210..d95b2d626 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,6 +22,7 @@
 //= require leaflet-providers/leaflet-providers.js
 //= require leaflet-toolbar/dist/leaflet.toolbar.js
 //= require leaflet-distortableimage/dist/leaflet.distortableimage.js
+//= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
 //= require leaflet-easybutton/src/easy-button.js
 //= require sparklines/source/sparkline.js
 //= require annotations-legacy.js
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 55fa8d78c..25bb6f016 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,10 +6,12 @@ $icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
 @import "annotations";
 @import "sidebar.css";
 @import "bootstrap/dist/css/bootstrap.min.css";
+@import "leaflet/dist/leaflet.css";
 @import "leaflet-draw/dist/leaflet.draw.css";
 @import "leaflet-illustrate/dist/Leaflet.Illustrate.css";
 @import "leaflet-toolbar/dist/leaflet.toolbar.css";
 @import "leaflet-distortableimage/dist/leaflet.distortableimage.css";
+@import "leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css";
 @import "@fortawesome/fontawesome-free/css/all.css";
 // /*
 //  * This is a manifest file that'll be compiled into application.css, which will include all the files
diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 283a468be..76c5b12a9 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -1,6 +1,3 @@
-<%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
-<%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/windRoseLayer.js') %>
 <%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %>
 <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>

From bf66f69e6e8cdc5ad2232f62e58c3bef4f9facd5 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Thu, 25 Jul 2019 23:08:14 -0300
Subject: [PATCH 123/152] Fixing Leaflet-Environmental-Layers map loading

---
 app/assets/javascripts/application.js   | 1 +
 app/assets/stylesheets/application.scss | 2 ++
 app/views/maps/index.html.erb           | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 04ad5432d..eba4a7044 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -23,6 +23,7 @@
 //= require leaflet-providers/leaflet-providers.js
 //= require leaflet-toolbar/dist/leaflet.toolbar.js
 //= require leaflet-distortableimage/dist/leaflet.distortableimage.js
+//= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
 //= require leaflet-easybutton/src/easy-button.js
 //= require Google.js
 //= require sparklines/source/sparkline.js
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 55fa8d78c..25bb6f016 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,10 +6,12 @@ $icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
 @import "annotations";
 @import "sidebar.css";
 @import "bootstrap/dist/css/bootstrap.min.css";
+@import "leaflet/dist/leaflet.css";
 @import "leaflet-draw/dist/leaflet.draw.css";
 @import "leaflet-illustrate/dist/Leaflet.Illustrate.css";
 @import "leaflet-toolbar/dist/leaflet.toolbar.css";
 @import "leaflet-distortableimage/dist/leaflet.distortableimage.css";
+@import "leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css";
 @import "@fortawesome/fontawesome-free/css/all.css";
 // /*
 //  * This is a manifest file that'll be compiled into application.css, which will include all the files
diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 283a468be..76c5b12a9 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -1,6 +1,3 @@
-<%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
-<%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/windRoseLayer.js') %>
 <%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %>
 <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>

From 997a6fa93c9d8c72f20127d11d2dae9ae9b5ae14 Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Thu, 25 Jul 2019 07:41:26 -0400
Subject: [PATCH 124/152] h


From ab615b595d42b33c63d4c35f19101dba7af78ab9 Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 00:17:31 -0400
Subject: [PATCH 125/152] leaflet

---
 app/assets/javascripts/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d95b2d626..e14c82231 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,7 +18,7 @@
 
 //= require bootstrap/dist/js/bootstrap.js
 
-//= require leaflet/dist/leaflet
+//= require leaflet/dist/leaflet.js
 //= require leaflet-providers/leaflet-providers.js
 //= require leaflet-toolbar/dist/leaflet.toolbar.js
 //= require leaflet-distortableimage/dist/leaflet.distortableimage.js

From 3dd385a5bfe6bfdf915738432c054f0b591329ae Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 01:48:10 -0400
Subject: [PATCH 126/152] fix

---
 app/views/front_ui/index.html.erb | 3 ---
 config/environments/production.rb | 1 -
 config/initializers/assets.rb     | 1 -
 3 files changed, 5 deletions(-)

diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb
index 4e99aa441..b10575b4b 100644
--- a/app/views/front_ui/index.html.erb
+++ b/app/views/front_ui/index.html.erb
@@ -1,6 +1,3 @@
-<%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
-<%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/src/windRoseLayer.js') %>
 <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
 <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 219f7fc32..e9926b12c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -39,7 +39,6 @@
   config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
   config.assets.precompile += ['tags.js',
                                'uploads.js',
-                               'knitter.js',
                                'annotations.js',
                                'maps.js']
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index b666a7c43..c72222861 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -12,6 +12,5 @@
 # Rails.application.config.assets.precompile += %w( search.js )
 Rails.application.config.assets.precompile += ['tags.js',
                                                'uploads.js',
-                                               'knitter.js',
                                                'annotations.js',
                                                'maps.js']

From c785c639ca030a1f0958f8f321bf847b9268594f Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 03:26:08 -0400
Subject: [PATCH 127/152] change

---
 .../javascripts/annotations-embed-legacy.js   |    4 -
 app/assets/javascripts/annotations.js         |    5 -
 app/assets/javascripts/application.js         |   43 +-
 app/assets/javascripts/knitter.js             |  778 ++--
 .../javascripts/{maps.js => map_sidebar.js}   |    8 +-
 .../javascripts/mapknitter/Annotations.js     |    4 +-
 app/assets/javascripts/tags.js                |    0
 app/assets/javascripts/uploads.js             |    9 -
 app/views/layouts/knitter2.html.erb           |    3 -
 config/environments/production.rb             |    5 +-
 config/initializers/assets.rb                 |    6 +-
 package.json                                  |    1 +
 yarn.lock                                     | 3524 ++++++++++++++++-
 13 files changed, 3872 insertions(+), 518 deletions(-)
 delete mode 100644 app/assets/javascripts/annotations-embed-legacy.js
 delete mode 100644 app/assets/javascripts/annotations.js
 rename app/assets/javascripts/{maps.js => map_sidebar.js} (94%)
 delete mode 100644 app/assets/javascripts/tags.js

diff --git a/app/assets/javascripts/annotations-embed-legacy.js b/app/assets/javascripts/annotations-embed-legacy.js
deleted file mode 100644
index cfd49c121..000000000
--- a/app/assets/javascripts/annotations-embed-legacy.js
+++ /dev/null
@@ -1,4 +0,0 @@
-//= require jquery/dist/jquery.js
-//= require bootstrap/dist/js/bootstrap.js
-//= require leaflet/dist/leaflet
-//= require leaflet-providers/leaflet-providers.js
diff --git a/app/assets/javascripts/annotations.js b/app/assets/javascripts/annotations.js
deleted file mode 100644
index c313fa5c3..000000000
--- a/app/assets/javascripts/annotations.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//= require leaflet-draw/dist/leaflet.draw-src.js
-//= require leaflet-illustrate/dist/Leaflet.Illustrate.js
-//= require mapknitter/Annotations
-//= require mapknitter/Annotations.style
-//= require mapknitter/Annotations.Toolbar
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e14c82231..037a072ff 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,20 +11,33 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 
-//= require jquery
-//= require jquery-ujs
-//= require jquery/dist/jquery.js
-//= require jquery-ujs/src/rails.js 
+// = require jquery
+// = require jquery-ujs
+// = require jquery/dist/jquery.js
+// = require jquery-ujs/src/rails.js 
+// = require jquery-ui/jquery-ui.min.js
 
-//= require bootstrap/dist/js/bootstrap.js
+//= require blueimp-tmpl/js/tmpl.js
+//= require blueimp-file-upload/js/vendor/jquery.ui.widget
+//= require blueimp-file-upload/js/jquery.fileupload
+//= require blueimp-file-upload/js/jquery.fileupload-process
+//= require blueimp-file-upload/js/jquery.fileupload-ui
 
-//= require leaflet/dist/leaflet.js
-//= require leaflet-providers/leaflet-providers.js
-//= require leaflet-toolbar/dist/leaflet.toolbar.js
-//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
-//= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
-//= require leaflet-easybutton/src/easy-button.js
-//= require sparklines/source/sparkline.js
-//= require annotations-legacy.js
-//= require glfx-js/dist/glfx.js
-//= require webgl-distort/dist/webgl-distort.js
+// = require bootstrap/dist/js/bootstrap.js
+
+// = require leaflet/dist/leaflet.js
+// = require leaflet-providers/leaflet-providers.js
+// = require leaflet-toolbar/dist/leaflet.toolbar.js
+//=  require leaflet-draw/dist/leaflet.draw-src.js
+//=  require leaflet-illustrate/dist/Leaflet.Illustrate.js
+// = require leaflet-distortableimage/dist/leaflet.distortableimage.js
+// = require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
+// = require leaflet-easybutton/src/easy-button.js
+// = require sparklines/source/sparkline.js
+// = require glfx-js/dist/glfx.js
+// = require ion-rangeslider/js/ion.rangeSlider.js
+// = require exif-js/exif.js
+// = require webgl-distort/dist/webgl-distort.js
+// = require mapknitter/core/Class.js
+
+// = require_tree .
diff --git a/app/assets/javascripts/knitter.js b/app/assets/javascripts/knitter.js
index 7e0d6d156..caab553a4 100644
--- a/app/assets/javascripts/knitter.js
+++ b/app/assets/javascripts/knitter.js
@@ -1,418 +1,418 @@
-// Legacy!
-var Knitter = {
-  // start storing a layer_type and layer_url in Map model, use it to switch this:
-  openlayers_on: false,
-  save: {
-    state: true,
-    saved: function(response) {
-      Knitter.save.state = true
-      $('save_saved').show()
-      $('save_saving').hide()
-      $('save_failed').hide()
-      //console.log(response)
-    },
-    submitted: function(response) {
-      Knitter.save.state = "saving"
-      $('save_saved').hide()
-      $('save_saving').show()
-      $('save_failed').hide()
-    },
-    failed: function(response) {
-      Knitter.save.state = false
-      $('save_saved').hide()
-      $('save_saving').hide()
-      $('save_failed').show()
-      //console.log(response)
-    },
-  },
-  setup: function() {
-    Glop.observe('glop:predraw', function() { $C.clear();})
-    // disable default "delete" key (in Chrome it goes "back")
-    window.addEventListener ('keydown', function (e) {
-      // If the key pressed was a backspace key, handle it specially
-      if (e.keyIdentifier == 'U+0008' || e.keyIdentifier == 'Backspace') {
-        // If the target of the backspace was the body element, handle it specially
-        if (e.target == document.body) {
-          // Prevent the default Backspace action from happening
-          e.preventDefault ();
-        }
-      }
-    }, true);
+// // Legacy!
+// var Knitter = {
+//   // start storing a layer_type and layer_url in Map model, use it to switch this:
+//   openlayers_on: false,
+//   save: {
+//     state: true,
+//     saved: function(response) {
+//       Knitter.save.state = true
+//       $('save_saved').show()
+//       $('save_saving').hide()
+//       $('save_failed').hide()
+//       //console.log(response)
+//     },
+//     submitted: function(response) {
+//       Knitter.save.state = "saving"
+//       $('save_saved').hide()
+//       $('save_saving').show()
+//       $('save_failed').hide()
+//     },
+//     failed: function(response) {
+//       Knitter.save.state = false
+//       $('save_saved').hide()
+//       $('save_saving').hide()
+//       $('save_failed').show()
+//       //console.log(response)
+//     },
+//   },
+//   setup: function() {
+//     Glop.observe('glop:predraw', function() { $C.clear();})
+//     // disable default "delete" key (in Chrome it goes "back")
+//     window.addEventListener ('keydown', function (e) {
+//       // If the key pressed was a backspace key, handle it specially
+//       if (e.keyIdentifier == 'U+0008' || e.keyIdentifier == 'Backspace') {
+//         // If the target of the backspace was the body element, handle it specially
+//         if (e.target == document.body) {
+//           // Prevent the default Backspace action from happening
+//           e.preventDefault ();
+//         }
+//       }
+//     }, true);
 
-    var first_new_image = true
-    warpables.each(function(warpable,index) {
-      if (warpable.nodes != 'none') {
-        // nodes as [[lon,lat],[lon,lat]]
-        Warper.load_image(warpable.img,warpable.nodes,warpable.id,warpable.locked);
-      } else {
-        if (first_new_image) Warper.new_image(warpable.img,warpable.id,true);
-        else Warper.new_image(warpable.img,warpable.id,true)
-        first_new_image = false
-      }
-    })
-    Warper.sort_images()
-    Knitter.center_on_warpables()
-    if (Config.fullscreen) {
-      $('header').hide()
-      Config.padding_top = 0
-    }
-    if (Config.locked == 'true') {
-      Warper.locked = true
-    }
-  },
-  init_openlayers: function(format) {
-    if (format == 'WMS') {
-             map = new OpenLayers.Map('map', { controls: [],
-        projection: spher_merc,
-         displayProjection: spher_merc,
-               maxExtent: new OpenLayers.Bounds(-180,-90,180,90),
-      });
-    } else {
-             map = new OpenLayers.Map('map', { controls: [],
-          tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
-        units: "m",
-        projection: latlon,
-        //numZoomLevels: 22,
-          displayProjection: spher_merc,
-               maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
-        //maxResolution: 156543.0339
-      });
-    }
-    Knitter.openlayers_on = true;
-  },
+//     var first_new_image = true
+//     warpables.each(function(warpable,index) {
+//       if (warpable.nodes != 'none') {
+//         // nodes as [[lon,lat],[lon,lat]]
+//         Warper.load_image(warpable.img,warpable.nodes,warpable.id,warpable.locked);
+//       } else {
+//         if (first_new_image) Warper.new_image(warpable.img,warpable.id,true);
+//         else Warper.new_image(warpable.img,warpable.id,true)
+//         first_new_image = false
+//       }
+//     })
+//     Warper.sort_images()
+//     Knitter.center_on_warpables()
+//     if (Config.fullscreen) {
+//       $('header').hide()
+//       Config.padding_top = 0
+//     }
+//     if (Config.locked == 'true') {
+//       Warper.locked = true
+//     }
+//   },
+//   init_openlayers: function(format) {
+//     if (format == 'WMS') {
+//              map = new OpenLayers.Map('map', { controls: [],
+//         projection: spher_merc,
+//          displayProjection: spher_merc,
+//                maxExtent: new OpenLayers.Bounds(-180,-90,180,90),
+//       });
+//     } else {
+//              map = new OpenLayers.Map('map', { controls: [],
+//           tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
+//         units: "m",
+//         projection: latlon,
+//         //numZoomLevels: 22,
+//           displayProjection: spher_merc,
+//                maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
+//         //maxResolution: 156543.0339
+//       });
+//     }
+//     Knitter.openlayers_on = true;
+//   },
 
-  start_openlayers: function(layer,tile_url,tile_layer) {
-    if (layer == "none") $('map').hide()
-    else $('map').show()
-    if (!Knitter.openlayers_on) Knitter.init_openlayers(layer)
-    // http://isse.cr.usgs.gov/ArcGIS/services/Combined/TNM_Large_Scale_Imagery/MapServer/WMSServer?request=GetCapabilities&service=WMS
-    // http://raster.nationalmap.gov/ArcGIS/rest/services/Combined/TNM_Large_Scale_Imagery/MapServer
-    // http://viewer.nationalmap.gov/example/services.html
-    Config.tiles = true
-    Config.tile_type = layer
-    Zoom.interval = 6
-    if (layer == 'google') {
-      var gsat = new OpenLayers.Layer.Google("Google Satellite", {
-        type: google.maps.MapTypeId.SATELLITE,
-        sphericalMercator: true,
-        numZoomLevels: 23,
-        maxZoomLevel: 23
-      } );
-      map.addLayer(gsat)
-      map.layers[0].mapObject.setTilt(0);
+//   start_openlayers: function(layer,tile_url,tile_layer) {
+//     if (layer == "none") $('map').hide()
+//     else $('map').show()
+//     if (!Knitter.openlayers_on) Knitter.init_openlayers(layer)
+//     // http://isse.cr.usgs.gov/ArcGIS/services/Combined/TNM_Large_Scale_Imagery/MapServer/WMSServer?request=GetCapabilities&service=WMS
+//     // http://raster.nationalmap.gov/ArcGIS/rest/services/Combined/TNM_Large_Scale_Imagery/MapServer
+//     // http://viewer.nationalmap.gov/example/services.html
+//     Config.tiles = true
+//     Config.tile_type = layer
+//     Zoom.interval = 6
+//     if (layer == 'google') {
+//       var gsat = new OpenLayers.Layer.Google("Google Satellite", {
+//         type: google.maps.MapTypeId.SATELLITE,
+//         sphericalMercator: true,
+//         numZoomLevels: 23,
+//         maxZoomLevel: 23
+//       } );
+//       map.addLayer(gsat)
+//       map.layers[0].mapObject.setTilt(0);
 
-      // not sure why nothing else works, but this allows more zooming in!
-      map.layers[0].numZoomLevels = 24
-      map.layers[0].maxZoomLevel = 24
-      map.layers[0].resolutions.push(0.29858214168548586/2,0.29858214168548586/4,0.29858214168548586/8,0.29858214168548586/16)
-      map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
-        new OpenLayers.Projection("EPSG:4326"),
-        map.getProjectionObject()
-      ), 5);
+//       // not sure why nothing else works, but this allows more zooming in!
+//       map.layers[0].numZoomLevels = 24
+//       map.layers[0].maxZoomLevel = 24
+//       map.layers[0].resolutions.push(0.29858214168548586/2,0.29858214168548586/4,0.29858214168548586/8,0.29858214168548586/16)
+//       map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
+//         new OpenLayers.Projection("EPSG:4326"),
+//         map.getProjectionObject()
+//       ), 5);
 
-    } else if (layer == 'mapbox') {
-      var mapbox = new OpenLayers.Layer.TMS( "MapBox OpenStreetMap",
-        [ "http://a.tile.mapbox.com/","http://b.tile.mapbox.com/",
-          "http://c.tile.mapbox.com/","http://d.tile.mapbox.com/" ],
-        { 'layername': 'mapbox.mapbox-streets', 'type':'jpg',
-          'buffer': 0, 'transitionEffect':'resize',
-          attribution: 'rendered by <a href="http://mapbox.com">MapBox</a>, from <a href="http://www.openstreetmap.org/">OpenStreetMap data</a>'} );
-      map.addLayer(mapbox)
-    } else if (layer == 'osm') {
-      var osm = new OpenLayers.Layer.TMS( "OpenStreetMap",
-            "http://tile.openstreetmap.org/",
-            { type: 'png',
-        numZoomLevels: 23,
-        maxZoomLevel: 23,
-        getURL: osm_getTileURL,
-        displayOutsideMaxExtent: true,
-        attribution: '<a href="http://www.openstreetmap.org/">OpenStreetMap</a>'
-        }
-      );
-      map.addLayer(osm)
-    } else if (layer == 'bing') {
-      var apiKey = "AhYrUtF-jMIlTiblfgB_spQXBgc3u1_4h1mrgm_vEmyrnHLbA8v8452MolECULTX"
-      //Only in later versions of OpenLayers: //var bingsat = new OpenLayers.Layer.Bing("Aerial", {type: "Aerial", apiKey:apiKey, sphericalMercator:true});
-      var bingsat = new OpenLayers.Layer.VirtualEarth("Virtual Earth Aerial",  {
-        'type': VEMapStyle.Aerial,
-        numZoomLevels: 23,
-        maxZoomLevel: 23,
-        'sphericalMercator': true
-      });
-      map.addLayer(bingsat)
-    } else if (layer == 'yahoo') {
-      var yahoosat = new OpenLayers.Layer.Yahoo("Yahoo Satellite", {type: YAHOO_MAP_SAT, sphericalMercator: true, numZoomLevels: 23});
-      map.addLayer(yahoosat)
-/*you can try
-  http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/
+//     } else if (layer == 'mapbox') {
+//       var mapbox = new OpenLayers.Layer.TMS( "MapBox OpenStreetMap",
+//         [ "http://a.tile.mapbox.com/","http://b.tile.mapbox.com/",
+//           "http://c.tile.mapbox.com/","http://d.tile.mapbox.com/" ],
+//         { 'layername': 'mapbox.mapbox-streets', 'type':'jpg',
+//           'buffer': 0, 'transitionEffect':'resize',
+//           attribution: 'rendered by <a href="http://mapbox.com">MapBox</a>, from <a href="http://www.openstreetmap.org/">OpenStreetMap data</a>'} );
+//       map.addLayer(mapbox)
+//     } else if (layer == 'osm') {
+//       var osm = new OpenLayers.Layer.TMS( "OpenStreetMap",
+//             "http://tile.openstreetmap.org/",
+//             { type: 'png',
+//         numZoomLevels: 23,
+//         maxZoomLevel: 23,
+//         getURL: osm_getTileURL,
+//         displayOutsideMaxExtent: true,
+//         attribution: '<a href="http://www.openstreetmap.org/">OpenStreetMap</a>'
+//         }
+//       );
+//       map.addLayer(osm)
+//     } else if (layer == 'bing') {
+//       var apiKey = "AhYrUtF-jMIlTiblfgB_spQXBgc3u1_4h1mrgm_vEmyrnHLbA8v8452MolECULTX"
+//       //Only in later versions of OpenLayers: //var bingsat = new OpenLayers.Layer.Bing("Aerial", {type: "Aerial", apiKey:apiKey, sphericalMercator:true});
+//       var bingsat = new OpenLayers.Layer.VirtualEarth("Virtual Earth Aerial",  {
+//         'type': VEMapStyle.Aerial,
+//         numZoomLevels: 23,
+//         maxZoomLevel: 23,
+//         'sphericalMercator': true
+//       });
+//       map.addLayer(bingsat)
+//     } else if (layer == 'yahoo') {
+//       var yahoosat = new OpenLayers.Layer.Yahoo("Yahoo Satellite", {type: YAHOO_MAP_SAT, sphericalMercator: true, numZoomLevels: 23});
+//       map.addLayer(yahoosat)
+// /*you can try
+//   http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/
 
-  but you might get better performance from newworld which switches
-  between bmng/landsat/naip based on zoom level
+//   but you might get better performance from newworld which switches
+//   between bmng/landsat/naip based on zoom level
 
-  http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NewWorld_google */
-    } else if (layer == 'TMS') {
-      Config.tile_url = tile_url || Config.tile_url
-             var tms = new OpenLayers.Layer.TMS( "OpenLayers TMS", Config.tile_url,
-        { //projection: latlon,
-          //displayProjection: spher_merc,
-          //getURL: Knitter.overlay_getTileURL,
-          //maxResolution:156543.0339,
-          //units: "m",
-                //maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
-          //tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
-          numZoomLevels: 23,
-          serviceVersion: '.',
-          layername: '.',
-          type: 'png',
-          alpha: true,
-          isBaseLayer: true});
-             map.addLayer(tms);
-    } else if (layer == 'WMS') {
-      projection: latlon,
-      //wms_url = prompt('Enter a WMS URI','http://msrmaps.com/ogcmap.ashx')
-      Config.tile_url = tile_url || Config.tile_url
-      Config.tile_layer = tile_layer || Config.tile_layer
-      map.addLayer(new OpenLayers.Layer.WMS('WMS',Config.tile_url,{
-      layers: Config.tile_layer
-        //layers:'DOQ'
-        //layers:'osm'
-      }))
-    }
+//   http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NewWorld_google */
+//     } else if (layer == 'TMS') {
+//       Config.tile_url = tile_url || Config.tile_url
+//              var tms = new OpenLayers.Layer.TMS( "OpenLayers TMS", Config.tile_url,
+//         { //projection: latlon,
+//           //displayProjection: spher_merc,
+//           //getURL: Knitter.overlay_getTileURL,
+//           //maxResolution:156543.0339,
+//           //units: "m",
+//                 //maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
+//           //tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
+//           numZoomLevels: 23,
+//           serviceVersion: '.',
+//           layername: '.',
+//           type: 'png',
+//           alpha: true,
+//           isBaseLayer: true});
+//              map.addLayer(tms);
+//     } else if (layer == 'WMS') {
+//       projection: latlon,
+//       //wms_url = prompt('Enter a WMS URI','http://msrmaps.com/ogcmap.ashx')
+//       Config.tile_url = tile_url || Config.tile_url
+//       Config.tile_layer = tile_layer || Config.tile_layer
+//       map.addLayer(new OpenLayers.Layer.WMS('WMS',Config.tile_url,{
+//       layers: Config.tile_layer
+//         //layers:'DOQ'
+//         //layers:'osm'
+//       }))
+//     }
 
-    Glop.observe('glop:draw',function(){$('map').setStyle({height:Glop.height+'px'})})
-    if (Config.tile_type == 'WMS') Glop.observe('mouseup',function() {map.layers.first().refresh()})
+//     Glop.observe('glop:draw',function(){$('map').setStyle({height:Glop.height+'px'})})
+//     if (Config.tile_type == 'WMS') Glop.observe('mouseup',function() {map.layers.first().refresh()})
 
-    // the following is complete nonsense and resolves to a point, not a bbox:
-    var lat1 = Projection.y_to_lat(Map.y-Glop.height/2)
-    var lon1 = Projection.x_to_lon(Map.x-Glop.width/2)
-    var lat2 = Projection.y_to_lat(Map.y+Glop.height/2)
-    var lon2 = Projection.x_to_lon(Map.x+Glop.width/2)
+//     // the following is complete nonsense and resolves to a point, not a bbox:
+//     var lat1 = Projection.y_to_lat(Map.y-Glop.height/2)
+//     var lon1 = Projection.x_to_lon(Map.x-Glop.width/2)
+//     var lat2 = Projection.y_to_lat(Map.y+Glop.height/2)
+//     var lon2 = Projection.x_to_lon(Map.x+Glop.width/2)
 
-    var bounds = new OpenLayers.Bounds();
-    bounds.extend(new OpenLayers.LonLat(lon1,lat1))//.transform(spher_merc,latlon))
-    bounds.extend(new OpenLayers.LonLat(lon2,lat2))//.transform(spher_merc,latlon))
-    //if (warpables.length = 0)
-    map.zoomToExtent( bounds )
-    //console.log(lat1,lon1,lat2,lon2)
-    //console.log(bounds)
-    //console.log('initial extent based on viewport sync with Cartagen')
+//     var bounds = new OpenLayers.Bounds();
+//     bounds.extend(new OpenLayers.LonLat(lon1,lat1))//.transform(spher_merc,latlon))
+//     bounds.extend(new OpenLayers.LonLat(lon2,lat2))//.transform(spher_merc,latlon))
+//     //if (warpables.length = 0)
+//     map.zoomToExtent( bounds )
+//     //console.log(lat1,lon1,lat2,lon2)
+//     //console.log(bounds)
+//     //console.log('initial extent based on viewport sync with Cartagen')
 
-    //scalebar = new OpenLayers.Control.ScaleBar();
-    //map.addControl(scalebar);
+//     //scalebar = new OpenLayers.Control.ScaleBar();
+//     //map.addControl(scalebar);
 
-    if (Config.tile_switcher) {
-      var switcherControl = new OpenLayers.Control.LayerSwitcher()
-      map.addControl(switcherControl);
-      switcherControl.maximizeControl();
-    }
-    Knitter.openLayersDraw()
-    Glop.observe('glop:draw', Knitter.openLayersDraw)
-    //Knitter.update_map(Map.lat,Map.lon,Map.zoom,layer)
-    setTimeout(Knitter.update_map_to_center,1000)
+//     if (Config.tile_switcher) {
+//       var switcherControl = new OpenLayers.Control.LayerSwitcher()
+//       map.addControl(switcherControl);
+//       switcherControl.maximizeControl();
+//     }
+//     Knitter.openLayersDraw()
+//     Glop.observe('glop:draw', Knitter.openLayersDraw)
+//     //Knitter.update_map(Map.lat,Map.lon,Map.zoom,layer)
+//     setTimeout(Knitter.update_map_to_center,1000)
 
-  },
+//   },
 
-  update_map_to_center: function() {
-    loc = Knitter.find_map_center()
-    if (loc) Knitter.update_map(loc.lat,loc.lon,loc.zoom,false)
-  },
+//   update_map_to_center: function() {
+//     loc = Knitter.find_map_center()
+//     if (loc) Knitter.update_map(loc.lat,loc.lon,loc.zoom,false)
+//   },
 
-  update_map: function(lat,lon,zoom,layer) {
-    Knitter.save.submitted()
-    layer = layer || false
-    new Ajax.Request('/map/update/'+Knitter.map_id,{
-      method: 'get',
-      parameters: {
-        map: {
-          lat: lat,
-          lon: lon
-        },
-        zoom: zoom,
-        tiles: layer,
-        tile_url: Config.tile_url,
-        tile_layer: Config.tile_layer
-      },
-      onSuccess: Knitter.save.saved,
-      on0: Knitter.save.failed,
-      onFailure: Knitter.save.failed,
-    })
-  },
+//   update_map: function(lat,lon,zoom,layer) {
+//     Knitter.save.submitted()
+//     layer = layer || false
+//     new Ajax.Request('/map/update/'+Knitter.map_id,{
+//       method: 'get',
+//       parameters: {
+//         map: {
+//           lat: lat,
+//           lon: lon
+//         },
+//         zoom: zoom,
+//         tiles: layer,
+//         tile_url: Config.tile_url,
+//         tile_layer: Config.tile_layer
+//       },
+//       onSuccess: Knitter.save.saved,
+//       on0: Knitter.save.failed,
+//       onFailure: Knitter.save.failed,
+//     })
+//   },
 
-  openLayersDraw: function() {
-    if (Config.tile_type == 'WMS') map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat))
-    else map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat).transform(spher_merc,latlon))
+//   openLayersDraw: function() {
+//     if (Config.tile_type == 'WMS') map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat))
+//     else map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat).transform(spher_merc,latlon))
 
-    var left = new OpenLayers.LonLat(map.getExtent().left,map.getExtent().top);
-    var right = new OpenLayers.LonLat(map.getExtent().right,map.getExtent().bottom);
+//     var left = new OpenLayers.LonLat(map.getExtent().left,map.getExtent().top);
+//     var right = new OpenLayers.LonLat(map.getExtent().right,map.getExtent().bottom);
 
-    if (Config.tile_type == 'WMS') var convert = Glop.width/124023.4375
-    else {
-      left = left.transform(spher_merc,latlon);
-      right = right.transform(spher_merc,latlon);
+//     if (Config.tile_type == 'WMS') var convert = Glop.width/124023.4375
+//     else {
+//       left = left.transform(spher_merc,latlon);
+//       right = right.transform(spher_merc,latlon);
 
-      var convert = 124023.4375*Glop.width
-    }
-    Map.zoom = convert/(right.lon-left.lon)
+//       var convert = 124023.4375*Glop.width
+//     }
+//     Map.zoom = convert/(right.lon-left.lon)
 
-  },
+//   },
 
-  overlay_getTileURL: function(bounds) {
-          var res = this.map.getResolution();
-          var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-          var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
-          var z = this.map.getZoom();
-    //console.log('getting tile '+z+','+x+','+y)
-    if (this.map.baseLayer.name == 'Virtual Earth Roads' || this.map.baseLayer.name == 'Virtual Earth Aerial' || this.map.baseLayer.name == 'Virtual Earth Hybrid') {
-            z = z + 1;
-          }
-    if (mapBounds.intersectsBounds( bounds ) && z >= mapMinZoom && z <= mapMaxZoom ) {
-    //console.log( this.url + z + "/" + x + "/" + y + "." + this.type);
-      return this.url + z + "/" + x + "/" + y + "." + this.type;
-    } else {
-      return "http://www.maptiler.org/img/none.png";
-    }
-  },
+//   overlay_getTileURL: function(bounds) {
+//           var res = this.map.getResolution();
+//           var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+//           var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
+//           var z = this.map.getZoom();
+//     //console.log('getting tile '+z+','+x+','+y)
+//     if (this.map.baseLayer.name == 'Virtual Earth Roads' || this.map.baseLayer.name == 'Virtual Earth Aerial' || this.map.baseLayer.name == 'Virtual Earth Hybrid') {
+//             z = z + 1;
+//           }
+//     if (mapBounds.intersectsBounds( bounds ) && z >= mapMinZoom && z <= mapMaxZoom ) {
+//     //console.log( this.url + z + "/" + x + "/" + y + "." + this.type);
+//       return this.url + z + "/" + x + "/" + y + "." + this.type;
+//     } else {
+//       return "http://www.maptiler.org/img/none.png";
+//     }
+//   },
 
-  save_new_location: function(lat,lon,zoom) {
-    Knitter.save.submitted()
-    new Ajax.Request('/map/update/'+Knitter.map_id,{
-      method: 'get',
-      parameters: {
-        lat: lat,
-        lon: lon,
-        zoom: zoom
-      },
-      onSuccess: Knitter.save.saved,
-      on0: Knitter.save.failed,
-      onFailure: Knitter.save.failed,
-    })
-  },
+//   save_new_location: function(lat,lon,zoom) {
+//     Knitter.save.submitted()
+//     new Ajax.Request('/map/update/'+Knitter.map_id,{
+//       method: 'get',
+//       parameters: {
+//         lat: lat,
+//         lon: lon,
+//         zoom: zoom
+//       },
+//       onSuccess: Knitter.save.saved,
+//       on0: Knitter.save.failed,
+//       onFailure: Knitter.save.failed,
+//     })
+//   },
 
-  save_current_location: function(callback) {
-    Knitter.save_new_location(Map.lat,Map.lon,Map.zoom)
-    if (!Object.isUndefined(callback)) callback()
-  },
+//   save_current_location: function(callback) {
+//     Knitter.save_new_location(Map.lat,Map.lon,Map.zoom)
+//     if (!Object.isUndefined(callback)) callback()
+//   },
 
-  toggle_vectors: function() {
-    Config.vectors = !Config.vectors
-    $('tagreport').toggle()
-    if (Config.vectors) $('tool_vectors').addClassName('down')
-    else $('tool_vectors').removeClassName('down')
-    if ($('loading_message')) $('loading_message').hide()
-    Knitter.save.submitted()
-    new Ajax.Request('/map/update/'+Knitter.map_id,{
-      method: 'get',
-      parameters: {
-        lat: Map.lat,
-        lon: Map.lon,
-        zoom: Map.zoom,
-        vectors: Config.vectors
-      },
-      onSuccess: Knitter.save.saved,
-      on0: Knitter.save.failed,
-      onFailure: Knitter.save.failed,
-    })
-  },
+//   toggle_vectors: function() {
+//     Config.vectors = !Config.vectors
+//     $('tagreport').toggle()
+//     if (Config.vectors) $('tool_vectors').addClassName('down')
+//     else $('tool_vectors').removeClassName('down')
+//     if ($('loading_message')) $('loading_message').hide()
+//     Knitter.save.submitted()
+//     new Ajax.Request('/map/update/'+Knitter.map_id,{
+//       method: 'get',
+//       parameters: {
+//         lat: Map.lat,
+//         lon: Map.lon,
+//         zoom: Map.zoom,
+//         vectors: Config.vectors
+//       },
+//       onSuccess: Knitter.save.saved,
+//       on0: Knitter.save.failed,
+//       onFailure: Knitter.save.failed,
+//     })
+//   },
 
-  background_transparent: true,
-  toggle_background: function() {
-    if (Knitter.background_transparent) {
-      $('map').removeClassName('transparent');
-    } else {
-      $('map').addClassName('transparent');
-    }
-    Knitter.background_transparent = !Knitter.background_transparent
-  },
+//   background_transparent: true,
+//   toggle_background: function() {
+//     if (Knitter.background_transparent) {
+//       $('map').removeClassName('transparent');
+//     } else {
+//       $('map').addClassName('transparent');
+//     }
+//     Knitter.background_transparent = !Knitter.background_transparent
+//   },
 
-  find_map_center: function() {
-    if (warpables.length > 0) {
-      var latsum = 0, lonsum = 0, latcount = 0, loncount = 0
-      var maxlat = 0,maxlon = 0,minlat = 0,minlon = 0
-      warpables.each(function(warpable){
-        if (warpable.nodes != "none") {
-          warpable.nodes.each(function(node) {
-            var lon = Projection.x_to_lon(-node[0])
-            var lat = Projection.y_to_lat(node[1])
-            if (maxlon == 0) maxlon = lon
-            if (maxlat == 0) maxlat = lat
-            if (minlon == 0) minlon = lon
-            if (minlat == 0) minlat = lat
-            if (lon > maxlon) maxlon = lon
-            if (lat > maxlat) maxlat = lat
-            if (lon < minlon) minlon = lon
-            if (lat < minlat) minlat = lat
-                     lonsum += lon
-                     latsum += lat
-            loncount += 1
-            latcount += 1
-              })
-        }
-      },this)
-      zoom = parseInt(-Math.log((maxlon-minlon)/360)/Math.log(2))+2
-      if (loncount) {
-        return { lat:(maxlat+minlat)/2,
-          lon:(maxlon+minlon)/2,
-          zoom:zoom,
-          width:maxlon-minlon
-        }
-      } else {
-        return false
-      }
-    } else { return false }
-  },
+//   find_map_center: function() {
+//     if (warpables.length > 0) {
+//       var latsum = 0, lonsum = 0, latcount = 0, loncount = 0
+//       var maxlat = 0,maxlon = 0,minlat = 0,minlon = 0
+//       warpables.each(function(warpable){
+//         if (warpable.nodes != "none") {
+//           warpable.nodes.each(function(node) {
+//             var lon = Projection.x_to_lon(-node[0])
+//             var lat = Projection.y_to_lat(node[1])
+//             if (maxlon == 0) maxlon = lon
+//             if (maxlat == 0) maxlat = lat
+//             if (minlon == 0) minlon = lon
+//             if (minlat == 0) minlat = lat
+//             if (lon > maxlon) maxlon = lon
+//             if (lat > maxlat) maxlat = lat
+//             if (lon < minlon) minlon = lon
+//             if (lat < minlat) minlat = lat
+//                      lonsum += lon
+//                      latsum += lat
+//             loncount += 1
+//             latcount += 1
+//               })
+//         }
+//       },this)
+//       zoom = parseInt(-Math.log((maxlon-minlon)/360)/Math.log(2))+2
+//       if (loncount) {
+//         return { lat:(maxlat+minlat)/2,
+//           lon:(maxlon+minlon)/2,
+//           zoom:zoom,
+//           width:maxlon-minlon
+//         }
+//       } else {
+//         return false
+//       }
+//     } else { return false }
+//   },
 
-  center_on_warpables: function() {
-    loc = Knitter.find_map_center()
-    if (loc) Cartagen.go_to(loc.lat,loc.lon,loc.zoom)
-    // the "+2" is a hack... this equation would work without it if the map were only one tile wide.
-    map.zoomTo(parseInt(-Math.log((loc.width)/360)/Math.log(2))+2)
-  },
+//   center_on_warpables: function() {
+//     loc = Knitter.find_map_center()
+//     if (loc) Cartagen.go_to(loc.lat,loc.lon,loc.zoom)
+//     // the "+2" is a hack... this equation would work without it if the map were only one tile wide.
+//     map.zoomTo(parseInt(-Math.log((loc.width)/360)/Math.log(2))+2)
+//   },
 
-  export_tabs: ['export_intro','export_options'],
-  export_hide_tabs: function() {
-    Knitter.export_tabs.each(function(tab) {
-      $(tab).hide();
-      $(tab+'_tab').removeClassName('active');
-    })
-  },
-  export_intro: function() {
-    Knitter.export_hide_tabs();
-    $('export_normal').show();
-    $('export_intro').show();
-    $('export_intro_tab').addClassName('active');
-  },
-  export_options: function() {
-    Knitter.export_hide_tabs();
-    $('export_normal').show();
-    $('export_options').show();
-    $('export_options_tab').addClassName('active');
-  },
-  export_multispectral: function() {
-    Knitter.export_hide_tabs();
-    $('export_normal').hide();
-    $('export_multispectral').show();
-    $('export_multispectral_tab').addClassName('active');
-  },
-  // for now, just used to store the "export progress" checkers, which run every 5 secs and fill up the logs.
-  updaters: [],
-  cancel_updaters: function() {
-    Knitter.updaters.each(function(u){
-      u.stop()
-    })
-  },
-}
+//   export_tabs: ['export_intro','export_options'],
+//   export_hide_tabs: function() {
+//     Knitter.export_tabs.each(function(tab) {
+//       $(tab).hide();
+//       $(tab+'_tab').removeClassName('active');
+//     })
+//   },
+//   export_intro: function() {
+//     Knitter.export_hide_tabs();
+//     $('export_normal').show();
+//     $('export_intro').show();
+//     $('export_intro_tab').addClassName('active');
+//   },
+//   export_options: function() {
+//     Knitter.export_hide_tabs();
+//     $('export_normal').show();
+//     $('export_options').show();
+//     $('export_options_tab').addClassName('active');
+//   },
+//   export_multispectral: function() {
+//     Knitter.export_hide_tabs();
+//     $('export_normal').hide();
+//     $('export_multispectral').show();
+//     $('export_multispectral_tab').addClassName('active');
+//   },
+//   // for now, just used to store the "export progress" checkers, which run every 5 secs and fill up the logs.
+//   updaters: [],
+//   cancel_updaters: function() {
+//     Knitter.updaters.each(function(u){
+//       u.stop()
+//     })
+//   },
+// }
 
-function osm_getTileURL(bounds) {
-  var res = this.map.getResolution();
-  var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-  var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
-  var z = this.map.getZoom();
-  var limit = Math.pow(2, z);
+// function osm_getTileURL(bounds) {
+//   var res = this.map.getResolution();
+//   var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+//   var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+//   var z = this.map.getZoom();
+//   var limit = Math.pow(2, z);
 
-  if (y < 0 || y >= limit) {
-      return "http://www.maptiler.org/img/none.png";
-  } else {
-      x = ((x % limit) + limit) % limit;
-      return this.url + z + "/" + x + "/" + y + "." + this.type;
-  }
-}
+//   if (y < 0 || y >= limit) {
+//       return "http://www.maptiler.org/img/none.png";
+//   } else {
+//       x = ((x % limit) + limit) % limit;
+//       return this.url + z + "/" + x + "/" + y + "." + this.type;
+//   }
+// }
diff --git a/app/assets/javascripts/maps.js b/app/assets/javascripts/map_sidebar.js
similarity index 94%
rename from app/assets/javascripts/maps.js
rename to app/assets/javascripts/map_sidebar.js
index 8345c7a83..51464962f 100644
--- a/app/assets/javascripts/maps.js
+++ b/app/assets/javascripts/map_sidebar.js
@@ -1,11 +1,5 @@
-//= require popper
-//= require jquery-ui/jquery-ui.min.js
-//= require knitter
-//= require exif-js/exif.js
-//= require mapknitter
-//= require ion-rangeslider/js/ion.rangeSlider.js
-
 /* Move navbar links into dropdown if nav is inside the sidebar. */
+// = require jquery/dist/jquery.js
 jQuery(document).ready(function($) {
   window.toggle_sidebar = function(e){
     var icon = $('.sidebar-toggle-icon')
diff --git a/app/assets/javascripts/mapknitter/Annotations.js b/app/assets/javascripts/mapknitter/Annotations.js
index f3d0997a9..d2eb91fa2 100644
--- a/app/assets/javascripts/mapknitter/Annotations.js
+++ b/app/assets/javascripts/mapknitter/Annotations.js
@@ -3,8 +3,8 @@ MapKnitter.Annotations.include({
   initialize: function(options) {
     MapKnitter.Resources.prototype.initialize.call(this, options);
 
-    var map = options.map
-      drawOptions = {};
+    var map = options.map,
+        drawOptions = {};
 
     this._map = map;
     this._drawnItems = new L.FeatureGroup().addTo(map);
diff --git a/app/assets/javascripts/tags.js b/app/assets/javascripts/tags.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js
index 4da3185e5..f3817031a 100644
--- a/app/assets/javascripts/uploads.js
+++ b/app/assets/javascripts/uploads.js
@@ -1,15 +1,6 @@
-//= require blueimp-tmpl/js/tmpl.js
-//= require blueimp-file-upload/js/vendor/jquery.ui.widget
-//= require blueimp-file-upload/js/jquery.fileupload
-//= require blueimp-file-upload/js/jquery.fileupload-process
-//= require blueimp-file-upload/js/jquery.fileupload-ui
-
 // iframe-transport is ajax file upload support for IE, Uncomment if needed      
 // javascript_include_tag  (file_upload + "js/jquery.iframe-transport")      
 
-// need this so that jQuery draggable is attached to jQuery objects (for use in map views)
-//= require jquery-ui/jquery-ui.min.js
-
 function addUploadedImageToSidebar($upload) {
   /* Modify the table row created by jQuery-File-Upload to remove unneeded cells. */
   //$upload.find(".indicate").remove();
diff --git a/app/views/layouts/knitter2.html.erb b/app/views/layouts/knitter2.html.erb
index 7c27ea209..ec42d7050 100644
--- a/app/views/layouts/knitter2.html.erb
+++ b/app/views/layouts/knitter2.html.erb
@@ -14,9 +14,6 @@
 
   <%= stylesheet_link_tag 'application' %>
   <%= javascript_include_tag 'application' %>
-  <%= javascript_include_tag 'maps' %>
-  <%= javascript_include_tag 'uploads' %>
-  <% if @annotations %><%= javascript_include_tag 'annotations' %><% end %>
 
   <script src='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-omnivore/v0.3.1/leaflet-omnivore.min.js' async defer></script>
   <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAxlBXzYwdeaOMKZgx_UNBp2qBtdD0L_9g"></script>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e9926b12c..0babfc4e3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,10 +37,7 @@
   config.assets.digest = true
 
   config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-  config.assets.precompile += ['tags.js',
-                               'uploads.js',
-                               'annotations.js',
-                               'maps.js']
+  config.assets.precompile += []
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index c72222861..517d648c7 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -10,7 +10,5 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += ['tags.js',
-                                               'uploads.js',
-                                               'annotations.js',
-                                               'maps.js']
+Rails.application.config.assets.precompile += []
+                                               
diff --git a/package.json b/package.json
index e44e77aa2..447a228b0 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
     "modalbox": "okonet/modalbox#*",
     "ol2": "openlayers/ol2#release-2.13.1",
+    "popper": "^1.0.1",
     "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.3",
     "sparklines": "mariusGundersen/sparkline#~1.2.0",
     "spin.js": "fgnass/spin.js#^2.3.1",
diff --git a/yarn.lock b/yarn.lock
index 98fc05cb7..ce500850e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,26 @@
 # yarn lockfile v1
 
 
+"@compone/class@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@compone/class/-/class-1.1.1.tgz#cbe6225ca123894769c8cb65b49430bd8dea472a"
+  integrity sha512-pbODcJi0TdyKQ/PTHSHLwO4h/r5EgMdkPQLdBSaZBUiBuWdGil+0PEhpfhAWDuFrwVPKiCHYQOfs8WyGe9ABWA==
+
+"@compone/define@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@compone/define/-/define-1.2.4.tgz#59cd34c95d32c11de7496db5c801dc7748cb8666"
+  integrity sha512-w0ZDiYMIppvb1epoNY64pkEACwn9693cc7qM1ZSKWUVZczx5vlR4iZM7by129IYUdCq0SsbxQbbPZjnzj/0Qew==
+  dependencies:
+    "@compone/class" "^1.1.1"
+    "@compone/event" "^1.1.2"
+
+"@compone/event@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@compone/event/-/event-1.1.2.tgz#e20ca62c9a1a1c062a9612874b78453737a7cbeb"
+  integrity sha512-baJDnAr8pWefqfltNS33HieD+s23YO+w2/RD6lPxIEzlOuM1R5RT5vpUUTcrzn0Er3oj62PlfMUyS0SwnVw67Q==
+  dependencies:
+    utilise "^2.3.5"
+
 "@fortawesome/fontawesome-free@^5.9.0":
   version "5.9.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz#1aa5c59efb1b8c6eb6277d1e3e8c8f31998b8c8e"
@@ -12,17 +32,45 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.50.tgz#f3d68482b1f54b5f4fba8daaac385db12bb6a706"
   integrity sha512-+ZbcUwJdaBgOZpwXeT0v+gHC/jQbEfzoc9s4d0rN0JIKeQbuTrT+A2n1aQY6LpZjrLXJT7avVUqiCecCJeeZxA==
 
+"@types/node@^8.10.50":
+  version "8.10.51"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.51.tgz#80600857c0a47a8e8bafc2dae6daed6db58e3627"
+  integrity sha512-cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q==
+
+JSONStream@^1.0.3:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn-node@^1.3.0:
+acorn-jsx@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+  dependencies:
+    acorn "^3.0.4"
+
+acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.7.0.tgz#aac6a559d27af6176b076ab6fb13c5974c213e3b"
   integrity sha512-XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==
@@ -32,12 +80,31 @@ acorn-node@^1.3.0:
     acorn-walk "^6.1.1"
     xtend "^4.0.1"
 
+acorn-object-spread@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz#48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"
+  integrity sha1-SOrQ9KjrFplaF6Dbn/xqyq2kumg=
+  dependencies:
+    acorn "^3.1.0"
+
 acorn-walk@^6.1.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn@^5.0.0:
+acorn5-object-spread@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn5-object-spread/-/acorn5-object-spread-4.0.0.tgz#d5758081eed97121ab0be47e31caaef2aa399697"
+  integrity sha1-1XWAge7ZcSGrC+R+Mcqu8qo5lpc=
+  dependencies:
+    acorn "^5.1.2"
+
+acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+
+acorn@^5.0.0, acorn@^5.1.2, acorn@^5.2.1:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -71,11 +138,45 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
+ansi-colors@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
+ansi-colors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
+  dependencies:
+    ansi-wrap "^0.1.0"
+
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  dependencies:
+    ansi-wrap "0.1.0"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -83,12 +184,89 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+anymatch@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz#2fb624fe0e84bccab00afee3d0006ed310f22f09"
+  integrity sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+archiver-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+  dependencies:
+    glob "^7.1.4"
+    graceful-fs "^4.2.0"
+    lazystream "^1.0.0"
+    lodash.defaults "^4.2.0"
+    lodash.difference "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.union "^4.6.0"
+    normalize-path "^3.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-3.0.3.tgz#7487be5172650619eb5e3a473032a348a3412cdc"
+  integrity sha512-d0W7NUyXoLklozHHfvWnHoHS3dvQk8eB22pv5tBwcu1jEO5eZY8W+gHytkAaJ0R8fU2TnNThrWYxjvFlKvRxpw==
+  dependencies:
+    archiver-utils "^2.1.0"
+    async "^2.6.3"
+    buffer-crc32 "^0.2.1"
+    glob "^7.1.4"
+    readable-stream "^3.4.0"
+    tar-stream "^2.1.0"
+    zip-stream "^2.1.0"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+  dependencies:
+    arr-flatten "^1.0.1"
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.1.0:
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@@ -103,21 +281,55 @@ array-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
   integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
 
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
 array-from@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
   integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
 
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
+
 array-slice@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
@@ -130,11 +342,43 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
+assert@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assert@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.3.0.tgz#03939a622582a812cc202320a0b9a56c9b815849"
+  integrity sha1-A5OaYiWCqBLMICMgoLmlbJuBWEk=
+  dependencies:
+    util "0.10.3"
+
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+async-each@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async@^2.0.0, async@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -155,6 +399,16 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-js@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
+  integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=
+
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
@@ -180,11 +434,36 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+
+binary@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
+  integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=
+  dependencies:
+    buffers "~0.1.1"
+    chainsaw "~0.1.0"
+
 bit-twiddle@^1.0.0, bit-twiddle@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
   integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
 
+bl@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
+  integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
+  dependencies:
+    readable-stream "^3.0.1"
+
 blueimp-canvas-to-blob@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.5.0.tgz#5679ac32f6a2835821f0c3ad661719ff85a9236b"
@@ -220,6 +499,27 @@ blueimp-tmpl@blueimp/JavaScript-Templates#2.5.4:
   version "2.5.4"
   resolved "https://codeload.github.com/blueimp/JavaScript-Templates/tar.gz/b75e882ec0e353ce2d8bfdb2ea755060d2012368"
 
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 bootstrap@twbs/bootstrap#^4.3.1:
   version "4.3.1"
   resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/8fa0d3010112dca5dd6dd501173415856001ba8b"
@@ -229,6 +529,23 @@ bootstrap@~3.2.0:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.2.0.tgz#a0726e7c12e79f4a2a504f8d1ee9f2850a83f637"
   integrity sha1-oHJufBLnn0oqUE+NHunyhQqD9jc=
 
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -245,6 +562,13 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brfs@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216"
@@ -265,6 +589,255 @@ brfs@^1.3.0:
     static-module "^2.2.0"
     through2 "^2.0.0"
 
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-icons@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/browser-icons/-/browser-icons-0.0.1.tgz#888e5f10763603745fa7180e4cd8db0a2b6548ec"
+  integrity sha1-iI5fEHY2A3RfpxgOTNjbCitlSOw=
+  dependencies:
+    icon-android "*"
+    icon-chrome "*"
+    icon-firefox "*"
+    icon-ie "*"
+    icon-ios "*"
+    icon-linux "*"
+    icon-opera "*"
+    icon-osx "*"
+    icon-safari "*"
+    icon-windows "*"
+
+browser-pack@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774"
+  integrity sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==
+  dependencies:
+    JSONStream "^1.0.3"
+    combine-source-map "~0.8.0"
+    defined "^1.0.0"
+    safe-buffer "^5.1.1"
+    through2 "^2.0.0"
+    umd "^3.0.0"
+
+browser-resolve@^1.11.0, browser-resolve@^1.11.2, browser-resolve@^1.7.0:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
+  dependencies:
+    resolve "1.1.7"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@~0.1.2:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  integrity sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=
+  dependencies:
+    pako "~0.2.0"
+
+browserify-zlib@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserify@^12.0.0:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-12.0.2.tgz#57f21e5e6e308ff5987c4dafd44840b2b98f7a19"
+  integrity sha1-V/IeXm4wj/WYfE2v1EhAsrmPehk=
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "~1.3.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.1.2"
+    buffer "^3.4.3"
+    concat-stream "~1.5.1"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "~1.1.0"
+    duplexer2 "~0.1.2"
+    events "~1.1.0"
+    glob "^5.0.15"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "~0.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    isarray "0.0.1"
+    labeled-stream-splicer "^2.0.0"
+    module-deps "^4.0.2"
+    os-browserify "~0.1.1"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.4.3"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "~0.10.0"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "~0.0.0"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "~0.0.1"
+    xtend "^4.0.0"
+
+browserify@^14.5.0:
+  version "14.5.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
+  integrity sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.2.0"
+    buffer "^5.0.2"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.1"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "~1.1.0"
+    duplexer2 "~0.1.2"
+    events "~1.1.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    labeled-stream-splicer "^2.0.0"
+    module-deps "^4.0.8"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "~1.0.0"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "~0.0.0"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "~0.0.1"
+    xtend "^4.0.0"
+
+buble@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.16.0.tgz#1773e7b5a383f5c722af6b1b16b2ba49cb866a98"
+  integrity sha512-Eb5vt1+IvXXPyYD1IIQIuaBwIuJOSWQ2kXzULlg5I83aLGF2qzcjRU2joYusnWFgAenvJ9xTOMvZvT0bb8BLbg==
+  dependencies:
+    acorn "^3.3.0"
+    acorn-jsx "^3.0.1"
+    acorn-object-spread "^1.0.0"
+    chalk "^1.1.3"
+    magic-string "^0.14.0"
+    minimist "^1.2.0"
+    os-homedir "^1.0.1"
+    vlq "^0.2.2"
+
+"buble@github:pemrouz/buble":
+  version "0.18.0"
+  resolved "https://codeload.github.com/pemrouz/buble/tar.gz/4e639aeeb64712ac95dc30a52750d1ee4432c9c8"
+  dependencies:
+    acorn "^5.1.2"
+    acorn-jsx "^3.0.1"
+    acorn5-object-spread "^4.0.0"
+    chalk "^2.1.0"
+    magic-string "^0.22.4"
+    minimist "^1.2.0"
+    os-homedir "^1.0.1"
+    vlq "^0.2.2"
+
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -275,6 +848,28 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^3.4.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb"
+  integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=
+  dependencies:
+    base64-js "0.0.8"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+buffer@^5.0.2, buffer@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
 buffer@~5.0.2:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.8.tgz#84daa52e7cf2fa8ce4195bc5cf0f7809e0930b24"
@@ -283,6 +878,26 @@ buffer@~5.0.2:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+buffers@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
+  integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s=
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -298,11 +913,21 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+cached-path-relative@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
+  integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 cartagen@jywarren/cartagen#*:
   version "0.0.0"
   resolved "https://codeload.github.com/jywarren/cartagen/tar.gz/b348dd06e2d1a69936826e9ef4e6f9fa0ed4a060"
@@ -320,7 +945,37 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^2.0.1, chalk@^2.3.1:
+chai@*:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
+  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^3.0.1"
+    get-func-name "^2.0.0"
+    pathval "^1.1.0"
+    type-detect "^4.0.5"
+
+chainsaw@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
+  integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=
+  dependencies:
+    traverse ">=0.3.0 <0.4"
+
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -334,6 +989,55 @@ charm@~0.1.0:
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
   integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+
+chokidar@*:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
+  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
+  dependencies:
+    anymatch "^3.0.1"
+    braces "^3.0.2"
+    glob-parent "^5.0.0"
+    is-binary-path "^2.1.0"
+    is-glob "^4.0.1"
+    normalize-path "^3.0.0"
+    readdirp "^3.1.1"
+  optionalDependencies:
+    fsevents "^2.0.6"
+
+chokidar@^1.0.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+chownr@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
+  integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -365,11 +1069,25 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -390,6 +1108,26 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
+colors@^1.1.0, colors@^1.1.2, colors@^1.2.1, colors@^1.2.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
+  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+
+combine-source-map@^0.8.0, combine-source-map@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
+  integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos=
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -397,6 +1135,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@2.15.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
+
 commander@^2.11.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
@@ -411,6 +1154,51 @@ components-jqueryui@components/jqueryui#^1.12.1, jquery-ui@components/jqueryui#^
   version "1.12.1"
   resolved "https://codeload.github.com/components/jqueryui/tar.gz/44ecf3794cc56b65954cc19737234a3119d036cc"
 
+compress-commons@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.0.0.tgz#c555107ef865eef0ba8a31fe56ec79f813ed3e65"
+  integrity sha512-gnETNngrfsAoLBENM8M0DoiCDJkHwz3OfIg4mBtqKDcRgE4oXNwHxHxgHvwKKlrcD7eZ7BVTy4l8t9xVF7q3FQ==
+  dependencies:
+    buffer-crc32 "^0.2.13"
+    crc32-stream "^2.0.0"
+    normalize-path "^3.0.0"
+    readable-stream "^2.3.6"
+
+compressible@~2.0.16:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
+  dependencies:
+    mime-db ">= 1.40.0 < 2"
+
+compression@*, compression@^1.6.2, compression@^1.7.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.6.1, concat-stream@~1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 concat-stream@~1.4.5:
   version "1.4.11"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.11.tgz#1dc9f666f2621da9c618b1e7f8f3b2ff70b5f76f"
@@ -429,15 +1217,34 @@ concat-stream@~1.5.0, concat-stream@~1.5.1:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@~1.6.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+constants-browserify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 contentstream@^1.0.0:
   version "1.0.0"
@@ -453,6 +1260,34 @@ convert-source-map@^1.5.1:
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
+  integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
+
+cookie-parser@^1.3.5:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.4.tgz#e6363de4ea98c3def9697b93421c09f30cf5d188"
+  integrity sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==
+  dependencies:
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -468,6 +1303,85 @@ corslite@0.0.7:
   resolved "https://registry.yarnpkg.com/corslite/-/corslite-0.0.7.tgz#8e451db5320a7556de1ef78d9bd3566343077721"
   integrity sha1-jkUdtTIKdVbeHveNm9NWY0MHdyE=
 
+crc32-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
+  dependencies:
+    crc "^3.4.4"
+    readable-stream "^2.0.0"
+
+crc@^3.4.4:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
+  dependencies:
+    buffer "^5.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cryonic@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cryonic/-/cryonic-1.0.0.tgz#57320e757d7c3abc72914b037e049295e6bd04f4"
+  integrity sha512-8wqWtdI+7IQVYCDS40H/H267zb2Lwn08Q7HT0hIqHNMkRPQdV355dPRu/hV02k2sBtZJ+KEnRVtaZWzT3hPVmQ==
+
+crypto-browserify@^3.0.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
 csv2geojson@~5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/csv2geojson/-/csv2geojson-5.0.2.tgz#abd649f2ec57689219ad4f19d333be75456b6f59"
@@ -540,6 +1454,16 @@ d@1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
+dargs@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
+  integrity sha1-7H6lDHhWTNNsnV7Bj2Yyn63ieCk=
+
+dash-ast@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37"
+  integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -559,14 +1483,33 @@ data-uri-to-buffer@^2.0.0:
   dependencies:
     "@types/node" "^8.0.7"
 
-debug@^2.2.0, debug@^2.3.3:
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
+
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.0.0:
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@3.2.6, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.0.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -576,6 +1519,31 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+decompress-zip@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/decompress-zip/-/decompress-zip-0.3.2.tgz#f3fa2841666abce394604f4a9e8a7085c202d464"
+  integrity sha512-Ab1QY4LrWMrUuo53lLnmGOby7v8ryqxJ+bKibKSiPisx+25mhut1dScVBXAYx14i/PqSrFZvR2FRRazhLbvL+g==
+  dependencies:
+    binary "^0.3.0"
+    graceful-fs "^4.1.3"
+    mkpath "^0.1.0"
+    nopt "^3.0.1"
+    q "^1.1.2"
+    readable-stream "^1.1.8"
+    touch "0.0.3"
+
+deep-eql@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+  dependencies:
+    type-detect "^4.0.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -588,6 +1556,13 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -610,21 +1585,108 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+deps-sort@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
+  integrity sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=
+  dependencies:
+    JSONStream "^1.0.3"
+    shasum "^1.0.0"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detective@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+djbx@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/djbx/-/djbx-1.0.3.tgz#c58966d2c05d0dd5fd43c787894b059ee6cc9b18"
+  integrity sha512-Y8ph/85fEChtSgSgw1asP4cGLNLxlbnDBnQMpX8+MOpaiYyOn8assnSpIrwHuoGZV/sE1DUbKh9aeKlWZdHKEg==
+
+domain-browser@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  integrity sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=
+
 dup@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dup/-/dup-1.0.0.tgz#51fc5ac685f8196469df0b905e934b20af5b4029"
   integrity sha1-UfxaxoX4GWRp3wuQXpNLIK9bQCk=
 
+duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2, duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  dependencies:
+    readable-stream "^2.0.2"
+
 duplexer2@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -632,13 +1694,6 @@ duplexer2@~0.0.2:
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer2@~0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
-  dependencies:
-    readable-stream "^2.0.2"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -647,6 +1702,62 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+elliptic@^6.0.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca"
+  integrity sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
+es-abstract@^1.5.1:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
   version "0.10.50"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
@@ -696,7 +1807,12 @@ es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
     d "1"
     es5-ext "~0.10.14"
 
-escape-string-regexp@^1.0.5:
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -756,6 +1872,11 @@ esprima@^3.1.3:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
   integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 esprima@~1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
@@ -796,6 +1917,11 @@ esutils@~1.0.0:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
   integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
 
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
 event-emitter@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
@@ -804,10 +1930,56 @@ event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+events@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exif-js@jseidelin/exif-js#*:
   version "2.3.0"
   resolved "https://codeload.github.com/jseidelin/exif-js/tar.gz/a10f3d53f3f72defef4cad5a54a90ee308901fe6"
 
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -821,6 +1993,13 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
+  dependencies:
+    fill-range "^2.1.0"
+
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
@@ -828,6 +2007,56 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+express-session@^1.15.3:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.2.tgz#59f36d7770e94872d19b163b6708a2d16aa6848c"
+  integrity sha512-oy0sRsdw6n93E9wpCNWKRnSsxYnSDX9Dnr9mhZgqUEEorzcq5nshGYSZ4ZReHFhKQ80WI5iVUUSPW7u3GaKauw==
+  dependencies:
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~2.0.0"
+    on-headers "~1.0.2"
+    parseurl "~1.3.3"
+    safe-buffer "5.1.2"
+    uid-safe "~2.1.5"
+
+express@^4.12.4, express@^4.14.0, express@^4.15.4, express@^4.16.2, express@^4.16.3:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -848,6 +2077,13 @@ extend@^3.0.0, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+  dependencies:
+    is-extglob "^1.0.0"
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -882,6 +2118,16 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
+fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
+    time-stamp "^1.0.0"
+
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -897,6 +2143,22 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+
+fill-range@^2.1.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^3.0.0"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -907,6 +2169,38 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-package-json@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/find-package-json/-/find-package-json-1.2.0.tgz#4057d1b943f82d8445fe52dc9cf456f6b8b58083"
+  integrity sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==
+
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -938,6 +2232,13 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 font-awesome@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
@@ -948,6 +2249,13 @@ for-in@^1.0.1, for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+  dependencies:
+    for-in "^1.0.1"
+
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
@@ -974,6 +2282,11 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -981,6 +2294,11 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
 from2-string@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/from2-string/-/from2-string-1.1.0.tgz#18282b27d08a267cb3030cd2b8b4b0f212af752a"
@@ -996,16 +2314,75 @@ from2@^2.0.3:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-minipass@^1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
+  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+  dependencies:
+    minipass "^2.2.1"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.0.0:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  dependencies:
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
+
+fsevents@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
+  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-get-assigned-identifiers@^1.1.0:
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+get-assigned-identifiers@^1.1.0, get-assigned-identifiers@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1"
   integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==
 
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+
 get-pixels@~3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03"
@@ -1023,6 +2400,18 @@ get-pixels@~3.3.0:
     request "^2.44.0"
     through "^2.3.4"
 
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -1046,6 +2435,75 @@ glfx-js@jywarren/glfx.js#*:
   version "0.0.1"
   resolved "https://codeload.github.com/jywarren/glfx.js/tar.gz/07a117c2b7c75a8556d7338108c0976d110c11a2"
 
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
+  dependencies:
+    is-glob "^2.0.0"
+
+glob-parent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
+  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^5.0.15:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -1066,6 +2524,16 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
+
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
 grunt-cli@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.3.2.tgz#60f12d12c1b5aae94ae3469c6b5fe24e960014e8"
@@ -1082,6 +2550,19 @@ grunt-known-options@~1.1.0:
   resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.1.tgz#6cc088107bd0219dc5d3e57d91923f469059804d"
   integrity sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==
 
+gulp-mocha@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-mocha/-/gulp-mocha-6.0.0.tgz#80f32bc705ce30747f355ddb8ccd96a1c73bef13"
+  integrity sha512-FfBldW5ttnDpKf4Sg6/BLOOKCCbr5mbixDGK1t02/8oSrTCwNhgN/mdszG3cuQuYNzuouUdw4EH/mlYtgUscPg==
+  dependencies:
+    dargs "^5.1.0"
+    execa "^0.10.0"
+    mocha "^5.2.0"
+    npm-run-path "^2.0.2"
+    plugin-error "^1.0.1"
+    supports-color "^5.4.0"
+    through2 "^2.0.3"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -1095,11 +2576,28 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -1131,23 +2629,58 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
 haversine-distance@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/haversine-distance/-/haversine-distance-1.1.4.tgz#78578c5623e75f2d791d954ca947731986b95591"
   integrity sha512-ElW49a3HbKhoIlFQ7gGvazYyi9etz5e1hrUDS/Z9MCvtm5iQm1YAvd9Rx8Oy121h+0X7PbsjBBRKDH4Otr0JuA==
 
+he@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
+
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 heatmap.js@*:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/heatmap.js/-/heatmap.js-2.0.5.tgz#466d3b86513f5d49112a49d25700ab2730149153"
   integrity sha1-Rm07hlE/XUkRKknSVwCrJzAUkVM=
 
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -1155,6 +2688,33 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
+htmlescape@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
+  integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -1164,16 +2724,90 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https-browserify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+  integrity sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=
+
+icon-android@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-android/-/icon-android-0.0.1.tgz#506b4ea60090a792ec45ee685a9b36192aa6cac8"
+  integrity sha1-UGtOpgCQp5LsRe5oWps2GSqmysg=
+
+icon-chrome@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-chrome/-/icon-chrome-0.0.1.tgz#a724cb044c9ebaa5e094721881526794b71b3da4"
+  integrity sha1-pyTLBEyeuqXglHIYgVJnlLcbPaQ=
+
+icon-firefox@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-firefox/-/icon-firefox-0.0.1.tgz#6b91a77926bc91070ff8397056eff4b7aa15fa24"
+  integrity sha1-a5GneSa8kQcP+DlwVu/0t6oV+iQ=
+
+icon-ie@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-ie/-/icon-ie-0.0.1.tgz#02dee75b0b5de3e75debe1683ec36af6d4a9bbd9"
+  integrity sha1-At7nWwtd4+dd6+FoPsNq9tSpu9k=
+
+icon-ios@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-ios/-/icon-ios-0.0.1.tgz#16cabc61255bd4ca3c679a30c54592246a073f79"
+  integrity sha1-Fsq8YSVb1Mo8Z5owxUWSJGoHP3k=
+
+icon-linux@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-linux/-/icon-linux-0.0.1.tgz#221ece1e9b0e244fd3eee8fbc1e1d29cd4dbb6b0"
+  integrity sha1-Ih7OHpsOJE/T7uj7weHSnNTbtrA=
+
+icon-opera@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-opera/-/icon-opera-0.0.1.tgz#ce5a71536e65bef669c0f6387d8bcc07194d640f"
+  integrity sha1-zlpxU25lvvZpwPY4fYvMBxlNZA8=
+
+icon-osx@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-osx/-/icon-osx-0.0.1.tgz#1a97fde0666ac81f9e5befcaba7f19fd4bd556d0"
+  integrity sha1-Gpf94GZqyB+eW+/Kun8Z/UvVVtA=
+
+icon-safari@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-safari/-/icon-safari-0.0.1.tgz#874afcc093de8f70ecc5b6a5c2cd8389faa5522c"
+  integrity sha1-h0r8wJPej3Dsxbalws2DifqlUiw=
+
+icon-windows@*:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/icon-windows/-/icon-windows-0.0.1.tgz#abe463f50f10d6dfc3bea2d5ffd4a1b350b57fcd"
+  integrity sha1-q+Rj9Q8Q1t/DvqLV/9Shs1C1f80=
+
 iconv-lite@0.2:
   version "0.2.11"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
   integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
 
+iconv-lite@0.4.24, iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  dependencies:
+    minimatch "^3.0.4"
+
 image-sequencer@publiclab/image-sequencer#~1.4.0:
   version "1.4.1"
   resolved "https://codeload.github.com/publiclab/image-sequencer/tar.gz/cbbfbff4bc14f494c423867cc4572b001c5c3c4d"
@@ -1200,21 +2834,72 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
   version "0.9.11-rc.1"
   resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.4:
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
+inline-source-map@~0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
+  integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=
+  dependencies:
+    source-map "~0.5.3"
+
+insert-module-globals@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.0.tgz#ec87e5b42728479e327bd5c5c71611ddfb4752ba"
+  integrity sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==
+  dependencies:
+    JSONStream "^1.0.3"
+    acorn-node "^1.5.2"
+    combine-source-map "^0.8.0"
+    concat-stream "^1.6.1"
+    is-buffer "^1.1.0"
+    path-is-absolute "^1.0.1"
+    process "~0.11.0"
+    through2 "^2.0.0"
+    undeclared-identifiers "^1.1.2"
+    xtend "^4.0.0"
+
 interpret@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
 ion-rangeslider@ionDen/ion.rangeslider#~2.3.0:
   version "2.3.0"
   resolved "https://codeload.github.com/ionDen/ion.rangeslider/tar.gz/c98c10d3d360aa52e997bb8e4fd371c958f78e4b"
@@ -1226,6 +2911,11 @@ iota-array@^1.0.0:
   resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087"
   integrity sha1-ge9X/l0FgUzVjCSDYyqZwwoOgIc=
 
+ipaddr.js@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -1248,11 +2938,35 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-buffer@^1.0.2, is-buffer@^1.1.5:
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-buffer@^1.0.2, is-buffer@^1.1.0, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-buffer@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -1267,6 +2981,11 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -1285,6 +3004,18 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+  dependencies:
+    is-primitive "^2.0.0"
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -1297,11 +3028,35 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0:
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+  dependencies:
+    is-extglob "^1.0.0"
+
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -1309,6 +3064,20 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -1316,6 +3085,16 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -1323,12 +3102,41 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
 is-relative@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
-    is-unc-path "^1.0.0"
+    is-unc-path "^1.0.0"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
@@ -1352,7 +3160,7 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -1407,6 +3215,14 @@ jquery@~2:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
   integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
 
+js-yaml@*, js-yaml@3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -1422,11 +3238,28 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
+json-stable-stringify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
+  integrity sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=
+  dependencies:
+    jsonify "~0.0.0"
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -1470,11 +3303,33 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+labeled-stream-splicer@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21"
+  integrity sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==
+  dependencies:
+    inherits "^2.0.1"
+    stream-splicer "^2.0.0"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  dependencies:
+    readable-stream "^2.0.5"
+
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
 "leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
   version "1.3.0"
   resolved "git://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
@@ -1606,12 +3461,55 @@ liftoff@~2.5.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.difference@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.memoize@~3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
+  integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
+
+lodash.union@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+  integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
+
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
 lodash@^4.17.5:
   version "4.17.14"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
-log-symbols@^2.2.0:
+log-symbols@2.2.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
@@ -1623,6 +3521,18 @@ longest@^1.0.1:
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
   integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
+lru_map@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd"
+  integrity sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0=
+
+magic-string@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.14.0.tgz#57224aef1701caeed273b17a39a956e72b172462"
+  integrity sha1-VyJK7xcByu7Sc7F6OalW5ysXJGI=
+  dependencies:
+    vlq "^0.2.1"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -1637,6 +3547,13 @@ make-iterator@^1.0.0:
   dependencies:
     kind-of "^6.0.2"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -1649,6 +3566,39 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+math-random@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
@@ -1656,7 +3606,31 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-micromatch@^3.0.4:
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+micromatch@^3.0.4, micromatch@^3.1.10:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -1675,19 +3649,27 @@ micromatch@^3.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@1.40.0:
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
-mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19:
+mime-types@^2.0.1, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
   integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
   dependencies:
     mime-db "1.40.0"
 
-mime@^1.3.4:
+mime@1.6.0, mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -1697,16 +3679,38 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
 
-minimist@^1.1.3:
+minimist@*, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -1717,6 +3721,21 @@ minimist@~1.1.2:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
   integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
 
+minipass@^2.2.1, minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  dependencies:
+    minipass "^2.2.1"
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -1725,15 +3744,109 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+mkpath@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-0.1.0.tgz#7554a6f8d871834cc97b5462b122c4c124d6de91"
+  integrity sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=
+
+mocha@*:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.0.tgz#f896b642843445d1bb8bca60eabd9206b8916e56"
+  integrity sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    debug "3.2.6"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    find-up "3.0.0"
+    glob "7.1.3"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.13.1"
+    log-symbols "2.2.0"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    ms "2.1.1"
+    node-environment-flags "1.0.5"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "13.2.2"
+    yargs-parser "13.0.0"
+    yargs-unparser "1.5.0"
+
+mocha@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
+  dependencies:
+    browser-stdout "1.3.1"
+    commander "2.15.1"
+    debug "3.1.0"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.5"
+    he "1.1.1"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    supports-color "5.4.0"
+
 modalbox@okonet/modalbox#*:
   version "0.0.0"
   resolved "https://codeload.github.com/okonet/modalbox/tar.gz/dab4d4f0b3244f7c3dff24424a850d3379bc7c9c"
 
+module-deps@^4.0.2, module-deps@^4.0.8:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
+  integrity sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=
+  dependencies:
+    JSONStream "^1.0.3"
+    browser-resolve "^1.7.0"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.0"
+    defined "^1.0.0"
+    detective "^4.0.0"
+    duplexer2 "^0.1.2"
+    inherits "^2.0.1"
+    parents "^1.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.3"
+    stream-combiner2 "^1.1.1"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+nan@^2.12.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -1751,6 +3864,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+nanosocket@*:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nanosocket/-/nanosocket-1.1.0.tgz#56b00467aa3e333abc34e1089c946682b144623f"
+  integrity sha512-v2LsjYMRu3/JT/z8Qpkj1X5dgwCptC3D0NzeYlb7tb2qGJhlx0PSXZJraf1tRPKipj2iwB15GRzqUaOlN+LieQ==
+
 ndarray-fft@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ndarray-fft/-/ndarray-fft-1.0.3.tgz#dc5bba18e3ab82c997adbaebb78e79f82c93a22a"
@@ -1798,6 +3916,20 @@ ndarray@^1.0.13, ndarray@^1.0.15, ndarray@^1.0.18:
     iota-array "^1.0.0"
     is-buffer "^1.0.2"
 
+needle@^2.2.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 next-pow-2@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-pow-2/-/next-pow-2-1.0.0.tgz#cb5c2f1dae040c56cdd5cda1dc5c6a3a338f4367"
@@ -1808,12 +3940,59 @@ next-tick@^1.0.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
+ngrok@*:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ngrok/-/ngrok-3.2.3.tgz#847f62a8bb79e218815bb94bbb4790be8d47c161"
+  integrity sha512-p32VJznacM5O5oAEu8VnIoRpBl7NSodMQuZVHNwvzudBI5IXC1a37kCtgleIBjPft1gqd1jtgSRBEuZ6RPSRMA==
+  dependencies:
+    "@types/node" "^8.10.50"
+    decompress-zip "^0.3.2"
+    request "^2.88.0"
+    request-promise-native "^1.0.7"
+    uuid "^3.3.2"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 node-bitmap@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091"
   integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE=
 
-nopt@~4.0.1:
+node-environment-flags@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
+  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+    semver "^5.7.0"
+
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+nopt@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1, nopt@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -1821,11 +4000,70 @@ nopt@~4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
+nopt@~1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  dependencies:
+    abbrev "1"
+
+normalize-path@^2.0.0, normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-bundled@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
+
+npm-packlist@^1.1.6:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
+  integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-run-path@^2.0.0, npm-run-path@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
+object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -1845,7 +4083,7 @@ object-inspect@~1.4.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
-object-keys@^1.0.6:
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -1862,6 +4100,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -1872,6 +4120,14 @@ object.defaults@^1.1.0:
     for-own "^1.0.0"
     isobject "^3.0.0"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
 object.map@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
@@ -1880,6 +4136,14 @@ object.map@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -1896,6 +4160,25 @@ omggif@^1.0.5:
   resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f"
   integrity sha1-3LcCTazVDFK00wPwSALJHAV8dl8=
 
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -1942,11 +4225,30 @@ ora@^2.0.0:
     strip-ansi "^4.0.0"
     wcwidth "^1.0.1"
 
-os-homedir@^1.0.0:
+os-browserify@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
+  integrity sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ=
+
+os-browserify@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
+os-locale@^3.0.0, os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -1960,6 +4262,40 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
+p-limit@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
 pace@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/pace/-/pace-0.0.4.tgz#d66405d5f5bc12d25441a6e26c878dbc69e77a77"
@@ -1967,6 +4303,35 @@ pace@0.0.4:
   dependencies:
     charm "~0.1.0"
 
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+
+pako@~1.0.5:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+
+parents@^1.0.0, parents@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
+  integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=
+  dependencies:
+    path-platform "~0.11.15"
+
+parse-asn1@^5.0.0:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
 parse-data-uri@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/parse-data-uri/-/parse-data-uri-0.2.0.tgz#bf04d851dd5c87b0ab238e5d01ace494b604b4c9"
@@ -1983,21 +4348,66 @@ parse-filepath@^1.0.1:
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-node-version@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
+path-browserify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
+path-platform@~0.11.15:
+  version "0.11.15"
+  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
+  integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=
+
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
@@ -2010,11 +4420,52 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+pathval@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
+  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+
+platform@*, platform@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
+  integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==
+
+plugin-error@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
+  integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
+  dependencies:
+    ansi-colors "^1.0.1"
+    arr-diff "^4.0.0"
+    arr-union "^3.1.0"
+    extend-shallow "^3.0.2"
+
 pngjs-nozlib@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7"
@@ -2030,6 +4481,38 @@ polyline@0.2.0:
   resolved "https://registry.yarnpkg.com/polyline/-/polyline-0.2.0.tgz#4f2b716ca81134a6cbaa488975d236ecb1cc2840"
   integrity sha1-TytxbKgRNKbLqkiJddI27LHMKEA=
 
+popper@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/popper/-/popper-1.0.1.tgz#a3153910a01ce328a297cb241924afff0690837e"
+  integrity sha512-i/6yRlY5+VomX0ScQ5TI4Ro8XlQbOj7NMRf0hSnUEVv/aAP6IbrxvNcRsrEG6VsKzvltfINPeD4p++6SKwOTSA==
+  dependencies:
+    browser-icons "*"
+    browserify "^12.0.0"
+    buble "^0.16.0"
+    chai "*"
+    chokidar "*"
+    colors "^1.1.2"
+    compression "*"
+    cryonic "^1.0.0"
+    express "^4.12.4"
+    js-yaml "*"
+    minimist "*"
+    mocha "*"
+    platform "*"
+    rijs "*"
+    rijs.core "*"
+    rijs.css "*"
+    rijs.data "*"
+    rijs.fn "*"
+    rijs.npm "*"
+    rijs.resdir "*"
+    rijs.sync "*"
+    serve-static "*"
+    utilise "*"
+    wd "*"
+  optionalDependencies:
+    ngrok "*"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -2040,6 +4523,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -2050,30 +4538,88 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process@~0.11.0:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
 prototypejs-bower@plynchnlm/prototypejs-bower#1.7.3:
   version "0.0.0"
   resolved "https://codeload.github.com/plynchnlm/prototypejs-bower/tar.gz/5da3d86b77b94ec7eb5b92b8b5e0a7a241adae43"
 
-psl@^1.1.24:
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
+psl@^1.1.24, psl@^1.1.28:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.2.0.tgz#df12b5b1b3a30f51c329eacbdef98f3a6e136dc6"
   integrity sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==
 
-punycode@^1.4.1:
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+q@^1.1.2, q@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
+querystring-es3@~0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
 quote-stream@^1.0.1, quote-stream@^1.0.2, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
@@ -2091,7 +4637,78 @@ quote-stream@~0.0.0:
     minimist "0.0.8"
     through2 "~0.4.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+  integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=
+
+randomatic@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
+  dependencies:
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-only-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
+  integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=
+  dependencies:
+    readable-stream "^2.0.2"
+
+readable-stream@^1.1.8, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -2104,6 +4721,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@~1.0.17, readable-stream@~1.0.27-1, readable-stream@~1.0.33-1:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -2114,16 +4740,6 @@ readable-stream@~1.0.17, readable-stream@~1.0.27-1, readable-stream@~1.0.33-1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -2136,6 +4752,22 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+readdirp@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
+  integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
+  dependencies:
+    picomatch "^2.0.4"
+
 readline-sync@^1.4.7:
   version "1.4.9"
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
@@ -2148,6 +4780,13 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -2156,6 +4795,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
@@ -2166,7 +4810,23 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request@^2.44.0:
+request-promise-core@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
+  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+  dependencies:
+    lodash "^4.17.11"
+
+request-promise-native@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
+  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  dependencies:
+    request-promise-core "1.1.2"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@2.88.0, request@^2.44.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -2192,6 +4852,21 @@ request@^2.44.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -2205,7 +4880,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7:
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
   integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
@@ -2232,21 +4912,160 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
+rijs.components@*:
+  version "3.1.16"
+  resolved "https://registry.yarnpkg.com/rijs.components/-/rijs.components-3.1.16.tgz#97b43246f1842e45a5b97bb8cce3abae8d0e54b5"
+  integrity sha512-7TneWZIILv20erfzKtU1xnwtFSxiB+/9rwdS/3WGkugUbaXZF811kNfvaOlE4+BEj08CV8o0Dkasih3p4NV/dw==
+  dependencies:
+    "@compone/define" "^1.2.4"
+    utilise "^2.3.5"
+
+rijs.core@*:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rijs.core/-/rijs.core-1.2.6.tgz#638cd5a01baae10fccf57683172802adf37a7414"
+  integrity sha512-bB/tay726eZomQe91ciIuSGM1zDNyIuOkKdg6jRvYOGR8N30x5qHoADVgCEJgpgqlsPjmuBq6qPsJ3Pw4Nv6Uw==
+  dependencies:
+    colors "^1.1.0"
+    utilise "^2.3.5"
+
+rijs.css@*:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/rijs.css/-/rijs.css-1.2.4.tgz#f0c227ba58e4d0a50e7261a90536a96254ddc9df"
+  integrity sha512-2VKq0iWFki9gZMntUCoOCJVxn/o7tOZu7L0MzD7srPKiynaTsk8A7PjTwFmds1vdJ995v8adg3ax0eS5i+Jbow==
+  dependencies:
+    djbx "^1.0.3"
+    utilise "^2.3.3"
+
+rijs.data@*:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/rijs.data/-/rijs.data-2.2.4.tgz#7ba03c30afb463a6ea40c8ca8bc2b3a033939e26"
+  integrity sha512-zvR1GzRzcqZOeD7K+YVV7MmvLeLFbrLsrkxkEW570WiLQsnjTaZ6hLnftXlHLnPMWMIrGfs8gh6BJLWY3XcjXA==
+  dependencies:
+    utilise "^2.3.5"
+
+rijs.fn@*:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rijs.fn/-/rijs.fn-1.2.6.tgz#b2a24f2c40eb2bdc58119ededdc63b30fb848ace"
+  integrity sha512-v/xM7OOzS8HXqGA0y9ey/D0YOyAjiujKJT17/4U0CqViVhMi+0AsJCSuJqSMS4CkzLpy3CqdgKkRD6hnet3i+w==
+  dependencies:
+    browser-resolve "^1.11.2"
+    utilise "^2.3.5"
+
+rijs.npm@*:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rijs.npm/-/rijs.npm-2.0.0.tgz#3dd1d8681e3598e813379d44e6c05519fa230889"
+  integrity sha512-xRg5+MH0H5fDe9aMi68xZHq3E6AH1+fouGIJ+a7uFoirnbYdP9YqMK3QYFnvslF0Is08Rhx/R9P/7vwpI1N4rg==
+  dependencies:
+    browser-resolve "^1.11.2"
+    browserify "^14.5.0"
+    find-package-json "^1.0.0"
+    utilise "*"
+
+rijs.pages@*:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rijs.pages/-/rijs.pages-1.3.0.tgz#8c1495158f136f30743bd99f223e25d0d740b77b"
+  integrity sha512-230MZ7oyDVPoTBQSHuA3vqawikFgRtvoVRaRq7utWPpbo7NpDO7TaOsJmzM66WPypMXStH5ijyFADXwrqYJvdg==
+  dependencies:
+    compression "^1.6.2"
+    express "^4.16.2"
+    serve-static "^1.13.1"
+    utilise "*"
+
+rijs.resdir@*:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/rijs.resdir/-/rijs.resdir-1.4.4.tgz#41ed402dde3610bbb1dd42551c79101944f8f02f"
+  integrity sha512-l31HSXq13Rqaxr5wfY4d2MBFdTwmgG1A/FxGNrBc31E2WgBe4Hj86LhnRQage4SN8RjVZnf1JWWakbS7BVfoBw==
+  dependencies:
+    chokidar "^1.0.5"
+    glob "^7.1.2"
+    minimist "^1.2.0"
+    utilise "^2.3.5"
+
+rijs.serve@*:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/rijs.serve/-/rijs.serve-1.1.1.tgz#37abcf4e93ddd69f78f23f11783c5e779b434715"
+  integrity sha512-BZ4tNnMakHvfv0pLVLm1xtN7fncAnux5n57A1RsFOma1Y2wexM/ww8BHwQrsCkSYP+3ujfljthyb1J3HJGwXpA==
+  dependencies:
+    compression "^1.7.2"
+    express "^4.16.3"
+    utilise "^2.3.5"
+
+rijs.sessions@*:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/rijs.sessions/-/rijs.sessions-1.1.2.tgz#5a5cc94929f1f768f76dfb33af52c048e6ad837c"
+  integrity sha512-vj9iV8ov5awAnDy5x28FEezafbMClO/1JhnBIIsQg9DQ5vQBysPlwyiSHtNelXmE9gFbaxnsPD1/mUc3hm3FsQ==
+  dependencies:
+    cookie-parser "^1.3.5"
+    express-session "^1.15.3"
+    utilise "*"
+
+rijs.singleton@*:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rijs.singleton/-/rijs.singleton-1.0.0.tgz#74e7fbf186a8e4dc0cd3b00ed6377a6128f4b691"
+  integrity sha512-QeVEkimxkU0v06NnMYkKsj7R2AzFewG2FH1wMuUtO88n7gY7C/zdbFkNbYeWxqL+tuK+eLYWGFuoburTNM7rXQ==
+  dependencies:
+    utilise "*"
+
+rijs.sync@*:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/rijs.sync/-/rijs.sync-2.3.5.tgz#8728c6d7d72a80172fcba316b27d0a43f30449ab"
+  integrity sha512-tcbhmjLyWb+2s2gdiSmROEoD/OQPFeKC9xBnKgs0H+umY8CaVrVPGFdr1y1qovm7HxUbdk/BKqi94GQDc5XB3A==
+  dependencies:
+    buble "github:pemrouz/buble"
+    express "^4.14.0"
+    lru_map "^0.3.3"
+    platform "^1.3.4"
+    utilise "^2.3.5"
+    xrs "^1.2.2"
+
+rijs@*:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/rijs/-/rijs-0.9.1.tgz#6a0569a898cc5a5f92bfd59ad866c8ef1a9f2787"
+  integrity sha512-Hl5yWFZUdVePXIOHRrFXGxQZ2+fzWucqqx/aQjkE0PxbmNyOY0WA/SWdDA1eKeqb7lh2a0vcchR9mZLiQ9rHFQ==
+  dependencies:
+    rijs.components "*"
+    rijs.core "*"
+    rijs.css "*"
+    rijs.data "*"
+    rijs.fn "*"
+    rijs.pages "*"
+    rijs.resdir "*"
+    rijs.serve "*"
+    rijs.sessions "*"
+    rijs.singleton "*"
+    rijs.sync "*"
+    utilise "*"
+
+rimraf@^2.6.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 rw@1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -2254,7 +5073,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -2272,6 +5091,11 @@ save-pixels@~2.3.4:
     pngjs-nozlib "^1.0.0"
     through "^2.3.4"
 
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 scope-analyzer@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.0.5.tgz#72c9c6770c3e66984f84c7d3c7045998a1a7db8a"
@@ -2284,6 +5108,45 @@ scope-analyzer@^2.0.1:
     estree-is-function "^1.0.0"
     get-assigned-identifiers "^1.1.0"
 
+semver@^5.3.0, semver@^5.5.0, semver@^5.7.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+serve-static@*, serve-static@1.14.1, serve-static@^1.13.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -2294,11 +5157,24 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sexagesimal@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/sexagesimal/-/sexagesimal-0.5.0.tgz#9d815bd2bddd634b625ba6851bf8fe74a5ad3ef3"
   integrity sha1-nYFb0r3dY0tiW6aFG/j+dKWtPvM=
 
+sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
@@ -2313,11 +5189,46 @@ shapefile@0.3:
     iconv-lite "0.2"
     optimist "0.3"
 
-signal-exit@^3.0.2:
+shasum@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
+  integrity sha1-5wEjENj0F/TetXEhUOVni4euVl8=
+  dependencies:
+    json-stable-stringify "~0.0.0"
+    sha.js "~2.4.4"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shell-quote@^1.4.3, shell-quote@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -2369,7 +5280,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.5.6, source-map@~0.5.1:
+source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -2406,6 +5317,11 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -2500,11 +5416,96 @@ static-module@^3.0.0:
     static-eval "^2.0.2"
     through2 "~2.0.3"
 
-string_decoder@~0.10.x:
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
+stream-browserify@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-combiner2@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
+  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
+  dependencies:
+    duplexer2 "~0.1.0"
+    readable-stream "^2.0.2"
+
+stream-http@^2.0.0:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-splicer@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.1.tgz#0b13b7ee2b5ac7e0609a7463d83899589a363fcd"
+  integrity sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@~0.10.0, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
+string_decoder@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -2512,6 +5513,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -2519,14 +5527,88 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-supports-color@^5.3.0:
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+subarg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
+  dependencies:
+    minimist "^1.1.0"
+
+supports-color@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-through2@^2.0.0, through2@~2.0.3:
+syntax-error@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
+  integrity sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==
+  dependencies:
+    acorn-node "^1.2.0"
+
+tar-stream@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
+  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
+  dependencies:
+    bl "^3.0.0"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+tar@^4:
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
+  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.5"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+through2@^2.0.0, through2@^2.0.3, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -2542,11 +5624,28 @@ through2@~0.4.1:
     readable-stream "~1.0.17"
     xtend "~2.1.1"
 
-through@^2.3.4:
+"through@>=2.2.7 <3", through@^2.3.4, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+
+timers-browserify@^1.0.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
+  integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=
+  dependencies:
+    process "~0.11.0"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -2562,6 +5661,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -2581,6 +5687,11 @@ togeojson@0.13.0:
     minimist "0.0.8"
     xmldom "~0.1.19"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 topojson@1.6.26:
   version "1.6.26"
   resolved "https://registry.yarnpkg.com/topojson/-/topojson-1.6.26.tgz#365f88a5e1858ab064872d9b968496fa923857ad"
@@ -2593,6 +5704,21 @@ topojson@1.6.26:
     rw "1"
     shapefile "0.3"
 
+touch@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-0.0.3.tgz#51aef3d449571d4f287a5d87c9c8b49181a0db1d"
+  integrity sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=
+  dependencies:
+    nopt "~1.0.10"
+
+tough-cookie@^2.3.3:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -2601,6 +5727,16 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+"traverse@>=0.3.0 <0.4":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
+
+tty-browserify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -2620,6 +5756,19 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@^4.0.0, type-detect@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 type@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/type/-/type-1.0.1.tgz#084c9a17fcc9151a2cdb1459905c2e45e4bb7d61"
@@ -2653,11 +5802,34 @@ uglify-to-browserify@~1.0.0:
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
   integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
+uid-safe@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
+  dependencies:
+    random-bytes "~1.0.0"
+
+umd@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
+  integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
+undeclared-identifiers@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz#9254c1d37bdac0ac2b52de4b6722792d2a91e30f"
+  integrity sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==
+  dependencies:
+    acorn-node "^1.3.0"
+    dash-ast "^1.0.0"
+    get-assigned-identifiers "^1.2.0"
+    simple-concat "^1.0.0"
+    xtend "^4.0.1"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -2673,6 +5845,11 @@ uniq@^1.0.0:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -2705,21 +5882,61 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
+url@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@~0.10.1:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
+
+utilise@*, utilise@^2.3.3, utilise@^2.3.5:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/utilise/-/utilise-2.3.8.tgz#a639f79b1b385600b21ee58acfe991f2a83189c2"
+  integrity sha512-scuRvOkBODMEvS87Uz0Pe3f737JSszUAgB9pHHOHaHroA0MfFC+STXBIDT3x/uMQx/9sbREJnHUhs9xfRPT+gg==
+  dependencies:
+    colors "^1.2.3"
+    through "^2.3.8"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
 uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uws@^9.148.0:
+  version "9.148.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.148.0.tgz#56aff36cb95f7594573daff2a21105ec4b764664"
+  integrity sha512-vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g==
+
 v8flags@~3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
@@ -2727,6 +5944,16 @@ v8flags@~3.1.1:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+vargs@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
+  integrity sha1-a2GE2mUgzDIEzhtAfKwm2SYJ6/8=
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -2736,11 +5963,18 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vlq@^0.2.2:
+vlq@^0.2.1, vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
   integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
+vm-browserify@~0.0.1:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
+  dependencies:
+    indexof "0.0.1"
+
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -2748,6 +5982,21 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+wd@*:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.3.tgz#db228863e15648e0c1466df45b263fc30470dbc4"
+  integrity sha512-doB7E6DDhis6sSCfWps9Uz0UBBPAySv1x96KH6klfHp8y89HvhqEq3c0O8LPZhG37egJULN0m7+M9t16xUTG0g==
+  dependencies:
+    archiver "^3.0.0"
+    async "^2.0.0"
+    fancy-log "^1.3.3"
+    gulp-mocha "^6.0.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.1"
+    q "^1.5.1"
+    request "2.88.0"
+    vargs "^0.1.0"
+
 webgl-distort@jywarren/webgl-distort#*:
   version "0.0.1"
   resolved "https://codeload.github.com/jywarren/webgl-distort/tar.gz/f8a86cb7c60b25a1728ffb532c8ec2db116821f7"
@@ -2760,13 +6009,25 @@ wellknown@0.4.2:
     concat-stream "~1.5.0"
     minimist "~1.1.2"
 
-which@^1.2.14:
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@1.3.1, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
+wide-align@1.1.3, wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
@@ -2787,12 +6048,36 @@ wordwrap@~1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
 xmldom@~0.1.19:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
 
-xtend@^4.0.1, xtend@~4.0.1:
+xrs@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/xrs/-/xrs-1.2.2.tgz#767ee98cd09c97e8a4b9dc1191973d214ea7b7ab"
+  integrity sha512-pLmxYQnG3Qm0xtZZMFr7W7ls9DYNtNe9D5KLQpniu3DeoHDMkFXrjo8OjCEyhQ3Pf4Jr/pYFDhuMrQVTfEqEOw==
+  dependencies:
+    colors "^1.2.1"
+    express "^4.15.4"
+    nanosocket "*"
+    utilise "^2.3.5"
+    uws "^9.148.0"
+
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -2804,6 +6089,84 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.0, yallist@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+
+yargs-parser@13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
+  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^13.0.0:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-unparser@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
+  integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
+  dependencies:
+    flat "^4.1.0"
+    lodash "^4.17.11"
+    yargs "^12.0.5"
+
+yargs@13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+  integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
+yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
@@ -2813,3 +6176,12 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
+zip-stream@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.0.tgz#4f94246b64341536b86318bd556654278812b726"
+  integrity sha512-F/xoLqlQShgvn1BzHQCNiYIoo2R93GQIMH+tA6JC3ckMDkme4bnhEEXSferZcG5ea/6bZNx3GqSUHqT8TUO6uQ==
+  dependencies:
+    archiver-utils "^2.1.0"
+    compress-commons "^2.0.0"
+    readable-stream "^3.4.0"

From cc22333655c5c46f425467c08328f115d590294a Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 04:50:06 -0400
Subject: [PATCH 128/152] updates

---
 app/assets/javascripts/application.js |   2 +
 app/assets/javascripts/knitter.js     | 780 +++++++++++++-------------
 app/views/front_ui/index.html.erb     |  11 +-
 app/views/maps/index.html.erb         | 232 ++++----
 4 files changed, 512 insertions(+), 513 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 037a072ff..2493b2985 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,12 +26,14 @@
 // = require bootstrap/dist/js/bootstrap.js
 
 // = require leaflet/dist/leaflet.js
+// = require leaflet-fullhash/leaflet-fullHash.js
 // = require leaflet-providers/leaflet-providers.js
 // = require leaflet-toolbar/dist/leaflet.toolbar.js
 //=  require leaflet-draw/dist/leaflet.draw-src.js
 //=  require leaflet-illustrate/dist/Leaflet.Illustrate.js
 // = require leaflet-distortableimage/dist/leaflet.distortableimage.js
 // = require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
+// = require leaflet-environmental-layers/src/windRoseLayer.js
 // = require leaflet-easybutton/src/easy-button.js
 // = require sparklines/source/sparkline.js
 // = require glfx-js/dist/glfx.js
diff --git a/app/assets/javascripts/knitter.js b/app/assets/javascripts/knitter.js
index caab553a4..56d4ca122 100644
--- a/app/assets/javascripts/knitter.js
+++ b/app/assets/javascripts/knitter.js
@@ -1,418 +1,420 @@
-// // Legacy!
-// var Knitter = {
-//   // start storing a layer_type and layer_url in Map model, use it to switch this:
-//   openlayers_on: false,
-//   save: {
-//     state: true,
-//     saved: function(response) {
-//       Knitter.save.state = true
-//       $('save_saved').show()
-//       $('save_saving').hide()
-//       $('save_failed').hide()
-//       //console.log(response)
-//     },
-//     submitted: function(response) {
-//       Knitter.save.state = "saving"
-//       $('save_saved').hide()
-//       $('save_saving').show()
-//       $('save_failed').hide()
-//     },
-//     failed: function(response) {
-//       Knitter.save.state = false
-//       $('save_saved').hide()
-//       $('save_saving').hide()
-//       $('save_failed').show()
-//       //console.log(response)
-//     },
-//   },
-//   setup: function() {
-//     Glop.observe('glop:predraw', function() { $C.clear();})
-//     // disable default "delete" key (in Chrome it goes "back")
-//     window.addEventListener ('keydown', function (e) {
-//       // If the key pressed was a backspace key, handle it specially
-//       if (e.keyIdentifier == 'U+0008' || e.keyIdentifier == 'Backspace') {
-//         // If the target of the backspace was the body element, handle it specially
-//         if (e.target == document.body) {
-//           // Prevent the default Backspace action from happening
-//           e.preventDefault ();
-//         }
-//       }
-//     }, true);
+// Legacy!
+jQuery(document).ready(function($) {
+  var Knitter = {
+    // start storing a layer_type and layer_url in Map model, use it to switch this:
+    openlayers_on: false,
+    save: {
+      state: true,
+      saved: function(response) {
+        Knitter.save.state = true
+        $('save_saved').show()
+        $('save_saving').hide()
+        $('save_failed').hide()
+        //console.log(response)
+      },
+      submitted: function(response) {
+        Knitter.save.state = "saving"
+        $('save_saved').hide()
+        $('save_saving').show()
+        $('save_failed').hide()
+      },
+      failed: function(response) {
+        Knitter.save.state = false
+        $('save_saved').hide()
+        $('save_saving').hide()
+        $('save_failed').show()
+        //console.log(response)
+      },
+    },
+    setup: function() {
+      Glop.observe('glop:predraw', function() { $C.clear();})
+      // disable default "delete" key (in Chrome it goes "back")
+      window.addEventListener ('keydown', function (e) {
+        // If the key pressed was a backspace key, handle it specially
+        if (e.keyIdentifier == 'U+0008' || e.keyIdentifier == 'Backspace') {
+          // If the target of the backspace was the body element, handle it specially
+          if (e.target == document.body) {
+            // Prevent the default Backspace action from happening
+            e.preventDefault ();
+          }
+        }
+      }, true);
 
-//     var first_new_image = true
-//     warpables.each(function(warpable,index) {
-//       if (warpable.nodes != 'none') {
-//         // nodes as [[lon,lat],[lon,lat]]
-//         Warper.load_image(warpable.img,warpable.nodes,warpable.id,warpable.locked);
-//       } else {
-//         if (first_new_image) Warper.new_image(warpable.img,warpable.id,true);
-//         else Warper.new_image(warpable.img,warpable.id,true)
-//         first_new_image = false
-//       }
-//     })
-//     Warper.sort_images()
-//     Knitter.center_on_warpables()
-//     if (Config.fullscreen) {
-//       $('header').hide()
-//       Config.padding_top = 0
-//     }
-//     if (Config.locked == 'true') {
-//       Warper.locked = true
-//     }
-//   },
-//   init_openlayers: function(format) {
-//     if (format == 'WMS') {
-//              map = new OpenLayers.Map('map', { controls: [],
-//         projection: spher_merc,
-//          displayProjection: spher_merc,
-//                maxExtent: new OpenLayers.Bounds(-180,-90,180,90),
-//       });
-//     } else {
-//              map = new OpenLayers.Map('map', { controls: [],
-//           tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
-//         units: "m",
-//         projection: latlon,
-//         //numZoomLevels: 22,
-//           displayProjection: spher_merc,
-//                maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
-//         //maxResolution: 156543.0339
-//       });
-//     }
-//     Knitter.openlayers_on = true;
-//   },
+      var first_new_image = true
+      warpables.each(function(warpable,index) {
+        if (warpable.nodes != 'none') {
+          // nodes as [[lon,lat],[lon,lat]]
+          Warper.load_image(warpable.img,warpable.nodes,warpable.id,warpable.locked);
+        } else {
+          if (first_new_image) Warper.new_image(warpable.img,warpable.id,true);
+          else Warper.new_image(warpable.img,warpable.id,true)
+          first_new_image = false
+        }
+      })
+      Warper.sort_images()
+      Knitter.center_on_warpables()
+      if (Config.fullscreen) {
+        $('header').hide()
+        Config.padding_top = 0
+      }
+      if (Config.locked == 'true') {
+        Warper.locked = true
+      }
+    },
+    init_openlayers: function(format) {
+      if (format == 'WMS') {
+              map = new OpenLayers.Map('map', { controls: [],
+          projection: spher_merc,
+          displayProjection: spher_merc,
+                maxExtent: new OpenLayers.Bounds(-180,-90,180,90),
+        });
+      } else {
+              map = new OpenLayers.Map('map', { controls: [],
+            tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
+          units: "m",
+          projection: latlon,
+          //numZoomLevels: 22,
+            displayProjection: spher_merc,
+                maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
+          //maxResolution: 156543.0339
+        });
+      }
+      Knitter.openlayers_on = true;
+    },
 
-//   start_openlayers: function(layer,tile_url,tile_layer) {
-//     if (layer == "none") $('map').hide()
-//     else $('map').show()
-//     if (!Knitter.openlayers_on) Knitter.init_openlayers(layer)
-//     // http://isse.cr.usgs.gov/ArcGIS/services/Combined/TNM_Large_Scale_Imagery/MapServer/WMSServer?request=GetCapabilities&service=WMS
-//     // http://raster.nationalmap.gov/ArcGIS/rest/services/Combined/TNM_Large_Scale_Imagery/MapServer
-//     // http://viewer.nationalmap.gov/example/services.html
-//     Config.tiles = true
-//     Config.tile_type = layer
-//     Zoom.interval = 6
-//     if (layer == 'google') {
-//       var gsat = new OpenLayers.Layer.Google("Google Satellite", {
-//         type: google.maps.MapTypeId.SATELLITE,
-//         sphericalMercator: true,
-//         numZoomLevels: 23,
-//         maxZoomLevel: 23
-//       } );
-//       map.addLayer(gsat)
-//       map.layers[0].mapObject.setTilt(0);
+    start_openlayers: function(layer,tile_url,tile_layer) {
+      if (layer == "none") $('map').hide()
+      else $('map').show()
+      if (!Knitter.openlayers_on) Knitter.init_openlayers(layer)
+      // http://isse.cr.usgs.gov/ArcGIS/services/Combined/TNM_Large_Scale_Imagery/MapServer/WMSServer?request=GetCapabilities&service=WMS
+      // http://raster.nationalmap.gov/ArcGIS/rest/services/Combined/TNM_Large_Scale_Imagery/MapServer
+      // http://viewer.nationalmap.gov/example/services.html
+      Config.tiles = true
+      Config.tile_type = layer
+      Zoom.interval = 6
+      if (layer == 'google') {
+        var gsat = new OpenLayers.Layer.Google("Google Satellite", {
+          type: google.maps.MapTypeId.SATELLITE,
+          sphericalMercator: true,
+          numZoomLevels: 23,
+          maxZoomLevel: 23
+        } );
+        map.addLayer(gsat)
+        map.layers[0].mapObject.setTilt(0);
 
-//       // not sure why nothing else works, but this allows more zooming in!
-//       map.layers[0].numZoomLevels = 24
-//       map.layers[0].maxZoomLevel = 24
-//       map.layers[0].resolutions.push(0.29858214168548586/2,0.29858214168548586/4,0.29858214168548586/8,0.29858214168548586/16)
-//       map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
-//         new OpenLayers.Projection("EPSG:4326"),
-//         map.getProjectionObject()
-//       ), 5);
+        // not sure why nothing else works, but this allows more zooming in!
+        map.layers[0].numZoomLevels = 24
+        map.layers[0].maxZoomLevel = 24
+        map.layers[0].resolutions.push(0.29858214168548586/2,0.29858214168548586/4,0.29858214168548586/8,0.29858214168548586/16)
+        map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
+          new OpenLayers.Projection("EPSG:4326"),
+          map.getProjectionObject()
+        ), 5);
 
-//     } else if (layer == 'mapbox') {
-//       var mapbox = new OpenLayers.Layer.TMS( "MapBox OpenStreetMap",
-//         [ "http://a.tile.mapbox.com/","http://b.tile.mapbox.com/",
-//           "http://c.tile.mapbox.com/","http://d.tile.mapbox.com/" ],
-//         { 'layername': 'mapbox.mapbox-streets', 'type':'jpg',
-//           'buffer': 0, 'transitionEffect':'resize',
-//           attribution: 'rendered by <a href="http://mapbox.com">MapBox</a>, from <a href="http://www.openstreetmap.org/">OpenStreetMap data</a>'} );
-//       map.addLayer(mapbox)
-//     } else if (layer == 'osm') {
-//       var osm = new OpenLayers.Layer.TMS( "OpenStreetMap",
-//             "http://tile.openstreetmap.org/",
-//             { type: 'png',
-//         numZoomLevels: 23,
-//         maxZoomLevel: 23,
-//         getURL: osm_getTileURL,
-//         displayOutsideMaxExtent: true,
-//         attribution: '<a href="http://www.openstreetmap.org/">OpenStreetMap</a>'
-//         }
-//       );
-//       map.addLayer(osm)
-//     } else if (layer == 'bing') {
-//       var apiKey = "AhYrUtF-jMIlTiblfgB_spQXBgc3u1_4h1mrgm_vEmyrnHLbA8v8452MolECULTX"
-//       //Only in later versions of OpenLayers: //var bingsat = new OpenLayers.Layer.Bing("Aerial", {type: "Aerial", apiKey:apiKey, sphericalMercator:true});
-//       var bingsat = new OpenLayers.Layer.VirtualEarth("Virtual Earth Aerial",  {
-//         'type': VEMapStyle.Aerial,
-//         numZoomLevels: 23,
-//         maxZoomLevel: 23,
-//         'sphericalMercator': true
-//       });
-//       map.addLayer(bingsat)
-//     } else if (layer == 'yahoo') {
-//       var yahoosat = new OpenLayers.Layer.Yahoo("Yahoo Satellite", {type: YAHOO_MAP_SAT, sphericalMercator: true, numZoomLevels: 23});
-//       map.addLayer(yahoosat)
-// /*you can try
-//   http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/
+      } else if (layer == 'mapbox') {
+        var mapbox = new OpenLayers.Layer.TMS( "MapBox OpenStreetMap",
+          [ "http://a.tile.mapbox.com/","http://b.tile.mapbox.com/",
+            "http://c.tile.mapbox.com/","http://d.tile.mapbox.com/" ],
+          { 'layername': 'mapbox.mapbox-streets', 'type':'jpg',
+            'buffer': 0, 'transitionEffect':'resize',
+            attribution: 'rendered by <a href="http://mapbox.com">MapBox</a>, from <a href="http://www.openstreetmap.org/">OpenStreetMap data</a>'} );
+        map.addLayer(mapbox)
+      } else if (layer == 'osm') {
+        var osm = new OpenLayers.Layer.TMS( "OpenStreetMap",
+              "http://tile.openstreetmap.org/",
+              { type: 'png',
+          numZoomLevels: 23,
+          maxZoomLevel: 23,
+          getURL: osm_getTileURL,
+          displayOutsideMaxExtent: true,
+          attribution: '<a href="http://www.openstreetmap.org/">OpenStreetMap</a>'
+          }
+        );
+        map.addLayer(osm)
+      } else if (layer == 'bing') {
+        var apiKey = "AhYrUtF-jMIlTiblfgB_spQXBgc3u1_4h1mrgm_vEmyrnHLbA8v8452MolECULTX"
+        //Only in later versions of OpenLayers: //var bingsat = new OpenLayers.Layer.Bing("Aerial", {type: "Aerial", apiKey:apiKey, sphericalMercator:true});
+        var bingsat = new OpenLayers.Layer.VirtualEarth("Virtual Earth Aerial",  {
+          'type': VEMapStyle.Aerial,
+          numZoomLevels: 23,
+          maxZoomLevel: 23,
+          'sphericalMercator': true
+        });
+        map.addLayer(bingsat)
+      } else if (layer == 'yahoo') {
+        var yahoosat = new OpenLayers.Layer.Yahoo("Yahoo Satellite", {type: YAHOO_MAP_SAT, sphericalMercator: true, numZoomLevels: 23});
+        map.addLayer(yahoosat)
+  /*you can try
+    http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/
 
-//   but you might get better performance from newworld which switches
-//   between bmng/landsat/naip based on zoom level
+    but you might get better performance from newworld which switches
+    between bmng/landsat/naip based on zoom level
 
-//   http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NewWorld_google */
-//     } else if (layer == 'TMS') {
-//       Config.tile_url = tile_url || Config.tile_url
-//              var tms = new OpenLayers.Layer.TMS( "OpenLayers TMS", Config.tile_url,
-//         { //projection: latlon,
-//           //displayProjection: spher_merc,
-//           //getURL: Knitter.overlay_getTileURL,
-//           //maxResolution:156543.0339,
-//           //units: "m",
-//                 //maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
-//           //tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
-//           numZoomLevels: 23,
-//           serviceVersion: '.',
-//           layername: '.',
-//           type: 'png',
-//           alpha: true,
-//           isBaseLayer: true});
-//              map.addLayer(tms);
-//     } else if (layer == 'WMS') {
-//       projection: latlon,
-//       //wms_url = prompt('Enter a WMS URI','http://msrmaps.com/ogcmap.ashx')
-//       Config.tile_url = tile_url || Config.tile_url
-//       Config.tile_layer = tile_layer || Config.tile_layer
-//       map.addLayer(new OpenLayers.Layer.WMS('WMS',Config.tile_url,{
-//       layers: Config.tile_layer
-//         //layers:'DOQ'
-//         //layers:'osm'
-//       }))
-//     }
+    http://hypercube.telascience.org/tilecache/tilecache.py/1.0.0/NewWorld_google */
+      } else if (layer == 'TMS') {
+        Config.tile_url = tile_url || Config.tile_url
+              var tms = new OpenLayers.Layer.TMS( "OpenLayers TMS", Config.tile_url,
+          { //projection: latlon,
+            //displayProjection: spher_merc,
+            //getURL: Knitter.overlay_getTileURL,
+            //maxResolution:156543.0339,
+            //units: "m",
+                  //maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508.34),
+            //tileOrigin: new OpenLayers.LonLat(0,0).transform(latlon,spher_merc),
+            numZoomLevels: 23,
+            serviceVersion: '.',
+            layername: '.',
+            type: 'png',
+            alpha: true,
+            isBaseLayer: true});
+              map.addLayer(tms);
+      } else if (layer == 'WMS') {
+        projection: latlon,
+        //wms_url = prompt('Enter a WMS URI','http://msrmaps.com/ogcmap.ashx')
+        Config.tile_url = tile_url || Config.tile_url
+        Config.tile_layer = tile_layer || Config.tile_layer
+        map.addLayer(new OpenLayers.Layer.WMS('WMS',Config.tile_url,{
+        layers: Config.tile_layer
+          //layers:'DOQ'
+          //layers:'osm'
+        }))
+      }
 
-//     Glop.observe('glop:draw',function(){$('map').setStyle({height:Glop.height+'px'})})
-//     if (Config.tile_type == 'WMS') Glop.observe('mouseup',function() {map.layers.first().refresh()})
+      Glop.observe('glop:draw',function(){$('map').setStyle({height:Glop.height+'px'})})
+      if (Config.tile_type == 'WMS') Glop.observe('mouseup',function() {map.layers.first().refresh()})
 
-//     // the following is complete nonsense and resolves to a point, not a bbox:
-//     var lat1 = Projection.y_to_lat(Map.y-Glop.height/2)
-//     var lon1 = Projection.x_to_lon(Map.x-Glop.width/2)
-//     var lat2 = Projection.y_to_lat(Map.y+Glop.height/2)
-//     var lon2 = Projection.x_to_lon(Map.x+Glop.width/2)
+      // the following is complete nonsense and resolves to a point, not a bbox:
+      var lat1 = Projection.y_to_lat(Map.y-Glop.height/2)
+      var lon1 = Projection.x_to_lon(Map.x-Glop.width/2)
+      var lat2 = Projection.y_to_lat(Map.y+Glop.height/2)
+      var lon2 = Projection.x_to_lon(Map.x+Glop.width/2)
 
-//     var bounds = new OpenLayers.Bounds();
-//     bounds.extend(new OpenLayers.LonLat(lon1,lat1))//.transform(spher_merc,latlon))
-//     bounds.extend(new OpenLayers.LonLat(lon2,lat2))//.transform(spher_merc,latlon))
-//     //if (warpables.length = 0)
-//     map.zoomToExtent( bounds )
-//     //console.log(lat1,lon1,lat2,lon2)
-//     //console.log(bounds)
-//     //console.log('initial extent based on viewport sync with Cartagen')
+      var bounds = new OpenLayers.Bounds();
+      bounds.extend(new OpenLayers.LonLat(lon1,lat1))//.transform(spher_merc,latlon))
+      bounds.extend(new OpenLayers.LonLat(lon2,lat2))//.transform(spher_merc,latlon))
+      //if (warpables.length = 0)
+      map.zoomToExtent( bounds )
+      //console.log(lat1,lon1,lat2,lon2)
+      //console.log(bounds)
+      //console.log('initial extent based on viewport sync with Cartagen')
 
-//     //scalebar = new OpenLayers.Control.ScaleBar();
-//     //map.addControl(scalebar);
+      //scalebar = new OpenLayers.Control.ScaleBar();
+      //map.addControl(scalebar);
 
-//     if (Config.tile_switcher) {
-//       var switcherControl = new OpenLayers.Control.LayerSwitcher()
-//       map.addControl(switcherControl);
-//       switcherControl.maximizeControl();
-//     }
-//     Knitter.openLayersDraw()
-//     Glop.observe('glop:draw', Knitter.openLayersDraw)
-//     //Knitter.update_map(Map.lat,Map.lon,Map.zoom,layer)
-//     setTimeout(Knitter.update_map_to_center,1000)
+      if (Config.tile_switcher) {
+        var switcherControl = new OpenLayers.Control.LayerSwitcher()
+        map.addControl(switcherControl);
+        switcherControl.maximizeControl();
+      }
+      Knitter.openLayersDraw()
+      Glop.observe('glop:draw', Knitter.openLayersDraw)
+      //Knitter.update_map(Map.lat,Map.lon,Map.zoom,layer)
+      setTimeout(Knitter.update_map_to_center,1000)
 
-//   },
+    },
 
-//   update_map_to_center: function() {
-//     loc = Knitter.find_map_center()
-//     if (loc) Knitter.update_map(loc.lat,loc.lon,loc.zoom,false)
-//   },
+    update_map_to_center: function() {
+      loc = Knitter.find_map_center()
+      if (loc) Knitter.update_map(loc.lat,loc.lon,loc.zoom,false)
+    },
 
-//   update_map: function(lat,lon,zoom,layer) {
-//     Knitter.save.submitted()
-//     layer = layer || false
-//     new Ajax.Request('/map/update/'+Knitter.map_id,{
-//       method: 'get',
-//       parameters: {
-//         map: {
-//           lat: lat,
-//           lon: lon
-//         },
-//         zoom: zoom,
-//         tiles: layer,
-//         tile_url: Config.tile_url,
-//         tile_layer: Config.tile_layer
-//       },
-//       onSuccess: Knitter.save.saved,
-//       on0: Knitter.save.failed,
-//       onFailure: Knitter.save.failed,
-//     })
-//   },
+    update_map: function(lat,lon,zoom,layer) {
+      Knitter.save.submitted()
+      layer = layer || false
+      new Ajax.Request('/map/update/'+Knitter.map_id,{
+        method: 'get',
+        parameters: {
+          map: {
+            lat: lat,
+            lon: lon
+          },
+          zoom: zoom,
+          tiles: layer,
+          tile_url: Config.tile_url,
+          tile_layer: Config.tile_layer
+        },
+        onSuccess: Knitter.save.saved,
+        on0: Knitter.save.failed,
+        onFailure: Knitter.save.failed,
+      })
+    },
 
-//   openLayersDraw: function() {
-//     if (Config.tile_type == 'WMS') map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat))
-//     else map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat).transform(spher_merc,latlon))
+    openLayersDraw: function() {
+      if (Config.tile_type == 'WMS') map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat))
+      else map.moveTo(new OpenLayers.LonLat(Map.lon,Map.lat).transform(spher_merc,latlon))
 
-//     var left = new OpenLayers.LonLat(map.getExtent().left,map.getExtent().top);
-//     var right = new OpenLayers.LonLat(map.getExtent().right,map.getExtent().bottom);
+      var left = new OpenLayers.LonLat(map.getExtent().left,map.getExtent().top);
+      var right = new OpenLayers.LonLat(map.getExtent().right,map.getExtent().bottom);
 
-//     if (Config.tile_type == 'WMS') var convert = Glop.width/124023.4375
-//     else {
-//       left = left.transform(spher_merc,latlon);
-//       right = right.transform(spher_merc,latlon);
+      if (Config.tile_type == 'WMS') var convert = Glop.width/124023.4375
+      else {
+        left = left.transform(spher_merc,latlon);
+        right = right.transform(spher_merc,latlon);
 
-//       var convert = 124023.4375*Glop.width
-//     }
-//     Map.zoom = convert/(right.lon-left.lon)
+        var convert = 124023.4375*Glop.width
+      }
+      Map.zoom = convert/(right.lon-left.lon)
 
-//   },
+    },
 
-//   overlay_getTileURL: function(bounds) {
-//           var res = this.map.getResolution();
-//           var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-//           var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
-//           var z = this.map.getZoom();
-//     //console.log('getting tile '+z+','+x+','+y)
-//     if (this.map.baseLayer.name == 'Virtual Earth Roads' || this.map.baseLayer.name == 'Virtual Earth Aerial' || this.map.baseLayer.name == 'Virtual Earth Hybrid') {
-//             z = z + 1;
-//           }
-//     if (mapBounds.intersectsBounds( bounds ) && z >= mapMinZoom && z <= mapMaxZoom ) {
-//     //console.log( this.url + z + "/" + x + "/" + y + "." + this.type);
-//       return this.url + z + "/" + x + "/" + y + "." + this.type;
-//     } else {
-//       return "http://www.maptiler.org/img/none.png";
-//     }
-//   },
+    overlay_getTileURL: function(bounds) {
+            var res = this.map.getResolution();
+            var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+            var y = Math.round((bounds.bottom - this.tileOrigin.lat) / (res * this.tileSize.h));
+            var z = this.map.getZoom();
+      //console.log('getting tile '+z+','+x+','+y)
+      if (this.map.baseLayer.name == 'Virtual Earth Roads' || this.map.baseLayer.name == 'Virtual Earth Aerial' || this.map.baseLayer.name == 'Virtual Earth Hybrid') {
+              z = z + 1;
+            }
+      if (mapBounds.intersectsBounds( bounds ) && z >= mapMinZoom && z <= mapMaxZoom ) {
+      //console.log( this.url + z + "/" + x + "/" + y + "." + this.type);
+        return this.url + z + "/" + x + "/" + y + "." + this.type;
+      } else {
+        return "http://www.maptiler.org/img/none.png";
+      }
+    },
 
-//   save_new_location: function(lat,lon,zoom) {
-//     Knitter.save.submitted()
-//     new Ajax.Request('/map/update/'+Knitter.map_id,{
-//       method: 'get',
-//       parameters: {
-//         lat: lat,
-//         lon: lon,
-//         zoom: zoom
-//       },
-//       onSuccess: Knitter.save.saved,
-//       on0: Knitter.save.failed,
-//       onFailure: Knitter.save.failed,
-//     })
-//   },
+    save_new_location: function(lat,lon,zoom) {
+      Knitter.save.submitted()
+      new Ajax.Request('/map/update/'+Knitter.map_id,{
+        method: 'get',
+        parameters: {
+          lat: lat,
+          lon: lon,
+          zoom: zoom
+        },
+        onSuccess: Knitter.save.saved,
+        on0: Knitter.save.failed,
+        onFailure: Knitter.save.failed,
+      })
+    },
 
-//   save_current_location: function(callback) {
-//     Knitter.save_new_location(Map.lat,Map.lon,Map.zoom)
-//     if (!Object.isUndefined(callback)) callback()
-//   },
+    save_current_location: function(callback) {
+      Knitter.save_new_location(Map.lat,Map.lon,Map.zoom)
+      if (!Object.isUndefined(callback)) callback()
+    },
 
-//   toggle_vectors: function() {
-//     Config.vectors = !Config.vectors
-//     $('tagreport').toggle()
-//     if (Config.vectors) $('tool_vectors').addClassName('down')
-//     else $('tool_vectors').removeClassName('down')
-//     if ($('loading_message')) $('loading_message').hide()
-//     Knitter.save.submitted()
-//     new Ajax.Request('/map/update/'+Knitter.map_id,{
-//       method: 'get',
-//       parameters: {
-//         lat: Map.lat,
-//         lon: Map.lon,
-//         zoom: Map.zoom,
-//         vectors: Config.vectors
-//       },
-//       onSuccess: Knitter.save.saved,
-//       on0: Knitter.save.failed,
-//       onFailure: Knitter.save.failed,
-//     })
-//   },
+    toggle_vectors: function() {
+      Config.vectors = !Config.vectors
+      $('tagreport').toggle()
+      if (Config.vectors) $('tool_vectors').addClassName('down')
+      else $('tool_vectors').removeClassName('down')
+      if ($('loading_message')) $('loading_message').hide()
+      Knitter.save.submitted()
+      new Ajax.Request('/map/update/'+Knitter.map_id,{
+        method: 'get',
+        parameters: {
+          lat: Map.lat,
+          lon: Map.lon,
+          zoom: Map.zoom,
+          vectors: Config.vectors
+        },
+        onSuccess: Knitter.save.saved,
+        on0: Knitter.save.failed,
+        onFailure: Knitter.save.failed,
+      })
+    },
 
-//   background_transparent: true,
-//   toggle_background: function() {
-//     if (Knitter.background_transparent) {
-//       $('map').removeClassName('transparent');
-//     } else {
-//       $('map').addClassName('transparent');
-//     }
-//     Knitter.background_transparent = !Knitter.background_transparent
-//   },
+    background_transparent: true,
+    toggle_background: function() {
+      if (Knitter.background_transparent) {
+        $('map').removeClassName('transparent');
+      } else {
+        $('map').addClassName('transparent');
+      }
+      Knitter.background_transparent = !Knitter.background_transparent
+    },
 
-//   find_map_center: function() {
-//     if (warpables.length > 0) {
-//       var latsum = 0, lonsum = 0, latcount = 0, loncount = 0
-//       var maxlat = 0,maxlon = 0,minlat = 0,minlon = 0
-//       warpables.each(function(warpable){
-//         if (warpable.nodes != "none") {
-//           warpable.nodes.each(function(node) {
-//             var lon = Projection.x_to_lon(-node[0])
-//             var lat = Projection.y_to_lat(node[1])
-//             if (maxlon == 0) maxlon = lon
-//             if (maxlat == 0) maxlat = lat
-//             if (minlon == 0) minlon = lon
-//             if (minlat == 0) minlat = lat
-//             if (lon > maxlon) maxlon = lon
-//             if (lat > maxlat) maxlat = lat
-//             if (lon < minlon) minlon = lon
-//             if (lat < minlat) minlat = lat
-//                      lonsum += lon
-//                      latsum += lat
-//             loncount += 1
-//             latcount += 1
-//               })
-//         }
-//       },this)
-//       zoom = parseInt(-Math.log((maxlon-minlon)/360)/Math.log(2))+2
-//       if (loncount) {
-//         return { lat:(maxlat+minlat)/2,
-//           lon:(maxlon+minlon)/2,
-//           zoom:zoom,
-//           width:maxlon-minlon
-//         }
-//       } else {
-//         return false
-//       }
-//     } else { return false }
-//   },
+    find_map_center: function() {
+      if (warpables.length > 0) {
+        var latsum = 0, lonsum = 0, latcount = 0, loncount = 0
+        var maxlat = 0,maxlon = 0,minlat = 0,minlon = 0
+        warpables.each(function(warpable){
+          if (warpable.nodes != "none") {
+            warpable.nodes.each(function(node) {
+              var lon = Projection.x_to_lon(-node[0])
+              var lat = Projection.y_to_lat(node[1])
+              if (maxlon == 0) maxlon = lon
+              if (maxlat == 0) maxlat = lat
+              if (minlon == 0) minlon = lon
+              if (minlat == 0) minlat = lat
+              if (lon > maxlon) maxlon = lon
+              if (lat > maxlat) maxlat = lat
+              if (lon < minlon) minlon = lon
+              if (lat < minlat) minlat = lat
+                      lonsum += lon
+                      latsum += lat
+              loncount += 1
+              latcount += 1
+                })
+          }
+        },this)
+        zoom = parseInt(-Math.log((maxlon-minlon)/360)/Math.log(2))+2
+        if (loncount) {
+          return { lat:(maxlat+minlat)/2,
+            lon:(maxlon+minlon)/2,
+            zoom:zoom,
+            width:maxlon-minlon
+          }
+        } else {
+          return false
+        }
+      } else { return false }
+    },
 
-//   center_on_warpables: function() {
-//     loc = Knitter.find_map_center()
-//     if (loc) Cartagen.go_to(loc.lat,loc.lon,loc.zoom)
-//     // the "+2" is a hack... this equation would work without it if the map were only one tile wide.
-//     map.zoomTo(parseInt(-Math.log((loc.width)/360)/Math.log(2))+2)
-//   },
+    center_on_warpables: function() {
+      loc = Knitter.find_map_center()
+      if (loc) Cartagen.go_to(loc.lat,loc.lon,loc.zoom)
+      // the "+2" is a hack... this equation would work without it if the map were only one tile wide.
+      map.zoomTo(parseInt(-Math.log((loc.width)/360)/Math.log(2))+2)
+    },
 
-//   export_tabs: ['export_intro','export_options'],
-//   export_hide_tabs: function() {
-//     Knitter.export_tabs.each(function(tab) {
-//       $(tab).hide();
-//       $(tab+'_tab').removeClassName('active');
-//     })
-//   },
-//   export_intro: function() {
-//     Knitter.export_hide_tabs();
-//     $('export_normal').show();
-//     $('export_intro').show();
-//     $('export_intro_tab').addClassName('active');
-//   },
-//   export_options: function() {
-//     Knitter.export_hide_tabs();
-//     $('export_normal').show();
-//     $('export_options').show();
-//     $('export_options_tab').addClassName('active');
-//   },
-//   export_multispectral: function() {
-//     Knitter.export_hide_tabs();
-//     $('export_normal').hide();
-//     $('export_multispectral').show();
-//     $('export_multispectral_tab').addClassName('active');
-//   },
-//   // for now, just used to store the "export progress" checkers, which run every 5 secs and fill up the logs.
-//   updaters: [],
-//   cancel_updaters: function() {
-//     Knitter.updaters.each(function(u){
-//       u.stop()
-//     })
-//   },
-// }
+    export_tabs: ['export_intro','export_options'],
+    export_hide_tabs: function() {
+      Knitter.export_tabs.each(function(tab) {
+        $(tab).hide();
+        $(tab+'_tab').removeClassName('active');
+      })
+    },
+    export_intro: function() {
+      Knitter.export_hide_tabs();
+      $('export_normal').show();
+      $('export_intro').show();
+      $('export_intro_tab').addClassName('active');
+    },
+    export_options: function() {
+      Knitter.export_hide_tabs();
+      $('export_normal').show();
+      $('export_options').show();
+      $('export_options_tab').addClassName('active');
+    },
+    export_multispectral: function() {
+      Knitter.export_hide_tabs();
+      $('export_normal').hide();
+      $('export_multispectral').show();
+      $('export_multispectral_tab').addClassName('active');
+    },
+    // for now, just used to store the "export progress" checkers, which run every 5 secs and fill up the logs.
+    updaters: [],
+    cancel_updaters: function() {
+      Knitter.updaters.each(function(u){
+        u.stop()
+      })
+    },
+  }
 
-// function osm_getTileURL(bounds) {
-//   var res = this.map.getResolution();
-//   var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-//   var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
-//   var z = this.map.getZoom();
-//   var limit = Math.pow(2, z);
+  function osm_getTileURL(bounds) {
+    var res = this.map.getResolution();
+    var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+    var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+    var z = this.map.getZoom();
+    var limit = Math.pow(2, z);
 
-//   if (y < 0 || y >= limit) {
-//       return "http://www.maptiler.org/img/none.png";
-//   } else {
-//       x = ((x % limit) + limit) % limit;
-//       return this.url + z + "/" + x + "/" + y + "." + this.type;
-//   }
-// }
+    if (y < 0 || y >= limit) {
+        return "http://www.maptiler.org/img/none.png";
+    } else {
+        x = ((x % limit) + limit) % limit;
+        return this.url + z + "/" + x + "/" + y + "." + this.type;
+    }
+  }
+});
\ No newline at end of file
diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb
index b10575b4b..211a4869e 100644
--- a/app/views/front_ui/index.html.erb
+++ b/app/views/front_ui/index.html.erb
@@ -1,9 +1,8 @@
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/src/windRoseLayer.js') %>
-<%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
-<%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %>
+<%# <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
+<%# # <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %> 
 <%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
-<%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %>
+<%# <%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %> 
 
 <style>
 #hero {
@@ -207,7 +206,7 @@
   defaultLoc.zoom = defaultLoc.zoom || <%= params[:z] || 'false' %>;
 
   var Mapknitterunique = new L.Map('mapknitter-unique').setView([places[0].lat, places[0].lng], 8);
-  var hash = new L.Hash(Mapknitterunique);
+  // var hash = new L.Hash(Mapknitterunique);
 
   var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
 
@@ -256,7 +255,7 @@
     attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
   }).addTo(Mapknitterunique); 
 
-  Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
+  // Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
   Mapknitterunique.on('fullscreenchange', function () {
     if (Mapknitterunique.isFullscreen()) {
       Mapknitterunique.options.minZoom = 3 ;
diff --git a/app/views/maps/index.html.erb b/app/views/maps/index.html.erb
index 76c5b12a9..306b1587f 100644
--- a/app/views/maps/index.html.erb
+++ b/app/views/maps/index.html.erb
@@ -1,8 +1,3 @@
-<%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/windRoseLayer.js') %>
-<%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %>
-<%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
-<%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %>
-
 <%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
 
@@ -121,122 +116,123 @@
 </div>
 
 <script>
-  $(function(){
+  jQuery(document).ready(function($) {
     $("#loginModal").appendTo("body");
   });
-    var bounds = new L.LatLngBounds(new L.LatLng(84.67351257 , -172.96875) , new L.LatLng(-54.36775852 , 178.59375)) ;
-    var Mapknitterunique = new L.map('mapknitter-unique' , {
-      maxBounds: bounds , 
-      maxBoundsViscosity: 0.75
-    }).setView([43, -83] , 2);  
-    Mapknitterunique.options.minZoom = 2 ;
-
-    //L.tileLayer('').addTo() ; 
-  //  L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
-     var baselayer = L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png', {
-                attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
-    }).addTo(Mapknitterunique) ; 
-
-    Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
-    Mapknitterunique.on('fullscreenchange', function () {
-      if (Mapknitterunique.isFullscreen()) {
-        Mapknitterunique.options.minZoom = 3 ;
-       } 
-      else {
-        Mapknitterunique.options.minZoom = 1 ;
-       // Mapknitterunique.panTo(new L.LatLng(lat,lon));
-      }
-    });
-
-   // var PurpleLayer = L.layerGroup.purpleLayer() ;
-    var PurpleAirMarkerLayer = L.layerGroup.purpleAirMarkerLayer() ;
-    var SkyTruth = L.layerGroup.skyTruthLayer() ;
-    var Fractracker = L.layerGroup.fracTrackerLayer() ;
-    var OdorReport = L.layerGroup.odorReportLayer() ;
-    var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique) ;
-    var ToxicRelease = L.layerGroup.toxicReleaseLayer() ;
-
-    var OpenInfraMap_Power = L.tileLayer('https://tiles-{s}.openinframap.org/power/{z}/{x}/{y}.png',{
-        maxZoom: 18,
-        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Petroleum = L.tileLayer('https://tiles-{s}.openinframap.org/petroleum/{z}/{x}/{y}.png', {
-      maxZoom: 18,
-      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Telecom = L.tileLayer('https://tiles-{s}.openinframap.org/telecoms/{z}/{x}/{y}.png', {
-      maxZoom: 18,
-      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-    var OpenInfraMap_Water = L.tileLayer('https://tiles-{s}.openinframap.org/water/{z}/{x}/{y}.png',{
+
+  var bounds = new L.LatLngBounds(new L.LatLng(84.67351257 , -172.96875) , new L.LatLng(-54.36775852 , 178.59375)) ;
+  var Mapknitterunique = new L.map('mapknitter-unique' , {
+    maxBounds: bounds , 
+    maxBoundsViscosity: 0.75
+  }).setView([43, -83] , 2);  
+  Mapknitterunique.options.minZoom = 2 ;
+
+  //L.tileLayer('').addTo() ; 
+//  L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
+    var baselayer = L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png', {
+              attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+  }).addTo(Mapknitterunique) ; 
+
+  Mapknitterunique.addControl(new L.Control.Fullscreen()); // to go full-screen
+  Mapknitterunique.on('fullscreenchange', function () {
+    if (Mapknitterunique.isFullscreen()) {
+      Mapknitterunique.options.minZoom = 3 ;
+      } 
+    else {
+      Mapknitterunique.options.minZoom = 1 ;
+      // Mapknitterunique.panTo(new L.LatLng(lat,lon));
+    }
+  });
+
+  // var PurpleLayer = L.layerGroup.purpleLayer() ;
+  var PurpleAirMarkerLayer = L.layerGroup.purpleAirMarkerLayer() ;
+  var SkyTruth = L.layerGroup.skyTruthLayer() ;
+  var Fractracker = L.layerGroup.fracTrackerLayer() ;
+  var OdorReport = L.layerGroup.odorReportLayer() ;
+  var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique) ;
+  var ToxicRelease = L.layerGroup.toxicReleaseLayer() ;
+
+  var OpenInfraMap_Power = L.tileLayer('https://tiles-{s}.openinframap.org/power/{z}/{x}/{y}.png',{
       maxZoom: 18,
       attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
-    });
-
-    var Justicemap_income = L.tileLayer.provider('JusticeMap.income') ;
-    var JusticeMap_americanIndian = L.tileLayer.provider('JusticeMap.americanIndian') ;
-    var JusticeMap_asian = L.tileLayer.provider('JusticeMap.asian') ;
-    var JusticeMap_black = L.tileLayer.provider('JusticeMap.black') ;
-    var JusticeMap_multi = L.tileLayer.provider('JusticeMap.multi') ;
-    var JusticeMap_hispanic = L.tileLayer.provider('JusticeMap.hispanic') ;
-    var JusticeMap_nonWhite = L.tileLayer.provider('JusticeMap.nonWhite') ;
-    var JusticeMap_white = L.tileLayer.provider('JusticeMap.white') ;
-    var JusticeMap_plurality = L.tileLayer.provider('JusticeMap.plurality') ;
-    
-    var clouds = L.OWM.clouds({showLegend: true, opacity: 0.5});
-    var cloudscls = L.OWM.cloudsClassic({});
-    var precipitation = L.OWM.precipitation({});
-    var precipitationcls = L.OWM.precipitationClassic({});
-    var rain = L.OWM.rain({});
-    var raincls = L.OWM.rainClassic({});
-    var snow = L.OWM.snow({});
-    var pressure = L.OWM.pressure({});
-    var pressurecntr = L.OWM.pressureContour({});
-    var temp = L.OWM.temperature({});
-    var wind = L.OWM.wind({});
-
-    var city = L.OWM.current({intervall: 15, minZoom: 3});
-    var windrose = L.OWM.current({intervall: 15, minZoom: 3, markerFunction: myWindroseMarker, popup: false, clusterSize: 50,imageLoadingBgUrl: 'https://openweathermap.org/img/w0/iwind.png' });
-    windrose.on('owmlayeradd', windroseAdded, windrose); 
-
-    var baseMaps = {
-      "Baselayer1": baselayer
-    };
-    var overlayMaps = {
-     // "PurpleAirLayer-HeatMap": PurpleLayer ,
-      "PurpleAirLayer-Markers": PurpleAirMarkerLayer ,
-      "SkyTruth": SkyTruth , 
-      "Fractracker" : Fractracker ,
-      "ToxicRelease": ToxicRelease ,
-      "OdorReport": OdorReport ,
-      "MapKnitter": MapKnitter ,
-      "OpenInfraMap_Power": OpenInfraMap_Power ,
-      "OpenInfraMap_Telecom": OpenInfraMap_Telecom ,
-      "OpenInfraMap_Petroleum": OpenInfraMap_Petroleum ,
-      "OpenInfraMap_Water": OpenInfraMap_Water ,
-      "Justicemap_income": Justicemap_income,
-      "JusticeMap_americanIndian": JusticeMap_americanIndian ,
-      "JusticeMap_asian": JusticeMap_asian ,
-      "JusticeMap_black": JusticeMap_black,
-      "JusticeMap_multi": JusticeMap_multi ,
-      "JusticeMap_hispanic": JusticeMap_hispanic ,
-      "JusticeMap_nonWhite": JusticeMap_nonWhite,
-      "JusticeMap_white": JusticeMap_white ,
-      "JusticeMap_plurality": JusticeMap_plurality ,
-         "Clouds": clouds ,
-         "clouds (classic)": cloudscls ,
-         "precipitation": precipitation ,
-         "precipitation (classic)": precipitationcls , 
-         "rain": rain , 
-         "rain (classic)": raincls ,
-         "snow": snow , 
-         "pressure": pressure ,
-         "pressure contour (zoom in)": pressurecntr , 
-         "temp": temp , 
-         "wind": wind , 
-         "Cities (zoom in)": city  , 
-         "windrose (zoom in)": windrose
-    };
-    L.control.layers(baseMaps,overlayMaps).addTo(Mapknitterunique);
+  });
+  var OpenInfraMap_Petroleum = L.tileLayer('https://tiles-{s}.openinframap.org/petroleum/{z}/{x}/{y}.png', {
+    maxZoom: 18,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
+  });
+  var OpenInfraMap_Telecom = L.tileLayer('https://tiles-{s}.openinframap.org/telecoms/{z}/{x}/{y}.png', {
+    maxZoom: 18,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
+  });
+  var OpenInfraMap_Water = L.tileLayer('https://tiles-{s}.openinframap.org/water/{z}/{x}/{y}.png',{
+    maxZoom: 18,
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://www.openinframap.org/about.html">About OpenInfraMap</a>'
+  });
+
+  var Justicemap_income = L.tileLayer.provider('JusticeMap.income') ;
+  var JusticeMap_americanIndian = L.tileLayer.provider('JusticeMap.americanIndian') ;
+  var JusticeMap_asian = L.tileLayer.provider('JusticeMap.asian') ;
+  var JusticeMap_black = L.tileLayer.provider('JusticeMap.black') ;
+  var JusticeMap_multi = L.tileLayer.provider('JusticeMap.multi') ;
+  var JusticeMap_hispanic = L.tileLayer.provider('JusticeMap.hispanic') ;
+  var JusticeMap_nonWhite = L.tileLayer.provider('JusticeMap.nonWhite') ;
+  var JusticeMap_white = L.tileLayer.provider('JusticeMap.white') ;
+  var JusticeMap_plurality = L.tileLayer.provider('JusticeMap.plurality') ;
+  
+  var clouds = L.OWM.clouds({showLegend: true, opacity: 0.5});
+  var cloudscls = L.OWM.cloudsClassic({});
+  var precipitation = L.OWM.precipitation({});
+  var precipitationcls = L.OWM.precipitationClassic({});
+  var rain = L.OWM.rain({});
+  var raincls = L.OWM.rainClassic({});
+  var snow = L.OWM.snow({});
+  var pressure = L.OWM.pressure({});
+  var pressurecntr = L.OWM.pressureContour({});
+  var temp = L.OWM.temperature({});
+  var wind = L.OWM.wind({});
+
+  var city = L.OWM.current({intervall: 15, minZoom: 3});
+  var windrose = L.OWM.current({intervall: 15, minZoom: 3, markerFunction: myWindroseMarker, popup: false, clusterSize: 50,imageLoadingBgUrl: 'https://openweathermap.org/img/w0/iwind.png' });
+  windrose.on('owmlayeradd', windroseAdded, windrose); 
+
+  var baseMaps = {
+    "Baselayer1": baselayer
+  };
+  var overlayMaps = {
+    // "PurpleAirLayer-HeatMap": PurpleLayer ,
+    "PurpleAirLayer-Markers": PurpleAirMarkerLayer ,
+    "SkyTruth": SkyTruth , 
+    "Fractracker" : Fractracker ,
+    "ToxicRelease": ToxicRelease ,
+    "OdorReport": OdorReport ,
+    "MapKnitter": MapKnitter ,
+    "OpenInfraMap_Power": OpenInfraMap_Power ,
+    "OpenInfraMap_Telecom": OpenInfraMap_Telecom ,
+    "OpenInfraMap_Petroleum": OpenInfraMap_Petroleum ,
+    "OpenInfraMap_Water": OpenInfraMap_Water ,
+    "Justicemap_income": Justicemap_income,
+    "JusticeMap_americanIndian": JusticeMap_americanIndian ,
+    "JusticeMap_asian": JusticeMap_asian ,
+    "JusticeMap_black": JusticeMap_black,
+    "JusticeMap_multi": JusticeMap_multi ,
+    "JusticeMap_hispanic": JusticeMap_hispanic ,
+    "JusticeMap_nonWhite": JusticeMap_nonWhite,
+    "JusticeMap_white": JusticeMap_white ,
+    "JusticeMap_plurality": JusticeMap_plurality ,
+        "Clouds": clouds ,
+        "clouds (classic)": cloudscls ,
+        "precipitation": precipitation ,
+        "precipitation (classic)": precipitationcls , 
+        "rain": rain , 
+        "rain (classic)": raincls ,
+        "snow": snow , 
+        "pressure": pressure ,
+        "pressure contour (zoom in)": pressurecntr , 
+        "temp": temp , 
+        "wind": wind , 
+        "Cities (zoom in)": city  , 
+        "windrose (zoom in)": windrose
+  };
+  L.control.layers(baseMaps,overlayMaps).addTo(Mapknitterunique);
     
 </script>

From 81d496f61e91f212ae058d14af7a7444c584377a Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 05:37:03 -0400
Subject: [PATCH 129/152] stop precompiling assets

---
 app/views/layouts/_login.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_login.html.erb b/app/views/layouts/_login.html.erb
index 21122714b..29a85d808 100644
--- a/app/views/layouts/_login.html.erb
+++ b/app/views/layouts/_login.html.erb
@@ -20,7 +20,7 @@
   </li>
 <% end %>
 <script>
-$(function(){
-  $("#loginModal").appendTo("body");
-});
+  jQuery(document).ready(function($) {
+    $("#loginModal").appendTo("body");
+  });
 </script>

From 4cb16b0a9138d152d7d7c4ab09c09adce9a13060 Mon Sep 17 00:00:00 2001
From: sashadev-sky <sboginsky17@gmail.com>
Date: Fri, 26 Jul 2019 06:35:35 -0400
Subject: [PATCH 130/152] precompile

---
 app/assets/javascripts/application.js         |   6 +-
 app/views/front_ui/index.html.erb             |   6 +-
 config/environments/production.rb             |   2 +-
 config/initializers/assets.rb                 |   2 +-
 vendor/assets/javascripts/leaflet-fullHash.js | 200 ++++++++++++++++++
 5 files changed, 209 insertions(+), 7 deletions(-)
 create mode 100644 vendor/assets/javascripts/leaflet-fullHash.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2493b2985..baf357a01 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,6 +11,9 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 
+
+// = require leaflet/dist/leaflet-src.js
+
 // = require jquery
 // = require jquery-ujs
 // = require jquery/dist/jquery.js
@@ -25,8 +28,7 @@
 
 // = require bootstrap/dist/js/bootstrap.js
 
-// = require leaflet/dist/leaflet.js
-// = require leaflet-fullhash/leaflet-fullHash.js
+// = require leaflet-fullHash.js
 // = require leaflet-providers/leaflet-providers.js
 // = require leaflet-toolbar/dist/leaflet.toolbar.js
 //=  require leaflet-draw/dist/leaflet.draw-src.js
diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb
index 211a4869e..f2ae1bcec 100644
--- a/app/views/front_ui/index.html.erb
+++ b/app/views/front_ui/index.html.erb
@@ -2,7 +2,7 @@
 <%# # <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %> 
 <%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
 <%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
-<%# <%= javascript_include_tag('/lib/leaflet-fullhash/leaflet-fullHash.js') %> 
+<%= javascript_include_tag('leaflet-fullHash.js') %>
 
 <style>
 #hero {
@@ -205,8 +205,8 @@
   defaultLoc.lng = defaultLoc.lng || <%= params[:lng] || 'false' %>;
   defaultLoc.zoom = defaultLoc.zoom || <%= params[:z] || 'false' %>;
 
-  var Mapknitterunique = new L.Map('mapknitter-unique').setView([places[0].lat, places[0].lng], 8);
-  // var hash = new L.Hash(Mapknitterunique);
+  var Mapknitterunique = L.map('mapknitter-unique').setView([places[0].lat, places[0].lng], 8);
+  var hash = new L.Hash(Mapknitterunique);
 
   var MapKnitter = L.layerGroup.mapKnitterLayer().addTo(Mapknitterunique);
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0babfc4e3..b2954b4f8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,7 +37,7 @@
   config.assets.digest = true
 
   config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
-  config.assets.precompile += []
+  config.assets.precompile += ['leaflet-fullHash.js']
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 517d648c7..b20c1745e 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -10,5 +10,5 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += []
+Rails.application.config.assets.precompile += ['leaflet-fullHash.js']
                                                
diff --git a/vendor/assets/javascripts/leaflet-fullHash.js b/vendor/assets/javascripts/leaflet-fullHash.js
new file mode 100644
index 000000000..75d8d1c1b
--- /dev/null
+++ b/vendor/assets/javascripts/leaflet-fullHash.js
@@ -0,0 +1,200 @@
+(function(window) {
+	var HAS_HASHCHANGE = (function() {
+		var doc_mode = window.documentMode;
+		return ('onhashchange' in window) &&
+			(doc_mode === undefined || doc_mode > 7);
+	})();
+
+	L.Hash = function(map, options) {
+		this.onHashChange = L.Util.bind(this.onHashChange, this);
+
+		if (map) {
+			this.init(map, options);
+		}
+	};
+
+	L.Hash.parseHash = function(hash) {
+		if(hash.indexOf('#') === 0) {
+			hash = hash.substr(1);
+		}
+		var args = hash.split("/");
+		if (args.length == 4) {
+			var zoom = parseInt(args[0], 10),
+			lat = parseFloat(args[1]),
+			lon = parseFloat(args[2]),
+			layers = (args[3]).split("-");
+			if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) {
+				return false;
+			} else {
+				return {
+					center: new L.LatLng(lat, lon),
+					zoom: zoom,
+					layers: layers
+				};
+			}
+		} else {
+			return false;
+		}
+	};
+
+	L.Hash.formatHash = function(map) {
+		var center = map.getCenter(),
+		    zoom = map.getZoom(),
+		    precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)),
+		    layers = [];
+
+		//console.log(this.options);
+		var options = this.options;
+		//Check active layers
+		for(var key in options) {
+			if (options.hasOwnProperty(key)) {
+				if (map.hasLayer(options[key])) {
+					layers.push(key);
+				};
+			};
+		};
+
+		return "#" + [zoom,
+			center.lat.toFixed(precision),
+			center.lng.toFixed(precision),
+			layers.join("-")
+		].join("/");
+	},
+
+	L.Hash.prototype = {
+		map: null,
+		lastHash: null,
+
+		parseHash: L.Hash.parseHash,
+		formatHash: L.Hash.formatHash,
+
+		init: function(map, options) {
+			this.map = map;
+			L.Util.setOptions(this, options);
+
+			// reset the hash
+			this.lastHash = null;
+			this.onHashChange();
+
+			if (!this.isListening) {
+				this.startListening();
+			}
+		},
+
+		removeFrom: function(map) {
+			if (this.changeTimeout) {
+				clearTimeout(this.changeTimeout);
+			}
+
+			if (this.isListening) {
+				this.stopListening();
+			}
+
+			this.map = null;
+		},
+
+		onMapMove: function() {
+			// bail if we're moving the map (updating from a hash),
+			// or if the map is not yet loaded
+
+			if (this.movingMap || !this.map._loaded) {
+				return false;
+			}
+
+			var hash = this.formatHash(this.map);
+			if (this.lastHash != hash) {
+				location.replace(hash);
+				this.lastHash = hash;
+			}
+		},
+
+		movingMap: false,
+		update: function() {
+			var hash = location.hash;
+			if (hash === this.lastHash) {
+				return;
+			}
+			var parsed = this.parseHash(hash);
+			if (parsed) {
+				this.movingMap = true;
+
+				this.map.setView(parsed.center, parsed.zoom);
+				var layers = parsed.layers,
+					options = this.options,
+					that = this;
+				//Add/remove layers
+				this.map.eachLayer(function(layer) {
+					that.map.removeLayer(layer);
+				});
+
+				layers.forEach(function(element, index, array) {
+					//console.log(options[element]);
+					that.map.addLayer(options[element]);
+				});			
+
+				this.movingMap = false;
+			} else {
+				this.onMapMove(this.map);
+			}
+		},
+
+		// defer hash change updates every 100ms
+		changeDefer: 100,
+		changeTimeout: null,
+		onHashChange: function() {
+			// throttle calls to update() so that they only happen every
+			// `changeDefer` ms
+			if (!this.changeTimeout) {
+				var that = this;
+				this.changeTimeout = setTimeout(function() {
+					that.update();
+					that.changeTimeout = null;
+				}, this.changeDefer);
+			}
+		},
+
+		isListening: false,
+		hashChangeInterval: null,
+		startListening: function() {
+			this.map.on("moveend layeradd layerremove", this.onMapMove, this);
+
+			if (HAS_HASHCHANGE) {
+				L.DomEvent.addListener(window, "hashchange", this.onHashChange);
+			} else {
+				clearInterval(this.hashChangeInterval);
+				this.hashChangeInterval = setInterval(this.onHashChange, 50);
+			}
+			this.isListening = true;
+		},
+
+		stopListening: function() {
+			this.map.off("moveend layeradd layerremove", this.onMapMove, this);
+
+			if (HAS_HASHCHANGE) {
+				L.DomEvent.removeListener(window, "hashchange", this.onHashChange);
+			} else {
+				clearInterval(this.hashChangeInterval);
+			}
+			this.isListening = false;
+		},
+
+		_keyByValue: function(obj, value) {
+			for(var key in obj) {
+				if (obj.hasOwnProperty(key)) {
+					if (obj[key] === value) {
+						return key;
+					} else { return null; };
+				};
+			};
+		}
+	};
+	L.hash = function(map, options) {
+		return new L.Hash(map, options);
+	};
+	L.Map.prototype.addHash = function() {
+		this._hash = L.hash(this, this.options);
+	};
+	L.Map.prototype.removeHash = function() {
+		this._hash.removeFrom();
+	};
+})(window);

From ccafe26d44b570ca39d6256ef3f448ac24b0c95f Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 26 Jul 2019 17:51:50 -0300
Subject: [PATCH 131/152] Using correct Yarn, NPM and Node version, avoiding
 mismatch

---
 .gitignore   |  4 +++-
 .travis.yml  |  9 ++++++++
 .yarnrc      |  2 +-
 package.json |  9 +++++---
 yarn.lock    | 58 ++++++++++++++++++++++++++++++----------------------
 5 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8a036c5b..ca0638748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,6 @@ coverage_report/
 test/reports/
 yarn-error.log
 yarn.lock
-.idea/
\ No newline at end of file
+.idea/
+passenger.3000.pid
+passenger.3000.pid.lock
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a99cc8c70..844f206c0 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ language: ruby
 rvm:
   - 2.4.6
 
+node_js:
+  - "12.6.0"
+
 services:
   - mysql
   - docker
@@ -12,12 +15,18 @@ cache:
    - $PWD/public/lib/
    - $PWD/vendor/.bundle/
 
+before_install:
+  - npm i -g npm@6.9.0
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.17.3
+  - export PATH="$HOME/.yarn/bin:$PATH"
+
 install:
   - cp config/database.yml.example config/database.yml
   - cp config/config.yml.example config/config.yml
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle check --path vendor/.bundle/ || bundle install --path vendor/.bundle/
+  - yarn add mkdirp q --install.modules-folder "./public/lib"
   - yarn check || yarn install
   - if [ $RAILS_ENV == 'production' ]; then
       mysql -e "CREATE DATABASE mapknitter;";
diff --git a/.yarnrc b/.yarnrc
index 8a5f0bbba..9e5aa2822 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1 +1 @@
- --install.modules-folder "./public/lib"
+--install.modules-folder "./public/lib"
diff --git a/package.json b/package.json
index 614012e5a..9221285de 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "author": "Public Lab contributors <web@publiclab.org>",
   "license": "MIT",
   "dependencies": {
+    "mkdirp": "0.5.1",
+    "q": "1.5.1",
     "blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
     "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.22.1",
     "blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
@@ -13,8 +15,11 @@
     "bootstrap": "twbs/bootstrap#^4.3.1",
     "cartagen": "jywarren/cartagen#*",
     "components-jqueryui": "components/jqueryui#^1.12.1",
+    "decompress-zip": "0.2.1",
     "exif-js": "jseidelin/exif-js#*",
     "glfx-js": "jywarren/glfx.js#*",
+    "graceful-fs": "4.1.0",
+    "graceful-js": "1.0.0",
     "image-sequencer": "publiclab/image-sequencer#~1.4.0",
     "ion-rangeslider": "ionDen/ion.rangeslider#~2.3.0",
     "jquery": "jquery/jquery-dist#^3.4.1",
@@ -38,9 +43,7 @@
     "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.3",
     "sparklines": "mariusGundersen/sparkline#~1.2.0",
     "spin.js": "fgnass/spin.js#^2.3.1",
-    "webgl-distort": "jywarren/webgl-distort#*",
-    "decompress-zip": "^0.2.1",
-    "mkdirp": "^0.5.0"
+    "webgl-distort": "jywarren/webgl-distort#*"
   },
   "engines": {
     "yarn": ">= 1.0.0"
diff --git a/yarn.lock b/yarn.lock
index 0f788bb5b..78ed64228 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,9 +23,9 @@
     utilise "^2.3.5"
 
 "@fortawesome/fontawesome-free@^5.9.0":
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.9.0.tgz#1aa5c59efb1b8c6eb6277d1e3e8c8f31998b8c8e"
-  integrity sha512-g795BBEzM/Hq2SYNPm/NQTIp3IWd4eXSH0ds87Na2jnrAUFX3wkyZAI4Gwj9DOaWMuz2/01i8oWI7P7T/XLkhg==
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.10.0.tgz#dbfb34093c87c9516f03ee1db3385adae3ae9461"
+  integrity sha512-XX16koDMY/tkJmec0VFfKF7RYZOze/203B1iyLnRaAySm3ZPhKaeyIpf73Yh8xhrMk3Fj4TeH3FC01qyFTyg8g==
 
 "@types/node@^8.0.7", "@types/node@^8.10.50":
   version "8.10.51"
@@ -1514,10 +1514,10 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-decompress-zip@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decompress-zip/-/decompress-zip-0.2.2.tgz#f03eaa719914868d7f5ccbdfb36930cc98cfb260"
-  integrity sha512-v+Na3Ck86Px7s2ix+f77pMQC3GlkxHHN+YyvnkEW7+xX5F39pcDpIV/VFvGYk8MznTFcMoPjL3XNWEJLXWoSPw==
+decompress-zip@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/decompress-zip/-/decompress-zip-0.2.1.tgz#5c2a2d06136f26ebb458453c2efb2ead8b593fed"
+  integrity sha1-XCotBhNvJuu0WEU8LvsurYtZP+0=
   dependencies:
     binary "^0.3.0"
     graceful-fs "^4.1.3"
@@ -2532,11 +2532,21 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+graceful-fs@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.0.tgz#6be6119244f64d6417fe303cc36ab497b5756cc1"
+  integrity sha1-a+YRkkT2TWQX/jA8w2q0l7V1bME=
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
   integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
 
+graceful-js@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/graceful-js/-/graceful-js-1.0.0.tgz#c71628e75055ab5f2ddca2851451ce93eb26194e"
+  integrity sha1-xxYo51BVq18t3KKFFFHOk+smGU4=
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -2827,7 +2837,7 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
     fisheyegl "^0.1.2"
     font-awesome "~4.5.0"
     get-pixels "~3.3.0"
-    imgareaselect "https://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
+    imgareaselect "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2"
     jquery "~2"
     jsqr "^0.2.2"
     lodash "^4.17.5"
@@ -2838,9 +2848,9 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
     save-pixels "~2.3.4"
     urify "^2.1.0"
 
-"imgareaselect@https://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
+"imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
   version "0.9.11-rc.1"
-  resolved "https://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
+  resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
 
 indexof@0.0.1:
   version "0.0.1"
@@ -3338,9 +3348,9 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-"leaflet-blurred-location@https://github.com/publiclab/leaflet-blurred-location#main":
+"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
   version "1.3.0"
-  resolved "https://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
+  resolved "git://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
   dependencies:
     haversine-distance "^1.1.4"
     jquery "^3.2.1"
@@ -3351,9 +3361,9 @@ leaflet-dist@vperron/leaflet-dist#0.7.x:
   resolved "https://codeload.github.com/vperron/leaflet-dist/tar.gz/2ec7a0846eaecdce1321d92b3c45c74f4fd08dd3"
 
 leaflet-distortableimage@^0.6.3:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/leaflet-distortableimage/-/leaflet-distortableimage-0.6.5.tgz#747c0aea4fa75b942224c7457db6bbd46beabda9"
-  integrity sha512-hVDrJXQ12GDHGFM8+PyhQ6psfaFoEgKgX/14Myj3Mc2EBVumnPGRV0n5aJRPxNLgNaMXuQV6F8pQTR4K4gX7FQ==
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/leaflet-distortableimage/-/leaflet-distortableimage-0.6.6.tgz#f09fe4b080b8051a64dc83d4c7b47ea5d77c4737"
+  integrity sha512-riffjjRGOe17O5SnPNxSuTv86bQXYAGEE57kZnYntgPdeWqu1oteA5MBLyBlIJFykhRRUvjw/KPKYG5/WEPlvA==
   dependencies:
     grunt-cli "^1.2.0"
     leaflet-toolbar "0.4.0-alpha.2"
@@ -3373,7 +3383,7 @@ leaflet-environmental-layers@^1.3.6:
   dependencies:
     jquery "^3.3.1"
     leaflet "^1.3.1"
-    leaflet-blurred-location "https://github.com/publiclab/leaflet-blurred-location#main"
+    leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location#main"
     leaflet-fullhash "github:sagarpreet-chadha/leaflet-fullHash"
     leaflet-heatmap "1.0.0"
     leaflet-providers "^1.1.17"
@@ -3441,7 +3451,7 @@ leaflet.blurred-location-display@^1.1.0:
   integrity sha512-l7vtPdwGbo6Xqeds37DstKNMANiI8g7EUvKrQ34CcBebyz1GcBBnWGn2wq44uqWxvKgt3okZDWdm4i6tWwjKpQ==
   dependencies:
     jquery "^3.3.1"
-    leaflet-blurred-location "https://github.com/publiclab/leaflet-blurred-location#main"
+    leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location#main"
 
 leaflet@*, leaflet@Leaflet/Leaflet#^1.0.0, leaflet@^1.3.1, leaflet@^1.3.3:
   version "1.5.1"
@@ -3944,9 +3954,9 @@ next-tick@^1.0.0:
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 ngrok@*:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ngrok/-/ngrok-3.2.3.tgz#847f62a8bb79e218815bb94bbb4790be8d47c161"
-  integrity sha512-p32VJznacM5O5oAEu8VnIoRpBl7NSodMQuZVHNwvzudBI5IXC1a37kCtgleIBjPft1gqd1jtgSRBEuZ6RPSRMA==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ngrok/-/ngrok-3.2.4.tgz#1844d8746f1e9813b6fc08d4d5db0be1c61061a6"
+  integrity sha512-+Ay8Gi4a9zipVNsNEomT/Q9gKw8QxBaq9q7fWokqMt0yxbmMrdmIvMMRGnKuZfafEZxnpHR+/CbS+dyNqdU5gQ==
   dependencies:
     "@types/node" "^8.10.50"
     decompress-zip "^0.3.2"
@@ -4598,7 +4608,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-q@^1.1.2, q@^1.5.1:
+q@1.5.1, q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -4772,9 +4782,9 @@ readdirp@^3.1.1:
     picomatch "^2.0.4"
 
 readline-sync@^1.4.7:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
-  integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
+  integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
 
 rechoir@^0.6.2:
   version "0.6.2"

From b80b31502d74d89ad21ba162ca8fb37b07d8ae19 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 29 Jul 2019 16:15:20 -0300
Subject: [PATCH 132/152] Removing unwanted tags.js invocation

---
 .travis.yml                            | 5 +++--
 .yarnrc                                | 2 +-
 app/controllers/front_ui_controller.rb | 3 ++-
 app/views/maps/show.html.erb           | 1 -
 config/application.rb                  | 1 -
 config/initializers/assets.rb          | 3 +--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 844f206c0..4b4761d02 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,9 @@ install:
   - cp db/schema.rb.example db/schema.rb
   - ./lib/exporter-deps.sh > /dev/null 2>&1
   - bundle check --path vendor/.bundle/ || bundle install --path vendor/.bundle/
-  - yarn add mkdirp q --install.modules-folder "./public/lib"
-  - yarn check || yarn install
+  - if [ $RAILS_ENV != 'production' ]; then
+      yarn check || yarn install;
+    fi
   - if [ $RAILS_ENV == 'production' ]; then
       mysql -e "CREATE DATABASE mapknitter;";
       mysql -e "CREATE USER 'mapknitter'@'%' IDENTIFIED BY 'mapknitter';";
diff --git a/.yarnrc b/.yarnrc
index 9e5aa2822..1698e7063 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1 +1 @@
---install.modules-folder "./public/lib"
+--modules-folder public/lib/
diff --git a/app/controllers/front_ui_controller.rb b/app/controllers/front_ui_controller.rb
index 7582c8f93..4c68f927b 100644
--- a/app/controllers/front_ui_controller.rb
+++ b/app/controllers/front_ui_controller.rb
@@ -8,7 +8,8 @@ def index
     @maps = Map.new_maps.first(4)
     @unpaginated = true
     # TODO: these could use optimization but are better than prev:
-    @mappers = if Tag.where(name: 'featured').first
+    tag = Tag.where(name: 'featured').first
+    @mappers = if tag
                  User.where(login: tag.maps.collect(&:author))
                else
                  []
diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb
index 1fa6151f5..a4b0f4c45 100644
--- a/app/views/maps/show.html.erb
+++ b/app/views/maps/show.html.erb
@@ -61,7 +61,6 @@
     <%= render :partial => "comments/new" %>
   </div>
 
-  <%= javascript_include_tag 'tags' %>
 <% end %>
 
 <% content_for :images do %>
diff --git a/config/application.rb b/config/application.rb
index 8e8c228aa..30eb5662d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -47,7 +47,6 @@ class Application < Rails::Application
     config.action_dispatch.default_headers['X-Frame-Options'] = "ALLOW-FROM https://publiclab.org"
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.3'
     config.assets.paths << Rails.root.join("public","lib")
   end
 end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index aadb9467e..9ecac2298 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -2,7 +2,7 @@
 
 Rails.application.configure do
     # Version of your assets, change this if you want to expire all your assets.
-    config.assets.version = '1.0'
+    config.assets.version = '1.3'
     config.assets.precompile += %w[*.png *.jpg *.jpeg *.gif]
 
     # Add additional assets to the asset load path.
@@ -18,7 +18,6 @@
                                'maps.js',
                                'leaflet-fullHash.js']
 
-
     # Precompile additional assets.
     # application.js, application.css, and all non-JS/CSS in the app/assets
     # folder are already added.

From 2d12491f20e4d70ff76c092b2c635e5d410924b4 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Mon, 29 Jul 2019 21:18:41 -0300
Subject: [PATCH 133/152] Improving Makefile recipe

---
 Makefile  | 17 +++++++++--------
 yarn.lock |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 7be3086f7..cb85f9c30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,12 @@
 export COMPOSE_HTTP_TIMEOUT=360
 
+define wait_for_container
+	@while ! docker logs mapknitter | grep "web server started"; do\
+		echo "Serving Mapknitter";\
+		sleep 10;\
+	done;
+endef
+
 build:
 	cp config/database.yml.example config/database.yml
 	cp config/amazon_s3.yml.example config/amazon_s3.yml
@@ -9,18 +16,12 @@ build:
 
 deploy-container:
 	docker-compose up -d
-	while ! docker logs mapknitter | grep "web server started"; do\
-		echo "Serving Mapknitter";\
-		sleep 10;\
-	done;
+	$(call wait_for_container)
 
 redeploy-container:
 	docker-compose down --remove-orphans
 	docker-compose up --force-recreate -d
-	while ! docker logs mapknitter | grep "web server started"; do\
-		echo "Serving Mapknitter";\
-		sleep 10;\
-	done;
+	$(call wait_for_container)
 	docker exec -e DISABLE_DATABASE_ENVIRONMENT_CHECK=1 mapknitter bash -lc \
 												"bundle exec rails db:drop && \
 												 bundle exec rails db:create && \
diff --git a/yarn.lock b/yarn.lock
index 1459bf7ed..baf761cc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1196,9 +1196,9 @@ image-sequencer@publiclab/image-sequencer#~1.4.0:
     save-pixels "~2.3.4"
     urify "^2.1.0"
 
-"imgareaselect@git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
+"imgareaselect@https://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2":
   version "0.9.11-rc.1"
-  resolved "git://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
+  resolved "https://github.com/jywarren/imgareaselect.git#db8ae869ca0fcb289252678cebd17d6f40711f61"
 
 inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
@@ -1475,9 +1475,9 @@ lazy-cache@^1.0.3:
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
-"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
+"leaflet-blurred-location@https://github.com/publiclab/leaflet-blurred-location#main":
   version "1.3.0"
-  resolved "git://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
+  resolved "https://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
   dependencies:
     haversine-distance "^1.1.4"
     jquery "^3.2.1"

From 552fc70e6d4292ba89a6aff67af1b5fec08c73bf Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 00:19:52 -0300
Subject: [PATCH 134/152] Using node_modules/ as dependencies folder, since
 https://github.com/sass/node-sass/issues/2050#issuecomment-317233552

---
 .bowerrc                      | 3 ---
 .gitignore                    | 3 +--
 .travis.yml                   | 2 +-
 .yarnrc                       | 1 -
 config/initializers/assets.rb | 2 +-
 docker-compose.yml            | 2 +-
 package.json                  | 2 --
 7 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 .bowerrc
 delete mode 100644 .yarnrc

diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 5ad6204a4..000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"directory": "./public/lib"
-}
diff --git a/.gitignore b/.gitignore
index ca0638748..105178bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,7 @@ vendor/bundle
 app/assets/bower_components
 app/assets/node_modules
 public/assets
-public/lib
-node_modules
+node_modules/
 todo.txt
 .sass-cache
 .byebug_history
diff --git a/.travis.yml b/.travis.yml
index 4b4761d02..5d0f87b46 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ services:
 
 cache:
   directories:
-   - $PWD/public/lib/
+   - $PWD/node_modules/
    - $PWD/vendor/.bundle/
 
 before_install:
diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 1698e7063..000000000
--- a/.yarnrc
+++ /dev/null
@@ -1 +0,0 @@
---modules-folder public/lib/
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 9ecac2298..d6ce8915f 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -8,7 +8,7 @@
     # Add additional assets to the asset load path.
     # Rails.application.config.assets.paths << Emoji.images_path
     # Add Yarn node_modules folder to the asset load path.
-    config.assets.paths << Rails.root.join('public/lib')
+    config.assets.paths << Rails.root.join('node_modules')
 
     config.assets.precompile << /\.(?:svg|eot|woff|ttf)\z/
     config.assets.precompile += ['tags.js',
diff --git a/docker-compose.yml b/docker-compose.yml
index e11ed81ba..c241b1ef1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     volumes:
       - .:/app
       - bundle_cache:/usr/local/bundle
-      - yarn_cache:/app/public/lib
+      - yarn_cache:/app/node_modules/
     ports:
       - $PORT:3000
     depends_on:
diff --git a/package.json b/package.json
index f20e471f4..62a55b297 100644
--- a/package.json
+++ b/package.json
@@ -35,12 +35,10 @@
     "leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
     "leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
     "leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
-    "mkdirp": "0.5.1",
     "modalbox": "okonet/modalbox#*",
     "ol2": "openlayers/ol2#release-2.13.1",
     "popper": "^1.0.1",
     "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.3",
-    "q": "1.5.1",
     "sparklines": "mariusGundersen/sparkline#~1.2.0",
     "spin.js": "fgnass/spin.js#^2.3.1",
     "webgl-distort": "jywarren/webgl-distort#*"

From 2773d0e6707a2c644c55b2c6fbef974ba9f8ffee Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 00:20:07 -0300
Subject: [PATCH 135/152] Upgrading Yarn dependencies

---
 .rubocop.yml | 1 +
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 9d1f9dc76..7312570cd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,6 +13,7 @@ AllCops:
     - '/config.ru'
   Exclude:
     - 'vendor/*'
+    - 'node_modules/**/*'
     - 'spec/**/*'
     - 'bin/*'
     - 'doc/*'
diff --git a/yarn.lock b/yarn.lock
index e4b3a118f..8027feb8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4613,7 +4613,7 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-q@1.5.1, q@^1.1.2, q@^1.5.1:
+q@^1.1.2, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=

From 15369b4116ca709c5db1514ed8f38ec6b245dd74 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 01:03:26 -0300
Subject: [PATCH 136/152] Removing duplicate rubocop directive

---
 .codeclimate.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 7922fef22..c5bc964da 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -17,8 +17,6 @@ plugins:
     enabled: true
   fixme:
     enabled: true
-  rubocop:
-    enabled: true
 
 exclude_patterns:
 - config/

From 41a0c3e0e0b701ef119f89a34280d5bd694d6ae6 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 09:35:52 -0300
Subject: [PATCH 137/152] Removing test/ from codeclimate checks

---
 .codeclimate.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index c5bc964da..e5b31b3e7 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -24,5 +24,6 @@ exclude_patterns:
 - vendor/
 - log/
 - bin/
+- test/
 
 

From 4d2c9474445ba72927bb99884cf936877ee2403e Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 09:44:33 -0300
Subject: [PATCH 138/152] Removing fixed FIXME comments

---
 app/models/annotation.rb | 2 --
 app/models/user.rb       | 3 +--
 app/models/warpable.rb   | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index cba78ff2b..0ee80760f 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,6 +1,4 @@
 class Annotation < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
   belongs_to :map, optional: true
   belongs_to :user, optional: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d40a02ca0..6dd1352b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,8 +16,7 @@ class User < ApplicationRecord
   validates_length_of       :email, within: 6..100 # r@a.wk
   validates_uniqueness_of   :email
 
-  # HACK: HACK HACK -- how to do attr_accessor from here?
-  # prevents a user from submitting a crafted form that bypasses activation
+  # Prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 9c255baa2..fef962645 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,7 +1,4 @@
 class Warpable < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
-  # attr_accessible :image
 
   attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation

From 0970e84d07ab9cdaeeb444c22477225333853c29 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 09:44:33 -0300
Subject: [PATCH 139/152] Removing fixed FIXME comments

---
 app/models/annotation.rb | 2 --
 app/models/user.rb       | 3 +--
 app/models/warpable.rb   | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index cba78ff2b..0ee80760f 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -1,6 +1,4 @@
 class Annotation < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
   belongs_to :map, optional: true
   belongs_to :user, optional: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d40a02ca0..6dd1352b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,8 +16,7 @@ class User < ApplicationRecord
   validates_length_of       :email, within: 6..100 # r@a.wk
   validates_uniqueness_of   :email
 
-  # HACK: HACK HACK -- how to do attr_accessor from here?
-  # prevents a user from submitting a crafted form that bypasses activation
+  # Prevents a user from submitting a crafted form that bypasses activation
   # anything else you want your user to change should be added here.
 
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
diff --git a/app/models/warpable.rb b/app/models/warpable.rb
index 9c255baa2..66c1dd55e 100755
--- a/app/models/warpable.rb
+++ b/app/models/warpable.rb
@@ -1,8 +1,4 @@
 class Warpable < ApplicationRecord
-  # FIXME: - We should start using strong parameters here in favor of this below
-  # include ActiveModel::MassAssignmentSecurity
-  # attr_accessible :image
-
   attr_accessor :image
   attr_accessor :src, :srcmedium # for json generation
 

From 2211dc41902d8ea77f9300861c1c48f441a51956 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 30 Jul 2019 10:18:36 -0300
Subject: [PATCH 140/152] Updating docs in README

---
 .simplecov |  1 +
 README.md  | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.simplecov b/.simplecov
index 78a8a5dbd..8e319c72c 100644
--- a/.simplecov
+++ b/.simplecov
@@ -10,4 +10,5 @@ SimpleCov.start 'rails' do
   add_filter '/vendor/'
   add_filter '/log/'
   add_filter '/tmp/'
+  add_filter '/node_modules/'
 end
diff --git a/README.md b/README.md
index db57430a1..cf00654bb 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ You'll need Ruby v2.4.6 (use your local ruby version management system - RVM / r
 2. Install gems with `bundle install` from the rails root folder. You may need to run `bundle update` if you have older gems in your environment.
 3. Copy and configure config/database.yml from config/database.yml.example, using a new empty database you've created
 4. Copy and configure config/config.yml from config/config.yml.example (for now, this is only for the [Google Maps API Key, which is optional](http://stackoverflow.com/questions/2769148/whats-the-api-key-for-in-google-maps-api-v3), and a path for [logging in when running locally, also optional](#Logging-in-when-running-locally))
-5. Initialize database with `bundle exec rake db:setup`
+5. Initialize database with `bundle exec rails db:setup`
 6. Enter ReCaptcha public and private keys in config/initializers/recaptcha.rb, copied from recaptcha.rb.example. To get keys, visit https://www.google.com/recaptcha/admin/create
 7. Install static assets (like external javascript libraries, fonts) with `yarn install` 
 8. Start rails with `bundle exec passenger start` from the Rails root and open http://localhost:3000 in a web browser. (For some, just `passenger start` will work; adding `bundle exec` ensures you're using the version of passenger you just installed with Bundler.)
@@ -217,15 +217,11 @@ u_admin.role = 'admin'
 
 When you try to run tests in MapKnitter, you can run the default Rake tasks, such as:
 
-`rake test:units` `rake test:functionals` `rake test:integration`
+`rails test:unit` `rails test:controllers` `rails test:integration`
 
 or simply:
 
-`rake test`
-
-By running like this you'll see a lot of warnings and deprecation notices - FOR NOW -, but we're working on them. If you'd like a cleaner visual of your tests, you can just use our custom defined task:
-
-`rake test:all`
+`rails test`
 
 #### Running tests of a specific file:
 

From ca0c2fc7d3395a1b7700c8d4a67c28adda180b01 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Fri, 2 Aug 2019 11:37:15 -0300
Subject: [PATCH 141/152] Bumping recaptcha and include methods

---
 Gemfile                                  | 2 +-
 Gemfile.lock                             | 6 +++---
 config/initializers/recaptcha.rb.example | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index f8f9c3ab3..1e6127ee5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ group :dependencies do
   gem 'mysql2', '< 0.6'
   gem 'geokit-rails', '1.1.4'
   gem 'image_science', '1.3.0'
-  gem 'recaptcha', '~> 4.14.0', require: 'recaptcha/rails'
+  gem 'recaptcha', '~> 5.0.0', require: 'recaptcha/rails'
   gem 'oa-openid', '0.3.2'
   gem 'ruby-openid', '~>2.5'
   gem 'open_id_authentication'
diff --git a/Gemfile.lock b/Gemfile.lock
index a99f09bec..c2af24df3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    recaptcha (4.14.0)
+    recaptcha (5.0.0)
       json
     redcarpet (3.5.0)
     right_aws_api (0.3.5)
@@ -228,7 +228,7 @@ GEM
     ruby-openid (2.7.0)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
-    ruby-prof (0.18.0)
+    ruby-prof (1.0.0)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
     sass (3.7.4)
@@ -330,7 +330,7 @@ DEPENDENCIES
   rails-perftest
   rake (~> 12.3.2)
   rdiscount (= 2.2.0.1)
-  recaptcha (~> 4.14.0)
+  recaptcha (~> 5.0.0)
   right_aws_api (~> 0.3.5)
   rubocop (~> 0.70.0)
   rubocop-performance
diff --git a/config/initializers/recaptcha.rb.example b/config/initializers/recaptcha.rb.example
index 25a35c4e6..0ecc96d34 100644
--- a/config/initializers/recaptcha.rb.example
+++ b/config/initializers/recaptcha.rb.example
@@ -1,7 +1,8 @@
 require "recaptcha/rails"
 
 class ActionView::Base 
-  include Recaptcha::ClientHelper 
+  include Recaptcha::Adapters::ViewMethods
+  include Recaptcha::Adapters::ControllerMethods
 end 
 
 Recaptcha.configure do |config|

From 74b75ca2cccb2ac865541ce900c182de9abdc73c Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 6 Aug 2019 15:51:34 -0300
Subject: [PATCH 142/152] Fixing migration version

---
 db/migrate/20190715092943_create_versions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20190715092943_create_versions.rb b/db/migrate/20190715092943_create_versions.rb
index bfffb7c68..334e1c360 100644
--- a/db/migrate/20190715092943_create_versions.rb
+++ b/db/migrate/20190715092943_create_versions.rb
@@ -1,6 +1,6 @@
 # This migration creates the `versions` table, the only schema PT requires.
 # All other migrations PT provides are optional.
-class CreateVersions < ActiveRecord::Migration
+class CreateVersions < ActiveRecord::Migration[5.2]
 
   # The largest text column available in all supported RDBMS is
   # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size

From 0148e7a3fdc8daf6019d725a58497005c3ffaffd Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 6 Aug 2019 16:08:51 -0300
Subject: [PATCH 143/152] Using strong params in requests

---
 test/controllers/images_controller_test.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/controllers/images_controller_test.rb b/test/controllers/images_controller_test.rb
index bf0628f5a..99ef9c2c8 100644
--- a/test/controllers/images_controller_test.rb
+++ b/test/controllers/images_controller_test.rb
@@ -83,7 +83,7 @@ def fetch_in_production
   test 'creates version after image creation' do
     session[:user_id] = 1
     assert_difference 'PaperTrail::Version.count', 1 do
-      post :create, map_id: @map.slug, uploaded_data: @uploaded_data
+      post :create, params: { map_id: @map.slug, uploaded_data: @uploaded_data }
     end
     warp = Warpable.last
     assert warp.versions.present?
@@ -94,7 +94,7 @@ def fetch_in_production
     session[:user_id] = 1
 
     assert_difference 'PaperTrail::Version.count', 1 do
-      patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points
+      patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points }
     end
     assert_response :success
     assert @warp.versions.present?
@@ -106,12 +106,12 @@ def fetch_in_production
     points1 = "-72.39,41.83:-72.39,41.83:-72.39,41.83:-72.39,41.84"
     points2 = "-72.39,40.83:-72.39,41.83:-72.39,41.83:-71.39,45.84"
 
-    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points1
+    patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points1 }
     @warp.reload
     nodes_latest = @warp.nodes
-    patch :update, id: @map.id, warpable_id: @warp.id, locked: false, points: points2
+    patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points2 }
     assert_difference 'PaperTrail::Version.count', 1 do
-      get :revert, id: @warp.id, version: @warp.versions.last
+      get :revert, params: { id: @warp.id, version: @warp.versions.last }
     end
     @warp.reload
     assert_equal(nodes_latest, @warp.nodes)

From 6b591032a14ec7d85801f7db32a413939b1fa17b Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Sat, 10 Aug 2019 14:16:20 +0530
Subject: [PATCH 144/152] Use Rack::Test::UploadedFile instead of
 ActionDispatch::Http::UploadedFile

---
 test/controllers/images_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controllers/images_controller_test.rb b/test/controllers/images_controller_test.rb
index 99ef9c2c8..042096f72 100644
--- a/test/controllers/images_controller_test.rb
+++ b/test/controllers/images_controller_test.rb
@@ -12,8 +12,8 @@ def setup
     system('cp test/fixtures/demo.png public/system/images/1/original/')
     system('mkdir -p public/warps/saugus-landfill-incinerator')
 
-    @file ||= File.open(File.expand_path(Rails.root + 'test/fixtures/demo.png', __FILE__))
-    @uploaded_data = ActionDispatch::Http::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
+    file_location = Rails.root + 'test/fixtures/demo.png'
+    @uploaded_data = Rack::Test::UploadedFile.new(file_location.to_s, 'demo.png', "image/png")
     PaperTrail.enabled = true
   end
 

From a1fe6aded261de3c7c9005ff71cca18887fde602 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 15 Aug 2019 11:18:28 +0530
Subject: [PATCH 145/152] Fix minor asset issue

---
 app/assets/javascripts/application.js | 3 +++
 app/views/front_ui/index.html.erb     | 2 --
 yarn.lock                             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 56b7822ef..31aced106 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -43,5 +43,8 @@
 //= require exif-js/exif.js
 //= require webgl-distort/dist/webgl-distort.js
 //= require mapknitter/core/Class.js
+//= leaflet-spin/example/spin/dist/spin.min.js
+//= leaflet-spin/example/leaflet.spin.min.js
+
 
 //= require_tree .
diff --git a/app/views/front_ui/index.html.erb b/app/views/front_ui/index.html.erb
index 22b2ae0b8..ea71c9c93 100644
--- a/app/views/front_ui/index.html.erb
+++ b/app/views/front_ui/index.html.erb
@@ -1,7 +1,5 @@
 <%# <%= javascript_include_tag('https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js') %>
 <%# # <%= stylesheet_link_tag "https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css" %> 
-<%= javascript_include_tag('/lib/leaflet-spin/example/spin/dist/spin.min.js') %>
-<%= javascript_include_tag('/lib/leaflet-spin/example/leaflet.spin.min.js') %>
 <%= javascript_include_tag('leaflet-fullHash.js') %>
 
 <style>
diff --git a/yarn.lock b/yarn.lock
index 620793a4e..de9cbd099 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3348,9 +3348,9 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location.git#main":
+"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
   version "1.3.0"
-  resolved "git://github.com/publiclab/leaflet-blurred-location.git#1bff37cb96518bd87192277b14c290cba3c138ba"
+  resolved "git://github.com/publiclab/leaflet-blurred-location#1bff37cb96518bd87192277b14c290cba3c138ba"
   dependencies:
     haversine-distance "^1.1.4"
     jquery "^3.2.1"

From a900b99f300c3023279d0feef785675a39fc8634 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 15 Aug 2019 11:24:30 +0530
Subject: [PATCH 146/152] Remove manual asset references and add them to
 application js

---
 app/assets/javascripts/application.js | 6 +++---
 app/views/layouts/knitter2.html.erb   | 2 --
 app/views/map/_leaflet.html.erb       | 1 -
 app/views/map/leaflet.html.erb        | 1 -
 app/views/tags/index.html.erb         | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 31aced106..1e4dfef91 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -43,8 +43,8 @@
 //= require exif-js/exif.js
 //= require webgl-distort/dist/webgl-distort.js
 //= require mapknitter/core/Class.js
-//= leaflet-spin/example/spin/dist/spin.min.js
-//= leaflet-spin/example/leaflet.spin.min.js
-
+//= require leaflet-spin/example/spin/dist/spin.min.js
+//= require leaflet-spin/example/leaflet.spin.min.js
+//= require image-sequencer/dist/image-sequencer.js
 
 //= require_tree .
diff --git a/app/views/layouts/knitter2.html.erb b/app/views/layouts/knitter2.html.erb
index 208683f2e..7f225df83 100644
--- a/app/views/layouts/knitter2.html.erb
+++ b/app/views/layouts/knitter2.html.erb
@@ -9,7 +9,6 @@
   <meta name="description" content="<%= @map.description.gsub('"',"'") if @map.description %>" />  
   <meta name="viewport" content="width=320, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
-  <link rel="stylesheet" href="/lib/leaflet/dist/leaflet.css"/>
   <link rel="shortcut icon" href="/images/mapknitter-255.png" />
 
   <%= stylesheet_link_tag 'application' %>
@@ -18,7 +17,6 @@
   <script src='//api.tiles.mapbox.com/mapbox.js/plugins/leaflet-omnivore/v0.3.1/leaflet-omnivore.min.js' async defer></script>
   <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAxlBXzYwdeaOMKZgx_UNBp2qBtdD0L_9g"></script>
   <script src='https://unpkg.com/leaflet.gridlayer.googlemutant@0.7.0/Leaflet.GoogleMutant.js'></script>
-  <script src='/lib/image-sequencer/dist/image-sequencer.js'></script>
 </head>
 <body>
 
diff --git a/app/views/map/_leaflet.html.erb b/app/views/map/_leaflet.html.erb
index da1268dd2..3ae800ef8 100644
--- a/app/views/map/_leaflet.html.erb
+++ b/app/views/map/_leaflet.html.erb
@@ -30,7 +30,6 @@
 </style>
     
 <script src="/lib/leaflet/dist/leaflet.js" type="text/javascript" charset="utf-8"></script>
-<link rel="stylesheet" href="/lib/leaflet/dist/leaflet.css" type="text/css" media="screen" title="no title" charset="utf-8">
 <script src="https://maps.google.com/maps/api/js?v=3.2&sensor=false"></script> 
 <script src="/lib/leaflet-google/index.js"></script>
 
diff --git a/app/views/map/leaflet.html.erb b/app/views/map/leaflet.html.erb
index 1440855b2..fd99a4818 100644
--- a/app/views/map/leaflet.html.erb
+++ b/app/views/map/leaflet.html.erb
@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <script src="/lib/leaflet/dist/leaflet.js"></script>
-  <link href="/lib/leaflet/dist/leaflet.css" rel="stylesheet"/>
   <script src="/lib/jquery/dist/jquery.min.js"></script>
   <script src="/lib/leaflet-distortableimage/lib/easybutton.js"></script>
   <link rel="stylesheet" href="/lib/leaflet-distortableimage/DistortableImageOverlay.css"/>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 88ca2b3d0..8afa92cfd 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,4 +1,3 @@
-<%= stylesheet_link_tag "/lib/leaflet/dist/leaflet.css" %>
 <%= stylesheet_link_tag "/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.css" %>
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js') %>
 <%= javascript_include_tag('/lib/leaflet-environmental-layers/dist/windRoseLayer.js') %>
@@ -108,4 +107,4 @@
       "MapKnitter": MapKnitter
     };
     L.control.layers(baseMaps,overlayMaps).addTo(Mapknitterunique);
-</script>
\ No newline at end of file
+</script>

From 0a18f29cb5c22c954a2909fa532520a3f350de24 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 15 Aug 2019 11:49:13 +0530
Subject: [PATCH 147/152] Fix asset ordering in application.js

---
 .gitignore                               |  3 ++-
 app/assets/javascripts/application.js    | 10 ++++++----
 app/assets/javascripts/mapknitter/Map.js |  2 --
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 105178bfb..5c03ac56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ public/warpables/*
 public/system/*
 public/warps/*
 public/tms/*
+public/lib/*
 db/schema.rb
 *.db
 config/database.yml
@@ -46,4 +47,4 @@ yarn-error.log
 yarn.lock
 .idea/
 passenger.3000.pid
-passenger.3000.pid.lock
\ No newline at end of file
+passenger.3000.pid.lock
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1e4dfef91..48102dadd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -30,10 +30,6 @@
 
 //= require leaflet-fullHash.js
 //= require leaflet-providers/leaflet-providers.js
-//= require leaflet-toolbar/dist/leaflet.toolbar.js
-//= require leaflet-draw/dist/leaflet.draw-src.js
-//= require leaflet-illustrate/dist/Leaflet.Illustrate.js
-//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
 //= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
 //= require leaflet-environmental-layers/src/windRoseLayer.js
 //= require leaflet-easybutton/src/easy-button.js
@@ -46,5 +42,11 @@
 //= require leaflet-spin/example/spin/dist/spin.min.js
 //= require leaflet-spin/example/leaflet.spin.min.js
 //= require image-sequencer/dist/image-sequencer.js
+//= require leaflet-toolbar/dist/leaflet.toolbar.js
+//= require leaflet-draw/dist/leaflet.draw-src.js
+//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
+//= require leaflet-illustrate/dist/Leaflet.Illustrate.js
+//= require leaflet-distortableimage/src/edit/tools/EditAction.js
+//= require mapknitter/Map.js
 
 //= require_tree .
diff --git a/app/assets/javascripts/mapknitter/Map.js b/app/assets/javascripts/mapknitter/Map.js
index 9d51de037..0a43a103f 100644
--- a/app/assets/javascripts/mapknitter/Map.js
+++ b/app/assets/javascripts/mapknitter/Map.js
@@ -1,5 +1,3 @@
-//= require leaflet-toolbar/dist/leaflet.toolbar.js
-//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
 
 MapKnitter.Map = MapKnitter.Class.extend({
 

From ad142c59b74364862f9c1656ca40ff1218d84264 Mon Sep 17 00:00:00 2001
From: Kaustubh Nair <kaustubh.nair108@gmail.com>
Date: Thu, 15 Aug 2019 20:48:33 +0530
Subject: [PATCH 148/152] Configure System tests  (#936)

* Add new system tests and fix minor asset loading

* modify test

* Add chromedriver to travis

* Add sudo

* Add dependencies to dockerfile

* Properly installing chrome and chromedriver
---
 .travis.yml                          |  2 ++
 Dockerfile                           | 15 ++++++++++++++-
 Gemfile                              |  3 +++
 Gemfile.lock                         | 25 +++++++++++++++++++++++++
 lib/exporter-deps.sh                 | 26 ++++++++++++++++++++++++++
 test/application_system_test_case.rb |  7 +++++++
 test/system/searches_test.rb         | 11 +++++++++++
 7 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 test/application_system_test_case.rb
 create mode 100644 test/system/searches_test.rb

diff --git a/.travis.yml b/.travis.yml
index 5d0f87b46..cee7cba88 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,6 +52,8 @@ jobs:
       script: bundle exec rails test:integration
     - name: "Controllers Tests"
       script: bundle exec rails test:controllers
+    - name: "System Tests"
+      script: bundle exec rails test:system
     - name: "Rubocop Linter"
       script: bundle exec rubocop
     - name: "Docker Builds"
diff --git a/Dockerfile b/Dockerfile
index 08a6a35ca..cbd055b5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,23 @@ RUN echo "deb http://packages.laboratoriopublico.org/publiclab/ stretch main" >
 COPY sysadmin.publiclab.key /app/sysadmin.publiclab.key
 RUN apt-key add /app/sysadmin.publiclab.key
 
-# Install dependencies
+# Install dependencies for Mapknitter
 RUN apt-get update -qq && apt-get install -y \
   nodejs gdal-bin curl procps git imagemagick python-gdal zip
 
+# Install dependencies for system tests
+RUN apt-get -y install fonts-liberation libappindicator3-1 libasound2 \
+    libatk-bridge2.0-0 libatspi2.0-0 libgtk-3-0 libnspr4 \
+    libnss3 libx11-xcb1 libxss1 libxtst6 lsb-release xdg-utils && \
+    wget https://github.com/webnicer/chrome-downloads/raw/master/x64.deb/google-chrome-stable_75.0.3770.142-1_amd64.deb \
+          -O google-chrome.deb && \
+    dpkg -i google-chrome.deb && \
+    apt-get -fy install && \
+    wget https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip && \
+    unzip chromedriver_linux64.zip && \
+    mv chromedriver /usr/local/bin/chromedriver && \
+    chmod +x /usr/local/bin/chromedriver
+
 # Configure ImageMagick
 COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
 
diff --git a/Gemfile b/Gemfile
index d2eafbf47..4b886186a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,6 +62,9 @@ group :test do
 end
 
 group :development, :test do
+  gem 'capybara'
+  gem 'puma'
+  gem 'selenium-webdriver'
   gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
   gem 'faker', '~> 1.9.3'
   gem 'pry-rails', '~> 0.3.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b09d130b..f00fe5dda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     arel (9.0.0)
     ast (2.4.0)
@@ -63,6 +65,16 @@ GEM
       sassc (>= 2.0.0)
     builder (3.2.3)
     byebug (11.0.1)
+    capybara (3.28.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (1.0.1)
+      rake (< 13.0)
     climate_control (0.2.0)
     codecov (0.1.14)
       json
@@ -166,6 +178,9 @@ GEM
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
+    public_suffix (3.1.1)
+    puma (4.1.0)
+      nio4r (~> 2.0)
     rack (2.0.7)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -210,6 +225,7 @@ GEM
     recaptcha (5.0.0)
       json
     redcarpet (3.5.0)
+    regexp_parser (1.6.0)
     request_store (1.4.1)
       rack (>= 1.4)
     right_aws_api (0.3.5)
@@ -236,6 +252,7 @@ GEM
     ruby-prof (1.0.0)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
+    rubyzip (1.2.3)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -250,6 +267,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    selenium-webdriver (3.142.3)
+      childprocess (>= 0.5, < 2.0)
+      rubyzip (~> 1.2, >= 1.2.2)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -299,6 +319,8 @@ GEM
     will_paginate (3.1.7)
     will_paginate-bootstrap4 (0.2.2)
       will_paginate (~> 3.0, >= 3.0.0)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -310,6 +332,7 @@ DEPENDENCIES
   bootsnap (~> 1.4.4)
   bootstrap-sass
   byebug (~> 11.0.1)
+  capybara
   codecov
   faker (~> 1.9.3)
   friendly_id
@@ -331,6 +354,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
+  puma
   rails (~> 5.2.3)
   rails-controller-testing
   rails-perftest
@@ -344,6 +368,7 @@ DEPENDENCIES
   ruby-prof
   sass
   sassc-rails
+  selenium-webdriver
   simplecov
   skylight
   spring
diff --git a/lib/exporter-deps.sh b/lib/exporter-deps.sh
index f65bf5969..453cecebd 100755
--- a/lib/exporter-deps.sh
+++ b/lib/exporter-deps.sh
@@ -1,5 +1,7 @@
 sudo add-apt-repository -y ppa:ubuntugis/ppa
 sudo apt-get update
+
+# Installing Mapknitter dependencies
 sudo apt-get install -y gdal-bin \
                         python3-gdal \
                         python-gdal \
@@ -14,3 +16,27 @@ sudo apt-get install -y gdal-bin \
                         ruby-dev \
                         libmagickcore-dev \
                         libmagickwand-dev
+
+# Installing system tests dependencies
+sudo apt-get install -y fonts-liberation \
+                        libappindicator3-1 \
+                        libasound2 \
+                        libatk-bridge2.0-0 \
+                        libatspi2.0-0 \
+                        libgtk-3-0 \
+                        libnspr4 \
+                        libnss3 \
+                        libx11-xcb1 \
+                        libxss1 \
+                        libxtst6 \
+                        lsb-release \
+                        xdg-utils
+
+sudo wget https://github.com/webnicer/chrome-downloads/raw/master/x64.deb/google-chrome-stable_75.0.3770.142-1_amd64.deb \
+           -O google-chrome.deb
+sudo dpkg -i google-chrome.deb
+sudo apt-get -fy install
+sudo wget https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip
+sudo unzip chromedriver_linux64.zip
+sudo mv chromedriver /usr/local/bin/chromedriver
+sudo chmod +x /usr/local/bin/chromedriver
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
new file mode 100644
index 000000000..13edbb606
--- /dev/null
+++ b/test/application_system_test_case.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  chromeOptions = %w(--headless  --disable-gpu --no-sandbox --remote-debugging-port=9222)
+  caps = Selenium::WebDriver::Remote::Capabilities.chrome("chromeOptions" => {"args" => chromeOptions})
+  driven_by :selenium, using: :chrome, screen_size: [1400, 1400], options: { desired_capabilities: caps }
+end
diff --git a/test/system/searches_test.rb b/test/system/searches_test.rb
new file mode 100644
index 000000000..77e529513
--- /dev/null
+++ b/test/system/searches_test.rb
@@ -0,0 +1,11 @@
+require 'application_system_test_case'
+
+class SearchesTest < ApplicationSystemTestCase
+    test 'visiting the index' do
+      visit '/'
+
+      fill_in('search-input', with: 'hola')
+      find('button.btn-light').click
+      assert_selector('h2', text: 'Search results for \'hola\'')
+    end
+end

From 843a7196a99d984ed8703ae6366721eebe5d5ccc Mon Sep 17 00:00:00 2001
From: Vidit <chitkara.vidit@gmail.com>
Date: Wed, 21 Aug 2019 05:34:06 +0530
Subject: [PATCH 149/152] action cable setup (#805)

* WIP action cable setup

* basic action cable setup complete

* minor change

* minor changes

* few changes

* initial working functionality complete

* Refactoring code

* Adding Foreman gem

* Scheduling Puma and Passenger servers

* WIP action cable setup

* basic action cable setup complete

* minor change

* minor changes

* few changes

* initial working functionality complete

* Refactoring code

* Adding Foreman gem

* Scheduling Puma and Passenger servers

* few minor fix

* added a few tests

* Refactoring connection module

* Using strong params in requests

* added documentation

* added more docs

* added tests

* Using puma as dependency and correct image controller

* added a few tests

* a few changes

* remove unnecessary render

* few test fixes
---
 Gemfile                                       |  8 ++-
 Gemfile.lock                                  | 15 +++--
 Procfile                                      |  2 +
 SYNCHRONOUS_EDITING.md                        | 30 +++++++++
 app/assets/javascripts/application.js         | 67 ++++++++++---------
 app/assets/javascripts/cable.js               | 11 +++
 .../channels/concurrent_editing.js            | 26 +++++++
 app/assets/javascripts/mapknitter/Map.js      | 29 ++++++++
 app/channels/application_cable/channel.rb     |  4 ++
 app/channels/application_cable/connection.rb  | 17 +++++
 app/channels/concurrent_editing_channel.rb    | 17 +++++
 app/controllers/application_controller.rb     |  4 +-
 app/controllers/images_controller.rb          |  6 +-
 app/models/map.rb                             |  6 ++
 app/views/layouts/application.html.erb        |  1 +
 config/environments/development.rb            |  3 +
 config/environments/production.rb             |  2 +
 config/puma.rb                                |  5 ++
 config/routes.rb                              |  2 +
 start.sh                                      |  2 +-
 .../concurrent_editing_channel_test.rb        | 23 +++++++
 test/channels/connection_test.rb              | 31 +++++++++
 test/fixtures/maps.yml                        |  4 +-
 test/fixtures/nodes.yml                       | 13 ++++
 test/system/synchronous_editing_test.rb       | 16 +++++
 25 files changed, 299 insertions(+), 45 deletions(-)
 create mode 100644 Procfile
 create mode 100644 SYNCHRONOUS_EDITING.md
 create mode 100644 app/assets/javascripts/cable.js
 create mode 100644 app/assets/javascripts/channels/concurrent_editing.js
 create mode 100644 app/channels/application_cable/channel.rb
 create mode 100644 app/channels/application_cable/connection.rb
 create mode 100644 app/channels/concurrent_editing_channel.rb
 create mode 100644 config/puma.rb
 create mode 100644 test/channels/concurrent_editing_channel_test.rb
 create mode 100644 test/channels/connection_test.rb
 create mode 100644 test/system/synchronous_editing_test.rb

diff --git a/Gemfile b/Gemfile
index 61ac297e1..8882cdb05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ group :dependencies do
   gem 'bootsnap', '~> 1.4.4'
   gem 'turbolinks', '~> 5'
   gem 'mini_magick', '~> 4.8'
+  gem 'puma', '~> 4.1.0'
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'
@@ -37,12 +38,15 @@ group :dependencies do
   # compiling markdown to html
   gem 'rdiscount', '2.2.0.1'
 
+  # Process manager for applications with multiple components
+  gem 'foreman', '~> 0.85.0'
+
   # asset pipelining
   gem 'bootstrap-sass'
   gem 'sassc-rails'
   gem 'jquery-rails'
   gem 'sprockets', '3.7.2'
-  gem "sprockets-rails"
+  gem 'sprockets-rails'
   gem 'sass', require: 'sass'
   gem 'autoprefixer-rails', '~> 9.5.1.1'
   gem 'uglifier', '~> 4.1.20'
@@ -65,11 +69,11 @@ end
 
 group :development, :test do
   gem 'capybara'
-  gem 'puma'
   gem 'selenium-webdriver'
   gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
   gem 'faker', '~> 2.1.2'
   gem 'pry-rails', '~> 0.3.9'
+  gem 'action-cable-testing'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f1ffa1d4..3565f59f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,6 +4,8 @@ GEM
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.2)
+    action-cable-testing (0.6.0)
+      actioncable (>= 5.0)
     actioncable (5.2.3)
       actionpack (= 5.2.3)
       nio4r (~> 2.0)
@@ -89,6 +91,8 @@ GEM
     faker (2.1.2)
       i18n (>= 0.8)
     ffi (1.11.1)
+    foreman (0.85.0)
+      thor (~> 0.19.1)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)
     geokit (1.13.1)
@@ -210,7 +214,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.1.0)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     rails-perftest (0.0.7)
     railties (5.2.3)
@@ -261,9 +265,8 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (2.0.1)
+    sassc (2.1.0)
       ffi (~> 1.9)
-      rake
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
@@ -296,7 +299,7 @@ GEM
     sqlite3 (1.4.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (0.20.3)
+    thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.9)
     turbolinks (5.2.0)
@@ -330,6 +333,7 @@ PLATFORMS
 
 DEPENDENCIES
   RubyInline (~> 3.12.4)
+  action-cable-testing
   autoprefixer-rails (~> 9.5.1.1)
   aws-sdk (~> 1.5.7)
   bootsnap (~> 1.4.4)
@@ -338,6 +342,7 @@ DEPENDENCIES
   capybara
   codecov
   faker (~> 2.1.2)
+  foreman (~> 0.85.0)
   friendly_id
   geokit-rails (= 1.1.4)
   httparty
@@ -357,7 +362,7 @@ DEPENDENCIES
   passenger
   popper_js (~> 1.11, >= 1.11.1)
   pry-rails (~> 0.3.9)
-  puma
+  puma (~> 4.1.0)
   rack_session_access
   rails (~> 5.2.3)
   rails-controller-testing
diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..841da4133
--- /dev/null
+++ b/Procfile
@@ -0,0 +1,2 @@
+passenger: passenger start
+puma: puma -C config/puma.rb
diff --git a/SYNCHRONOUS_EDITING.md b/SYNCHRONOUS_EDITING.md
new file mode 100644
index 000000000..66819275f
--- /dev/null
+++ b/SYNCHRONOUS_EDITING.md
@@ -0,0 +1,30 @@
+The new synchronous editing feature
+===================================
+
+With the introduction of ActionCable to our system, it has been possible
+to do perform real-time tasks quite easily. We have used rail's default
+action cable to make a _concurrent_editing_channel.rb_ in the _app/channels_ folder,
+to handle all the incoming requests and consists of all the business 
+logic as well. At the frontend we have, _app/javascripts/channels/concurrent_editing.js_ which
+handles the logic at the browser or the frontend.
+
+## Flow of the feature:
+
+1. When the map is updated, the _speak_ method of _concurrent_editing.js_ is called which requests 
+the _sync_ method of _concurrent_editing_channel.rb_ to broadcast the updated data to 
+the connected users.
+
+2. The broadcasted data is finally caught by the _received_ function of _app/javascripts/channels/concurrent_editing.js_
+
+3. Finally the _received_ function calls the _synchronizeData_ function to update 
+ all the fresh data on the map.
+ 
+
+## Testing: 
+
+1. The _action-cable-testing_ gem is used for the feature's testing. It has some really
+cool testing functionality which was required for our use case.
+
+2. Currently we have separate tests written for connection related features and channel 
+specific features. The relevant files are test/channels/concurrent_editing_channel_test.rb and
+test/channels/connection_test.rb
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index dc9abfe1c..d248e6b45 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,41 +12,42 @@
 //
 
 
-//= require leaflet/dist/leaflet-src.js
+// = require leaflet/dist/leaflet-src.js
 
-//= require jquery
-//= require jquery-ujs
-//= require jquery/dist/jquery.js
-//= require jquery-ujs/src/rails.js 
-//= require jquery-ui/jquery-ui.min.js
+// = require jquery
+// = require jquery-ujs
+// = require jquery/dist/jquery.js
+// = require jquery-ujs/src/rails.js 
+// = require jquery-ui/jquery-ui.min.js
 
-//= require blueimp-tmpl/js/tmpl.js
-//= require blueimp-file-upload/js/vendor/jquery.ui.widget
-//= require blueimp-file-upload/js/jquery.fileupload
-//= require blueimp-file-upload/js/jquery.fileupload-process
-//= require blueimp-file-upload/js/jquery.fileupload-ui
+// = require blueimp-tmpl/js/tmpl.js
+// = require blueimp-file-upload/js/vendor/jquery.ui.widget
+// = require blueimp-file-upload/js/jquery.fileupload
+// = require blueimp-file-upload/js/jquery.fileupload-process
+// = require blueimp-file-upload/js/jquery.fileupload-ui
 
-//= require bootstrap/dist/js/bootstrap.js
+// = require bootstrap/dist/js/bootstrap.js
 
-//= require leaflet-fullHash.js
-//= require leaflet-providers/leaflet-providers.js
-//= require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
-//= require leaflet-environmental-layers/src/windRoseLayer.js
-//= require leaflet-easybutton/src/easy-button.js
-//= require sparklines/source/sparkline.js
-//= require glfx-js/dist/glfx.js
-//= require ion-rangeslider/js/ion.rangeSlider.js
-//= require exif-js/exif.js
-//= require webgl-distort/dist/webgl-distort.js
-//= require mapknitter/core/Class.js
-//= require leaflet-spin/example/spin/dist/spin.min.js
-//= require leaflet-spin/example/leaflet.spin.min.js
-//= require image-sequencer/dist/image-sequencer.js
-//= require leaflet-toolbar/dist/leaflet.toolbar.js
-//= require leaflet-draw/dist/leaflet.draw-src.js
-//= require leaflet-distortableimage/dist/leaflet.distortableimage.js
-//= require leaflet-illustrate/dist/Leaflet.Illustrate.js
-//= require leaflet-distortableimage/src/edit/tools/EditAction.js
-//= require mapknitter/Map.js
+// = require leaflet-fullHash.js
+// = require leaflet-providers/leaflet-providers.js
+// = require leaflet-environmental-layers/dist/LeafletEnvironmentalLayers.js
+// = require leaflet-environmental-layers/src/windRoseLayer.js
+// = require leaflet-easybutton/src/easy-button.js
+// = require sparklines/source/sparkline.js
+// = require glfx-js/dist/glfx.js
+// = require ion-rangeslider/js/ion.rangeSlider.js
+// = require exif-js/exif.js
+// = require webgl-distort/dist/webgl-distort.js
+// = require mapknitter/core/Class.js
+// = require leaflet-spin/example/spin/dist/spin.min.js
+// = require leaflet-spin/example/leaflet.spin.min.js
+// = require image-sequencer/dist/image-sequencer.js
+// = require leaflet-toolbar/dist/leaflet.toolbar.js
+// = require leaflet-draw/dist/leaflet.draw-src.js
+// = require leaflet-illustrate/dist/Leaflet.Illustrate.js
+// = require leaflet-distortableimage/dist/leaflet.distortableimage.js
+// = require leaflet-distortableimage/src/edit/tools/EditAction.js
+// = require mapknitter/Map.js
+// = require cable.js
 
-//= require_tree .
+// = require_tree .
diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
new file mode 100644
index 000000000..f613e17f5
--- /dev/null
+++ b/app/assets/javascripts/cable.js
@@ -0,0 +1,11 @@
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);
diff --git a/app/assets/javascripts/channels/concurrent_editing.js b/app/assets/javascripts/channels/concurrent_editing.js
new file mode 100644
index 000000000..f93e01e45
--- /dev/null
+++ b/app/assets/javascripts/channels/concurrent_editing.js
@@ -0,0 +1,26 @@
+/* Handles all the frontend interactions with action cable and the server.  */
+
+App.concurrent_editing = App.cable.subscriptions.create("ConcurrentEditingChannel", {
+  connected: function() {
+    // Called when the subscription is ready for use on the server
+  },
+
+  disconnected: function() {
+    // Called when the subscription has been terminated by the server
+  },
+
+  received: function(data) {
+    // Called when there's incoming data on the websocket for this channel
+    window.mapKnitter.synchronizeData(data.changes);
+  },
+
+  speak: function(changes) {
+   /* Called when an image is updated from Map.js ('saveImage' function).
+    *  This function calls concurrent_editing_channel.rb's 'sync' method
+    *  which is responsible for broadcasting the updated warpables
+    *  to all the user's connected to the concurrent_editing channel. */
+    return this.perform("sync", {
+        changes: changes
+    });
+  }
+});
diff --git a/app/assets/javascripts/mapknitter/Map.js b/app/assets/javascripts/mapknitter/Map.js
index 0a43a103f..136d1755f 100644
--- a/app/assets/javascripts/mapknitter/Map.js
+++ b/app/assets/javascripts/mapknitter/Map.js
@@ -386,6 +386,32 @@ MapKnitter.Map = MapKnitter.Class.extend({
     if (this.editing._mode !== "lock") { e.stopPropagation(); }
   },
 
+    /* Called by the concurrent_editing.js channel's 'received' function (app/assets/javascripts/channels/concurrent_editing.js).
+     * It recieves a list of updated warpables,i.e. list of images with updated corner points. The aim of writing this function
+     * is to reposition the updated images onto the map on every connected browser (via the ActionCable). */
+
+  synchronizeData: function(warpables) {
+      var layers = [];
+      map.eachLayer(function(l) {layers.push(l)});
+      layers = layers.filter(image => (image._url!=undefined || image._url!=null));
+      warpables.forEach(function(warpable) {
+          corners = [];
+          warpable.nodes.forEach(function(node) {
+              corners.push(L.latLng(node.lat, node.lon));
+          });
+
+          x = corners[2];
+          y = corners [3];
+          corners [2] = y;
+          corners [3] = x;
+
+          console.log(corners);
+
+          layer = layers.filter(l => l._url==warpable.srcmedium)[0];
+          layer.setCorners(corners);
+      });
+  },
+
   saveImageIfChanged: function () {
     var img = this,
         edit = img.editing;
@@ -424,6 +450,9 @@ MapKnitter.Map = MapKnitter.Class.extend({
       beforeSend: function (e) {
         $('.mk-save').removeClass('fa-check-circle fa-times-circle fa-green fa-red').addClass('fa-spinner fa-spin')
       },
+      success: function(data) {
+        App.concurrent_editing.speak(data);
+      },
       complete: function (e) {
         $('.mk-save').removeClass('fa-spinner fa-spin').addClass('fa-check-circle fa-green')
       },
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
new file mode 100644
index 000000000..d67269728
--- /dev/null
+++ b/app/channels/application_cable/channel.rb
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
new file mode 100644
index 000000000..a76243b26
--- /dev/null
+++ b/app/channels/application_cable/connection.rb
@@ -0,0 +1,17 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+    identified_by :current_user
+
+    def connect
+      self.current_user = find_verified_user
+    end
+
+    private
+
+    def find_verified_user
+      User.find(cookies.signed["user_id"])
+    rescue ActiveRecord::RecordNotFound
+      reject_unauthorized_connection
+    end
+  end
+end
diff --git a/app/channels/concurrent_editing_channel.rb b/app/channels/concurrent_editing_channel.rb
new file mode 100644
index 000000000..79991c3b1
--- /dev/null
+++ b/app/channels/concurrent_editing_channel.rb
@@ -0,0 +1,17 @@
+class ConcurrentEditingChannel < ApplicationCable::Channel
+  # This class handles the server side logic of the actioncable communication.
+
+  def subscribed
+    # Called first to connect user to the channel.
+    stream_from "concurrent_editing_channel"
+  end
+
+  def unsubscribed
+    # Any cleanup needed when channel is unsubscribed
+  end
+
+  def sync(changes)
+    # Responsible for broadcasting the updated warpables or simply images to the user's connected on this channel.
+    ActionCable.server.broadcast 'concurrent_editing_channel', changes
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6760cf9a4..782efc642 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -20,7 +20,9 @@ def current_user
     user_id = session[:user_id]
     if user_id
       begin
-        @user = User.find(user_id)
+        u = User.find(user_id)
+        cookies.signed["user_id"] = u.id
+        @user = u
       rescue StandardError
         @user = nil
       end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 6ef5d486b..cf773b22b 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -92,7 +92,11 @@ def update
       @warpable.locked = params[:locked]
       @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
       @warpable.save
-      render html: 'success'
+
+      respond_to do |format|
+        format.html { render html: 'success' }
+        format.json { render json: @warpable.map.fetch_map_data }
+      end
     else
       render plain: 'You must be logged in to update the image, unless the map is anonymous.'
     end
diff --git a/app/models/map.rb b/app/models/map.rb
index 7d65e3ecb..ab001ff16 100755
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -273,4 +273,10 @@ def add_tag(tagname, user)
     tagname = tagname.downcase
     tags.create(name: tagname, user_id: user.id, map_id: id) unless has_tag(tagname)
   end
+
+  def fetch_map_data
+    # fetches a list of updated warpables along with their corners in a json format.
+    data = warpables
+    data.to_json
+  end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 85bdb4cdf..2f5c573b9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
     <link rel="shortcut icon" href="/images/mapknitter-255.png">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
     <%= stylesheet_link_tag 'application' %>
+    <%= action_cable_meta_tag %>
     <%= javascript_include_tag 'application' %>
   </head>
   <body>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d4ca60dce..2e870ab0e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -74,4 +74,7 @@
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  config.action_cable.url = "ws://localhost:3000/cable"
+  config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/]
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 91ef1928a..7bed767d6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -103,4 +103,6 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/]
 end
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 000000000..a6860886a
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,5 @@
+#!/usr/bin/env puma
+
+environment ENV.fetch("RAILS_ENV") { "production" }
+
+pidfile '/app/tmp/pids/puma.pid'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index de570b36f..26bafb420 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,8 @@
 
   root to: 'front_ui#index'
 
+  mount ActionCable.server => '/cable'
+
   get 'front-page', to: 'front_ui#index'
   get 'mappers', to: 'front_ui#nearby_mappers'
   get 'about', to: 'front_ui#about'
diff --git a/start.sh b/start.sh
index 517a983d1..674e2b563 100755
--- a/start.sh
+++ b/start.sh
@@ -24,4 +24,4 @@ if [ -f $pidfile ] ; then
 	rm $pidfile;
 fi
 
-bundle exec passenger start
+bundle exec foreman start
diff --git a/test/channels/concurrent_editing_channel_test.rb b/test/channels/concurrent_editing_channel_test.rb
new file mode 100644
index 000000000..b458255e3
--- /dev/null
+++ b/test/channels/concurrent_editing_channel_test.rb
@@ -0,0 +1,23 @@
+require 'test_helper'
+
+module ApplicationCable
+  class ConcurrentEditingChannelTest < ActionCable::Channel::TestCase
+
+    def test_synch_editing_broadcast_count
+      channel_name = "concurrent_editing_channel"
+      assert_broadcasts channel_name, 0
+      ActionCable.server.broadcast channel_name, data: {}
+      assert_broadcasts channel_name, 1
+    end
+
+
+    def test_synch_editing_broadcast_message
+      channel_name = "concurrent_editing_channel"
+      changes = { :image_change => "test" }
+      ActionCable.server.broadcast channel_name, data: changes
+      assert_broadcast_on(channel_name, data: changes) do
+        ActionCable.server.broadcast channel_name, data: changes
+      end
+    end
+  end
+end
diff --git a/test/channels/connection_test.rb b/test/channels/connection_test.rb
new file mode 100644
index 000000000..309565779
--- /dev/null
+++ b/test/channels/connection_test.rb
@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module ApplicationCable
+  class ConnectionTest < ActionCable::Connection::TestCase
+    def test_connection_with_user
+      cookies.signed["user_id"] = users(:chris)
+
+      #this simulates the connection
+      connect
+
+      # assert connected user
+      assert_equal "chris", connection.current_user.login
+    end
+
+    def test_does_not_connect_without_user
+
+      # user not logged in
+      begin
+        # trying to connect but fails
+        connect
+      rescue Exception=>e
+
+        #compare the error class
+        assert_equal e.class, ActionCable::Connection::Authorization::UnauthorizedError
+      end
+
+      #check is connection is nil(which it  should be)
+      assert_equal nil, connection
+    end
+  end
+end
diff --git a/test/fixtures/maps.yml b/test/fixtures/maps.yml
index 2e9c1f20d..76dab52c6 100644
--- a/test/fixtures/maps.yml
+++ b/test/fixtures/maps.yml
@@ -34,7 +34,7 @@ nairobi:
   lat: -1.2920659
   lon: 36.8219462
   description: Capital of Kenya
-  created_at: <% Time.now %>
+  created_at: <%= Time.now %>
   license: publicdomain
   user_id: 2
   author: aaron
@@ -47,7 +47,7 @@ village:
   lat: -0.023559
   lon: 37.90619300000003
   description: A mall in Nairobi
-  created_at: <% Time.now %>
+  created_at: <%= Time.now %>
   license: publicdomain
   user_id: 2
   author: aaron
diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 3759b4cee..d16cde45c 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -56,3 +56,16 @@ four:
   way_order: 0
   body: nil
 
+five:
+  id: 5
+  color: "black"
+  author: "anonymous"
+  lat: 42.8377535388083
+  lon: -75.3981708900972
+  way_id: 0
+  order: 0
+  name: ""
+  description: ""
+  map_id: 1
+  way_order: 0
+  body: nil
diff --git a/test/system/synchronous_editing_test.rb b/test/system/synchronous_editing_test.rb
new file mode 100644
index 000000000..2dde3353a
--- /dev/null
+++ b/test/system/synchronous_editing_test.rb
@@ -0,0 +1,16 @@
+require 'application_system_test_case'
+
+class SynchronousTest < ApplicationSystemTestCase
+  setup do
+    Capybara.current_driver = Capybara.javascript_driver
+    Capybara.asset_host = "http://localhost:3000"
+  end
+
+  test 'warpables change flow' do
+    map = maps(:saugus)
+    original_data = map.fetch_map_data
+    map.warpables.first.update_column(:nodes, "2,5,1,3")
+    updated_data = map.fetch_map_data
+    assert_not_equal updated_data, original_data
+  end
+end
\ No newline at end of file

From f78cbc956ff9ac81305f12455dad4ef56091bf08 Mon Sep 17 00:00:00 2001
From: Alax Alves <alaxallves@gmail.com>
Date: Tue, 20 Aug 2019 21:10:17 -0300
Subject: [PATCH 150/152] Fixing CodeClimate issues

---
 app/assets/javascripts/mapknitter/Map.js | 6 ++----
 app/controllers/images_controller.rb     | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/mapknitter/Map.js b/app/assets/javascripts/mapknitter/Map.js
index 136d1755f..c7659757e 100644
--- a/app/assets/javascripts/mapknitter/Map.js
+++ b/app/assets/javascripts/mapknitter/Map.js
@@ -433,10 +433,8 @@ MapKnitter.Map = MapKnitter.Class.extend({
 
   saveImage: function () {
     var img = this;
-    // reset change state string:
-    img._corner_state = JSON.stringify(img._corners);
-    // send save request
-    $.ajax('/images', {
+    img._corner_state = JSON.stringify(img._corners); // reset change state string:
+    $.ajax('/images', { // send save request
       type: 'PATCH',
       data: {
         warpable_id: img.warpable_id,
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index cf773b22b..30213e913 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -72,8 +72,8 @@ def show
 
   def update
     @warpable = Warpable.find params[:warpable_id]
-    map = Map.find(@warpable.map_id)
-    if map.anonymous? || logged_in?
+
+    if Map.find(@warpable.map_id).anonymous? || logged_in?
       nodes = []
       author = @warpable.map.author
       # is it really necessary to make new points each time?
@@ -92,7 +92,6 @@ def update
       @warpable.locked = params[:locked]
       @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
       @warpable.save
-
       respond_to do |format|
         format.html { render html: 'success' }
         format.json { render json: @warpable.map.fetch_map_data }

From 1627b963756a4d63e075a1cec4459846c5c432dd Mon Sep 17 00:00:00 2001
From: Vidit <chitkara.vidit@gmail.com>
Date: Sat, 24 Aug 2019 03:29:51 +0530
Subject: [PATCH 151/152] Synch editing add ons (#957)

* few bug fixes

* separate editing channels for different maps

* test fixes

* rubocop fixes
---
 .../channels/concurrent_editing.js            |  11 +-
 app/assets/javascripts/mapknitter/Map.js      | 123 +++++++++++++++++-
 app/channels/concurrent_editing_channel.rb    |   4 +-
 app/controllers/images_controller.rb          |   7 +-
 test/controllers/images_controller_test.rb    |   2 +-
 5 files changed, 132 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/channels/concurrent_editing.js b/app/assets/javascripts/channels/concurrent_editing.js
index f93e01e45..872022784 100644
--- a/app/assets/javascripts/channels/concurrent_editing.js
+++ b/app/assets/javascripts/channels/concurrent_editing.js
@@ -1,6 +1,10 @@
 /* Handles all the frontend interactions with action cable and the server.  */
 
-App.concurrent_editing = App.cable.subscriptions.create("ConcurrentEditingChannel", {
+App.concurrent_editing = App.cable.subscriptions.create(
+    {
+        channel: "ConcurrentEditingChannel",
+        mapSlug: window.location.href.split("/").pop()
+    }, {
   connected: function() {
     // Called when the subscription is ready for use on the server
   },
@@ -11,7 +15,7 @@ App.concurrent_editing = App.cable.subscriptions.create("ConcurrentEditingChanne
 
   received: function(data) {
     // Called when there's incoming data on the websocket for this channel
-    window.mapKnitter.synchronizeData(data.changes);
+    window.mapknitter.synchronizeData(data.changes);
   },
 
   speak: function(changes) {
@@ -20,7 +24,8 @@ App.concurrent_editing = App.cable.subscriptions.create("ConcurrentEditingChanne
     *  which is responsible for broadcasting the updated warpables
     *  to all the user's connected to the concurrent_editing channel. */
     return this.perform("sync", {
-        changes: changes
+        changes: changes,
+        map_slug: window.location.href.split("/").pop()
     });
   }
 });
diff --git a/app/assets/javascripts/mapknitter/Map.js b/app/assets/javascripts/mapknitter/Map.js
index c7659757e..a7051a25a 100644
--- a/app/assets/javascripts/mapknitter/Map.js
+++ b/app/assets/javascripts/mapknitter/Map.js
@@ -405,11 +405,123 @@ MapKnitter.Map = MapKnitter.Class.extend({
           corners [2] = y;
           corners [3] = x;
 
-          console.log(corners);
-
           layer = layers.filter(l => l._url==warpable.srcmedium)[0];
-          layer.setCorners(corners);
+
+          if(layer == null || layer == undefined) {
+              window.mapknitter.synchronizeNewAddedImage(warpable);
+          } else {
+              layer.setCorners(corners);
+              var index = layers.indexOf(layer);
+              if (index > -1) {
+                  layers.splice(index, 1);
+              }
+          }
       });
+
+      // remove images if deleted from any user's browser
+      layers.forEach(function(layer) {
+          edit = layer.editing
+          edit._removeToolbar();
+          edit.disable();
+          // remove from Leaflet map:
+          map.removeLayer(layer);
+          // remove from sidebar too:
+          $('#warpable-' + layer.warpable_id).remove();
+      });
+  },
+
+  synchronizeNewAddedImage: function(warpable) {
+      var wn = warpable.nodes;
+      bounds = [];
+
+      // only already-placed images:
+      if (wn.length > 0) {
+          var downloadEl = $('.img-download-' + warpable.id),
+              imgEl = $('#full-img-' + warpable.id);
+
+          downloadEl.click(function () {
+              downloadEl.html('<i class="fa fa-circle-o-notch fa-spin"></i>');
+
+              imgEl[0].onload = function () {
+                  var height = imgEl.height(),
+                      width = imgEl.width(),
+                      nw = map.latLngToContainerPoint(wn[0]),
+                      ne = map.latLngToContainerPoint(wn[1]),
+                      se = map.latLngToContainerPoint(wn[2]),
+                      sw = map.latLngToContainerPoint(wn[3]),
+                      offsetX = nw.x,
+                      offsetY = nw.y,
+                      displayedWidth = $('#warpable-img-' + warpable.id).width(),
+                      ratio = width / displayedWidth;
+
+                  nw.x -= offsetX;
+                  ne.x -= offsetX;
+                  se.x -= offsetX;
+                  sw.x -= offsetX;
+
+                  nw.y -= offsetY;
+                  ne.y -= offsetY;
+                  se.y -= offsetY;
+                  sw.y -= offsetY;
+
+                  warpWebGl(
+                      'full-img-' + warpable.id,
+                      [0, 0, width, 0, width, height, 0, height],
+                      [nw.x, nw.y, ne.x, ne.y, se.x, se.y, sw.x, sw.y],
+                      true // trigger download
+                  )
+
+                  downloadEl.html('<i class="fa fa-download"></i>');
+              }
+
+              imgEl[0].src = $('.img-download-' + warpable.id).attr('data-image');
+          });
+
+          var corners = [
+              L.latLng(wn[0].lat, wn[0].lon),
+              L.latLng(wn[1].lat, wn[1].lon),
+              L.latLng(wn[3].lat, wn[3].lon),
+              L.latLng(wn[2].lat, wn[2].lon)
+          ];
+
+          var img = L.distortableImageOverlay(warpable.srcmedium, {
+              corners: corners,
+              mode: 'lock'
+          }).addTo(map);
+
+          var customExports = mapknitter.customExportAction();
+          var imgGroup = L.distortableCollection({
+              actions: [customExports]
+          }).addTo(map);
+
+          imgGroup.addLayer(img);
+
+          /**
+           * TODO: toolbar may still appear outside of frame. Create a getter for toolbar corners in LDI and then include them in this calculation
+           */
+          bounds = bounds.concat(corners);
+          var newImgBounds = L.latLngBounds(corners);
+
+          if (!map._initialBounds.contains(newImgBounds) && !map._initialBounds.equals(newImgBounds)) {
+              map._initialBounds.extend(newImgBounds);
+              mapknitter._map.flyToBounds(map._initialBounds);
+          }
+
+          images.push(img);
+          img.warpable_id = warpable.id;
+
+          if (!mapknitter.readOnly) {
+              L.DomEvent.on(img._image, {
+                  click: mapknitter.selectImage,
+                  dblclick: mapknitter.dblClickImage,
+                  load: mapknitter.setupToolbar
+              }, img);
+
+              L.DomEvent.on(imgGroup, 'layeradd', mapknitter.setupEvents, img);
+          }
+
+          img.editing.disable()
+      }
   },
 
   saveImageIfChanged: function () {
@@ -434,7 +546,7 @@ MapKnitter.Map = MapKnitter.Class.extend({
   saveImage: function () {
     var img = this;
     img._corner_state = JSON.stringify(img._corners); // reset change state string:
-    $.ajax('/images', { // send save request
+    $.ajax('/images/'+img.warpable_id, { // send save request
       type: 'PATCH',
       data: {
         warpable_id: img.warpable_id,
@@ -474,6 +586,9 @@ MapKnitter.Map = MapKnitter.Class.extend({
           beforeSend: function (e) {
             $('.mk-save').removeClass('fa-check-circle fa-times-circle fa-green fa-red').addClass('fa-spinner fa-spin')
           },
+          success: function(data) {
+              App.concurrent_editing.speak(data);
+          },
           complete: function (e) {
             $('.mk-save').removeClass('fa-spinner fa-spin').addClass('fa-check-circle fa-green')
             // disable interactivity:
diff --git a/app/channels/concurrent_editing_channel.rb b/app/channels/concurrent_editing_channel.rb
index 79991c3b1..35ea0bb7c 100644
--- a/app/channels/concurrent_editing_channel.rb
+++ b/app/channels/concurrent_editing_channel.rb
@@ -3,7 +3,7 @@ class ConcurrentEditingChannel < ApplicationCable::Channel
 
   def subscribed
     # Called first to connect user to the channel.
-    stream_from "concurrent_editing_channel"
+    stream_from "concurrent_editing_channel:#{params[:mapSlug]}"
   end
 
   def unsubscribed
@@ -12,6 +12,6 @@ def unsubscribed
 
   def sync(changes)
     # Responsible for broadcasting the updated warpables or simply images to the user's connected on this channel.
-    ActionCable.server.broadcast 'concurrent_editing_channel', changes
+    ActionCable.server.broadcast "concurrent_editing_channel:#{changes['map_slug']}", changes
   end
 end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 30213e913..88300b8db 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -92,10 +92,7 @@ def update
       @warpable.locked = params[:locked]
       @warpable.cm_per_pixel = @warpable.get_cm_per_pixel
       @warpable.save
-      respond_to do |format|
-        format.html { render html: 'success' }
-        format.json { render json: @warpable.map.fetch_map_data }
-      end
+      render json: @warpable.map.fetch_map_data
     else
       render plain: 'You must be logged in to update the image, unless the map is anonymous.'
     end
@@ -114,7 +111,7 @@ def destroy
       @warpable.destroy
       respond_to do |format|
         format.html { redirect_to @warpable.map }
-        format.json { render json: @warpable }
+        format.json { render json: @warpable.map.fetch_map_data }
       end
     else
       flash[:error] = 'You must be logged in to delete images.'
diff --git a/test/controllers/images_controller_test.rb b/test/controllers/images_controller_test.rb
index 042096f72..41ae79767 100644
--- a/test/controllers/images_controller_test.rb
+++ b/test/controllers/images_controller_test.rb
@@ -62,7 +62,7 @@ def fetch_in_production
     points = "-71.39,41.83:-71.39,41.83:-71.39,41.83:-71.39,41.83"
     patch :update, params: { id: @map.id, warpable_id: @warp.id, locked: false, points: points}
     assert_not_nil @warp.nodes
-    assert_equal "text/html", response.content_type
+    assert_equal "application/json", response.content_type
     assert_response :success
   end
 

From 8c1d63465c6cfddfc6a7a7c96fbb48a5f9e6cee4 Mon Sep 17 00:00:00 2001
From: StlMaris123 <stellamarisnjage@gmail.com>
Date: Tue, 21 Jan 2020 18:56:03 +0200
Subject: [PATCH 152/152] sort sql injection vulnerability, add gem brkeman to
 helo detect more vulnerability

---
 Gemfile                             | 1 +
 Gemfile.lock                        | 2 ++
 app/controllers/users_controller.rb | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 777c78835..0d3efc9e6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,6 +74,7 @@ group :development, :test do
   gem 'faker', '~> 2.6.0'
   gem 'pry-rails', '~> 0.3.9'
   gem 'action-cable-testing'
+  gem 'brakeman'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6236a9b8f..e4332a007 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,6 +76,7 @@ GEM
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
+    brakeman (4.7.2)
     builder (3.2.3)
     byebug (11.0.1)
     capybara (3.29.0)
@@ -351,6 +352,7 @@ DEPENDENCIES
   aws-sdk-s3 (~> 1)
   bootsnap (~> 1.4.5)
   bootstrap-sass
+  brakeman
   byebug (~> 11.0.1)
   capybara
   codecov
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5dc4f187f..88498eb35 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -13,7 +13,7 @@ def index
     @users = User.joins(:maps)
                  .select('users.*, count(users.id) as maps_count')
                  .group('maps.user_id')
-                 .order(sort_column + ' ' + sort_direction)
+                 .order(sort_column => sort_direction)
                  .paginate(page: params[:page], per_page: 24)
     render 'users/index'
   end