From 8933a7a6d5b785d6d74eb21f1e162089badadf03 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Thu, 28 Sep 2023 13:08:29 +0200 Subject: [PATCH] Feature: Fireblight map: Add nursery icon --- .gitignore | 1 + .../fireblight/icons/plant-clipart.png | Bin 0 -> 7042 bytes .../webapp/map_applications/fireblight/js/map.js | 8 +++++++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/map_applications/fireblight/icons/plant-clipart.png diff --git a/.gitignore b/.gitignore index 259914ed..3aeb7b4c 100755 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ classes/ .settings/ *.iml /.idea/ +.vscode/settings.json diff --git a/src/main/webapp/map_applications/fireblight/icons/plant-clipart.png b/src/main/webapp/map_applications/fireblight/icons/plant-clipart.png new file mode 100644 index 0000000000000000000000000000000000000000..0092966ba2df2b2a60297d3644b7fa713928221c GIT binary patch literal 7042 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 N?&<31vd$@?2>=71sh0o% literal 0 HcmV?d00001 diff --git a/src/main/webapp/map_applications/fireblight/js/map.js b/src/main/webapp/map_applications/fireblight/js/map.js index 50b99143..aacf48e3 100755 --- a/src/main/webapp/map_applications/fireblight/js/map.js +++ b/src/main/webapp/map_applications/fireblight/js/map.js @@ -324,8 +324,14 @@ function diseaseSpreadingPoiStyle(feature, resolution) radius: radiusInMeters / (resolution / viewProjection.getMetersPerUnit() * Math.cos(latitude_rad)) }) }); + const icon = new ol.style.Style({ + image: new ol.style.Icon({ + src: 'icons/plant-clipart.png', + scale: 0.25 + }) + }); - return [circle]; + return [circle, icon]; } } else if(feature.getProperties()["pointOfInterestTypeId"] == "6") // Apiary site -- GitLab