From ba5e7b140b008fac0b9bba512f9971657c33cb7c Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 25 Apr 2022 00:18:23 +0100 Subject: [PATCH] Revert "imagery: add locatejs image assets" This reverts commit 90a3375388fe240c52a7d2eff72d78e07f99a52c. --- .../imagery/files/default/location-arrow-solid.svg | 1 - cookbooks/imagery/files/default/spinner-solid.svg | 1 - cookbooks/imagery/resources/site.rb | 14 -------------- cookbooks/imagery/templates/default/imagery.js.erb | 4 +--- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 cookbooks/imagery/files/default/location-arrow-solid.svg delete mode 100644 cookbooks/imagery/files/default/spinner-solid.svg 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 @@ - \ 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 @@ - \ 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; -- 2.43.2