From: Grant Slater <git@firefishy.com>
Date: Sun, 24 Apr 2022 23:18:23 +0000 (+0100)
Subject: Revert "imagery: add locatejs image assets"
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ba5e7b140b008fac0b9bba512f9971657c33cb7c

Revert "imagery: add locatejs image assets"

This reverts commit 90a3375388fe240c52a7d2eff72d78e07f99a52c.
---

diff --git a/cookbooks/imagery/files/default/location-arrow-solid.svg b/cookbooks/imagery/files/default/location-arrow-solid.svg
deleted file mode 100644
index 9fea1566a..000000000
--- a/cookbooks/imagery/files/default/location-arrow-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="location-arrow" class="svg-inline--fa fa-location-arrow fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M444.52 3.52L28.74 195.42c-47.97 22.39-31.98 92.75 19.19 92.75h175.91v175.91c0 51.17 70.36 67.17 92.75 19.19l191.9-415.78c15.99-38.39-25.59-79.97-63.97-63.97z"></path></svg>
\ No newline at end of file
diff --git a/cookbooks/imagery/files/default/spinner-solid.svg b/cookbooks/imagery/files/default/spinner-solid.svg
deleted file mode 100644
index f795980b3..000000000
--- a/cookbooks/imagery/files/default/spinner-solid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="spinner" class="svg-inline--fa fa-spinner fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M304 48c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48 48 21.49 48 48zm-48 368c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm208-208c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM96 256c0-26.51-21.49-48-48-48S0 229.49 0 256s21.49 48 48 48 48-21.49 48-48zm12.922 99.078c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.491-48-48-48zm294.156 0c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.49-48-48-48zM108.922 60.922c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.491-48-48-48z"></path></svg>
\ No newline at end of file
diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 9660a6c89..14cb2842e 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -85,20 +85,6 @@ action :create do
     mode "644"
   end
 
-  cookbook_file "/srv/#{new_resource.site}/location-arrow-solid.svg" do
-    source "location-arrow-solid.svg"
-    user "root"
-    group "root"
-    mode "644"
-end
-
-  cookbook_file "/srv/#{new_resource.site}/spinner-solid.svg" do
-    source "spinner-solid.svg"
-    user "root"
-    group "root"
-    mode "644"
-  end
-
   layers = Dir.glob("/srv/imagery/layers/#{new_resource.site}/*.yml").collect do |path|
     YAML.safe_load(::File.read(path), [Symbol])
   end
diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index 713aa03bd..e29d86342 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -37,9 +37,7 @@ function createMap(divName) {
   map.addControl(new L.Control.Permalink());
 
   var lc = L.control.locate({
-    position: 'topright',
-    icon: '/location-arrow-solid.svg',
-    iconLoading: '/spinner-solid.svg'
+    position: 'topright'
   }).addTo(map);
 
   return map;