From 0279dd079ceb5203bac57b2480291731b8382e55 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Sat, 1 Feb 2020 13:30:36 +0000 Subject: [PATCH 1/9] lein-release plugin: bumped version from 0.1.2 to 0.1.3-SNAPSHOT for next development cycle --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index dff2acc..2a503c9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject geocsv "0.1.2" +(defproject geocsv "0.1.3-SNAPSHOT" :description "A wee tool to show comma-separated value data on a map." :url "https://github.com/simon-brooke/geocsv" From 4b7a48bbba56f9edffce024b3e94c1380aa3165a Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Sat, 1 Feb 2020 13:31:40 +0000 Subject: [PATCH 2/9] Added PGP signature. Not sure whether this is wise. --- pom.xml.asc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml.asc b/pom.xml.asc index b14b9d6..e8f868b 100644 --- a/pom.xml.asc +++ b/pom.xml.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQFIBAABCgAyFiEEgk5pWlj1vvTbfWCZp6TxjR1N+YcFAl4x7nAUHHNpbW9uQGpv -dXJuZXltYW4uY2MACgkQp6TxjR1N+Yfg+Qf/RszgXEwAJo/bud7klPSxk5jfPrMF -lth0h3gjS0UuyWxKsyoiij1CXswbjZYudGPMF923YX/9oIj2sn2ZlaohDtMi6/xY -vTmcfijNK8pHm31Sbi6oPSSTS211o1YjWYRbSg399NaxRc18vi8sTy2e49LOVmU7 -mSrwIOoWelMaCoctB2opSsLy0FhTFFA6rvaXBWxuNsRh5ULAICCerRIxWJJp0lO1 -e5A9wDM/0AOvZYAhma5TzMRc3z0aT3sy+/eEay6PT+0QTyQ65AeHks7XFIfvCGM+ -5EaPeUj+qOkVBR7ppPGHxcy19sdQMQ3s9OWRYE/Sc+dNmmbQ/T91uZ9vKg== -=45nJ +iQFIBAABCgAyFiEEgk5pWlj1vvTbfWCZp6TxjR1N+YcFAl41fWUUHHNpbW9uQGpv +dXJuZXltYW4uY2MACgkQp6TxjR1N+YcqGwf/QS6aVhFtlW+QYLGg9jVbuVUtzLZE +IPwq8CDGtcfyW8nk9CWTK7TmKD2m8+SHYJYdh0lWfQNC23eaoVMOQVmXNlP3NUUF +TiBmPa+El6Oa3DJ4Z77vjTV5HI4eq/q74PJvmO7ICXMicc2+2Z3/aI88qh3vnh04 +VD8uwz55Cue8lFHDJfOSqNZCQaQqfSzmixNwTLPwyWdwONVCvkzsZfwrwa0+h0gr +LUUwRumoLuIB0J6xLJ68xEkKozdxhZ70vp9MD8sxulJxwtnXL66ElezixI8cRQIs +e4O/e5BnxV3HihbfjZIMmUgeh6Kr6W/bme0Z3+BFBiIuIsCYpk3Or4gIyw== +=+BhA -----END PGP SIGNATURE----- From 37b89eb335cbc36bcd82ae7d2b379d7e5cb0abf5 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 5 Feb 2020 14:56:33 +0000 Subject: [PATCH 3/9] Added a few customer-requested pins; deleted non-X11 colours pins --- .../img/map-pins/Anchor-customer-pin.png | Bin 1648 -> 1903 bytes .../img/map-pins/Anchor-customer-pin.svg | 8 +- .../public/img/map-pins/Champion-pin.png | Bin 0 -> 1736 bytes .../{Chocolate-pin.svg => Champion-pin.svg} | 74 ++++++- resources/public/img/map-pins/Coral-pin.svg | 98 ---------- .../img/map-pins/Cornflower-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Cornsilk-pin.svg | 98 ---------- resources/public/img/map-pins/Crimson-pin.svg | 98 ---------- resources/public/img/map-pins/Cyan-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Cyan-pin.svg | 98 ---------- .../img/map-pins/Dark-Goldenrod-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Gray-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Green-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Khaki-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Magenta-pin.svg | 98 ---------- .../img/map-pins/Dark-Olive-Green-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Orange-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Orchid-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Red-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Salmon-pin.svg | 98 ---------- .../img/map-pins/Dark-Sea-Green-pin.svg | 98 ---------- .../img/map-pins/Dark-Slate-Blue-pin.svg | 98 ---------- .../img/map-pins/Dark-Slate-Gray-pin.svg | 98 ---------- .../img/map-pins/Dark-Turquoise-pin.svg | 98 ---------- .../public/img/map-pins/Dark-Violet-pin.svg | 98 ---------- .../public/img/map-pins/Deep-Pink-pin.svg | 98 ---------- .../public/img/map-pins/Deep-Sky-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Developer-pin.png | Bin 0 -> 2013 bytes .../public/img/map-pins/Developer-pin.svg | 181 ++++++++++++++++++ .../public/img/map-pins/Dim-Gray-pin.svg | 98 ---------- .../public/img/map-pins/Dodger-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Firebrick-pin.svg | 98 ---------- .../public/img/map-pins/Floral-White-pin.svg | 98 ---------- .../public/img/map-pins/Forest-Green-pin.svg | 98 ---------- resources/public/img/map-pins/Fuchsia-pin.svg | 98 ---------- .../img/map-pins/Further-education-pin.png | Bin 0 -> 1893 bytes ...euse-pin.svg => Further-education-pin.svg} | 36 +++- .../public/img/map-pins/Gainsboro-pin.svg | 98 ---------- .../public/img/map-pins/Ghost-White-pin.svg | 98 ---------- resources/public/img/map-pins/Gold-pin.svg | 98 ---------- .../public/img/map-pins/Goldenrod-pin.svg | 98 ---------- resources/public/img/map-pins/Gray-pin.svg | 98 ---------- .../public/img/map-pins/Green-Yellow-pin.svg | 98 ---------- resources/public/img/map-pins/Green-pin.svg | 98 ---------- .../img/map-pins/Higher-education-pin.png | Bin 0 -> 1933 bytes ...-Blue-pin.svg => Higher-education-pin.svg} | 36 +++- .../public/img/map-pins/Honeydew-pin.svg | 98 ---------- .../public/img/map-pins/Hot-Pink-pin.svg | 98 ---------- .../public/img/map-pins/Indian-Red-pin.svg | 98 ---------- resources/public/img/map-pins/Indigo-pin.svg | 98 ---------- resources/public/img/map-pins/Ivory-pin.svg | 98 ---------- resources/public/img/map-pins/Khaki-pin.svg | 98 ---------- .../img/map-pins/Lavender-Blush-pin.svg | 98 ---------- .../public/img/map-pins/Lavender-pin.svg | 98 ---------- .../public/img/map-pins/Lawn-Green-pin.svg | 98 ---------- .../public/img/map-pins/Lemon-Chiffon-pin.svg | 98 ---------- .../public/img/map-pins/Light-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Light-Coral-pin.svg | 98 ---------- .../public/img/map-pins/Light-Cyan-pin.svg | 98 ---------- .../img/map-pins/Light-Goldenrod-pin.svg | 98 ---------- .../public/img/map-pins/Light-Gray-pin.svg | 98 ---------- .../public/img/map-pins/Light-Green-pin.svg | 98 ---------- .../public/img/map-pins/Light-Pink-pin.svg | 98 ---------- .../public/img/map-pins/Light-Salmon-pin.svg | 98 ---------- .../img/map-pins/Light-Sea-Green-pin.svg | 98 ---------- .../img/map-pins/Light-Sky-Blue-pin.svg | 98 ---------- .../img/map-pins/Light-Slate-Gray-pin.svg | 98 ---------- .../img/map-pins/Light-Steel-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Light-Yellow-pin.svg | 98 ---------- .../public/img/map-pins/Lime-Green-pin.svg | 98 ---------- resources/public/img/map-pins/Lime-pin.svg | 98 ---------- resources/public/img/map-pins/Linen-pin.svg | 98 ---------- resources/public/img/map-pins/Magenta-pin.svg | 98 ---------- resources/public/img/map-pins/Maroon-pin.svg | 98 ---------- .../img/map-pins/Medium-Aquamarine-pin.svg | 98 ---------- .../public/img/map-pins/Medium-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Medium-Orchid-pin.svg | 98 ---------- .../public/img/map-pins/Medium-Purple-pin.svg | 98 ---------- .../img/map-pins/Medium-Sea-Green-pin.svg | 98 ---------- .../img/map-pins/Medium-Slate-Blue-pin.svg | 98 ---------- .../img/map-pins/Medium-Spring-Green-pin.svg | 98 ---------- .../img/map-pins/Medium-Turquoise-pin.svg | 98 ---------- .../img/map-pins/Medium-Violet-Red-pin.svg | 98 ---------- .../public/img/map-pins/Midnight-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Mint-Cream-pin.svg | 98 ---------- .../public/img/map-pins/Misty-Rose-pin.svg | 98 ---------- .../public/img/map-pins/Moccasin-pin.svg | 98 ---------- .../public/img/map-pins/Navajo-White-pin.svg | 98 ---------- .../public/img/map-pins/Navy-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Old-Lace-pin.svg | 98 ---------- .../public/img/map-pins/Olive-Drab-pin.svg | 98 ---------- resources/public/img/map-pins/Olive-pin.svg | 98 ---------- .../public/img/map-pins/Orange-Red-pin.svg | 98 ---------- resources/public/img/map-pins/Orange-pin.svg | 98 ---------- resources/public/img/map-pins/Orchid-pin.svg | 98 ---------- .../img/map-pins/Pale-Goldenrod-pin.svg | 98 ---------- .../public/img/map-pins/Pale-Green-pin.svg | 98 ---------- .../img/map-pins/Pale-Turquoise-pin.svg | 98 ---------- .../img/map-pins/Pale-Violet-Red-pin.svg | 98 ---------- .../public/img/map-pins/Papaya-Whip-pin.svg | 98 ---------- .../public/img/map-pins/Peach-Puff-pin.svg | 98 ---------- resources/public/img/map-pins/Peru-pin.svg | 98 ---------- resources/public/img/map-pins/Pink-pin.svg | 98 ---------- .../img/map-pins/Planning-authority-pin.png | Bin 1773 -> 1512 bytes .../img/map-pins/Planning-authority-pin.svg | 8 +- resources/public/img/map-pins/Plum-pin.svg | 98 ---------- .../public/img/map-pins/Powder-Blue-pin.svg | 98 ---------- resources/public/img/map-pins/Purple-pin.svg | 98 ---------- .../img/map-pins/Rebecca-Purple-pin.svg | 98 ---------- resources/public/img/map-pins/Red-pin.svg | 98 ---------- .../public/img/map-pins/Rosy-Brown-pin.svg | 98 ---------- .../public/img/map-pins/Royal-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Saddle-Brown-pin.svg | 98 ---------- resources/public/img/map-pins/Salmon-pin.svg | 98 ---------- .../public/img/map-pins/Sandy-Brown-pin.svg | 98 ---------- .../public/img/map-pins/Sea-Green-pin.svg | 98 ---------- .../public/img/map-pins/Seashell-pin.svg | 98 ---------- resources/public/img/map-pins/Sienna-pin.svg | 98 ---------- resources/public/img/map-pins/Silver-pin.svg | 98 ---------- .../public/img/map-pins/Sky-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Slate-Blue-pin.svg | 98 ---------- .../public/img/map-pins/Slate-Gray-pin.svg | 98 ---------- resources/public/img/map-pins/Snow-pin.svg | 98 ---------- .../public/img/map-pins/Spring-Green-pin.svg | 98 ---------- .../public/img/map-pins/Steel-Blue-pin.svg | 98 ---------- resources/public/img/map-pins/Tan-pin.svg | 98 ---------- resources/public/img/map-pins/Teal-pin.svg | 98 ---------- resources/public/img/map-pins/Thistle-pin.svg | 98 ---------- resources/public/img/map-pins/Tomato-pin.svg | 98 ---------- .../public/img/map-pins/Turquoise-pin.svg | 98 ---------- resources/public/img/map-pins/Violet-pin.svg | 98 ---------- .../public/img/map-pins/Web-Gray-pin.svg | 98 ---------- .../public/img/map-pins/Web-Green-pin.svg | 98 ---------- .../public/img/map-pins/Web-Maroon-pin.svg | 98 ---------- .../public/img/map-pins/Web-Purple-pin.svg | 98 ---------- resources/public/img/map-pins/Wheat-pin.svg | 98 ---------- .../public/img/map-pins/White-Smoke-pin.svg | 98 ---------- resources/public/img/map-pins/White-pin.svg | 98 ---------- .../public/img/map-pins/colours/Blank-pin.svg | 12 +- 140 files changed, 316 insertions(+), 12485 deletions(-) create mode 100644 resources/public/img/map-pins/Champion-pin.png rename resources/public/img/map-pins/{Chocolate-pin.svg => Champion-pin.svg} (59%) delete mode 100644 resources/public/img/map-pins/Coral-pin.svg delete mode 100644 resources/public/img/map-pins/Cornflower-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Cornsilk-pin.svg delete mode 100644 resources/public/img/map-pins/Crimson-pin.svg delete mode 100644 resources/public/img/map-pins/Cyan-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Cyan-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Goldenrod-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Khaki-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Magenta-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Olive-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Orange-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Orchid-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Red-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Salmon-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Sea-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Slate-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Slate-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Turquoise-pin.svg delete mode 100644 resources/public/img/map-pins/Dark-Violet-pin.svg delete mode 100644 resources/public/img/map-pins/Deep-Pink-pin.svg delete mode 100644 resources/public/img/map-pins/Deep-Sky-Blue-pin.svg create mode 100644 resources/public/img/map-pins/Developer-pin.png create mode 100644 resources/public/img/map-pins/Developer-pin.svg delete mode 100644 resources/public/img/map-pins/Dim-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Dodger-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Firebrick-pin.svg delete mode 100644 resources/public/img/map-pins/Floral-White-pin.svg delete mode 100644 resources/public/img/map-pins/Forest-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Fuchsia-pin.svg create mode 100644 resources/public/img/map-pins/Further-education-pin.png rename resources/public/img/map-pins/{Chartreuse-pin.svg => Further-education-pin.svg} (60%) delete mode 100644 resources/public/img/map-pins/Gainsboro-pin.svg delete mode 100644 resources/public/img/map-pins/Ghost-White-pin.svg delete mode 100644 resources/public/img/map-pins/Gold-pin.svg delete mode 100644 resources/public/img/map-pins/Goldenrod-pin.svg delete mode 100644 resources/public/img/map-pins/Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Green-Yellow-pin.svg delete mode 100644 resources/public/img/map-pins/Green-pin.svg create mode 100644 resources/public/img/map-pins/Higher-education-pin.png rename resources/public/img/map-pins/{Cadet-Blue-pin.svg => Higher-education-pin.svg} (60%) delete mode 100644 resources/public/img/map-pins/Honeydew-pin.svg delete mode 100644 resources/public/img/map-pins/Hot-Pink-pin.svg delete mode 100644 resources/public/img/map-pins/Indian-Red-pin.svg delete mode 100644 resources/public/img/map-pins/Indigo-pin.svg delete mode 100644 resources/public/img/map-pins/Ivory-pin.svg delete mode 100644 resources/public/img/map-pins/Khaki-pin.svg delete mode 100644 resources/public/img/map-pins/Lavender-Blush-pin.svg delete mode 100644 resources/public/img/map-pins/Lavender-pin.svg delete mode 100644 resources/public/img/map-pins/Lawn-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Lemon-Chiffon-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Coral-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Cyan-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Goldenrod-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Pink-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Salmon-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Sea-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Sky-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Slate-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Steel-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Light-Yellow-pin.svg delete mode 100644 resources/public/img/map-pins/Lime-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Lime-pin.svg delete mode 100644 resources/public/img/map-pins/Linen-pin.svg delete mode 100644 resources/public/img/map-pins/Magenta-pin.svg delete mode 100644 resources/public/img/map-pins/Maroon-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Aquamarine-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Orchid-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Purple-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Sea-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Slate-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Spring-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Turquoise-pin.svg delete mode 100644 resources/public/img/map-pins/Medium-Violet-Red-pin.svg delete mode 100644 resources/public/img/map-pins/Midnight-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Mint-Cream-pin.svg delete mode 100644 resources/public/img/map-pins/Misty-Rose-pin.svg delete mode 100644 resources/public/img/map-pins/Moccasin-pin.svg delete mode 100644 resources/public/img/map-pins/Navajo-White-pin.svg delete mode 100644 resources/public/img/map-pins/Navy-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Old-Lace-pin.svg delete mode 100644 resources/public/img/map-pins/Olive-Drab-pin.svg delete mode 100644 resources/public/img/map-pins/Olive-pin.svg delete mode 100644 resources/public/img/map-pins/Orange-Red-pin.svg delete mode 100644 resources/public/img/map-pins/Orange-pin.svg delete mode 100644 resources/public/img/map-pins/Orchid-pin.svg delete mode 100644 resources/public/img/map-pins/Pale-Goldenrod-pin.svg delete mode 100644 resources/public/img/map-pins/Pale-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Pale-Turquoise-pin.svg delete mode 100644 resources/public/img/map-pins/Pale-Violet-Red-pin.svg delete mode 100644 resources/public/img/map-pins/Papaya-Whip-pin.svg delete mode 100644 resources/public/img/map-pins/Peach-Puff-pin.svg delete mode 100644 resources/public/img/map-pins/Peru-pin.svg delete mode 100644 resources/public/img/map-pins/Pink-pin.svg delete mode 100644 resources/public/img/map-pins/Plum-pin.svg delete mode 100644 resources/public/img/map-pins/Powder-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Purple-pin.svg delete mode 100644 resources/public/img/map-pins/Rebecca-Purple-pin.svg delete mode 100644 resources/public/img/map-pins/Red-pin.svg delete mode 100644 resources/public/img/map-pins/Rosy-Brown-pin.svg delete mode 100644 resources/public/img/map-pins/Royal-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Saddle-Brown-pin.svg delete mode 100644 resources/public/img/map-pins/Salmon-pin.svg delete mode 100644 resources/public/img/map-pins/Sandy-Brown-pin.svg delete mode 100644 resources/public/img/map-pins/Sea-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Seashell-pin.svg delete mode 100644 resources/public/img/map-pins/Sienna-pin.svg delete mode 100644 resources/public/img/map-pins/Silver-pin.svg delete mode 100644 resources/public/img/map-pins/Sky-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Slate-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Slate-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Snow-pin.svg delete mode 100644 resources/public/img/map-pins/Spring-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Steel-Blue-pin.svg delete mode 100644 resources/public/img/map-pins/Tan-pin.svg delete mode 100644 resources/public/img/map-pins/Teal-pin.svg delete mode 100644 resources/public/img/map-pins/Thistle-pin.svg delete mode 100644 resources/public/img/map-pins/Tomato-pin.svg delete mode 100644 resources/public/img/map-pins/Turquoise-pin.svg delete mode 100644 resources/public/img/map-pins/Violet-pin.svg delete mode 100644 resources/public/img/map-pins/Web-Gray-pin.svg delete mode 100644 resources/public/img/map-pins/Web-Green-pin.svg delete mode 100644 resources/public/img/map-pins/Web-Maroon-pin.svg delete mode 100644 resources/public/img/map-pins/Web-Purple-pin.svg delete mode 100644 resources/public/img/map-pins/Wheat-pin.svg delete mode 100644 resources/public/img/map-pins/White-Smoke-pin.svg delete mode 100644 resources/public/img/map-pins/White-pin.svg diff --git a/resources/public/img/map-pins/Anchor-customer-pin.png b/resources/public/img/map-pins/Anchor-customer-pin.png index 4cbe582431c38ff8f8c0da9f3aceac8efc9da01d..ec9eca7e31e5f9235b9589cad057a46425ac2ccb 100644 GIT binary patch delta 1639 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 oD5XvpYNKErIdbG93f!)L0Yo VMP)IWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000HQNkl&H$QpiMl8zr5Z+}PsZsUyi0tTCSqo0G@?cIwVq@R1}FKST75-7Lb8VgqHI^XAc5fX_dCYr+t$?{LkusT;4RLS>m?-n{&fNM`eG zWMz$b!MnS|Ki{=0U!e3GNfyOT&is7GtK{TSl$UETI4DgzIR`pBqeB9pJEuibl6&%5 zlK87FTU^e(JZG}ix(P;;$urwxX#wX|NKgM80Dmt(g+d1BRkJOY7Ng1J7Qk2-4GUuc zfT*akfJda$jUYRFAYgxFqx`5Yx0&}zqEx6c9q==EL;&3nWJ1$_X3=g%W><%;j38XQzYt)|$w zuL~;Go6oazrxObn457C-!pHygsS>TN@c@7oD|+7!HktaNR(k*dhYrp02?BuAr?XI9 z9Xt8l*{QCf?QQUc=?OIFX-TS7$RCjoi1ZDiwppavQ0s!(hyJ z`ed1)y!=CWJOUUasIE>yf4|bl#~49utQ!>-HfXgz+tkk-0m#f8h0WH8+}vKj^*}Ut z?jV|)8nJZgkiW8jFaRVbj=^eeMp@b2prJcFpbT@7`xvx6bv> zRIS$YuChoe(Kj^cKDOkn z*#?aNY5T8CCevI>=|_YR#gvi)lC;MY6*cF|nKM=z5g|_$47+zPQg?L?5=y`2oO@mR zoO2I=4vWR|&}%0APmq5V6%}dRl-i%ITIIU8dGjLx(6qKj=arT&6$Byg{Q2`ufo28u zAuB2>`XI|EQmH @@ -34,9 +34,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.919596" - inkscape:cx="23.755716" - inkscape:cy="28.082932" + inkscape:zoom="11.2" + inkscape:cx="9.405576" + inkscape:cy="11.480203" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -89,10 +89,66 @@ id="layer1" transform="translate(-385.35304,-463.7035)"> + inkscape:connector-curvature="0" + inkscape:export-xdpi="95.965683" + inkscape:export-ydpi="95.965683" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/public/img/map-pins/Coral-pin.svg b/resources/public/img/map-pins/Coral-pin.svg deleted file mode 100644 index f572eab..0000000 --- a/resources/public/img/map-pins/Coral-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Cornflower-Blue-pin.svg b/resources/public/img/map-pins/Cornflower-Blue-pin.svg deleted file mode 100644 index c8396bf..0000000 --- a/resources/public/img/map-pins/Cornflower-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Cornsilk-pin.svg b/resources/public/img/map-pins/Cornsilk-pin.svg deleted file mode 100644 index 17a1823..0000000 --- a/resources/public/img/map-pins/Cornsilk-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Crimson-pin.svg b/resources/public/img/map-pins/Crimson-pin.svg deleted file mode 100644 index 253c6b8..0000000 --- a/resources/public/img/map-pins/Crimson-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Cyan-pin.svg b/resources/public/img/map-pins/Cyan-pin.svg deleted file mode 100644 index f165f44..0000000 --- a/resources/public/img/map-pins/Cyan-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Blue-pin.svg b/resources/public/img/map-pins/Dark-Blue-pin.svg deleted file mode 100644 index 05d4f39..0000000 --- a/resources/public/img/map-pins/Dark-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Cyan-pin.svg b/resources/public/img/map-pins/Dark-Cyan-pin.svg deleted file mode 100644 index e620b6a..0000000 --- a/resources/public/img/map-pins/Dark-Cyan-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Goldenrod-pin.svg b/resources/public/img/map-pins/Dark-Goldenrod-pin.svg deleted file mode 100644 index 45c2eac..0000000 --- a/resources/public/img/map-pins/Dark-Goldenrod-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Gray-pin.svg b/resources/public/img/map-pins/Dark-Gray-pin.svg deleted file mode 100644 index 1940052..0000000 --- a/resources/public/img/map-pins/Dark-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Green-pin.svg b/resources/public/img/map-pins/Dark-Green-pin.svg deleted file mode 100644 index deb8e73..0000000 --- a/resources/public/img/map-pins/Dark-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Khaki-pin.svg b/resources/public/img/map-pins/Dark-Khaki-pin.svg deleted file mode 100644 index cad1b04..0000000 --- a/resources/public/img/map-pins/Dark-Khaki-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Magenta-pin.svg b/resources/public/img/map-pins/Dark-Magenta-pin.svg deleted file mode 100644 index bcd992c..0000000 --- a/resources/public/img/map-pins/Dark-Magenta-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Olive-Green-pin.svg b/resources/public/img/map-pins/Dark-Olive-Green-pin.svg deleted file mode 100644 index ed36396..0000000 --- a/resources/public/img/map-pins/Dark-Olive-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Orange-pin.svg b/resources/public/img/map-pins/Dark-Orange-pin.svg deleted file mode 100644 index 86bcdc0..0000000 --- a/resources/public/img/map-pins/Dark-Orange-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Orchid-pin.svg b/resources/public/img/map-pins/Dark-Orchid-pin.svg deleted file mode 100644 index 1ea4ea0..0000000 --- a/resources/public/img/map-pins/Dark-Orchid-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Red-pin.svg b/resources/public/img/map-pins/Dark-Red-pin.svg deleted file mode 100644 index 2d0a6d5..0000000 --- a/resources/public/img/map-pins/Dark-Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Salmon-pin.svg b/resources/public/img/map-pins/Dark-Salmon-pin.svg deleted file mode 100644 index 1d8469c..0000000 --- a/resources/public/img/map-pins/Dark-Salmon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Sea-Green-pin.svg b/resources/public/img/map-pins/Dark-Sea-Green-pin.svg deleted file mode 100644 index 866ae55..0000000 --- a/resources/public/img/map-pins/Dark-Sea-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Slate-Blue-pin.svg b/resources/public/img/map-pins/Dark-Slate-Blue-pin.svg deleted file mode 100644 index 1e1c25c..0000000 --- a/resources/public/img/map-pins/Dark-Slate-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Slate-Gray-pin.svg b/resources/public/img/map-pins/Dark-Slate-Gray-pin.svg deleted file mode 100644 index c0acf36..0000000 --- a/resources/public/img/map-pins/Dark-Slate-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Turquoise-pin.svg b/resources/public/img/map-pins/Dark-Turquoise-pin.svg deleted file mode 100644 index 68b7945..0000000 --- a/resources/public/img/map-pins/Dark-Turquoise-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dark-Violet-pin.svg b/resources/public/img/map-pins/Dark-Violet-pin.svg deleted file mode 100644 index df9c315..0000000 --- a/resources/public/img/map-pins/Dark-Violet-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Deep-Pink-pin.svg b/resources/public/img/map-pins/Deep-Pink-pin.svg deleted file mode 100644 index 5902594..0000000 --- a/resources/public/img/map-pins/Deep-Pink-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Deep-Sky-Blue-pin.svg b/resources/public/img/map-pins/Deep-Sky-Blue-pin.svg deleted file mode 100644 index 8a374e9..0000000 --- a/resources/public/img/map-pins/Deep-Sky-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Developer-pin.png b/resources/public/img/map-pins/Developer-pin.png new file mode 100644 index 0000000000000000000000000000000000000000..9cad06303825484fcfdcd643164b17db451d15a2 GIT binary patch literal 2013 zcmV<32O{{1P)IWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000KmNkluyk}p&)T_j>C^rFk#|N$M6Mw&E^e!$$n>(Z`YE7$ z_mY~ELtbVk`P;XXCd7D!W+EvmLnCEn=PxP>e=wWPB?hBWdwtom&JL$@XbNaq8Gp>k zU@$wIfyzo;B_(9c6c`{ib!a3nud`EC_19HhH@I9b@73U-ufJx_#fzLtNI(dIGCGQT z)heC=+`k1pBg5r3ke<%a;>9eVY|G4KKuS<%TyQX%gs$tD)#(DN zs<>*i;T#!31yB^^mtS)Ew}4I-!*q^_2;~0#T(a5lSuBVhJ7}IipON4=DPiSGo(>my zTE?}t*kWQ3J9cobr-z8;%kfrK;aI<(p2=~0_K;dvM^d;`5E9tuL)o~IMK8TX=gpf~ z+S{>Mt&F|*9t#`}>R)&PFM!8`sl1#lO+)GHLyeC|JT7p^Qdd^u?Cxe(uwBzoHg6_p zczAr=!Gk0Y42-u{k0-nqI|W!usHh-qLeI~q_xb1XOz7?H#BANlJb>-nxs#nu|A7NE zrKb~C$D2~>!-sLSwGlg^fA}Ho0OjS(nLC%E-d-ZU`ikFQzKk_DmwrImuz~JyKp_O< zPd*uE8y}A^*ynKI`}9*TTP%p5ej@(!&vC`Z;tv-Tf*7AZO>9#W2}wyjSh9qBp$5G1 z23;FA;Avdoh z%a)CA!H~db&(f&taNq#RqodPzHGmI3;Hj!A=1jJkOz59|#?_J%a-@XfVirvJJRZ!` z0*7ho{L z{2zTpi_M1LYGur74Xoz>Wc)bN(17*SDUyTjd3p4mJc$$Fx#zgIawP*#6nOS*{L#^m zwjPY1-%cmKm>B$0q9i5;HX0Ssr40Xg|MpvK-+zyNLf^cZHdRG#*+NG}1*rgTHHs;sVkkr?Q+3&~L(13k#5Yua~jqmM4hj1P~ z%X(VLr@m6gSaqJZ1YESHN>qY(+?mj$mkaE+KuNV^@;-Hk~Gy+aZb82k9+ zXR^$(zhrx=a;MIn?e)z#G(fT>TCwQJXA2_Z5RMKK4t%&N*?V`BWS%F6HRqoTwwbNSX= z1-Z9x$9jcOc1bA%ww09954dY;YFZ}S!`epc)~$00;cI>I#rCdEn=W4mxOB;3-MKR_ z-(WE09XodH{Nv^dt7RTJa->Jo*mvsGoK&CBXaK0MPf1c$c{3c)uz>-D5dZY~)QGye zxw8S9n{8GhloR3R2^+Y!wzdo8cXf3s$wC;F&d!)PDP{ft9r)p}gKoDy@yr>gL(>!! z&=_up89l)Y3JN0a_SicX%UIO#uzK(4(VDs8=9m%Vy1KeiO;h&Xzi*zUX@)~H$uZ-L vfZ1&RJIMRGt{ + + + + + + + + + + + + + image/svg+xml + + + 20100801 + + + Simon Brooke + + + + + Copyright (c) 2010 Simon Brooke + + + basic_map_pin.svg + + Basic default map pin + $Revision: 1.2 $ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/public/img/map-pins/Dim-Gray-pin.svg b/resources/public/img/map-pins/Dim-Gray-pin.svg deleted file mode 100644 index 3aae2aa..0000000 --- a/resources/public/img/map-pins/Dim-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Dodger-Blue-pin.svg b/resources/public/img/map-pins/Dodger-Blue-pin.svg deleted file mode 100644 index d4a840f..0000000 --- a/resources/public/img/map-pins/Dodger-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Firebrick-pin.svg b/resources/public/img/map-pins/Firebrick-pin.svg deleted file mode 100644 index 72556cf..0000000 --- a/resources/public/img/map-pins/Firebrick-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Floral-White-pin.svg b/resources/public/img/map-pins/Floral-White-pin.svg deleted file mode 100644 index 4bb0860..0000000 --- a/resources/public/img/map-pins/Floral-White-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Forest-Green-pin.svg b/resources/public/img/map-pins/Forest-Green-pin.svg deleted file mode 100644 index 5f3b63b..0000000 --- a/resources/public/img/map-pins/Forest-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Fuchsia-pin.svg b/resources/public/img/map-pins/Fuchsia-pin.svg deleted file mode 100644 index 5420aa5..0000000 --- a/resources/public/img/map-pins/Fuchsia-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Further-education-pin.png b/resources/public/img/map-pins/Further-education-pin.png new file mode 100644 index 0000000000000000000000000000000000000000..89c40386d16df8336121b080f76bc9a126a6264e GIT binary patch literal 1893 zcmV-r2b%baP)IWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000JDNklGHg-rp?(F<}h(qW>ijwm9-nhTt zd_Vh}o&C)$2|Ur**ceZxQg2C#uM9KK5YC;XY1%nNm?K2KoX_W%$=KK!PbO2J z1c92JpFeWP_qAH98Z7HyM@pqzLyYOQbozzKXtclBYK*3NdSBne?<-39NC@vV8yy|} zIU@XYZtmzrE2!%(Bp*Ni!w;&}siTNOk+R0C)v2dEZ`I&DSEQ7O&BlhIBFbfBqphtp zswk|?1_y`UEtQf^v6x(KHb{tywz2W&p2b%I@6Kd?JZTss>y7eU zH(D}Hdqe?1RZ5UM6ROoOGKIq5MuaHE_X6&&s%)&Sz5fj7pRQ#xFHdS(yR$X^B@4A( zRRlqiZ*G1#*P4wlkq#o~CMZGYa67_zUf zQyTFZGhD`EE@N?5Rg;dQBwbZax$EoKPYGegn!yo6X4`lB9p``Drg>&69v`i*qb=Zo zhM^NNj1vo-_iUUm4)YIRl*!>TT2EwZ2L5d{lFM?;kL zm%a{G6eFNi_X$x$*Ij5U6h6pF>1+EjZZ3j`F}Rpczc{NXMzA%q?HRl7gU)RBl?g?O z`?h^|vsfG-3B%p5&wiw79feHhrAf|@lpDqA)*px=qf`xjf7Pf~XR}>huiT2qPt6g+ zcCGqmqExS?)6e}UlX+p%vL=o;&1-Z~N+hm3pIctO{48UUpu79kk956vr3DfV|Du_NY_R>{oOF4TwH`OG|jQQ0Ho<1OX>2xpo~S`bo%+(mf&LX zAH88%iEeIwH~;{UNSs>f=r}*2C`r57;AYbG-j!_j)tj1@ahv7Tr@B^KYzIK%y7#jH zFbx1;7z3Np=&_F-=Zj3GGL!ZFm5dN}6acrKcL=3>R{7+ zZpN~1d9m2ZyR$RB;HjIJI zy#`RK$enxaVN`#{QVMF@pY?rR!-Ie&0Fr8Twk-@D-S><9+eIP)07(&HEfNvByG!l(^ z9fV-R{x2oDLx_AcpU>Y0Xi(OL3l~lZAqEH`JNHx#fc+v2>9LuazME3g`sd2=aG2HHQb$=>B^NW>j3z+XJV+tp&2JqH06;0Z9F4l2iA1^m$zK)|-wC)> zDqSUnlybTClZfyzpU>a>PQc^i<23;M6=Omt1b%lIk3)e005nbeH6oU!lz%*|$Dwup f{P{QFkiGT)N*Vk|+E{D}00000NkvXXu0mjf0&jl) literal 0 HcmV?d00001 diff --git a/resources/public/img/map-pins/Chartreuse-pin.svg b/resources/public/img/map-pins/Further-education-pin.svg similarity index 60% rename from resources/public/img/map-pins/Chartreuse-pin.svg rename to resources/public/img/map-pins/Further-education-pin.svg index 579bf31..7a62ddb 100644 --- a/resources/public/img/map-pins/Chartreuse-pin.svg +++ b/resources/public/img/map-pins/Further-education-pin.svg @@ -16,11 +16,11 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="Blank-pin.svg" + sodipodi:docname="Further-education-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/basic_map_pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Further-education-pin.png" + inkscape:export-xdpi="95.999985" + inkscape:export-ydpi="95.999985" version="1.1"> @@ -34,9 +34,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.919596" - inkscape:cx="23.755716" - inkscape:cy="28.082932" + inkscape:zoom="11.2" + inkscape:cx="20.179083" + inkscape:cy="6.9983483" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -89,10 +89,30 @@ id="layer1" transform="translate(-385.35304,-463.7035)"> + + + + + + diff --git a/resources/public/img/map-pins/Gainsboro-pin.svg b/resources/public/img/map-pins/Gainsboro-pin.svg deleted file mode 100644 index 5cf0c47..0000000 --- a/resources/public/img/map-pins/Gainsboro-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Ghost-White-pin.svg b/resources/public/img/map-pins/Ghost-White-pin.svg deleted file mode 100644 index bc967dd..0000000 --- a/resources/public/img/map-pins/Ghost-White-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Gold-pin.svg b/resources/public/img/map-pins/Gold-pin.svg deleted file mode 100644 index 67c9a54..0000000 --- a/resources/public/img/map-pins/Gold-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Goldenrod-pin.svg b/resources/public/img/map-pins/Goldenrod-pin.svg deleted file mode 100644 index 9f97415..0000000 --- a/resources/public/img/map-pins/Goldenrod-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Gray-pin.svg b/resources/public/img/map-pins/Gray-pin.svg deleted file mode 100644 index 71477d0..0000000 --- a/resources/public/img/map-pins/Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Green-Yellow-pin.svg b/resources/public/img/map-pins/Green-Yellow-pin.svg deleted file mode 100644 index 1e75770..0000000 --- a/resources/public/img/map-pins/Green-Yellow-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Green-pin.svg b/resources/public/img/map-pins/Green-pin.svg deleted file mode 100644 index 5dffcca..0000000 --- a/resources/public/img/map-pins/Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Higher-education-pin.png b/resources/public/img/map-pins/Higher-education-pin.png new file mode 100644 index 0000000000000000000000000000000000000000..c95de4012575a3f3ef3435b8e23b9cbf38c72e4b GIT binary patch literal 1933 zcmV;82Xgp{P)IWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000JrNkl~NB@l`b4I*VNVklLcHkDI1X@C&h4R)NwADjL5%FN!P_3H47;9!&@jNVY9L1ZG5z6~~+On#4GlXU-V_%8K;|Uat z#iW3yy)P4@e=d=@uDWhzGq3SnZr4~ky}yOyDo^P8)F)b6RyM0C3WEGjB=X5B&o5OS z=Lk1EJp6sc*w3RqjDI7a-}ldA zF)|toO&tvcGWGI;m5Q;XszW>j5HMr3HsP9Sw*MiS9Ll(EOEX}t@~-QDX=!QXjeI`+ zbR;shOOovMam*NH0OA9yNI8ylE|J)O!?L=!1FY4oZFilyeY^drrrrH!Br>O9OxDNO zz!gfl^Qlzyt$eF=elYmIAM&t zY#4nvEGu%Vt7|$I46gOj8n{X+HVN^KXxhCYRn3J&u^ixe#~?&ZIgXrh969Sa%I#7q z_`Ye%1|hQTdA_Zz-l3E;2@&b)+}Hrtc-~bx&hcUF-L$NZ-xUho6-vde7&j6EV4u>o zg(r3Wmd5k$`q+j&p0=#e52Mk^HlBAb8%FMr$>fk(=jXE(^~iGmsc?8|!0#{Ai*J~C zE~T6gWAARc?7wOl`VV@0uY4&OoaGUEpz9k+<+#e%b^TvYhQm{T&E{F4*)PHO{@Z$XZvGNvrqbc}9UOsBz(-0i-`D_Vew?gRyF9R-P+-teqz=UD!sZuJq>xNAo zAG1-cZgcS%v(a$)-?+&gTb?I1gSPN|`H67&)~4WB)9F11Awujz%YRNh&wWS$ovemet7s&`rzI0bm9I;IO9U4r$uuYo^)$UZJ4R z+jjek>nd#B=mP-Y5Td%zXZ9;f_6u!o%e}H(+U(}mz~9jI5B`$LRF7&}VtoPzU?ZBA z9nrKb0Dwa&PCJfN^gMw_h_>>)+bN3GX4}#f9F=9OTat=LG%eSxK*X5Vp0PX8+8#TU z;KcD9WZ48=xU+RVG<&z97p;nfvf#NF=i}n3xfQQVle~&FlXCao<2KKNfZ?f zkis57d_h(98O!QYIL@Ip9s4lF5JHQp8ul1_6`ekPdQY`dnL*3T=4sEnzTNKJj@}E0 z4<;0)gCTT)o0*w02L}glaDl)xDMe{h2(e|)t3Iq{Q-n}PmIGHqp@SJk>7)Ro@p$~& zn*WItCq9h;&N6`EdIku91gh1{;Z$m-#dSAKqzccA?}kD{h9q^d2J;^=cAWxzCmxSq zTlL$hQ>RWHAcXWIglf-Jk;C{ok&s8eys$9AQ@ZxK@@7xZ5mOWm2Jix7Y{R=1W6S}7 zTVrEmAJi;l>lz&$?Q|VyE?OugAIoHB0RS?JqP?T*$1uj9y>Q{em92Vh`jxp}=g*(d zP{w|KPgQq$2w?z#Wxqen0o>URblYG607A%19>%`K*48cnfUG2G9>Dl^eYOq0c=2MA zG4}d`->)--P)QU6jIoK291H+}F#c^`l0u8B+DZTSm&N4A0yYfe0w84E?C3a%7+Z|T z<8vPi_|m0I6$bFLD#kKH=-f^`b_50h5JmA{usHp8PiK@KE_L-GlVB T#6;@P00000NkvXXu0mjf!q=MQ literal 0 HcmV?d00001 diff --git a/resources/public/img/map-pins/Cadet-Blue-pin.svg b/resources/public/img/map-pins/Higher-education-pin.svg similarity index 60% rename from resources/public/img/map-pins/Cadet-Blue-pin.svg rename to resources/public/img/map-pins/Higher-education-pin.svg index 8e8460e..90ccb98 100644 --- a/resources/public/img/map-pins/Cadet-Blue-pin.svg +++ b/resources/public/img/map-pins/Higher-education-pin.svg @@ -16,11 +16,11 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="Blank-pin.svg" + sodipodi:docname="Higher-education-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/basic_map_pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Higher-education-pin.png" + inkscape:export-xdpi="95.999985" + inkscape:export-ydpi="95.999985" version="1.1"> @@ -34,9 +34,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.919596" - inkscape:cx="23.755716" - inkscape:cy="28.082932" + inkscape:zoom="11.2" + inkscape:cx="20.179083" + inkscape:cy="6.9983483" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -89,10 +89,30 @@ id="layer1" transform="translate(-385.35304,-463.7035)"> + + + + + + diff --git a/resources/public/img/map-pins/Honeydew-pin.svg b/resources/public/img/map-pins/Honeydew-pin.svg deleted file mode 100644 index 29df913..0000000 --- a/resources/public/img/map-pins/Honeydew-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Hot-Pink-pin.svg b/resources/public/img/map-pins/Hot-Pink-pin.svg deleted file mode 100644 index 637af11..0000000 --- a/resources/public/img/map-pins/Hot-Pink-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Indian-Red-pin.svg b/resources/public/img/map-pins/Indian-Red-pin.svg deleted file mode 100644 index b728d7a..0000000 --- a/resources/public/img/map-pins/Indian-Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Indigo-pin.svg b/resources/public/img/map-pins/Indigo-pin.svg deleted file mode 100644 index fcfd7e5..0000000 --- a/resources/public/img/map-pins/Indigo-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Ivory-pin.svg b/resources/public/img/map-pins/Ivory-pin.svg deleted file mode 100644 index c51ce11..0000000 --- a/resources/public/img/map-pins/Ivory-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Khaki-pin.svg b/resources/public/img/map-pins/Khaki-pin.svg deleted file mode 100644 index bbf51f1..0000000 --- a/resources/public/img/map-pins/Khaki-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lavender-Blush-pin.svg b/resources/public/img/map-pins/Lavender-Blush-pin.svg deleted file mode 100644 index ab6f41c..0000000 --- a/resources/public/img/map-pins/Lavender-Blush-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lavender-pin.svg b/resources/public/img/map-pins/Lavender-pin.svg deleted file mode 100644 index ced5fe2..0000000 --- a/resources/public/img/map-pins/Lavender-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lawn-Green-pin.svg b/resources/public/img/map-pins/Lawn-Green-pin.svg deleted file mode 100644 index a96bad3..0000000 --- a/resources/public/img/map-pins/Lawn-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lemon-Chiffon-pin.svg b/resources/public/img/map-pins/Lemon-Chiffon-pin.svg deleted file mode 100644 index dc76f53..0000000 --- a/resources/public/img/map-pins/Lemon-Chiffon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Blue-pin.svg b/resources/public/img/map-pins/Light-Blue-pin.svg deleted file mode 100644 index 0980255..0000000 --- a/resources/public/img/map-pins/Light-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Coral-pin.svg b/resources/public/img/map-pins/Light-Coral-pin.svg deleted file mode 100644 index 374ee1f..0000000 --- a/resources/public/img/map-pins/Light-Coral-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Cyan-pin.svg b/resources/public/img/map-pins/Light-Cyan-pin.svg deleted file mode 100644 index 557ad3a..0000000 --- a/resources/public/img/map-pins/Light-Cyan-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Goldenrod-pin.svg b/resources/public/img/map-pins/Light-Goldenrod-pin.svg deleted file mode 100644 index 6491832..0000000 --- a/resources/public/img/map-pins/Light-Goldenrod-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Gray-pin.svg b/resources/public/img/map-pins/Light-Gray-pin.svg deleted file mode 100644 index e5ea12c..0000000 --- a/resources/public/img/map-pins/Light-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Green-pin.svg b/resources/public/img/map-pins/Light-Green-pin.svg deleted file mode 100644 index ac15d84..0000000 --- a/resources/public/img/map-pins/Light-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Pink-pin.svg b/resources/public/img/map-pins/Light-Pink-pin.svg deleted file mode 100644 index a7f121e..0000000 --- a/resources/public/img/map-pins/Light-Pink-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Salmon-pin.svg b/resources/public/img/map-pins/Light-Salmon-pin.svg deleted file mode 100644 index 6edd041..0000000 --- a/resources/public/img/map-pins/Light-Salmon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Sea-Green-pin.svg b/resources/public/img/map-pins/Light-Sea-Green-pin.svg deleted file mode 100644 index 7378515..0000000 --- a/resources/public/img/map-pins/Light-Sea-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Sky-Blue-pin.svg b/resources/public/img/map-pins/Light-Sky-Blue-pin.svg deleted file mode 100644 index 3c83da7..0000000 --- a/resources/public/img/map-pins/Light-Sky-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Slate-Gray-pin.svg b/resources/public/img/map-pins/Light-Slate-Gray-pin.svg deleted file mode 100644 index a1866b6..0000000 --- a/resources/public/img/map-pins/Light-Slate-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Steel-Blue-pin.svg b/resources/public/img/map-pins/Light-Steel-Blue-pin.svg deleted file mode 100644 index 7d771c2..0000000 --- a/resources/public/img/map-pins/Light-Steel-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Light-Yellow-pin.svg b/resources/public/img/map-pins/Light-Yellow-pin.svg deleted file mode 100644 index a3de894..0000000 --- a/resources/public/img/map-pins/Light-Yellow-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lime-Green-pin.svg b/resources/public/img/map-pins/Lime-Green-pin.svg deleted file mode 100644 index a4e6052..0000000 --- a/resources/public/img/map-pins/Lime-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Lime-pin.svg b/resources/public/img/map-pins/Lime-pin.svg deleted file mode 100644 index 5dffcca..0000000 --- a/resources/public/img/map-pins/Lime-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Linen-pin.svg b/resources/public/img/map-pins/Linen-pin.svg deleted file mode 100644 index 4cd830a..0000000 --- a/resources/public/img/map-pins/Linen-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Magenta-pin.svg b/resources/public/img/map-pins/Magenta-pin.svg deleted file mode 100644 index 5420aa5..0000000 --- a/resources/public/img/map-pins/Magenta-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Maroon-pin.svg b/resources/public/img/map-pins/Maroon-pin.svg deleted file mode 100644 index 9f4e1cb..0000000 --- a/resources/public/img/map-pins/Maroon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Aquamarine-pin.svg b/resources/public/img/map-pins/Medium-Aquamarine-pin.svg deleted file mode 100644 index 2ba83ba..0000000 --- a/resources/public/img/map-pins/Medium-Aquamarine-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Blue-pin.svg b/resources/public/img/map-pins/Medium-Blue-pin.svg deleted file mode 100644 index 76e8f1c..0000000 --- a/resources/public/img/map-pins/Medium-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Orchid-pin.svg b/resources/public/img/map-pins/Medium-Orchid-pin.svg deleted file mode 100644 index 6770921..0000000 --- a/resources/public/img/map-pins/Medium-Orchid-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Purple-pin.svg b/resources/public/img/map-pins/Medium-Purple-pin.svg deleted file mode 100644 index 1b75933..0000000 --- a/resources/public/img/map-pins/Medium-Purple-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Sea-Green-pin.svg b/resources/public/img/map-pins/Medium-Sea-Green-pin.svg deleted file mode 100644 index b37d5db..0000000 --- a/resources/public/img/map-pins/Medium-Sea-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Slate-Blue-pin.svg b/resources/public/img/map-pins/Medium-Slate-Blue-pin.svg deleted file mode 100644 index 4084b6f..0000000 --- a/resources/public/img/map-pins/Medium-Slate-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Spring-Green-pin.svg b/resources/public/img/map-pins/Medium-Spring-Green-pin.svg deleted file mode 100644 index 5a359d2..0000000 --- a/resources/public/img/map-pins/Medium-Spring-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Turquoise-pin.svg b/resources/public/img/map-pins/Medium-Turquoise-pin.svg deleted file mode 100644 index 5df855a..0000000 --- a/resources/public/img/map-pins/Medium-Turquoise-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Medium-Violet-Red-pin.svg b/resources/public/img/map-pins/Medium-Violet-Red-pin.svg deleted file mode 100644 index 26de706..0000000 --- a/resources/public/img/map-pins/Medium-Violet-Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Midnight-Blue-pin.svg b/resources/public/img/map-pins/Midnight-Blue-pin.svg deleted file mode 100644 index 57a48c7..0000000 --- a/resources/public/img/map-pins/Midnight-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Mint-Cream-pin.svg b/resources/public/img/map-pins/Mint-Cream-pin.svg deleted file mode 100644 index 49e0bc8..0000000 --- a/resources/public/img/map-pins/Mint-Cream-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Misty-Rose-pin.svg b/resources/public/img/map-pins/Misty-Rose-pin.svg deleted file mode 100644 index d346b68..0000000 --- a/resources/public/img/map-pins/Misty-Rose-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Moccasin-pin.svg b/resources/public/img/map-pins/Moccasin-pin.svg deleted file mode 100644 index f913dc0..0000000 --- a/resources/public/img/map-pins/Moccasin-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Navajo-White-pin.svg b/resources/public/img/map-pins/Navajo-White-pin.svg deleted file mode 100644 index 2277fcf..0000000 --- a/resources/public/img/map-pins/Navajo-White-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Navy-Blue-pin.svg b/resources/public/img/map-pins/Navy-Blue-pin.svg deleted file mode 100644 index 1d19483..0000000 --- a/resources/public/img/map-pins/Navy-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Old-Lace-pin.svg b/resources/public/img/map-pins/Old-Lace-pin.svg deleted file mode 100644 index b159585..0000000 --- a/resources/public/img/map-pins/Old-Lace-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Olive-Drab-pin.svg b/resources/public/img/map-pins/Olive-Drab-pin.svg deleted file mode 100644 index a76a146..0000000 --- a/resources/public/img/map-pins/Olive-Drab-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Olive-pin.svg b/resources/public/img/map-pins/Olive-pin.svg deleted file mode 100644 index 4d61082..0000000 --- a/resources/public/img/map-pins/Olive-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Orange-Red-pin.svg b/resources/public/img/map-pins/Orange-Red-pin.svg deleted file mode 100644 index 1655465..0000000 --- a/resources/public/img/map-pins/Orange-Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Orange-pin.svg b/resources/public/img/map-pins/Orange-pin.svg deleted file mode 100644 index 7828e28..0000000 --- a/resources/public/img/map-pins/Orange-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Orchid-pin.svg b/resources/public/img/map-pins/Orchid-pin.svg deleted file mode 100644 index 07f7540..0000000 --- a/resources/public/img/map-pins/Orchid-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Pale-Goldenrod-pin.svg b/resources/public/img/map-pins/Pale-Goldenrod-pin.svg deleted file mode 100644 index 8d5fd01..0000000 --- a/resources/public/img/map-pins/Pale-Goldenrod-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Pale-Green-pin.svg b/resources/public/img/map-pins/Pale-Green-pin.svg deleted file mode 100644 index 05bf87c..0000000 --- a/resources/public/img/map-pins/Pale-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Pale-Turquoise-pin.svg b/resources/public/img/map-pins/Pale-Turquoise-pin.svg deleted file mode 100644 index 3b38490..0000000 --- a/resources/public/img/map-pins/Pale-Turquoise-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Pale-Violet-Red-pin.svg b/resources/public/img/map-pins/Pale-Violet-Red-pin.svg deleted file mode 100644 index a9ed0fb..0000000 --- a/resources/public/img/map-pins/Pale-Violet-Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Papaya-Whip-pin.svg b/resources/public/img/map-pins/Papaya-Whip-pin.svg deleted file mode 100644 index 32ed7a2..0000000 --- a/resources/public/img/map-pins/Papaya-Whip-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Peach-Puff-pin.svg b/resources/public/img/map-pins/Peach-Puff-pin.svg deleted file mode 100644 index ade5adb..0000000 --- a/resources/public/img/map-pins/Peach-Puff-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Peru-pin.svg b/resources/public/img/map-pins/Peru-pin.svg deleted file mode 100644 index a2df964..0000000 --- a/resources/public/img/map-pins/Peru-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Pink-pin.svg b/resources/public/img/map-pins/Pink-pin.svg deleted file mode 100644 index f2eb15e..0000000 --- a/resources/public/img/map-pins/Pink-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Planning-authority-pin.png b/resources/public/img/map-pins/Planning-authority-pin.png index 12061eac4ee0e0f22487a673734c5920c68c8f22..7c3c38dce38c4fa9fde4fa7c13f20db8dc3e0c5b 100644 GIT binary patch delta 1245 zcmV<31S0$G4d@H7907j>wn;=mR9J=Wm|1L8RT#&A=iJ%a8Ky&5y0X+R0|z2A)BPJ{W@%HIW1~K@BFA2NT4^SmJ|;4@eh+Q9%o&RS<}_ETshrhAC|+EmMXr zGxwhB!!5MHP&#$$6aVDAeCMA3@1FHLIf8Nd{eG9v=X=vIv~_<{8u?(_iHk%;DS1H% zy>4h|==0|0=1~9vP*YQr6N&H>$VGubc_0|f4;qHej0aZJbm8+|Ov=h?$pNF&G$YUL z-@iW~{C>a7>rFX1IyyJAwe`bOp-|RnJb?Gg;|V0JTD7gzmy}aNlD2j)6`x$ zdUVIJ*@6Ou!(M;AudlR!;ldx6X&N`BQnvMhKzU#`p|=$Z<&1Q9mv@_{eZ7=YJvKO4 z7>vzgNP~A5!Nwx!cEr+hV4&!Rl&V02vMXg*(`z;=;e+{5{5149!DGOR3V5Rc25i%D zuvp3=rw23y?8=0~N@(}O;osn!bFlLQoH+tc1xqSnb3T9E)TZP35U>f6Yr}Unp^1D)GdH5=V5*C z6yUIcZAE`@*#m_`uqO}pOrLk3+&c8TU`GMGGyv(52Y?+Wd~q6HeiHJA{{wN7uDRg- z&dE@SI>#$Ru&E2$ldQ$!)?v+6tNc6RMPAAt1HiC9t?p6`DLmoX7rFbvCs;EBMC12D&!2KfKc zBk&{etSQQo+3kRJ%b+&_&L@FQ!Jhe6-Jk>BSpqlhP*h>XuDD@C3G^mT#I8H7Z8_+G zXIH|n#~~~H5O8BMto?`ai(njNTAr`>JOte3woa^gDtup#wgC!mUqGs#fDi?Qj4+a-qJ9+Z0 zbD>c7$mF`j#Osc-vQL-#d|hcmsHoRm)3p65rSV#Qef@EWvRA9Bs+MS)R-lx+cS||J z_I5ZtC;#BV-L1Orx|3u5{>>}A-pfIVYzM|BH+Ebh{AZSj<%(GXYz#2+3C>5l^DccI#SG)86^9dd#TD)&q)O z>u>}Uq}0EiiN}nOC#Tc7%QP7>O>^%|J!Y)x>gtWmaJv2lq1nHNizj?(00000NkvXX Hu0mjfnS5|t delta 1508 zcmVdRJUQCzCAd8yaiC#D}m1XGa79I6QGf)#{fWn*~8ImPqh*Ct%D71)^f`t}s zPphqM-}l|czz{%28`zb<%jcZ;|I0b==Q$LNpwVc;q*CcFnx=oZV~mpsAp)2ID2npa zG;Iz90;hSN|Dmz5(F*`T0RU{+ut7x#xlYq`qFSx)kBd_|X__W8A;uU}7K! zG4A&J{cG#%>-#BK&fvEncs8DWg`a z_b?2zanGJzw`PA!3IGrh5fMm9NwGIKH@^)4E}CJO9cs0@e>SC~C=?2hTCE;nS#}4F zFEp-0kI%}= ze&22%7K%h7w0`~iRR<0nNOm|J>~u0%mc{atgAuvsagu9bMq{dZ)~OW1CjfxaXcSE)9?S0CyL!61x~wNooP4vY>S981@fTg2HfP&(c5MHWkcL}FqBUtL`lS6y8-UEc)6;_!cf#qu;vuh%DMW@?_u<#PX|VwPpe z!GmAjFDfctrc};<90cV%Toi&Cld0RS{NH!Ck(xR^F!t!`+z8I_Zh_lOWo&B&8cG-+tK8MSq5 zfpu(sg1EQ0SL|{*XXI!*iqGerut&21fC>3`*V?(W@U4!Hj=3`_9p&M}M`FFc{N8_v z3$qNv4B73&A^?C>r}Xz`Lpm0_-7aDnW{5@z)wQ*?DG@?5(x+2_5TXo*witv^Elp9> zVV>v1&YnHDn2>3m`9gva3>6iXi+P^sFvdq1qtWO{PENjWv)MlF>@-ScGMPsvlf9tn znVI4UAPOE-{plLdwQmJeO1zS25 z3WaCvHK)_TojLQWV&zZndzF$f{bX0yov zplQ~{000={(+?gzRNTGWE=ODl2`GxX6>LUGtJTO~1dB){5_voxTXl7He6SfIJ#k}W zqZc7`)a`bMBZSU{k`eOqBoqoy0sv14`8m{#kjcx-`wT+tu73brTanRLCT>*#0000< KMNUMnLSTYd7~#zT diff --git a/resources/public/img/map-pins/Planning-authority-pin.svg b/resources/public/img/map-pins/Planning-authority-pin.svg index 1bbde07..86ad6ad 100644 --- a/resources/public/img/map-pins/Planning-authority-pin.svg +++ b/resources/public/img/map-pins/Planning-authority-pin.svg @@ -18,7 +18,7 @@ inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Planning-authority-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/basic_map_pin.png" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Planning-authority-pin.png" inkscape:export-xdpi="11.98" inkscape:export-ydpi="11.98" version="1.1"> @@ -58,8 +58,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="-144.01361" - inkscape:cy="86.04423" + inkscape:cx="-347.05427" + inkscape:cy="82.00362" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -112,7 +112,7 @@ id="layer1" transform="translate(-384.75,-187.11218)"> - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Powder-Blue-pin.svg b/resources/public/img/map-pins/Powder-Blue-pin.svg deleted file mode 100644 index 495ffef..0000000 --- a/resources/public/img/map-pins/Powder-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Purple-pin.svg b/resources/public/img/map-pins/Purple-pin.svg deleted file mode 100644 index 2f9c59e..0000000 --- a/resources/public/img/map-pins/Purple-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Rebecca-Purple-pin.svg b/resources/public/img/map-pins/Rebecca-Purple-pin.svg deleted file mode 100644 index 53508d8..0000000 --- a/resources/public/img/map-pins/Rebecca-Purple-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Red-pin.svg b/resources/public/img/map-pins/Red-pin.svg deleted file mode 100644 index 51c8ee5..0000000 --- a/resources/public/img/map-pins/Red-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Rosy-Brown-pin.svg b/resources/public/img/map-pins/Rosy-Brown-pin.svg deleted file mode 100644 index 454a019..0000000 --- a/resources/public/img/map-pins/Rosy-Brown-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Royal-Blue-pin.svg b/resources/public/img/map-pins/Royal-Blue-pin.svg deleted file mode 100644 index 168e105..0000000 --- a/resources/public/img/map-pins/Royal-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Saddle-Brown-pin.svg b/resources/public/img/map-pins/Saddle-Brown-pin.svg deleted file mode 100644 index 1e5c7e4..0000000 --- a/resources/public/img/map-pins/Saddle-Brown-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Salmon-pin.svg b/resources/public/img/map-pins/Salmon-pin.svg deleted file mode 100644 index 97278f0..0000000 --- a/resources/public/img/map-pins/Salmon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Sandy-Brown-pin.svg b/resources/public/img/map-pins/Sandy-Brown-pin.svg deleted file mode 100644 index 63f897c..0000000 --- a/resources/public/img/map-pins/Sandy-Brown-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Sea-Green-pin.svg b/resources/public/img/map-pins/Sea-Green-pin.svg deleted file mode 100644 index 09df86b..0000000 --- a/resources/public/img/map-pins/Sea-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Seashell-pin.svg b/resources/public/img/map-pins/Seashell-pin.svg deleted file mode 100644 index 9f9cd70..0000000 --- a/resources/public/img/map-pins/Seashell-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Sienna-pin.svg b/resources/public/img/map-pins/Sienna-pin.svg deleted file mode 100644 index 41df55a..0000000 --- a/resources/public/img/map-pins/Sienna-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Silver-pin.svg b/resources/public/img/map-pins/Silver-pin.svg deleted file mode 100644 index 825dca9..0000000 --- a/resources/public/img/map-pins/Silver-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Sky-Blue-pin.svg b/resources/public/img/map-pins/Sky-Blue-pin.svg deleted file mode 100644 index 2426e30..0000000 --- a/resources/public/img/map-pins/Sky-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Slate-Blue-pin.svg b/resources/public/img/map-pins/Slate-Blue-pin.svg deleted file mode 100644 index c0c01f8..0000000 --- a/resources/public/img/map-pins/Slate-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Slate-Gray-pin.svg b/resources/public/img/map-pins/Slate-Gray-pin.svg deleted file mode 100644 index d608b76..0000000 --- a/resources/public/img/map-pins/Slate-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Snow-pin.svg b/resources/public/img/map-pins/Snow-pin.svg deleted file mode 100644 index 2a07e00..0000000 --- a/resources/public/img/map-pins/Snow-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Spring-Green-pin.svg b/resources/public/img/map-pins/Spring-Green-pin.svg deleted file mode 100644 index 3692167..0000000 --- a/resources/public/img/map-pins/Spring-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Steel-Blue-pin.svg b/resources/public/img/map-pins/Steel-Blue-pin.svg deleted file mode 100644 index f3eb422..0000000 --- a/resources/public/img/map-pins/Steel-Blue-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Tan-pin.svg b/resources/public/img/map-pins/Tan-pin.svg deleted file mode 100644 index dce575f..0000000 --- a/resources/public/img/map-pins/Tan-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Teal-pin.svg b/resources/public/img/map-pins/Teal-pin.svg deleted file mode 100644 index 5bdda28..0000000 --- a/resources/public/img/map-pins/Teal-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Thistle-pin.svg b/resources/public/img/map-pins/Thistle-pin.svg deleted file mode 100644 index 2d0b61f..0000000 --- a/resources/public/img/map-pins/Thistle-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Tomato-pin.svg b/resources/public/img/map-pins/Tomato-pin.svg deleted file mode 100644 index 50a1a6b..0000000 --- a/resources/public/img/map-pins/Tomato-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Turquoise-pin.svg b/resources/public/img/map-pins/Turquoise-pin.svg deleted file mode 100644 index dc5147c..0000000 --- a/resources/public/img/map-pins/Turquoise-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Violet-pin.svg b/resources/public/img/map-pins/Violet-pin.svg deleted file mode 100644 index 8465558..0000000 --- a/resources/public/img/map-pins/Violet-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Web-Gray-pin.svg b/resources/public/img/map-pins/Web-Gray-pin.svg deleted file mode 100644 index c9af165..0000000 --- a/resources/public/img/map-pins/Web-Gray-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Web-Green-pin.svg b/resources/public/img/map-pins/Web-Green-pin.svg deleted file mode 100644 index 63d6289..0000000 --- a/resources/public/img/map-pins/Web-Green-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Web-Maroon-pin.svg b/resources/public/img/map-pins/Web-Maroon-pin.svg deleted file mode 100644 index 555402a..0000000 --- a/resources/public/img/map-pins/Web-Maroon-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Web-Purple-pin.svg b/resources/public/img/map-pins/Web-Purple-pin.svg deleted file mode 100644 index 21b3947..0000000 --- a/resources/public/img/map-pins/Web-Purple-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/Wheat-pin.svg b/resources/public/img/map-pins/Wheat-pin.svg deleted file mode 100644 index 00176f7..0000000 --- a/resources/public/img/map-pins/Wheat-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/White-Smoke-pin.svg b/resources/public/img/map-pins/White-Smoke-pin.svg deleted file mode 100644 index 02ab436..0000000 --- a/resources/public/img/map-pins/White-Smoke-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/White-pin.svg b/resources/public/img/map-pins/White-pin.svg deleted file mode 100644 index 133e254..0000000 --- a/resources/public/img/map-pins/White-pin.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - 20100801 - - - Simon Brooke - - - - - Copyright (c) 2010 Simon Brooke - - - basic_map_pin.svg - - Basic default map pin - $Revision: 1.2 $ - - - - - - - - diff --git a/resources/public/img/map-pins/colours/Blank-pin.svg b/resources/public/img/map-pins/colours/Blank-pin.svg index f659827..4d88a83 100644 --- a/resources/public/img/map-pins/colours/Blank-pin.svg +++ b/resources/public/img/map-pins/colours/Blank-pin.svg @@ -18,9 +18,9 @@ inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Blank-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/basic_map_pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Developer-pin.png" + inkscape:export-xdpi="95.965683" + inkscape:export-ydpi="95.965683" version="1.1"> @@ -34,9 +34,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.919596" - inkscape:cx="23.755716" - inkscape:cy="28.082932" + inkscape:zoom="11.2" + inkscape:cx="-17.708798" + inkscape:cy="19.198946" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" From 43a7548841984addf0aafb24c24cc8b0bb9dadfa Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 6 Feb 2020 11:34:03 +0000 Subject: [PATCH 4/9] Cosmetic map pin changes for customer --- .../public/img/map-pins/Operator-pin.png | Bin 1996 -> 1683 bytes .../public/img/map-pins/Operator-pin.svg | 78 +++++++++--------- .../img/map-pins/Planning-authority-pin.png | Bin 1512 -> 1767 bytes .../img/map-pins/Planning-authority-pin.svg | 6 +- 4 files changed, 43 insertions(+), 41 deletions(-) diff --git a/resources/public/img/map-pins/Operator-pin.png b/resources/public/img/map-pins/Operator-pin.png index 114a5f71509de50f0489f0c2405198e9738e9df3..56f3d2a76cc649a13a248f6fadc706fbb6631cf4 100644 GIT binary patch delta 1418 zcmV;51$Fw&50eeB907j?VM# ztWIJy?wTT?(Zs|LpsvY&*p?RvGS!4EtyB{_NN=f$x&4IU>oqmS;{vnMHuL?RT4M~BZHIlv)z#A1#hKrhi-Ml7rF?7}) zb(@^V#>SV_(IFUZNP#pOMrTNy-~6$|(*QsTmpVYw7D#ziu|hnxz+)Urgm1EXN4zkGRB} zEW$?Jz6ts5DV-%`hBlF~(l z2Cn7jSOf~`v~$2Jxj@qs9S1g#`o%FI%TS~c*vAx8!_1?OZc9kKF%4P zk1M?t%M*Xnm=APz@FQHJi>RDnKA%fO{zyHWw4d(?%5!E7F2YfXOB=QFSE&bJzf|&` zRNNjIV2AeVZ?sqbMNB`^!>k}JPs?h~6Vx)sr`=>9N&qX{vb+dy38o8oXqzPep zRTgttN~vQ+`Up|Q71rtiPwRi!DK$K+r#Zts{vv;6xq@e2u1TFCAl<}yL?V1F3vp2W zsXZ;Pn^h>n83|9F?I%P%Bl0I|^cjY33oKh?1^>R5L70rbqCIj@;^-^`qeH4`)*+5d z2|3pLreJ+TdnJWmU)NsNav2BZVJW?-)7MghKld)*yvILeR9BPYL56Xz8Q#ivm;gV} zoJW7}&B3$DW|g@JciP^MHK{xF#N7g4*JCa3 zXQ)2Fc>o^L0RSG=^91o|V3@kOvv*uasz0f&G_Kht>({Seq@pMKn)?P0y?p5FX}^3B zKjmbmMPJ0nf~=`^8HXY)zBziVaNpbat*rdCvRpmA$LZuQ}b#{g7!RaaQYewPn4Z!m!Cx_|JceZiW}nsR{niFk?e%-{0$$s2#%(a~|v zirruPNo}R$Iuh;=F95plIv7Aac|X<@tElR#Div4!BJx?@9)*Ati9{$8i=54bGsV6u zzM=LH+w1f7C@AC3&dxM0+XJaUk#WtR3-Krj3=j+kf3N7Us(x6gN5NXRZruwM*slKr Y91#w5btOwg00000NkvXXu0jG}f^x*f_W%F@ delta 1733 zcmV;$20HnZ4a^U)907j@nn^@KR9JC z(|)i`#|^H;q}im=x-o5x-HK^Q)7aQ-cWV>0iDbj_rH$H6T9HdI+HRJ1pkiccb&6%w zaua1xkc%_OaG7)24hX9^+U@p900Cg<&Ykh#`-do!l%MZ%B`3SxvaISW0ag@A=<2eB zH#b}3Rh6H8K7IT7^XFYcVPTbPtX@%u*T`cBnXh6 z&ZFJC8H|g=7pQ-o%Vk>i{`+~kqoc;Yi3w$+l$DkBM@iCm9Xs}2OCYG%i}=PHtlztr z9J`%puNSeek5yGwB%C-w((T(wFTTjA!N8m|Wj0SMxw(TwUw{2CPQYCr{$Y$Y8v&5evZ9tvqaNBlO4-Hng>2X=;C>)o4VU%O^hm(L{cJe}8kc zb+4#tVoGZ2s5{U!m6VXu+l#5Xn$|DB#9C0m^X26vmzR@VP{8x&&S9;trnS2pQ%MQQ zfxOnQA9<*0;yO{&Fc=KloIRWw?dj7zQ(DTc0|(g9-HoZKiAydQc9#pg-Oi=XPE2pT zMS5u|w@!bZ;@Qbb#QFRT22Im6g60hX&~^CW1D^4Ekz-?-YHuf^wwCV;3h>OtY}taR zwwCXI{E)Uun#IDj(}^i52~TDw-q~?kS$LC@@Hm}> zS}aU|^bzS*Rjgh%cytsQK$6fU30)B8k5yGfQS^VuK5iTE0FncJG@DTX1OXBgnds{y zWO^DQD9CUA`RA;uuP1t90;#{BkW;5fbh`-x2oLwST^6{wnBhBjXp4xzS5(CCn{Ogk zRuXsM0Q~@W?_wMpBDkjq6Tr4@41|TD#K$wWYZt@I21^q9JMVCJ=6U~qI^TVljF=dv zi;I65DlO&ix^;N>>>+pmemXz-gw8;Iiw4iu@#A!PJQ#NG=GO-gG666!z^d0?qr0q( zuBCV_2`tO#pMA!SLx<@7>MMWNZr{%ET$#S2;2Fin;@h;zzn5cU0~d!C0bjg`<--qI zclk1FblqQ41p$5YW*)rv9v$1a^Kh|V0r!9Lld7m7&Sqn?!$D+rHX{xP-#Q$8o0Y|g z!$IULudunYlGqgm4-8;9e3)PE+ec@0H7&PqW6I8ETXr_vdV4X|)X=hL4_zfCWDX84 z?&h+nsXlXt7^4xjyqpeMM(^+Eo91T10P^!0GaAvhZpB?wL&E9PM38R02t6~Ck=9lsU}5m0ruybh%<1X>tw{4JBLk1q>7R-J8LaEj z)kRoN&cfiF9LBo3FfUXR7X`k4oe-}VIWLc~g<|va@OZt*?d^mt2CU70|A3Yj%%P$9 zQd9j$WFS5F91|uJzAINS&lmHUrHOx%qzw)XgwET;Yu7NRrs4@yi=R|V3Z84%=3nRg z_e~+PtPP5)D%3YMCB!Pq+}2JfVQFa#ukVb~(in3(=N_@5NJ3-d+BiiKYh^(Y|2#5c z{QZd&8`BRTZf&29@9DvG^(w2aR$}IZNfLTxC61R~;$dbco=caAnjNF-P*#7In?5>f z4AM01F9LwgX8Wxyi)T|(Mu%U0^+s1l#*kZ<{keJeEK#>^1x^-GM1TEt?#IO78yP`v zXdt|}*nbgF6hZjur#0bc&ZMPucUvMgjo;PP)z$xJd^VfyHwFV0sw!s9ZLTXxN$v-4 zzx~6FwQCC0W)Tsw(cUt*!kRJpO5WQZ}1ygCt4o zG)6l^r|bI9b#-;lC*LnJ zSN$p~DvAcRro?(N%my%V6VEh_xTk^BNp)AH);>#r=8f*-q7%i zgsCY>1ZZwv8zV_t_fnus1_LOH^0&!JIoNKGj|Ol$SBI;rcyXydO9o%KaN)inXbp{x z32}-d3HR=qB7n>PcQAme3ZLG*85z^uY>iSB!5|1i%Thg-lw30^EG#reMw @@ -57,9 +57,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.98994949" - inkscape:cx="-545.31499" - inkscape:cy="86.04423" + inkscape:zoom="1.4" + inkscape:cx="-198.59155" + inkscape:cy="63.118072" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -112,7 +112,7 @@ id="layer1" transform="translate(-384.75,-187.11218)"> + transform="matrix(3.060171,0,0,3.060171,385.23861,206.1161)" + id="g879"> + + + - - - - - - - - - - - - - - + style="stroke-width:1.28299999;stroke-miterlimit:4;stroke-dasharray:none" + transform="translate(0.23963355,1)" + id="g870"> + + + diff --git a/resources/public/img/map-pins/Planning-authority-pin.png b/resources/public/img/map-pins/Planning-authority-pin.png index 7c3c38dce38c4fa9fde4fa7c13f20db8dc3e0c5b..167e4be16d40c57f96f175f78c508eeeb14d79da 100644 GIT binary patch delta 1502 zcmV<41tI$A3+D~6907j?wMj%lR9J=WmS0R$R~*NG_fKz23zU`?3i4k%6Q)4urjAgk zA;$T@HJF9On5bhRdoV#lVoZD@xU3Hf5f+!tC@T*x+BifoogrD$5XM%!n&Fg|N->ZM zT?^XVGFonX&)vho5dLV}z@Gd({_eToPtHB}ob$tA1)WYON=tuBYsPW>bA-@tp63Oy z4PY1+!Et;t8jb!C2n4<{o6TVW01N=&`0?X8JkJl|I9{aDXkO;$=QB8t^V=at2w~IH z(^8wwmV*#-Mk0|@g7|;z!i5W#ost3oBqt|FOG--SM@B}<0U(GI1ktF`XkPB5bd{{EtWZTo z#VkpZjW|N6xS*hbi6>qVPWB$|3M~`McdliTqcw0*FYd3sHv&Z>h=1@6P-3=Al$tE;Pe zdwUByJ3D{Jj7H<*($dm@wi=(Eoy~T3b~=nkqs8TNC0ABf)?B@MH7^p0V4IEKur3cD zK9pa+e0dMUFx1(zXPpNQ9AE$d#>dCSZ=1ndT3cIPcDvov)z$UEojZ35nwy&^PMkRL z_m*OoWw9$)uIzEU-N{8oMFFGHm}fK^WA$x7B9VVY-EOz&+O=!y!-o&QQYaLWO~n*N z@p`@fX=7vK$GdjzT1wcshJ}R%QFC*%bFCC$lQk|cFJEkGYI^Q)IHU~22*hG>l&0x9 znx^N5hlf>ixt#TQJV~pyiHQkmc6N5iVzDS!Ys<^aH~@gvYE_;)cW&b7(W49NJsZRV zfq;MCzkffIo}Rv3TwJ`UR;w3jnx3a=dR{0LqRPt3R|cZYmIF7@tR%;f=as4=kVP7*0 zBkJw#EkP)zo-ZK~LU8lu%@T%TD1?xna5x-(wOaku>-B!|?Afz4nM@Xv$z;m}5mV3h zP9l*A=5#vKdU|^HI-Sl;p643|1_pnuZ$58bUEM*FB)>xlm2DP)<9IYLFVA=S^l7_F zr3$Tm=J)%l>({UEot~anB7`<=b8#I1ljr#_`}_MJ0c^5Y>+0%0BnU!{5L&;bgd|C} zipApH?d|QOB9Z9L9jn*tHM6s`Oe7Nd3ILYZ2_rnuJMZ7WKfbme*AG=+U!Q*g0MBb` zYUUam8YTe%91e%HtE;ODA@s@M;Nb7EX2o?@-@A9u%W+)i=;&xJ%d$8CfX!yhBnV+8#pHzT1Lo6Y8MG#c#) z27^f)$NiW{M#3G4P$>Ks00KPE|CDG(!q7C`1PLzJzZP1M(4qBF$p8QV07*qoM6N<$ Ef_&WJa{vGU delta 1245 zcmV<31S0$A4d@H7907j>wn;=mR9J=Wm|1L8RT#&A=iJ%a8Ky&5y0X+R0|z2A)BPJ{W@%HIW1~K@BFA2NT4^SmJ|;4@eh+Q9%o&RS<}_ETshrhAC|+EmMXr zGxwhB!!5MHP&#$$6aVDAeCMA3@1FHLIf8Nd{eG9v=X=vIv~_<{8u?(_iHk%;DS1H% zy>4h|==0|0=1~9vP*YQr6N&H>$VGubc_0|f4;qHej0aZJbm8+|Ov=h?$pNF&G$YUL z-@iW~{C>a7>rFX1IyyJAwe`bOp-|RnJb?Gg;|V0JTD7gzmy}aNlD2j)6`x$ zdUVIJ*@6Ou!(M;AudlR!;ldx6X&N`BQnvMhKzU#`p|=$Z<&1Q9mv@_{eZ7=YJvKO4 z7>vzgNP~A5!Nwx!cEr+hV4&!Rl&V02vMXg*(`z;=;e+{5{5149!DGOR3V5Rc25i%D zuvp3=rw23y?8=0~N@(}O;osn!bFlLQoH+tc1xqSnb3T9E)TZP35U>f6Yr}Unp^1D)GdH5=V5*C z6yUIcZAE`@*#m_`uqO}pOrLk3+&c8TU`GMGGyv(52Y?+Wd~q6HeiHJA{{wN7uDRg- z&dE@SI>#$Ru&E2$ldQ$!)?v+6tNc6RMPAAt1HiC9t?p6`DLmoX7rFbvCs;EBMC12D&!2KfKc zBk&{etSQQo+3kRJ%b+&_&L@FQ!Jhe6-Jk>BSpqlhP*h>XuDD@C3G^mT#I8H7Z8_+G zXIH|n#~~~H5O8BMto?`ai(njNTAr`>JOte3woa^gDtup#wgC!mUqGs#fDi?Qj4+a-qJ9+Z0 zbD>c7$mF`j#Osc-vQL-#d|hcmsHoRm)3p65rSV#Qef@EWvRA9Bs+MS)R-lx+cS||J z_I5ZtC;#BV-L1Orx|3u5{>>}A-pfIVYzM|BH+Ebh{AZSj<%(GXYz#2+3C>5l^DccI#SG)86^9dd#TD)&q)O z>u>}Uq}0EiiN}nOC#Tc7%QP7>O>^%|J!Y)x>gtWmaJv2lq1nHNizj?(00000NkvXX Hu0mjfd`@sx diff --git a/resources/public/img/map-pins/Planning-authority-pin.svg b/resources/public/img/map-pins/Planning-authority-pin.svg index 86ad6ad..56ad6b4 100644 --- a/resources/public/img/map-pins/Planning-authority-pin.svg +++ b/resources/public/img/map-pins/Planning-authority-pin.svg @@ -58,8 +58,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="-347.05427" - inkscape:cy="82.00362" + inkscape:cx="-550.09493" + inkscape:cy="77.96301" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -112,7 +112,7 @@ id="layer1" transform="translate(-384.75,-187.11218)"> Date: Mon, 10 Feb 2020 13:26:45 +0000 Subject: [PATCH 5/9] Changes to map-pins requested by customer --- .gitignore | 3 + .../public/img/map-pins/Developer-pin.png | Bin 2013 -> 361 bytes .../Planning-authority-not-engaged-pin.png | Bin 0 -> 1767 bytes .../Planning-authority-not-engaged-pin.svg | 188 ++++++++++++++++++ .../img/map-pins/Planning-authority-pin.png | Bin 1767 -> 1667 bytes .../img/map-pins/Planning-authority-pin.svg | 105 ++-------- 6 files changed, 208 insertions(+), 88 deletions(-) create mode 100644 resources/public/img/map-pins/Planning-authority-not-engaged-pin.png create mode 100644 resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg diff --git a/.gitignore b/.gitignore index a13bf7e..23793cd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ profiles.clj resources/docs/orig.md +resources/public/img/map-pins/colours/*.svg +resources/public/img/map-pins/colours/*.png + diff --git a/resources/public/img/map-pins/Developer-pin.png b/resources/public/img/map-pins/Developer-pin.png index 9cad06303825484fcfdcd643164b17db451d15a2..62c76a96c79ac4e1f22bed00fabaffc7ec7cb3fe 100644 GIT binary patch delta 175 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 JPDHLkV1ipQDfIvV literal 0 HcmV?d00001 diff --git a/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg new file mode 100644 index 0000000..56ad6b4 --- /dev/null +++ b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Basic pin for SceneHere + 20100801 + + + Simon Brooke + + + + + Copyright (c) 2010 Simon Brooke + + + basic_map_pin.svg + + Basic default map pin + $Revision: 1.2 $ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/public/img/map-pins/Planning-authority-pin.png b/resources/public/img/map-pins/Planning-authority-pin.png index 167e4be16d40c57f96f175f78c508eeeb14d79da..282c9580bd55781d58cd198f2ab0520804f92ace 100644 GIT binary patch delta 1459 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 Hu0mjfWBT=6 diff --git a/resources/public/img/map-pins/Planning-authority-pin.svg b/resources/public/img/map-pins/Planning-authority-pin.svg index 56ad6b4..4cdddde 100644 --- a/resources/public/img/map-pins/Planning-authority-pin.svg +++ b/resources/public/img/map-pins/Planning-authority-pin.svg @@ -11,42 +11,19 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="240.5" - height="317.00851" + width="30.000006" + height="40.014305" id="svg2" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Planning-authority-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Planning-authority-pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Developer-pin.png" + inkscape:export-xdpi="95.965683" + inkscape:export-ydpi="95.965683" version="1.1"> - - - - - - - + id="defs4" /> + originx="0" + originy="0" /> @@ -86,7 +63,7 @@ image/svg+xml - Basic pin for SceneHere + 20100801 @@ -110,63 +87,15 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-384.75,-187.11218)"> + transform="translate(-385.35304,-463.7035)"> + inkscape:connector-curvature="0" /> - - - - - - - - - - - - - - - Date: Mon, 10 Feb 2020 13:26:45 +0000 Subject: [PATCH 6/9] Changes to map-pins requested by customer --- .gitignore | 3 + .../public/img/map-pins/Developer-pin.svg | 10 +- .../Planning-authority---engaged-pin.png | Bin 0 -> 1667 bytes .../Planning-authority-engaged-pin.png | Bin 0 -> 1667 bytes .../Planning-authority-not-engaged-pin.png | Bin 0 -> 1767 bytes .../Planning-authority-not-engaged-pin.svg | 188 ++++++++++++++++++ .../img/map-pins/Planning-authority-pin.png | Bin 1767 -> 1667 bytes .../img/map-pins/Planning-authority-pin.svg | 103 ++-------- 8 files changed, 212 insertions(+), 92 deletions(-) create mode 100644 resources/public/img/map-pins/Planning-authority---engaged-pin.png create mode 100644 resources/public/img/map-pins/Planning-authority-engaged-pin.png create mode 100644 resources/public/img/map-pins/Planning-authority-not-engaged-pin.png create mode 100644 resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg diff --git a/.gitignore b/.gitignore index a13bf7e..23793cd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ profiles.clj resources/docs/orig.md +resources/public/img/map-pins/colours/*.svg +resources/public/img/map-pins/colours/*.png + diff --git a/resources/public/img/map-pins/Developer-pin.svg b/resources/public/img/map-pins/Developer-pin.svg index f24b467..0c5df38 100644 --- a/resources/public/img/map-pins/Developer-pin.svg +++ b/resources/public/img/map-pins/Developer-pin.svg @@ -18,9 +18,9 @@ inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Developer-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/basic_map_pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Developer-pin.png" + inkscape:export-xdpi="95.965683" + inkscape:export-ydpi="95.965683" version="1.1"> @@ -35,7 +35,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="-17.708798" + inkscape:cx="-36.012369" inkscape:cy="19.198946" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -63,7 +63,7 @@ image/svg+xml - + 20100801 diff --git a/resources/public/img/map-pins/Planning-authority---engaged-pin.png b/resources/public/img/map-pins/Planning-authority---engaged-pin.png new file mode 100644 index 0000000000000000000000000000000000000000..282c9580bd55781d58cd198f2ab0520804f92ace GIT binary patch literal 1667 zcmV-}27LL6P)IWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000GgNklBNCAz4iA4<7kZypM)|Qr*?shx7JIn6Q&-e8JZMv{lT3Zf=?`_`a&G+*@ z&t%^Bd57ShdU|>!RaHNrguX)<*$f5`)bx2yjND+9y%vwhXGl*^j}%mcf7o6-GS)FRXv?v1=btuP4ocl1-#gZtu47GH7Y|kyrw6^hGU0okC!rmBrX6%wBTmKGqKr%mPHl()#npQgm zFnCVX_0!>9(Cklf%i*}$=PTudZ}==P@OrOY10SvmirS}1Q)Ip zYLmy4+ZUeGed+FWUwSp%ic0sTyFoA*Y6`J3utd8ox>dkVyJZsHb zf$&@51OQ~tWSSh!sR9Sa2YI7F?58YG1ESh!L^4l*O%GL06{7;K$(qAGqv0Hm6L#KA<<*Y1>aN8l?smlgE-<0KiIH z3bU9107N8?owEG^V9uB!J7p_w-j(wg^G(G>F$@5X=J<2JRx9%p9571$wsuTx(^{WjdqpM=yY1 z0(LEzGyXEv(5sa`TH(S0w{Rm}B^jxyjbaYnIO{EscqmC^lYg?2rp`9bu$m=Sm43B$T`tkH;?q zcrdSn2M<2wI8GZOM7%E~g2zX$;IU(%Ribi%Dyz4*cY|r0qgq6pooSi50RaB2KiHgT-pO&?j=sLWix2CyqC?{3$&+)S z_$-tRH4v9@0HDsR^&l8u33SC^0B{`VD~@vB>bdGV0FbkC5Dfh*^;t3a^y$;HjIkes z$zX(MJdq4ZWsD81I~V{s!X2y1SA~_7vfx6B|1jVN>yVeDslk z&!0bUfZIWsYHq*#H0lIdnx>bVOxy zV{&P5bZKvH0162SLSb`hV<2Q@W?^+~bRcbEa3FALZVCwrBvNH|X>)0BZaN?_E;1k_ z3JDz0%f|o!02XvbSad^jWnpw_Z*Cw|X>DZyGB7bPFgP$V3rYr+000GgNklBNCAz4iA4<7kZypM)|Qr*?shx7JIn6Q&-e8JZMv{lT3Zf=?`_`a&G+*@ z&t%^Bd57ShdU|>!RaHNrguX)<*$f5`)bx2yjND+9y%vwhXGl*^j}%mcf7o6-GS)FRXv?v1=btuP4ocl1-#gZtu47GH7Y|kyrw6^hGU0okC!rmBrX6%wBTmKGqKr%mPHl()#npQgm zFnCVX_0!>9(Cklf%i*}$=PTudZ}==P@OrOY10SvmirS}1Q)Ip zYLmy4+ZUeGed+FWUwSp%ic0sTyFoA*Y6`J3utd8ox>dkVyJZsHb zf$&@51OQ~tWSSh!sR9Sa2YI7F?58YG1ESh!L^4l*O%GL06{7;K$(qAGqv0Hm6L#KA<<*Y1>aN8l?smlgE-<0KiIH z3bU9107N8?owEG^V9uB!J7p_w-j(wg^G(G>F$@5X=J<2JRx9%p9571$wsuTx(^{WjdqpM=yY1 z0(LEzGyXEv(5sa`TH(S0w{Rm}B^jxyjbaYnIO{EscqmC^lYg?2rp`9bu$m=Sm43B$T`tkH;?q zcrdSn2M<2wI8GZOM7%E~g2zX$;IU(%Ribi%Dyz4*cY|r0qgq6pooSi50RaB2KiHgT-pO&?j=sLWix2CyqC?{3$&+)S z_$-tRH4v9@0HDsR^&l8u33SC^0B{`VD~@vB>bdGV0FbkC5Dfh*^;t3a^y$;HjIkes z$zX(MJdq4ZWsD81I~V{s!X2y1SA~_7vfx6B|1jVN>yVeDslk z&!0bUfZJM$2_#Zwc4>2IZ*DpuF)lJ7Bnk-}(96dF000(r zMObu0a%Ew3X>V>IRB3Hx05UK!FfceUF$+otl>h(*wMj%lR9J=WmS0R$R~*NG_fKz2 z3zU`?3i4k%6Q)4urjAgkA;$T@HJF9On5bhRdoV#lVoZD@xU3Hf5f+!tC@T*x+Bifo zogrD$5XM%!n&Fg|N->ZMT?^XVGFonX&)vho5dLV}z@Gd({_eToPtHB}ob$tA1)WYO zN=r*?#&P^}gwSrD=LN70U>Fv`aeOiwjs6e_1imqw&0zol3;^Kx@#8r>&kx}^UZl}z zUgqcLGdPa(+aX2>VbjyoQk%_|gAj5?B9TuYJb3UD)9G{~nM`JrN~KvXEiI2TGBU#3 zAzY8g<4Nl7?yg`M#vKlaKO)M?%3275`0T=k3znUd0stf@Cr3+4O6EsKM#=#oh!X_S zsL^O%?xb{;tgNh1MMcFdNs^5?La4Z)pn!=dAQ%i1mo8l@I)DEB9*@UE#q(}qVWFSr zc{R@SynrN06w6DYPzdkn=*X|GuCDg^e8QxpB<{$OBUKkKUR1w+{hEv=gCt3W5Tfu{ z26G&T84QLjtyZhG+wG}+eSN=mcX!*{+uJA2X7eybQRvX2L)x~sw%x&CkccJotzv`_ z+`fG~Q>)chnM|gvo}QjRZrr%>S7Bk{oBu&3lSSLw+FT}+>DNFYAgHOS(dza3!cZvm z*6b}G4h#$^s;jH3dV6~dIy*bZj7H<*($dm@wi=(Eoy~T3b~=nkqs8TNC0ABf)?B@M zH7^p0V4IEKur3cDK9pa+e0dMUFx1(zXPpNQ9AE$d#>dCSZ=1ndT3cIPcDvov)z$UE zojZ35nwy&^PMkRL_m*OoWw9$)uIzEU-N{8oMFFGHm}fK^WA$x7B9TPhZnx;#wQK6b zhY!C}C=`)R#S}&HdcFQ>V`JmTyLRnbO4zuDg@pxCb91wEtrTFBH7+kNUudhT#I zqzuCd#A0!jrs+AFrssx-hgEX9ob`A-NvpMqi3w?Tc6P{Ou_#w-%gf6+0D#qMRh~O{ zZsO?CqYLXj8^i*EfZxA=Ka-xGzFb^fyr@>I7ipTFr)hd#C={Z~%F0&?g(AFKOHEB> zYin!gg+d{>TFcGNUD~&AA0v@SBDJ-(uToM{xOa;GFW!sai+2p{*s){$$&)8-RaI3U z00582L)F*UAN2WrNfbqK0)YUfq@=I_05dZ)DN3a>w79q^P%4!n0D!rcZYmIF7@tR%;f= zas4=kVP7*0BkJw#EkP)zo-ZK~LU8lu%@T%TD1?xna5x-(wOaku>-B!|?Afz4nM@Xv z$z;m}5mV3hP9l*A=5#vKdU|^HI-Sl;p643|1_rEeK5t!J-9eHhze5O>Z5Dvzcr-6B z&v*LtX}e0L3ax$S_xq{q*RSuLo}N}Bgf?w+aUB1X=lL)D`}-dOY_eDD>gqlu2tthz zTEC@)BuTc4#p2!V?d_u?k?74GtJmu_v$L~IBog@w0G8JYBRtPL@87>azP29M4^>}Z zp8){RYierd8X6iV0RS8hhqSA!s|q3X$>8AN@3CgZbynZIchAdlT<7TMXfDgLH~@gn zX3Hc9Vk#bK++qNLXf*mg%d$d?#gYL4;BvX79LN0}Z%*7|lgZ=(fL~VjBj)vbWdJa` z<6-~+gwPL@larY?n@z!SoB+cxOS~BgomM)XP9&Gh-D0s=ytK6B>+9>wk2fQs8Jo@K za5Nh22nK^m9LN2bNJhdPh)^i}761Y~&;OKYM#9iE-2@3P*S{88kkFy^QON)R002ov JPDHLkV1ipQDfIvV literal 0 HcmV?d00001 diff --git a/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg new file mode 100644 index 0000000..56ad6b4 --- /dev/null +++ b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.svg @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Basic pin for SceneHere + 20100801 + + + Simon Brooke + + + + + Copyright (c) 2010 Simon Brooke + + + basic_map_pin.svg + + Basic default map pin + $Revision: 1.2 $ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/public/img/map-pins/Planning-authority-pin.png b/resources/public/img/map-pins/Planning-authority-pin.png index 167e4be16d40c57f96f175f78c508eeeb14d79da..282c9580bd55781d58cd198f2ab0520804f92ace 100644 GIT binary patch delta 1459 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 Hu0mjfWBT=6 diff --git a/resources/public/img/map-pins/Planning-authority-pin.svg b/resources/public/img/map-pins/Planning-authority-pin.svg index 56ad6b4..72b24dc 100644 --- a/resources/public/img/map-pins/Planning-authority-pin.svg +++ b/resources/public/img/map-pins/Planning-authority-pin.svg @@ -11,42 +11,19 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="240.5" - height="317.00851" + width="30.000006" + height="40.014305" id="svg2" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Planning-authority-pin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/simon/workspace/geocsv/resources/public/img/map-pins/Planning-authority-pin.png" - inkscape:export-xdpi="11.98" - inkscape:export-ydpi="11.98" + inkscape:export-xdpi="95.965683" + inkscape:export-ydpi="95.965683" version="1.1"> - - - - - - - + id="defs4" /> + originx="0" + originy="0" /> @@ -86,7 +63,7 @@ image/svg+xml - Basic pin for SceneHere + 20100801 @@ -110,63 +87,15 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-384.75,-187.11218)"> + transform="translate(-385.35304,-463.7035)"> + inkscape:connector-curvature="0" /> - - - - - - - - - - - - - - - Date: Mon, 10 Feb 2020 15:58:04 +0000 Subject: [PATCH 7/9] Made 'map' the default page, moved documentation to 'about'. --- .gitignore | 2 + .../public/img/map-pins/Developer-pin.png | Bin 361 -> 2013 bytes src/cljs/geocsv/client/core.cljs | 71 ++++++++---------- src/cljs/geocsv/client/db.cljs | 2 +- src/cljs/geocsv/client/events.cljs | 14 +++- 5 files changed, 46 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 23793cd..164b6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ resources/docs/orig.md resources/public/img/map-pins/colours/*.svg resources/public/img/map-pins/colours/*.png + +.rebel_readline_history diff --git a/resources/public/img/map-pins/Developer-pin.png b/resources/public/img/map-pins/Developer-pin.png index 62c76a96c79ac4e1f22bed00fabaffc7ec7cb3fe..9cad06303825484fcfdcd643164b17db451d15a2 100644 GIT binary patch delta 1840 zcmV-02haHF0^JWGiBL{Q4GJ0x0000DNk~Le0000U0000e2nGNE0O=D-5|JSq3l72n z01mslfnxa;OU~PO^WGX1D zf(!@@0>TXE-m@Q&$_zu-q3)C156{ba{`dc!bDndK!b2&4C@6@Gi;Me<(Wq_IG()3JMA$(Z`YE7$_mY~ELtbVk`P;XXCd7D!W+EvmLnCEn=PxP> ze=wWPB?hBWdwtom&JL$@XbNaq8Gp>kU@$wIfyzo;B_(9c6c`{ib!a3nud`EC_19Hh zH@I9b@73U-ufJx_#fzLtNI(dIGCGQT)heC=+`k2XJR`&F{o#ky`KqpCGMR)P9FU&Q z(Bj1`pKQy_WI#$#W?XPEnS`$EnAPb5s;anZv*8>WK?P70h7Q=LohzR8V z{amuy@L4Q~9Xn{AKcA7{I4NP}N}diEcv{A_wb)`}5Ic5ot*3{G<;(F_RpD5_o}S5Z zd-jljT31I>xKj`k*ylspxRFIKy+r5Dn^@Z0u~@B)z4smq91iMVcmXef$AhW7oGeX4 z>FYy{k4HQ%aL7_uR^sgLW>&CW(@-{VCTDnfeB8lkzo zJC~u}ULwBwir-(pj5Rlxen8o{+ZUR^Z*gALqO8l07+p zPEnw|oGYcJERYiR?BPmrF?T~U-o1OA?V?5WH#U-Bw=*{3vsw`y9Yj@BkgTf6{Cw`0 zmU25UkHNk^OhZF~-{2soo*vADgX4N{Z{Xq!VBFr0#o=HyHy7`cCG@}lKL45Um6UKd zF%kdq<2c~ap9AFQGf-5-tzgD0R^WYqu}%z$)lswcQt?y zKH#aUD&|bKnM~-Pea6+25^|)3;$jv|_&grW(*lQT0JXK)ZrviHxR|cV_Ldf+fBqS3 zaC}=EQEvBCduuCE(*lQ*n>UGUX(1W{fpc=W-`X0u096$^ZypbFbEhuM%uI%VC+ojj z&R>(#Qf@aj(b&{PX(VLr@m6gSaqJZ1Y zESHN>qY(+?mj$mkaE+KuNV^@;-Hk~Gy+aZb82k9+XR^E!EZ47l5fx zlC^8sW(grO6h$!yxy-7{Ut?nYuFA^q>Z78>FLU|UTLrndZ^wFng-~`$DFe2Zl+q8l zYiep*Cfmc>M(ftCa|q#UeeuQiu1%XRUkA8!$zk2OGcVs@FytLOcI^D)<_fE29yxNP zN7LAM>eQT6pU-FjsIN~+QdM~~9MG_V0fZ3$^!e0?y1Kcu0h*g_Rw0xV;pPb&xVE;o z3*>iobt%b07?sX<&X_nUW&Qsh_~EdFZnr)0%o(Rc(-afX7;c6cJ;4eJ3L@?H*gF=> zSk&;adhh7bnz`ZTm=WW;y1G$KQ}*7!Z=R)ThC?&SG2@GX*=+th$osmkADwBA8OxeA eYc?~(>H04r)2g9}8;ckK0000|pZ#*pCY;uyj)lQEQG)qloy>tq(cfB#O&(UI-_{rmi{SROzAq{6`Pjs47-Z%oqC zOe`$I!c4y;BpCjzS;HVMEc}a|div.container>div.content - [:img {:src "/img/warning_clojure.png"}] - (when-let [images @(rf/subscribe [:available-pin-images])] - [:div - [:h2 "The following pin images are available on this server"] - (apply - vector - (cons - :ol - (map - #(vector - :ol - [:img - {:src - (str - "img/map-pins/" - (s/capitalize - (s/replace - (s/lower-case - (str %)) - #"[^a-z0-9]" "-")) - "-pin.png") - :alt %}] - " " - %) - (sort images))))])]) - -(defn home-page [] - [:section.section>div.container>div.content - (when-let [docs @(rf/subscribe [:docs])] - [:div {:dangerouslySetInnerHTML {:__html (md->html docs)}}])]) + [:div + (when-let [docs @(rf/subscribe [:docs])] + [:div {:dangerouslySetInnerHTML {:__html (md->html docs)}}]) + (when-let [images @(rf/subscribe [:available-pin-images])] + [:div + [:h2 "The following pin images are available on this server"] + (apply + vector + (cons + :ol + (map + #(vector + :ol + [:img + {:src + (str + "img/map-pins/" + (s/capitalize + (s/replace + (s/lower-case + (str %)) + #"[^a-z0-9]" "-")) + "-pin.png") + :alt %}] + " " + %) + (sort images))))])]]) (defn map-page [] "Return the content for the main map page. Map showing current location." @@ -77,8 +73,7 @@ (mv/panel)) (def pages - {:home #'home-page - :map #'map-page + {:map #'map-page :about #'about-page}) (defn page [] @@ -92,14 +87,12 @@ (def router (reitit/router - [["/" {:name :home - :view #'home-page - :controllers [{:start (fn [_] (rf/dispatch [:init-home]))}]}] - ["/map" {:name :map + [["/" {:name :map :view #'map-page :controllers [{:start (fn [_] (rf/dispatch [:init-map]))}]}] ["/about" {:name :about - :view #'about-page}]])) + :view #'about-page + :controllers [{:start (fn [_] (rf/dispatch [:init-about]))}]}]])) (defn start-router! [] (rfe/start! diff --git a/src/cljs/geocsv/client/db.cljs b/src/cljs/geocsv/client/db.cljs index 557dec3..19a0afd 100644 --- a/src/cljs/geocsv/client/db.cljs +++ b/src/cljs/geocsv/client/db.cljs @@ -38,5 +38,5 @@ "Power-supplier"} ;; need to be fetched from server side :latitude 56 :longitude -4 - :page :home + :page :about :zoom 1}) diff --git a/src/cljs/geocsv/client/events.cljs b/src/cljs/geocsv/client/events.cljs index 5b6da4a..e49325e 100644 --- a/src/cljs/geocsv/client/events.cljs +++ b/src/cljs/geocsv/client/events.cljs @@ -50,6 +50,12 @@ (js/console.log (str "Failed to fetch data data" response)) db)) +(rf/reg-event-db + :bad-docs + (fn [db [_ _]] + (js/console.log "Failed to fetch docs") + (assoc db :docs "**WARNING:** failed to fetch documentation from server."))) + (rf/reg-event-db :common/set-error (fn [db [_ error]] @@ -96,10 +102,11 @@ {:http-xhrio {:method :get :uri "/docs" :response-format (ajax/raw-response-format) - :on-success [:set-docs]}})) + :on-success [:set-docs] + :on-failure [:bad-docs]}})) (rf/reg-event-fx - :init-home + :init-about (fn [_ _] {:dispatch [:fetch-docs]})) @@ -152,7 +159,7 @@ (fn [{db :db} [_ response]] (let [db' (assoc db :available-pin-images (set response))] - (js/console.log (str "processing pin images")) + (js/console.log "processing pin images") {:db (if (:view db') (refresh-map-pins db') @@ -161,6 +168,7 @@ (rf/reg-event-db :set-docs (fn [db [_ docs]] + (js/console.log "Successfully fetched docs") (assoc db :docs docs))) (rf/reg-event-db From e0b2a45a96f8ceaf77a674b580ab1ee75515383d Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 27 Feb 2020 14:01:11 +0000 Subject: [PATCH 8/9] #3: Done; recipe for adding map pins for flags. --- .gitignore | 2 +- README.md | 10 ++++++++++ .../public/img/map-pins/flags/flags-mini.zip | Bin 0 -> 85347 bytes .../public/img/map-pins/flags/make-flag-pins.sh | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 resources/public/img/map-pins/flags/flags-mini.zip create mode 100644 resources/public/img/map-pins/flags/make-flag-pins.sh diff --git a/.gitignore b/.gitignore index 164b6fb..6410585 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,6 @@ resources/docs/orig.md resources/public/img/map-pins/colours/*.svg resources/public/img/map-pins/colours/*.png - +resources/public/img/map-pins/flags/*.png .rebel_readline_history diff --git a/README.md b/README.md index aedaa70..14e3833 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,16 @@ A wee tool to show comma-separated value data on a map. [![Clojars Project](https://img.shields.io/clojars/v/geocsv.svg)](https://clojars.org/geocsv) +## Other variants + +This is a little project I've played about with, and there are now three variants: + +1. [geocsv](https://github.com/simon-brooke/geocsv) is a fairly heavyweight web-app with both client-side and serverside components. It was the first version, and is the only version which meets the original requirement of being able to present data from [Google Sheets](https://www.google.co.uk/sheets/about/), but it's a remarkably heavyweight solution to what should be a simple problem. +2. [geocsv-lite](https://github.com/simon-brooke/geocsv-lite) is a much lighter, client-side only reworking of the problem, in ClojureScript. I still wasn't satisfied that this was light enough. +3. [geocsv-js](https://github.com/simon-brooke/geocsv-js) is a reworking in native JavaScript without any frameworks or heave libraries, except Leaflet. It is vastly lighter, and probably the one to use in most applications. + +## Overview + The CSV file must have * column names in the first row; diff --git a/resources/public/img/map-pins/flags/flags-mini.zip b/resources/public/img/map-pins/flags/flags-mini.zip new file mode 100644 index 0000000000000000000000000000000000000000..007b28c95ed7fa7c2ce62685720b9ccad5847b0d GIT binary patch literal 85347 zcmb@u1yoht6E}S6PLXawK)R7`1f;tgq@}wBC8WE%JEdE?OOTM3P^6pt-HZD9KF{-a z`F^f%Er!Egn{)2$nctq7Ju~~rOG7~;0w4hZz?O-g9C~VTQzrxf047)fA;7?x;iZk4 ziZTKKs$-x@rxQd@u1Ej~=u^-?Kx2XK3YM3ZKtaSu1pSF3`Ak$1bR_~27CbEIw_Pen z9{>RHMp9Hr*>&N|^pKP=1Ul@e^lXn%2HN0C$Y4aafevkWOjuRbXRsL9!hV#J3xSSg zQ4cqQ$#X(Yo;Z{BR*Pku;69Wr$TvcWkQjyY4 z0so?HNW8cOcL=gd_^~2oz@5X%qhw%8=3AJ9d;l3-OzH7Ax0o1WwjIXKHX+0zHWIjF zOfF<7E;dJfiIGRwIuz;Bd{_8SdeWudyvamC$U~kpdfpR=+>@tLx%0|36iYsWn9v6Yem~C_%cPDCQ#E*Qh(6MLMbrm5p>LK;Z#bw?vCn<;p=-hgk`c7+lvIb!b?Ogd|Z z168Q*#OPVc-yskiN+5goPTfTLH_yQDzr?6lGxfHGz2!N9bNt5W6UMe{15yn@QcPB~ zTv*><9s~d^5CGus0l?Jkh35kr4FJ(S08IV_fIZ}I4%?g2YliyzpH5F+B0x^!3(|FU z!cqX6XAWQ$b<-Kb$%y-6tf$pHQ&#$;UglNvDEO@&BAU8rgsP!x#>0?|EDPAQ&3riH zA1mxD{v@?-$e*O-$wxlG;u3zQedEPs!=kQyDfOs3n@i7OTgIHqFQ3J=>8i2RLFxr0 z0L=a`{H8|RpQ?hO38s7YP5;FH|G+OXXzp0>;3e^J06zwVUm`GmpY<8(cOaduiy^Zf zW-H{trAMVwpu6Z}WmCO43b(bYJ!TFt^7n>rx=k-)6~`3e`?;e!06%o zgk4CzeRa=Ckp%J_GEkE#H001v9zoMnLNic8 zGqci*bHhr2et2M?fq&qh3&P0=z{$d*%F2Y8DkGSxAegHm*cv^yHKz1>f#ipT>&I>w zflm|fN17junjeBzib`5aCRh=LRuP5XoJRB>o$~!dy7##lqZp6J;_}BfPR8*Wr>Y5N zs_|#Jq~@w0e5`-4SpVRYh09tq)|b4pue}eyzJGW;`0)J0$Ez{y>v8Ox3GCamGawLX zr0$*qn$hHUgXuIfhw0CRB{uPa;B1)yF~og8*KiF@SYU zO*3$6hKZp-xMaAyC)W1BHe&nO?qdVZjR`U(%}QL|$n2tc43C>6zAzKMUk3Z94Y$Fv zqQ=lH@lPHn+ z3W&@tox_#bJRcSP=(-11*#BvIexc+eI;WNi2q9p)M~T&6po9?gcr17@N{W2ThCr8) zA1HwaKp;RsB0@l-LO?x&f~A3ir-O!Pf<|D5Mqr0Vd0i zj7kCmM+GWrB^qfJ8d)tGSv&fpZgh%1bjo3j#~^$dw`%EvxQYiWn0l;kf)g@;30-u8 z@|m$H_R~=6uReS@u}J0n=6dIF<%|ItpX_w!+;|P}YLZXo!ZWrrWN4~PR&>>#lg~a+?Joo}tXr{b=@?ty{#Nj`b^vgdef5SR< z2aS4y=w3WDoESi4iASm1!qBwmOXVO>Ojt6 zN8|C__0#^biiGnZhb&nfNiT_eKD~7~tG$(B)plsJVM!8im2MaI3&Mbcl8hnlf>)3K zI+X&xKzu+UVGEl$V8?GP@9>| z8P^kJ7`775@D2P4*Po??U@iQ5^haqwz6y&<&EHmTuel^x3{oAPL zTl$$8h^yjbrR6c-yQN5l3f|- zgW?aVQ|maTIKMHNK3RQnHMu@!{u=jg3NzC5Dk7r7+~le`l$PK27&^L^<#vz5MKcK% zx-Wlg@`2Y@p1p4&$_S)R= zN92yRsqdd9#$~-o%f9K%-rn}T!sXSu)t-Gy$p-N+kcZQiWP(F;Fx~U$^d}zw2gs>G z6Z~#N`x7IAK_7m2+E56HP)NuyD5x-K=(lii;mF95sDJ=e)F?DS06Ka!21X1PRxCDl z94Tos8Cfzpc`_wsDm8T)4NbZr;Dr$2g)qQOLZU=kx=dEKTuG@)ORH92zro1pow<3l zg=VRRMYD}ft0zFh8zAlj5cl(Y9~L&0m^fZoI9F8kp%Oq_1)y#5&Fyec?d)717}y#d z+#YWEFf#Iac6NVp@nH4Sx7F3dFE*~n$5-ds1=rWNx3_md001a24^&V9Dk=gyI)GhW z!0v9~#s7%kadR|lBrYCT0y5F>m z&h$*i=U_AmIGptK;_lEI3V`GPD3YLM)-JSW`4-k3%k(M+Zqa~i@3ymHiFCN-IsUtj zCLL_FR0o$kx7;%Hk{tpxvgovtYCCEh0C^ogn=nj-Cwvv0{DR84n5=SDB==&KLOLXF#O^~^b>AS233&Wu z;;1?0_)MtyhQ!_kdTd`p@E>%ab-_}y;&}~&-UGJa5MQFpHE1CAK^fCHw zFx9(u_$P-1OPfkv`jWy1IpIMCh|?3-C91*$B!nlt$@;HqKpgyLx>DJvaEG8#FoCCQ zXzP?3a0sjO^;qGFYpukc%jX|9 zB{O{kjUI#OUSNiQ64)OMUo)=`p$Km{6%}+T|MHC-|IN$e*K*qE%TkjRPBzUOmeOEo_C{HnxGH5nVH+GG#wxm6 z*HLVTni!2$#EQZ^&Iw9{LCk)gtE(QTX%lLTrs8N6?>LT>sPCjezV2x^!<+O74{?|( zUfj;)>P>tSZ!;TNng#*|)85*t`2u&+1MW5fe|W4f77l86O_#$l6e2J*I%W-cIC%T< zfrwJ+?A{P3Fu#j5-r!*Z`a!Y+)4ja@CW%4@y7{}$3uEqn4Ehl9b3OGRA4PuWLKy!b1tuH4vS^ z)4KOO<(p(kJ0j&9#N>_(&T+!RgajyVuo(3UJsJkF_8Z(R%kYq!fkv%BbT5a$$R(_O z&m~Nq(XT@(zW?DcA7Em7pE!h;;0@iBANaheIH#&SUPal1QDtVutnh^A-5;g3)r2yv zt?=oW=O(MLBs!l)5&VLjUhd7Xmx`JEFQ2JM%y3l)Vi8RDZ2td|GXQx0P?u{(ne=^N z_>5Ik5AM|qgOdcunTnlaWp+)8^8hk)_-V&M^9xc@Y}Wi=B&?k%dW8G^y9(uU0HiH%H! z9ErE@LjkkT5+|}c3)(<4`i*X^atH04L8ERzC;i7Q`G41R$amc&1&AQ}#Re3F8olW| z+z_~-;~nP3{8}AU!A+>=yuW_8G}bJlVK_h4ev~JnO5Hrbk^Zp7OFVX@oQFaEBH^|q zT=1Nj_OT5t?CqEQt^&BHAQvN)HgnUO%~h@&DZtfw}HNrVyBQ=Z2u! z0c4=hIrv*_znW&WTv$Yqb)V%wyxr0f$l$#`za9e_Y%Y5I}ZIXl;Kt=`OJc%GBDkv z%=}NR|BuM*yHNmp9k#c*BA`n**y|A2ag*2cJ!%km{7#6oRi3*|NqgX>;gHj-x!BP8 zAZoVDfU4gH6 zz&qeADAWatDe`uLrZWm&G}L2((S4|0g28$jJD zRu=Lhw{_8BRVH6ovk78P*uTur&aUg7+2osId4GD*n3+|FNf7_-P_p zE>yVhdf!m95}ZAoH}%r6WA3?8+k@mA2%}|$#A!Y+wqs$bEq6b5OV`pNkSF+^FZ;AL z<{<|H9GLDIwD}W*{{yz)Hx$2OLn!PY#_{4#&{Gh-`vC2McUuVXP(5QA8~EDK$0r?l z+4SZ7x;}$Z*oRj!C!@FU(@Oh_3(!;Jc+YxdYvlP| zE!Mt_b?dryaqEXAzkS$fNWjv&tes!h`=ayk%Rxj8tu&nC4Y|SHV9et1tX%oc(dEoh?l5~JrC^Qi z{=7?;!&(K2K)z;k=`hXv6fW=ETeqFDfn>bbFZMZi(svmu9i|G27(wY#E9?1|Dkh;J`M7NSkr`V+R3V ze^!1^SN|Iu7yg20T+M^ZZ9PdA+~xPeu<5A{l;w@tVKLro6Oy`sA?#{H8u@yt5(FF^O}1+MT&wg zFgF#+X{U2zo(8Jp;s!r2II7<7^bX0@@N}#DJit9bnIHW+&4e+9CSy)vK98}XN6^$L zU)=@U#~!O79UBP=$?hyhXK-bK%-J>rH~*rUzz}X0!D;SL9QtJ;H47_?;zvXBiBM@n ztps?E_@j%aD(Mi`i7`Vq$AjF@#q*FR^NYw(Gba#$s!HQ(8HW;$f7^>+TeXEr0GktN z7)g48KudyXi><=_13O?&p_AjtwW<>{Y;=_;5{bHhPsk zrUIXMgTm@t0gIi&JdsI7K!q1=PRDsA)$f@exH;3U1-U&i-820+IiT-MgKfy&T~;Kh zDB}TUnrp~NKhaq30b9q`(eo-vjeJ;&BJ=Vw;WVD>4?cvZfM`LEhr@BHHjRcg@Z+M! z&{z;5G3E?Y#@At+#TBSb?JM02Y32{D9vaYPAW-;OWx~r7QX?sgBsVtI$ezC&4TU4k6Y<`16dfas3wBh>el!5F2JHX5#5YS@Ee+V_}LR zilK|)cDu~V_dJ*OJh(osy1EDUtyy1F(J!!=9go)Wgv%t>(bO2bXF729e1=lm`1HiD z$=AIqk(PVJqVq9x?M0G;m1%_@9J82GOUFn{BZb*S^$6UMCiV+Soac-zLP}_C5HC;- z9Q?Tb9$QFaB^Ij!@U|@C(0K-raVnPV997d;4IHY1pvDWz^JVg%Yzo#m=7#!W3x>hM zx>Q<@B|ZH5svAPC1!AObwip)QtW3v{ zF2vwe()|&-zNx{tU}N=n316{A02!nr?v&ld>y8b$kXX~W_yuUMdeQZFhMBC_1=W$E zORbPQC6T33$CnJ5K4D=nRY;+JWM#EFpxY&fHS`U{09L(y+)m7;fWeH8fQyH>CQLz+ zR-e_-i{8;avZz>oa~a?ibV$#zZZ_FioIDG2+Cl(7tS9uiT}f?{<}&E>G(r9uI-WuyPua3m&|B1k(D{mof^)J zT;595<4-eRU1|nsNh6bn!{8$dQ4n~U)_WVZc}Sao+oFM};1q;ukURF6D1x!0OA@d6 z>YOo`!C6(}z7*2nO%ysR(5^lXE26yco5ra&ZrA^|&@-rA{ev`r2_tpD57|Wbi>>h?)ThMO9LqlA)1v23iJo)cz_MJX(%-_yi zq`_EYgkle8FgsbeNJ#h?-EIt4=kcYn?v=PmTt}In)b)zT5OjHbEHRbMSe#ep&0)5* z*R+!Jq90#Hl0s@as^;to+(&Wb$6N=#nXYVW7|hNgv)z3)i$D+aAbGFJqS*9#Qp?NL zuArbGs5{ix)=tERiO*su&ecB4*@W!vd`;HE@#$1LC@m1GA$FF@fy5Z zIoDQoXB#0OcGtQP=w(_d1NS@@IF+%4PXJ3uwWd<9wBtk`kPC=WF2H#}oG4RZ9#r*xJ!-#H!j1gqq+ zvc|}Xxvf-Aq^=quJvVMv${}72XYLXwNi%NCd3sIwA>dn~o}OM~TYEEA$8mTacanJb zkOrG0^#>;tpRuQABKF#ERYwi8JverAlaW~P6O3pi01`Qw$c4*iV1M+Rou)+gkSsV0 zU=E^tu)F-p68s^=h5ZrYvKva9H9Jx0x?#M#$T?Y_tH{p7`iN-CTu;9-94XJV^VC_P zk83Y9fPzuvj?*u&38Q)1*B$S7nR71`nKD+8g96h%n{Iz%^M9<#?}0A3^93mG(+s*? zf!8Fc^JTUj(O(`5_S-cvN^2C##N@aYy0s8G7M|!ce`wTGNNb_cfJusJ%s0*0$;sFX z6B${XNONC5+Xn^J0J*l)9R$u0L{iyM5-thndLi4W4To@(497-b6&gZCWG?Le%A2Z)peuD^Wa$dU!u!jSMx<>9p^N)^QfRGSrnP)%^*+>p4;Hxzu> zRAGp6(vA}4&k(jvs1@2lT2D;GY627r0x~BAS%{~g`00?EEgpKerduDAB)aqfDF?hv z#Y^hdVm~BH*}c}R6|JOsq}Z;vq%Vlv{~E?nklzLa>c}sSFf#OJ+E=fbdCFU}>hS?c z3jaXHuVAKar$_MsWCFo-FY>?1JO9TF*8ebr-z#$Hc|@S}ONahSILV>MsaS*6u8y1i z*nIQ#m;f}3uXZM>&|B!RGin{Ti>=F)b4CU}CXb~k%9L8jMkws(*raIqLp>uD?C@zlX=1+)RarbQ~7xi~J4 zIq^4czx_ozFPmZgbsDzp+dp2FudtSn<-U{|o;G#T-eLZT^e0*~DzC5~`^h>^HPA(Vl z?*04a_isJ{9*~$EzI^bus4mXThH%Br6GfgGK^$sozUy{s#m5H?IWpKwhmT06_mJ#C zvgWm=@b2-gJ9kR+LW-ZFZF_5(o*Jz3bN`8s6CN)$V8A(=@6}v|Uc2MY^KFXKg^Xn8-IDDmDcvi|)b&VVx_ynZ{azRBOFh0|N3h}x+`}fPG zS}XVo1IRjo3A|j4{=RMjT5vzhG^gJ!RBt>pVt^pJSlO2{nTL^Vs&yWT%? z#f;FWQiry-qATSKfO{jGp8F=U2ij2w&-iY*dyJu`Gzhn*>QfT%2y(rR$`O|ep{nul zmf@ODs5rnOOh(_%@V+KX%E5S-e zVFPf#71KH|sZAWa`o!v6+SVOB@`3$O{9fi!{$&I+c#r|Hs?-e^@VryGp^R&kGaB2s zdcCJ-;fzN-Dt^#`7ulXGEXRXC!oiU{ij-z@VK=(avgip>gOUb|6n9w7^CRuCkOZr` zdc6#|ixw0A0D=U+-%DF!KLf5CBxx|+OZ#t<_}`5aIA8apXQ}nR8zpB6B4-gY=Oc9P z0$lC~guGew{Bi8UA-uu?;-X&4k`9K_M&`15ma;nb@*2+aD*nn+;i^K}nsmk56y@4v zqlR#kcW_04vBOR3HJ^Oj-r!| zVvvnJAREIWn;;^c80DCxAe|gypJpJP(N*e$pE#2 zJ{fdVO&2Z+oZfu=%{c6i@z^=>`k@3zuY)I~nB;a(8kL*S2vfj>kpd_R+O$SldR z$NbVXT*2%N-^{&MM{-p=jwsA$I`a|YLz2;mv=workEC2Os+Twg0u?0vE_)_TO6a|G z_cjr$Xld9o43!5%_!CG5cGo&o7mmj=^47A`zKtLU?qF7hE-~m0fA*s3#Y}7#vY8Tt zZO^%JMIp*(>BZ4?y4vvr0?N$TI8X)QS#Q~g znD7=9SY$X<-sc-fMwmR6J{sjMePtJGeHA5xpp5*Dgeo$Tm680AT1wH@r7_Pq7Ob3_ zK!TGjg3Nu&{TK5hbS(DZ$kXyC^M6q-ASWFL^=l;Qx`;v0Jd(rdLl2!A;K7RUNTQUS z9{!Ydj zuOWlAK`a{lWb==efj__u{|C%~J!!W3j7*mf+LyI~t)FfzP&aWlfU9?K^?;?Z&OfjBD?egyq4h`GIN=H1}+K0yVGRy4drSl>B@;F z@MXQkdxmuLo5Q(JI_&u3%xq8n=qN1IZ3_-Rz9A7=?=gP&P#*8544xdO3-Gc9%buUD zPfNFnDV4IIvWa%&OB!u&oS0d%`xjIG1{Z;=rCYgM2aDO>s$oY}yQ{@71xQo7Z$ckw zN|;I-$7L_~vn0KLBfcQ{R)_V%RMG>{@*G=-lTDh%eq_8Z2J{Up#awK0@hgJ^&9N=# zyH!`|W;n&}tnG%aOJP+BXe6AU5%67SE4V$>y@+TPPullAdesdEMsj^7&8Dj6t}MA+-{xXMkP8`QDlj|(b0TO+C3&8hqo4=5rVv1Vpj60FeU z#*matA0}jQeKg)BovMy}fe>xbp+n2h&iLtN*UlhjpQmPq|&5x|amLtzRRzt3J!{&Wei4 z#S>cZeWxR6f*eYkCSy&+N9v1E7&s(5lVcOz6C)wJC`x&q(JrW>(fziKN(UvUY~r&Q z8VT!-d-F@Au_ugi(=G-3tOk` z!6caCh|o#~*ejG!TC1JHM(?dR-kq{-lO8@mSJaDWG|shtLiGktze5G4iv223xZjY+ zwwHOil#V5Qb}c(ZZbb;~IhH8~&Z&?AgS&s9?0C2uoB5vgR(>9)S&FRE%G(_MPrao6 z;V`iI-^S28l@JQ3SO?xzWq;ZT`CNN!OjyE9qdP(f4;=+bCgsdekq0TwrA3pq*ncaR zX(_L(8@6|}IR4I-`5o?*P_m^Wq$24%`Z1WKe2SN>8zPvnnYl#-mk!&`BLcq}p8=S6wbDdnC9#daQ5pWugekJXIyl(<~rnp*7_@yYA(HjV5o#$QH zs>R}Hz&?J4pa1bjIK+%`B#ETZcX*fHBts&u>zjts=govxwp#TEFidL40?CzECSj}! ziQQ|rlU^#QZP)uaUi3?P>|T-_{<#kjx_sx>(0gDjc-<3EvYBjMNjiK(KaoE73={+! zbqNJAt9)eognG7fj8pc7EL$<*1v$t8{bsAaWM?1)Itc*))4d<~o8IjEXc!tC4ZjGC zJO^FK?xSJ$GE~88OpzKH`}fwN4H5nXT2JW`?cm%j*Og^|A)W`MmI=^K+1feCnv21vs6jlS9yE&<*6n<+s~ z>-OY;M!|GHr9XBu|Br;vzq1eD8@IqmMG8Z@14a>wSA~2SLRN*4bHpR?W$1GlX-fbY zGGX4)ROb|G>4V~W6AG8_M0d~Ks#dmpe33~LlFQpl^N+UuanT|0lu;w$>=5OSH`BL< zpzxGAu38G8;2W{&MBwwezJ&#J?woGM!(h6f;@=c+|1-t39|@Ls z1vG+>dVD3mTElENyQA*n-qIz)y+IdOvv0F4h@QyEuYtfw4sod?v@PKp;Jh-yKR<|h z4m@B1U_>6Wq!E;_iEv(j#Fq`xzNL%Z2J%Ht2*SqY9Ey-!Z);d(m{mjI^*{0Lylo2% zAkQJ;Im%+rjM5mAH22k)^qfgONa1=BQ@+PFfP~m3KE=ctj?ZUtQaFJN5BTbynoF{( znelI_{0a+M#w2_7LBmErrSiub+8^RA&7biW7Tg(IGCLMHBl)3K?Taz2*7*Rag|{wr z%%OZYuG(vI=>5w)y`cH7^*m(x-^Se0BBgi^Al@8*^7qGb*?;-FZ_R7YN`c*z&VMJMKJl*q{S#l)-clw7+jV{uL$yj(-3xk$f{NbGajP zM$XnzSM<8}jZKv{SA;25D}7L=m*M-)ke%n6UMKaq{;JPD;FZLq`1YbZ3KV_b&M5$z zBUEZ3i{j+HO|O%=x;`ZU-$L6IexPc52RtAdq4(CFbQKatllc~JHa+K%U~YMMzSnT@ zD&NrkHua5j&hyMlae~tab3?%ncP&78`(aQQLiuvbDprX3t%5=TMW8Fk2=SAGU9~A} zz?a+e?E^74rBVfNZDj!^{-Cs7Y#)BdHA$801f}f*agzzgLch<+!EpEi-ocg~)l&c* zQYd+2R6$B+z|2|)8#HY34itd6wHS?j(wq^b``_5D7XFQ#f5_VTFG6y#ssG+xXa?&_ z3HtC;*7}u+&(YW{Mhe+QsWI(#a;0_&aaC|_b&Xm-DNYQ9QmmQl+~ znlhJ_(ASnQZ52nxt=b$M>bqgn*?;lJ^ixCV|j z19JgEE|v}Y*%2SF_-)eOsO&B^jp&_kK}habbD?)X6=LTm-EX_BZ9SekV<=TTn5(#| zZr->Jip#x(^;q;=I6gRrAY8pUKd8wE0`DTRIbEY)XDZ_(gEND zVH!;Lxc-}>0NMX5>+hYM5YRtxeIe)3!DIo4cySIqu+^MDJUDM4!NIw0Y1#$03$RtL zuViGXsrl$)TYBSkQdm?Z&q-g{`;a%*cUzWTlJiFL-C=0U??x)=W6mj}QVndFkUJ)leG58;2K zPddLiea#5mLBWOA*}J2KbGcc1`3>=wK4|sTRvd6=(*rA1NS!_RSb)zn!hpHeGh)h6 z^P0G#xAufj0ehqWPM{S7Ca~g+|Jc;_e-T+h z{A^NrcXTAN-ZrO^lCDI=d;^LP$5wzI2i`Qxcm7x6A|2ZqJ_$NEiLFVnpbzU2?NB+CWfOiGnj@{IdRGS;HK`(lommH51guK;l zzXN6nB<2IJfxwF#+lM@Q(IzMDK0qqjn~Lls0j>++=8$?CaQ(a;WsZN-+D)jbM6dOV z@$s1eKe1ZB=jCnPj#T@GyGT~u0yIYP#Q6cx=lTpdU-JQSW2G8ykG+23fe|%Fj-9WP zEhE~T9E0%)zEcqOlb}r-kp_HZ|VRV4( zwKZi+HyK+GoN|Jhn={Krhsf1?h?@0q>_$H?w}u`hh(-t55;uk)mvM;w3D zmC-#i{kp&?F$QY)6zH-HB$4;42Dc3NY;Hiq=6_+ZdV)G}{0drAxsC`gH7|^im{GgV zxQ2Z_t|EFNP}e0MB98T+UBSQb_PHf_AqIpsFx}(rZzB1B_b5VW{xB5!iM!9ASbWI6 z01`r_KoBDnb9=-_)_h%Ta-+$K>U!xecS2^I?r?CzV``ZrcgGH{w-M#G!_d zB_E)M)wjZk_{vkHOl>J(#O%>)Xj5MLg38z~r1t_L)I7dv_5qbjbeQ2d(<&*k&KBE# z{3PrGqNtam3f+~V8kdYOs5!hzjqB|*mJmOg=nPlKsHGR>Zy0*kf-%ioW{;K^iUpk$ zVrRvijX)2%kVAC+l#x-McN*Kf&yZr59>&lfRhv{!9;sEH?X@BhL6L*&+ZgEzJ^Yk$ zo-SW<&jwu~gPL|VuTzJC>?3^+5~#KpWsLQ7-aI<>4uc`bStCtWBW-G5TxnxqP}UfS z^qT85;v4={1pu#%LY)3FHUwaRPG|_0fC%s3X#Azp<%@|DNRT?gbg$As#_0dUgn-fh zJ;*USF2n_W82G8uaT#*h#)9)(3CQyR2S$WM^Z;COdfYl+d!%Wvk~cy$r$~^7lT)Ej z9HdGhjixd->K55h9>X%(_mA zLwZt{@~L1c@FEo^OJN!E`UdzxSTtko^0b5CEk=CHSI-l=zkkhA9l6?_HSl^J(pp zE}zhpO(K#NDwlITk2Cqc&ybw+4amq9cz93Ja(yzM9&b66UMe&Nx2Y$9GEn z)~0K|D0{YE8$n^YcYb-u9Xjoc>mFb4A4h+KPQekFPWJ+M~NR zEcIe+wTVO7lEd}bJsdVM51nG;znL(7fw2#?+I6GDe^zsmnz`VcsSx_Qy%)f}|I}65 ztuy=I%KQ};NP5_JQFB>M?bVJFu;st0tGcur&8t9T5%yA85 zR#fdqWF0OXkX4vYy>6T%7%sEqaM;x=P%6l%mo`C{KuGP_)%RgyH)(qNK3*WT)C9=> z3>5}x+z4hq7*&81UXDHTBkVCZX#qq_{jNb1qmVP|zQs+pm%`#5#8~G(okX*~F4}%1 zPJ=*4C-S~J%<(lL$AvBq=P46E&MVmmj^*D5^=*(`c_s{W=46tj0&6LwZ|5#Z!!f!1 z;!a_@ilnb2*k!?Q68cAs@=JbwCNm2jAlZTGUVeWp==~4*{kumCLioGIFV@LNuDcu-mpr<=uh&0d7|C;mJvsM$x>*(PF%djx zEgo!^8e=}{^P93FFC|UP&&*92=s4#Mo6{5#$$M9JH;^6(;eGCJj60itIv> zx`QF1TaxG09T|fbao>WSWsPy_l>lx>UFnYa;so2fFB~Is_I3H*SYtIVS9QxF0m1&9 ztjIhm$opKn-Va+6&D574qQN8L(;_=uXG^|1eAZBJ5)k`o9WXb=3oW~WYy6fi&K#R(nVQ2EckEgRmgQfme7ZTw^H)MnbsdshRoHHI zi>}L*ar!e29W&K$bXP9s2+J7lU`gwPCkg-oD@bg946gLXXJ%#ZBTR`5F`=Wv1*uUrRKPT0+Q^`k*pjG>fD?3k|k|4(ZMCMD{te5cxo|ALcDH zag|&Shk|UhF0jYGyoVQKz^MwF7IN*@3je9v{#HlsiR=jU=bZzUCfip+{CCL(=LeBj zJVXzq=-Qs_)(n=`l6iWoZ%QhM9-rKm&UikuxLO{+Sg|>^6>G}yM_wNEot!?$C(4Wv zP$y6@OfuTm;S#R8D2pD*U{7v0HHTO~&B?(SZw8)~v_~=Bf_my5`{oGw5b3+knJeF2 zY*=2{7F?aX6Y1kY4hj!G?$|)7J@qIBSJCUX1e25F>~AcY)`9gIRV;B z9==AQlLZpHJCsS^0CIR z2a2_WEm8-_va0yozFbyYKgCpLa<^|0PH)XksgDdOE=;M~Y||*&z1bvy$}7}AnZ}A^ zqbgFD;g>*}$CcO&p67KkC_WWB0^OyX1q7dZ%78;R76Q&h_E29l=?V-xyry4k9HZ zkZ8elFW$dtRR2$W^yG(l_515daM>&l3wuAvo3M0ms30H91)xVlY(yJ8`%EDc9r<-% zJpCaKUi@;ro`br>k_{~mBgF7Vf^3Ci4Nv5= z_o-yxFAgE+oNr2bp<=VkdP|4OEz3U6xaY#Zphd4EqJg&e^RKPL#Z9-jL}g`Yg$Y~Q z_bQ8nvov&(xgSEYc(xX;>&0efn{tyZA_yI3o~bt=sa+uz`%IX9DQy0SQ*Qgyv}^6#i)nL1OXB@1H5viZta@;W)GY~uO4bfaC%#mRZpbuJ3?dm=K~2w z+mU4wHMrD?u(j0|lL7tNjIU)ylogGcr%BNFjHKHM1<;rsH|uH9L;a8=<7Q&~RK59K z5$El&G>}iwp&{tGoKChv<39TEd7Ofzx6%$2rn|e{8{2N}^FzJ5Io%!zmGd3^q)AeKlSe2z}^~Fg_ww-P_mZi@ZwH=<5r1%@W*^jPA4ZDJd2g8N#4vYS<*s3G6ZBf z`NFS!sK^E{Xkok`{dSIepxZxA8e9h4lG3_YJwdz#nH0^EUIP~Vu+73)SDziR| z%4~LS(a~Xxpzt~38=K5fWX8R#exSTr<<+lMwa+1#E7B+0NDn(DC>XOS;Hl_d-_yJ zNcmBerBSE~qvSc#$rlw6#-)FHgs0)|ZY zPPtynk|Yy(D*#PSlp8b7G&t3AIY?LxKd^L?>d6W{!FqxEyIwg*(a3^okfQ_>*p!+5 z@ii&G4ROIGsUPo^d3)a@LE(kU^a_nR5S=AZ{bjMCYlWd(g;zwYcVw$iRGV*fTYBke z2I!}3G_!21^xbsFz{(gF?ZR{2k1~26W%WMF8+=qSTvRq*R5AHv;<(k=y&V$29U8wK zmayH_^Eo2vbH~6=$H2GQ#pAC26lT=N}f&=a(+O9$p?CUZ0-bTwH<- z8I3bi1&F^-U>obY&^t8%dPgC;*o3J(gb)hqn+N_-)K_=FV+wOgyjnV!rcG}KsXu8DtxEQ6+6a+g z-9&@8>}Qc?+N&NRu_?;_GC6d9)E17v39_%~*%<`dqVe+HgCL?^WcEEem??ES2T4jE z#>CbNjp^}#>>jJ$Vc*A;y|627!iArqLVNhTZM(#uf#&)T-}`Gn+Du(qvP z=}@ETXrb!Vr0K(<8S0?8f6K$;aa_s?Ldppu$_Wz6>2C5l&PN}(AAR5@Ul1n$C_%QQ zK)TdN{3)Ge)qrH(oMhXbXs4fGH;8aAl<;dJ{?{aeZ^QV9+4vXjxK{%>S3}s>qu@7M z0za#PE^=5#v@wT)&M`i zQ#GE>E4Gv>$VH$r7rMeX*Q3cJnt2B=cH)hx&p6K8i4-Og+Pw=-ca3#e!IAeXAJ~0A zkWQyXcom?MB1`2rcKD0^Kdik4Se0ATKfLMg?oR3M5D-yH8c7N1k`n1q5Ky{PP(f0< zyQQUDy1R3K_eRg_<2jG-c`v{JbunDP&E9*hnOQTlX8mRsH%xI;R}M*NS{y?=2`>sI z$+=?0=>sd_ss3`-mle&7-;9w2W*nV%pgoAIranU@pRi4qHK1jy#hgW#HQ;Bx_qMp0 zyKysKuSgXWqqGO+&VCT=6vTtvYRVtvrXZH~e{j^;5F9l-th2#`q&gJ&Yc98&Ffs%niF&Ym z7zeCTgt)w7s2t8yCkNDs%H+JJ*`8L7_Q6{F{#0J-th4J0arYXQYzKD!$~gy>l~6CO z#v;|7`D?dlxt3WxoUs$!y6PA>S7PT*JOhZop7Q;i(vtQEZAf+R>|ay**JR8;P4unv zK&2gv9rc1y;e$*Gj@zkld;6sg+#KNA#Q3$(SoxRQw4?gvQ7K3;tyo$b) z$H-(ri^seqJvFU(sUAPXU&?mwSaWi>w6ZTl7mi6Xry`zz~ zAc(x*w@XoDnHVe!^hkTIrHu-jc4K;@vp9xCga!o!raE@c(cj0WYX=;P$i|um zQP3@=gz+d$@o#3K`+*!tjkoj`ngwNWWe{5i2>EVw)zu}L;O0)JB55VHW5Ea*VeK-5 zn+4WoST5*#wRWy~^y82G&L8<9nFb&&zeHNzMp$>wHO{Pd?f<)m{8VwY1j!9#KmZWB z6~ey;kH1xMNVxN(K*3~TlI^0rHhHGi%85tGX+gCa{ zRfmUnW@ir<7LK*HE_8M-_4lt%Ol*CFG=bbZI5)? z8m-tE@L^Uzd{Vz0x(^2;oU)LBx_!=)c^k$FVMw?8&>irY`L8a$f{&YZ41>r=qef}6<>?@+^xq}H18 zQhlBY!2SJIN#;@&o8W%WNzMmvi3tEMLg<#0f0AXP1m6F9)BUXoaV6lF+uSIm>Hd$> zWBr_}PyB0e#E&0m*xS5GrF@J`Ox+x$g2)WR;LjNBCr$GvL)?&>N6mbe{RkH?3pY9J1?w0WhBEieF)xE@`jnYd`NT6AqUth-t8lw*E@=VYef#8D} zzF~YV@POa!dn^IW^cNHMQ$aO(F#I=wrx3bj>%SJB{}%=Qo?3vMw*08*F8X1Ef%4*$ zG_@<|kk%q`g0`C>817IZ`(fWqblM@`KsYt{3K*cT%}pASH9D-|T7b_6n5J=H@u|s$ zc#JH3k2q7dkN|0AiotpV6w0diQ}}i;Dk`cWOH=DXL!7Loy-X22xA3@wyhN>m1d)_} z{m?RDi%37%sc9`X4bI5HFuTnG@rD5IYn0o2ggBTAs7yDiLeh9o()b&CbUp-Ze_1kt zjmAd^Z-v62qk`@`!OC+vviJaV_zkCu-Ps2Q0Ofwv(CNT0P%vo1|L#B5>a4;zei1N6zaOONPR7Q`0GHfCn|>6N|0J+R=4Sfy*=63%TwG?{?2JYI=N@ZEs6`QW z=5Z)#23YkW!Iv*9)?bv?PT~mr6!z@iO z7=PWq>pBbYsoQ2lp_yWRwZ5ZE#OwtN*ET346Pg)`^lr0=JkFix-l+sqB}f4UmS9ia zz1_u=z%+8j`tmMkS-dG|gRfgY>17_sA6azaiCJU`P>hP;i6e`>cV)ruHEV|zm$^F> z!J^}=wLHnN!j#!DIw}DPbb>*L%aT~he7@mlb2_$Q{iCaMm-TOl-E>(i+4*urq%H$| zdFJG+r3y8rz5YDx56yMxzt&o3$&$$gR^x*@kjc}Jg74Gj^1pzw@4pP;=&4u>kjr)ap5WOM>w z6U^B&fq?!`qzxw#U+}%b=K#F60f0vMhnUD$#|kbBC8I<`GlQ5ji`yjj4z86$?jW>t!E3Em( z&4ozAi(tP4aPHRwOb5;`U)OIrl z`qoZ7xZ!L%A1w3sCHN4p1$^1j3O+4lx}?A|ylfC>I`*!P-2wNa%|r|C6{K8SJlj`L zntPZViPE4ae;>S;k#liP=6>1XYGX~&kX_)0fqPlWSF&|ElD?N~GWEpRHF#e9<+s>^ z8*qmMlHrNJPb2tLw6@VYobdkJyL1ub2#M54sl@R{ytfm& z#9)~J3gKxiz_GaNOR%?~J%}b)e0LfSKWp6gpjzRQu}NF3mmuv}=>q22Ku8X;eURUH z{{{VZ@4i))^y`Ud)e7!J@d3d%s=;-k-8XYuMd#q&wE%FOkqS7?pk%cn(CygUGF|}> zp_wCBxyjpw^5e$@HD^lJy=<7kIvA*Bkzfo43=hc0=r_i8c95xj5qJurTP6AvZ%+lh z_?PamIe#rK<#;7W9?OnwG8pqfovl8nWTnT3g}LlE854%BJJF(t9XNJMJLY7(jSrJF(Ih;zEGmb6sA`#o#{r zv6sPzT6%+S^le;-22X$2{ay|8e10Xxn55c|``Zg6YUP>2cR1^rd0B*+i zM%TZF_6LcFU+(j9`76cyRQ{S<{Qb)Qe18{MR68uN`?@~uz}>5p$X^oydg3wdY`B@uFZQCw)MrOk=Jm$T8=Dia31IEGQ=5Hr_-+hbyyxh>YJ2rnjw|Y9i zes*?o{k`xEL;P3@c&!9vX#s_2XJOEUE}0r>jC1zWAxYC;6#i$Z`c@)%1#++eq1#FS ziNn3!(Eg*m4krjvUOvjCNH-y&IXAbrprCJLWaZ-G3Y@?Vu5|-6-}=dAH}J9SKW4cm z0f#!g(k~5%n%kJ(I!@N?b1-vPRr&0rU(@sRwGFHlrgzZr#4sR{RJ)8~$~Z{&=Qoq$ z5wn*0PYkEU|BGGv|6n*F@wYc6$1S>UsAoYuO>B+`v1iZQ2h@enUR^?vd-lQg6inga zmB5Fe=HC)%0(_$!AF}q^9z(W!<$K92J)TDId4v zzkwpWPlOMSt>J3c7mRf&+*o<~MQB5t)Hxl+-24)JlouJ|94jr)QUp_V9y#Mk_I-0YBh?al9cXCEib{rjb%k8U%u?(NXGfNEh3aG&P8%G+7U( zShzrD8Y(hxgK^=pB0>uI@M2#rt$chfxP8}Ktw+F2?I^5&j*|>WXD;Ro@u#Uhf^4b_ z6`eHbIzf=?L)O=KgJYN~Y|WyXm+t2|AyKc4w!e5QSQ1O`0F9!HpC=b0LN{JjsSmEM zzXzY%nqsfyMmQQ5x4!(LrbY_>-m;#)w5z+7qThjlojmD_#(yD4|Yn0Io z{rj)E=L<+um}62}VhrzW)g|_x9mkZmV`IQ<7$-$HPfnkLOt!Tw5=s3KB{Ld!snR*1 zFc4Z-OSsjZV0wZu7klsVp_L9wwufH6ee|B^3l7ps#7A7aiq9|AK~-Amk&`a9g1dtl znV(-iH5|YDF)dJhOLBeg45m-LsB0xi-r#>xoOd;+iNIqB-73zXz+!HV=Dk~Vnr@AtVJa|~{f=frIV9RSp0V~RfAKq0 z)i7iAS16oUFAiYuT)6F$w+{3pU@WNkqi{+%sSpgdDC<99i$#>`g8(a0sU$Jh%MUl3?f|6*(NQ<9=r$x&^xhP&wJPQ^?2@ru%9wZ)gB_p+)(6$NE1P3*M5 zGj6?J{Vl{HW9BT1SIy*})Fvk@kN5AVcm1woeureR(h4w52;ENgS9HF4|Nq5Df8PiF z$Nn%MqFzAhbbRj}tLEl532%EvWwapp#uq_tFovSVZBAw6Lq!^+`&6!;VDXDtu8iBR;>Or0yEg)KWxJAE~-4`sWLSj5;r9zUJ` zQfS7mKj`{Cw@t!H@&QE@Qrv(*3T)CnPx zOg)Icl}NZxLU&N!Y&r4M+44I022v_tYOlfye45k`U(P5ChibCloeZb&HR4PX$S~y~ zdL=-I_eZ0z#&P)g2qzn$t|Yabzcj2DP!y|v;dD5#E#->w%DwAU97HtbP-OBUI}CWc z-^_2yLy80m@JtYb%+KmyL(Bh?CHS6&hiJi%3WI?k-YE*wj|^8@7DXqbk-W(Z1tqC; z0ZzonJlF>lw#k19L@vRez8)!&gS-BWm>V_^OpkoGb1yuh|AtAU%^-~#5&FqlS#ZX{ z<0*-J+;>lwFb|jA^wrgw?8B(l7^OGu`1io`KZSpd1@-l4+Gj2&TZb>n0Ni%LK&}}`U+m>S3mSNbw&#(>rtU|Z*h;B!R zc1Mq9SBGv_k8anTde@w0&zNSzvUMZ(Yuc$}8Xe|#ZyLJTEP+Ayx?5hm<@!r1t(RvS6d4(EP|5)Asg<3RH> zv;V+ zd+B;}LmS2cl7-N%bpQ37^#8C-p!9z%lju6jW@W-xG`LiiD2lWGktB$UFHrnK1dxbR zNJ*&`ZPB67h`k%7)nKvwR0|~F2(0dmXN;7u$hsqV(v73vl?!lTY?gZ7aJV8Om`nvL z8SVW#=>lWKxS5%|f<(&;++q75@|%?|ynnayT1MT2y7X-KV6MZ~`ElAPP?K)L<+Wql zF7ffwj&0Nfo3HDix?eirp*P?mgPKGRKAFZB4O!@1OAJ*rZsg-DUXX@-5-EH}D$!V} zNXsKRU|9yIFr`sQbZ^tihpL+**eLYgy+T(~RPgTHrZaU+5N6-XGXrfVq68-Lg=X z=q92uf)hEt{4C3uFA3BHTM^nV8aB86*0iWC@`4ldd6!9}l^6!5eEGyytSJ_oj&;@1 zw3ib2?lqEwE0tPMgJae2#afv3-1-_2DTHpt`meal|034E`#`8xh*$w12<&e7D1&@y zN6hL>*i1tVx?`)C=v@`1kBdvL^0~UK)UgSo=oD+Z1_q2UvDNETsJzT_I_s)3*vCTj z-$V!&X5M$Ckh(@Iol>}IGAT+L!H(m8-)F@%*kx3CEFqmG@G2dJKA1q%#4b*5h9#!f z{0_#_*I6T~GL+GS3KH7XJZ!f*ouv`m2-$8KTmA>SpQ8~T41P5dTy~F=Hn1V^a+h8k zLc*ei=JJ^q-d>PkB7W?_q`R`tHRviE;AMb$>4+5oG&4Ev!XE5?QrfN9*qY3G?3BCL z5k-xuLxl){c=fx&p;xT2S#I{PMsjT~Z7bx3NTT7TCE&wRa9gSCJ$L(0*}XkI_s`q< z!cJ@S4c@{-u(5E+&>wt|gSZe_`UdJ2TANV9>OH{66sW*w5ikbP-<(hN!w`_Wu!>8* zf8n>nvFCQoIbOjn=(0xJGpLZek{zT<4Fz z0zN;KCp*6I(xYJkZ2YWL3bov`oed`xzhLwXD6evnP#)&-SDjKfw?cp&VI6jJmhdfi z0YywnXD(au-jIIqC1Z=q3m#jMp9U^~rS7tcwAr&RG(JVY&Vu)ujHu>0*}n|bOw|jG zUlrdSmp^4H$J|ej>DsNY|KLX^Hk9HE4;69B!$8SzAs6l0z(l?FalAmZ;b6C+0e7Nk zX&9Q)YVzG{3BG}&`nnWy)vW<)B=h|kv$)QR#p%o;349J>%J!JNZkZDV(uv~)rya|i zvul_SE+7SVy|h)n3H&6ocGIF4fggtZk#Zse23nAVUYwQ-%X3JTP!{*tr@W>A^pR#u z;;o~hk8}@;1p1vg#l_dQLS_NOoh2YkglCgzX`2-bJx0$b6*|Yn88a2j*BM<5S0v}) zTiTvJ#!Y-{ivWH6Seu_mJBGZNS@bSmfNh|HPO*BMhGoLrC$e!_&b_1?iEmA03tu`L z=c`XhKGp&iw|r!s%`w7xBOgc!()}vWMnfC(@b^~3X4Grl1rR!fZUz6xiJt$wpIY>X z;0@zf<&Yjsm|X1CE}alTKa1=^UGveET8iE6qM z%@m{~S72<`pPHYO^H^Kk!p<)2DH}(Sj|+D=S#fVKkP*4QJX*)0p`j@@_QeN_u-#B< z`1;m{vobTkxIEbgVoq=Hji~2^lSzkH{2gZ*spI5yVwj08pO-I}=UW2H%gd{)s}q^8 z>^q>*UQ)t8h?I13;rnQeM5rL0D1)JGBIQ7=pqtpXuC;Zqg-jbXo8A=RIJFMy&~{YqM~?f6|L){~KbBCz2tIKAp{0%DPf1*%%cz8PPSyZ&5VxD&KCt`Oj@FYI#XvP9P zcyc|AS}kGxd#O3S#|YH~BnF{dsr^YL|J~OAJV}Nk|4V8odPk6RpGOEP8;vDdyIbTv z@$>n48{no;xo6*mSu??D8Q3@8Y%G`HLE$~H4&0lj#m4?B88F!MZ0{CV-r#(Ejo>@C z%6_Kj~3{fdwnsIqVH#*`%!KL@AOPXJQ7@j3UV5W4^?>e(5RojK05gT?u6p%(j@ z5)6y%qOzn~`E0JiW%X{~NY512Pr=|q1F(0#ReK`6x9#i&c=bdNW~*_op=t2kbM|gP zat6G>3rRx>GQ{SF{!|3vC98)W;EHFKjiK}CSmK`e)U%_!0$g1kjeFn*bc&ZtOL9Xu z-ZtB$qzSMA;-<@BusgWP+hosiEVb!TPddS{!2@Ol14&Us^_g@#me6v9z#15+Qa5%I z1;?Jl-;0GU*7N`guzwJ`70aKb$Ns(nfx6v*0514UiM!E9{b+Ztp_Rn3q$=O*(TKbzSmonXeZu)|0cWl0H6?WPnpw&a8qkY}oxp{f8T(h-qFj(MHaOX^R zX!nMOgcCd4>QK`nrbD{l&5c*OQ93>=D{Hz-^1TMH>lY(A>K{LTY-(!S94ib&tWPfg z2CO_{Xym&lV+DF7goKF0(8Gwsij;YFv$aT0Z~@oPSD(l`QX#J41tm^TPm}Q5VkVt^ zGn8|JOMDHONGeoA%!sIh`NsbI4VK8N6l7b!(PL~4-gV;nM*FNz^G9PRPH#Tj7`<|r zIo3t{O0+da6*O4ySx`VBbMF$D^<{jU$rwC8fnOqYw;Ug_AhByoeb`fKQZntDv;gw} zS}|^J?xohTh6~(}fcIT$MHs$Ixi48P@8xw9&7>M$(lc9v;b%D}2dfB8-H^j8QAlY< z1eq|jHhkn@W<~}w3W~6>@awL%#;@?%&(9B*VY!5ApF_tA(Ojim{?6gf*3mH3mw`67OtcNr{SoP zaD)!|_F0R7PZ1e0vKK!KVd7e*z>r!BkgYYhUwZFSBJ!dlAfp#6OF5)(Qlj#jpo03Q z?@dat()=$A4e!j|o*GzW5W3~hpY#&=N36U47k|d>Jq$51b!>GAi%K+~9^${y(XFYd zw6LomD%Uhrkw<@@OwXIePk&32l|B%sh5M6{%nT$fw#ZBV^k?k2qv zF;~lEBwM(B0;f1-7PzyfI$7&09|Gf|_-tHE*5dG<5f7sEA9KrL@IKkR_%@9H$Rv`T@s9d zoh^l#k!S1KBg-_g2{j~AE=Pyf(+&H|-=<-T-fM4Fcs|?Nd9kjbvwtV0O59ax8V{UNsvkf1Ii|?n$&xTwY$f8`y4iZb*V|YTMT+5(KqDIQ$&SJjUOnR(+w%Sk4 z@ga+f=Oc%sx09rttj%&!a%kE~WDUG3tH`4k72c*~7KX~-nvKJ&DnZa1=iOoIoF3sY z^VV%Ipf|(~u-&B*bTHkvU84~ahKiUUT~4S;a-le2p48K;sUNi@&S9YRnDLLLlngoRYa~$9P8Q-DB=G*m%;>Y|I~SEbtr@O#uU~=DKM(UJ)p2>GfJgyCkkw-SCv_nIa7)NPR?C@1 z;q689keXB_o@`P6)4h;~t+@=NYsVNE+a-a=J8zHoiGzg=-k)b9^Q-9}d$@tZ zMJ`w9okQWPId7C}R;mSV==7T(dd6tV-lMQSKifoc4lSQZY^fi3X%$h^dLWV7MsCy% zz0uzbzT9P(x#xX-UANJ*)mX6m^!< z-{(tMcf9Wq)L9`e&d7UlIw!tKPC9wGwUuRHki^cCXz$D$E~&Oa!kYTZe-MPq+n5$b z^}+h@>hx0tbWDMikeXEp-HPDP`+C3tpYls74hV#RfPjRAg!1Sex@rc7S_Y!J-I%Z~O7V`o&%R*ijI3@Qu^;dP;K@B=OI(nf^21l%Fco@LpjS22x* zTpFA~iy?+vn`ORrb_ezg82o3Q@@n zoCez>f9Y0|aB2dX8$m8e?0q z%={%sRZd5E+`0S6M%Tg=A@_04hm@-9>XL|rg1omWd8v2&HF#sT2Zl8^a@7j%$GyhD zEbNW8>WMK9Kgi4>dt7!d_n_?j005@3wguC@epXeaf`2lqb|ULm-uGskomOq$H1_8lves%$F zA7A1Yu~xg!56s{<9J1>c{+a-ITnOEA=wCZ>{g))c-@Puh;a_&d`|T46Ohj>!o@x&= z3a-axsk`78@J>#!@6UE8_&ZWgog01^ogehwqm;C-|OsP@X~VYY&t7vLuNb%s8>rNbXR7{Rz^ViUl z_v5`N3fMJ&bzr3M&@i4tL9{m6PC3*sw z4TR%f+x_KxPwyxwjExgsi?&s=KY&qr08$;TsI$)Pk)N|$s#ar=x>iGD?Zma|)BFMj z;}Y0_9$ur>v0$F~rQ{`a2UkqPwy|*RJ9*xa!8`=~K8)wg*1;9glJ{{u(O zApB;dNMh)U%T`7U#Az8@L{uOv@sa{5vEeZ<1ZMvm#n!+7eoO_h%n-U&>_6GJ(F1S) z{k&uJQG*chix=d){| zXgJ6kd6;=cnR`ds2E^M1#5)J4xQD$<$*ThX|BIAipQgje)cjaT@;IsZL~8z=tns3* z^YZ!@@K)O~ANF!84vtPvPR}paw=XU)FE@9tt{}G<4?Ur70Y-udsW;f(IXOMMy1Chq zwrvOgc6(bTWB;2ze*9(*T)067%_L$N?KuzIZ*S}jZi2L|nAjmR}a>RT4w&`nC5>Gwo)oV^UI5qN9(_ z_KlfI&|rmxgoufWf%MXc;z2z#O>Y;3eshsg<>w#lj4t*SVjj~^ zCE+P$>93=d>PM{ByB4fWRN&tk)ixtDpmKlthAK$U!+ogB6kp={*E9K_LuK2{=5_*x z>Gs!9{{S<2J5+euUoUh|Jht-gSF$$rsJ%O(Fsdwdve-5?XUC%@UQDo7^q`u$vU0bv zQ1#r18dQavhNs~k$UNSg&9ynzlR~5`St+=Obapod<8;= z*BX@R-%yi3gA*%DYw06kU=X^M`=1m<{N43}YQBeQ%l)@kZM~c)P<@Z%KmctNMK;*3 z`u;wiRiWV~mWZ$VWPa&n)c9+Cs_-v-DdC2c2$)Wo-t{-V-{6{z0$c3v<3GRqxseDT z#hPXAG$iAGWNW!i9zIr?P133xt_(<|KT1XDt^bGIoScG9FqXm)YD;=_^H(C{($V+} zu^HzXfw$5DA3_!@cQ0AGy^Jj%Ao}7V`=zsV^C;+zwY3*3cDSMASh4AnYvLpJroi2w z)7r8-gYm7Y-!L+iTLKvJ8yliK4_JM`qC*J6Gn;?i!u^+UPNWpypK};wiVCB zJ&JkE%3fM&oXn)sO0&+rudU{;2IYi0=o=)SfpYhm{Io>_&WY4R>$_;xJ~gSo!?^qD z6=^wn-U@jh(Y<8Mh{x&$veA_<$_Ue(=%e0>hm>IGlybWJ(ACtyB&qO}SW+LlKzTiY zS)vV0cf-uB7w#s~Xj1p^$f4>f(6^4$hWmswnhST1TBnsqrp4QmfOnOkRD`6$O8gMD z%6ePd)F=UUTAO8BTR5ib)6-H@j@)M=hZ;~fG1wlF+VWln)_}c&&P^}jo}$yDOkTou zvN!SUWR!->WamZ^lfkR%r*(>wGcR2tkp>zVy4vtDz3P}V`8(5pt{`JDFR~`^7y^m9 zW%|EvbpE-5A|ZVeU}+mdxay%*f+6r;{H!Pl@_3z`v$MLK`s?{xB3Lt?AnUk~3r(=4 zHNEsACbFouMI_zm*MO0HNDq{VO2)zv#l>*AEogU%|cMxIF6PVYAa~ zdKk&0C-_swGEhd}`z#t)oV827dfg^s#&7?%e_`r!;tNhdTH2F%{X50g277&yD;urRt;{mb4R3t#N16^DW81zsFC7(KVJQU`e}4TE8Z zlHAB#v6q454p&F8i~eLis!0M5sF%BqP4JzI8bo@I)(B}*ki!vV33U$L=tu1vM7jkY zYXErCP8N6&3~?Ca4C(V{e^-{DQW*|&YJjvVfY7Z}{sge|52^fB5La2-_d)^_29x5+ zN;)@j2EL;`8Q#LXnl|iOhT@U81Qw(b^O=EdvTe`99{5=cSu!~ktAeG&ZXAS}FyjI* z7imG z#ZeDFFd9~IIVUApO(Z4z*+*%VPSL46_u~G&_*g_677c76(V?>|l@RWUjlgTX(Tb_O z-BNMP4=d^|N$EP@r5gp8PeDSvH+;l~TZl7c_FRolrBTfc7<=Kn!t}ghL7M4;u-9}yaW`iAR z|GrP!^e7}YQ&yxxIb8}B~cZqK}V5df@9WCle&gAqM{so-oE-m z!4o|mZFN^F#JB21t@ulq(DtH5j+t2!a9akzDLYO7E?-+?L+yLq6q`Y*Yop>{+B}66 zj)$#rFoPcnHGgrF*IPqGV0aTEFQ>0OS{yDQ+O#%IOJn%t?(Tzy&!B!RtW+#@Rux+S zh6CD5yTku}NH^l|n)1`E#L_`483B(?|1vB8ib(pWS^1@)LFh--0Qd@Q*PpD3xyo6= zx#A-;8iz+fPy=VsBS1e@HJ)$qg|GX4dElETnfKCd%k0CDlqr7KY^8(e<})vln}N`+ zF8>Lt=KCH3*j|Hdx5oiEE%aaB2677mKkYXG3(1FUFdBmTSqZ~s@~v(Qk)vDgXhyCN zi9YLm!YK=V94l9;s5=_TAwg02SmM%rMKVCnyzvSoo=?V(DZ9)pCWAvtL%&*r)!^NKfG>f(uX$zLv1J3 zUMzIG&edO^d0rhHMs~@f8pTDKB>1fcyh)KewLA;Asn+b;f2MtOT7v-ghiZOc_#FBg zp%jC9A1In)mEF<#P(bxHlUeLqrv`gxWRF_sq*8XX<=st#!Q723G-~+KCz3i;Lhr^s z*b59c*XD9vk`Y|pSc{9}-L>Ev&E7YA8hESS%SCg$6gOdLlpaX(>=GzG z^GHV&m{&K4u6-YK3*1Qd&QuuEyT@!W!Kg((c_4vfZZ@y!32(F}6OPIeT|mmb(cN~bSo3YWd>_!c{&N+gm}YcIGwXH5H> z6}HNUvXw_^9HFCx`i`r`6RdC6my*538V`J@T6z4EFjXb%^eCRwq*hb_nxB09{yqHyt^CU6-v<%}27AV^J zCB4G->i*x&!cPZcgtuB_0yqx{-7dO6&q)18TGbk|aqpvK?5AcNpk^3gVi;g%_{v2; z#7{pgOgAn^JE1^3p-3~OK{KOEHKRv0V@N&ognG`Ha{d|RqC3TsJH<)>`9=)sMl9)8 zI?2vQlAUalolnHO`NRj6goiamM-7C>t%RpN1gE_OXSbk2UkbwnV3H-@!|^v!+UWiq zsM0tm#Y3NCSR1FoZ}FPYu(Kntc}Hs*i94_WhP+|0wvaGL86&;HL~+P?Xp)bP!@L9aTNfE#cv z=}wnY?DT$PcbpHyMsL|+4Leb>F&ca2Rbg$;RDUhfcm~bHJMLokIJDxzm4NxMKymvU zoP#*OhNoL?rrs~voua5yuq@_<|1P7Srd#GNHZf#B1u@^ZGWxZCs;TQA*zA8X-HAU; zH=OO$vSRSer@?kHO@Sr*k^r5;WQ&m)0^g7sNmMi@efXzxH^$B`49-4@zb)?K;wCFp z29yUvw}bl=+!HM@v+qe?OF~3onotBk;zDKn$3d@$r{fIq`pdu6f4C#XXC%ShNA2P4 zwfS!HH3O;97{8Km{!(p_Ml7B)>AvDr@}q_ZmxZp7j4$)wRN)y?4uB4Lqu;a+5;BdgDHo1{Afn~L#@8l z{Wz`bCY+>on*<+n+c0`Q=#Pbn?#IDCmeUMr*ul9d)?AyyYKm(!awAMP}g=*b#_yX z^pMW3BsVr*@k7|mD z?&;|P`syuZv>`o;25*(7=>ba6Zf{KA!j~X-tOasxWO3f zeF7aXNVAiESNi;MFZ?VG7-9Nfqx^#u-Y*CDk8cm|oi##_NAupe)UvWQlcl~;U9?_( zD#YH|JuxYKJ$!)|ce+*MeG=)@1)LO{(S3r2b|!jJE%55Tu41|QO60(EwzPpp#tv*d z>WLR#IF4(z*7W&j+o&f8MddZj1|F)@GxZx3cUsmTKJ39zn^l6ce7fg!?5MpOJplW+ z_O!KuJ4bN9N`}y_5dH)i^pB+0ZN~?o0yC@*88{5Mw`-F~&&2mQ$Uh{iI-4@++t$MS zTuL#Y^!$*18nKA}C0R+m#{-rG76L8T=K|9MNnx*PISnsnN?1mHMG50f(j}%$_VZoW zHlrML@cK=Ih|?uPs5TB}Q_ZM(C`>rL{n1cXK}K}IiwO)-~?k+<%ZDQ`I?qi7&fYM4+aD`S;i zh!0fL~sqXM2}kc@&sKs;qy}+wvMTu5bjQoh^qs8|-8DS;L`DcHCs%IaCJoqXUXIOUzI@s9n%C;Gz4sAJyP@x;2$(Yp7oOw=9KtE}M_ zad(f?lWi%r^7Zu+k_tO=EsqW9k@D?{hfiZ!*YkBM)_3xyTzAvnd5P%NSD$Wes~%$5 z=mX6L*9&+tD3XO-9Z2%O&gN=X^e4|aZJ#xjnDGPGt67(Z5|&xqABP1=i(^MLKC$-w zJ=5j=RbkTst%cC7=KjA(VMCeyaP5X1dJp-kGpUvMj2d|q**~*ah*Z53WT7le9x=ir z4-xN4d&qaUqVfal+47T{>||)DOBw6fJI64WYPDGpYWkjX8o(`OFx@zxqE8^UEwnao zrI~5_h`qA+jeRZH8`9m~%OV%j*SlJ#*KAV~N-ybY6WCMxNztAy?wBj?>;fjYbdGdc zv_wwu6Gzg7HE;1nAp%DD8%%td%)@@TkD-w~m53YxQWL3@q%LY5A&Df7VKWrp%r^Z|@n%Q!|46obWlFX53g? zPr}C6Nqkh3%r;J-jNgPSY&im_UxG&`UqQGrr$4v~kUWSBhm_!wHs z7+MP%v=5b|Q{b7ip#%{Fv3BE+SAH*F3)2tG?*Z9D=vKaeg30^4WrDhGj0S*T&AE;Z z`yU!J_N0qd(;61v8`KaJ^rgQCGwAThv7*sFkq}K1FIGSAe4U4rI4Jhh)^W~#3Hsk!VA36}#BbhNbIzkeSc7iY(^C-D{(9Ln}B z8tF4f{CFI{=d;1sV=|6SHe$5Y|U$TzP{RhilWl395C3Ju{cGAzLAK+b@9lrc~?hXjh`S0WGj_uj}hv{ z{d*ZteJ#aD0ptrIh>UIj{7B_LV#!C4*apPw1B#JC5qW_j_8eQn75`oceyS?9oSnM4 zx@MKXmV2J3_uV(Ig~Eab5+k`Y(nx>Pb6%fXT3?*oZb913uiDG6 z2KRw_a}pp}7H5cocs^;vQbA93P z1HKl+pwa2atJd8|0&^bZahS0Y>&NozcQ21GH40zv)cHNliEf^fAKG*LC^*I`^E9}p zRPlZMea;9YE*X5LXYa70xfsoAzg$9X&EqK0ZkE9Ro|T?jxKy#gV+h@{@=tQ#1i*{G z`=Iq{&f9}a$ZUa%_~)3d_XLdyd0)nUtlfF@k(BeQ1MS8Wd}VQYL~y(#f!*1jiJit& zSlv8t3t!yDx!iwAfN{49GZkYQIv6#aX?P#Y;$4z`b^No|#u~|_XFQh3tO`(|)rxif z*cgARzt8GtjOe{J|5YD&Z2Z@({vb~asW}I_bSCk9^cVQvq;uQ%P5~Lv>Dk-7Q}SVY zdN$BH8?obfDIg#K>5)!}K!W!3(hMe4!1Q}c>Qqf^oCi1%+YkNMt zm#wV%4c{N9Y1RD7Kg?)Hf{nAFVfkirqhh#?lh_WC#NCma+eTb3E-owgxoA z1j5X>{f3&pY2J@FENq;=(0=0^GBw4%qbn?2B6D|Xr=SPF0*F-jpT1&0WZMu~Uk8JR z`+nCH!FM1-5wbH&{A;AYb_)1EWuv%mn|r#3gUW*$dp2 z)NkPJQJ8;OR=sjLY|(JCbLqLXHYXeQQ8T0)dW7W1&fsM4z<2($6;~c7hj3qU*Q%%W7=8zP}BcBOSAox zk|0cgE8lx|1{l@30%~=8miE2Fh6qxS3}Gi+tdLCFbXjo&6xwULZV-EKPvI);$c<9C z!}T3wEpJluaG*fKXYUDBFZkUCQ$qp^eJlvgh<*Y@n95*rsHxs?fj@xhnSm<6{_z}~ zk%5FP#`^JCT!#0Ay+&J!e}EFb7JfRU``TM>VhcRfPR;>eBxyuBmWR)MZI-Tc0&N}y zqX=VL9SHWGkJZ)V1z zsVKvp@OxPYZ9pUGaljKTd`LLP$!<(ubF$}WUIY(autCQ5s?uut3PfxqKj4#lj}1Im zFpU@nhe<-~@>u!0A;e|JHJu9nIT~oAIN9T;jvN~ap&Nq@!7-DCu%Lk&H@c$XOLyWD}0PW9!vBaN5`YW#Aq zQ}A3*U&{6UAztY$!xzuEnSogA6h0#6}yyIB7u zA@n`R2C;%au*iJ3PW+BH0;fMBmp|pbFlNPQ7UdW&^>}HMcgnU|Dt6hruK890Wod=| z{bQ@+1+44aM`!1kfDJRUO{M|fNbL=$b(*p^ZCu(nf<9_T7XeQ z=yvY^n#1@n$(g_B7h!^bjC@GXTGbTPzP~D(m1R|df7!GpJ6YwdhTKDC@=aHwm=H#~ zcn#l|BbLP&9XCpkFjIn-3K1J86noz&ID{)wP`6^-9M_(jn3@y3nJ`5o(dT zS{W!Wy%0&x2Zq+|JU(Y-IIO$en{(Jfg7#wUHqMz50tu<{tR}R5MBRRE7}s*>Scg+t z(SMm189q2;-#XNx^-P&S6Xd$W@MXe zFo%ctkXyEp0yQGe;Q9jd5DQN{Ph#%leNL?EZ=?9E`pUj5i`dy-rhLTDQI;huw>wfC zSP$lh3)Lpm<-w26$2O0(i2KqSoXkXCpviJtSqDcC7I`dr-CWm9=qksB$iy-UAwE)2 zm*%ST;JjPl?u$hzynys*uFM3PUxwnau=nHPd-TvSQs$FLdC|)!lP|~mNe6N(tL#uk z>DLdg&IvpL(+=KY+g*8$Gt<=Q`~q^uW%tbK%sBrn==X}@k1z_b_YfTR@om^T%nxcA zk~$Q_<*~owki#@%y|L{Uz{@Ypx90v_!icv9A1H62Ic%nBITJc4w02q8S@{gDMt#JZ2~3@zXAJyxNu@pWD0u zzwI`RZ_l8m+B2-^1E|#axXY&;G zh5@8G61!P+f8tP_!{qoeQFULbJb7vnC>X>YNyC;wMUeZW;P+8pG{P8i!3lhHZ=j#X znvm13+6PP0nX3AE=YT^MTja@w&l@DYVWnYh%QT457>=2*nBC`?!w{ zofznr6B1Pu5?vb_U7PEXl3y`YP&riU8ei)g-Qbtf=oa1S9M;)0514(2Tti0P!$v*A z$0pau<@9Erna*gK&uUui4U7Q|Qx3m&AGUP^ZBvdq`;NN$k7gE*W)_cTmyTx_FM#GL zTRWHAJC{etH7*jP+&#=Gj(HP;^!xAbQ{J170N!AmHyGTX0dm{>QIz|S z7N`R~NWOyD0eUtCqj!Yz-#pcb^wrIVt=w#g6&fIMWO-1X`?Omjq~0-O>NzZH2!RWp zL+`53{o2-xx~J(!_T&eH;;5q07!kyg!4aa-`<=$Esr2PR#m3}AcCmpjtbHb1Ae%gx z)EX+%S&WQbisuh8h)=gb_qzmjHxQKxe5Qp9+1?P6e3T_VW!04v)33msqSmAde@-N+ zMkf@^bkDK)09>VQstig9gW-;Z0mBnpiV>zca za*9zW7aFCHC4CK#%U79zBLl&x3#h1%%R41;b3?Jy1m<*x{Y0ptEQ^?uJNVP$V7CKb zRq;9G?%eu;-B_Et(luxGe(Wdpn(tydOFi+`;H6O@2o5M4j@wcs=6b-Iv|bG_eD%}=>ZmjVB?>9Y5lwq&>OQ}GXf-q!0p2P>s9<8R2?E< zM&At#hw}qtz=hxtvM|7fU{7y}mper}35;JGgYE#2-mje?qJK-7LVdnyyl-#*>`WGv?R)MuvZH`X< zP&IN(3XF1QW?YBY`t*+<7P<*2E;K(cn9FOuc@CR(s4s|&m}IK24^3&MUUiC0d!OO@ z^AjX*Uc^!!*WD=RkBpA|GUkqtvw-*qp=_~+NqW?hi0E-1XeIwVvNQrF>- zs<(`Foq6CODH-EU1XPl+va}?(q=pZ$lzqecgplb;e%;QS^Lm}dO?XLNF20T!m?&6j zKNxCiYQ*N`7z<8;r-;dTsxOo2ywufKN*flnyx_K|f#d)RA{ugXd1YloV`F$0wfJCH zo(Popy~vB^r@}a7Ewt0Q<-o(X8WM}Y& zN~cUm!A?I@QCa!+twRtAQEyG)Uiwom|7cj{go&|zI(c9%=M4?b7XkZ}jLMS+UL4zz zzixn^yw*fpCV2$NQwZGh+V2Fv{Z*}o`VpR9H!MXfs(_DR`!440yEnAKIQKe)?&T@8n+wsPXn zYV}=rOG+2g^X;b{ldvzbZWudmVS>kT$9k3Q!QTch>YwKTWpZl>9k(brQ37zER?D(a zE_QmmR5W&?B_&X4UAT;W!}=m$W$$%WD@LnRCP`dE z%^h%X+seU}|C(p+X36Ua0Q>@hTb}uy*sZ_$3*i3{91*C)Hiafn4AQZ~2xWo?_^S8@ z95UgMVGArPRPsjZi7vf!o5h~7svC6~(Xne3KifK98?(lm?r*WFtF2ra#I5J!KM2!y zv;X!^yTU9+>&!d0&9E+TOv!!{?chgT$=XR;fDEf=xunb^QW$l z!c>b?V30h|PN0+oOgL!7^iWv{5!p7_@{`ZVp`fwnJdJpnUil&WcSMK>DbM8cq|2DT z7xowK9O=ZS;t$&T*fmA$MoeBHmi>g%!OZx)+WzT>?rYA|1@n6F#m%=%8r?-0Y9Za( z3}JDb$w9~YRVZEas`JIw_ex#K7s=wtBR-sjAguT?j%yg_p1+d+r_B0DOxL0YJpR8j z>o-hxNPr;>kXdD|Wh+pMmJmO=v#2Gc?4xJkH>&g??;mzrvMWYDdSCi(6bqOUn^ha6 zNrbls|K#6pGuDywO^z3VIGG@D%N0Kpzl^)8wL$=JazO?`!5#x_1B(s3^$$|(uO|uU zwvwj{l!57LEO4mlrwah(%sz(83Hc{@fEeL3m!J!Uwyuso;)ka<$$Et>K>osPk~Imz zG<_56YN#uZ*aP~aFYVaVy)-qF1U7>a#9b1?qdeAr_)G|RX?a@B?;$hSi>#$iwox>cHjF+i|RaUZWo8cCZZx9YNm>j2k#dPB@L>CB)vsV zfJP+wNB$Ek+(lbFwoaEm3}K{+hgjQrZT7OEtC_ULFpB3=_Uh4CZ(pbQKTKTLVPN+;h$=ODuw^ab9&QSaZVc1h8w&xN9_u$rPrQiRvN3ivl{+5se0x2>4Xu8j zoMN`6q+j(>Jp|1^lwTuXam*BSTEoHNhn#5g*QNZq4{f|kl#_tRkbtJ!rTo``j=$@U zkbMX=;#)ak7y;1*Lk!Yom1DJI+F=upx`RGnqw$EDwAfz0R5}7bhCf#)kQQV=f!NpY z#zkY{2Hknt6qYMsLGQ5_3y(#B>i;V+3AONva%hu&TY%T^#gk2T0uJX;=lYzvb6 zm?1sYe3wZaeo40@%f$045sK~gpF?qeY6T@m)Nhx8X+hw2YQN+0zXyEzyGa^GN!bqg zPtgx9y{)&N&eEKJUz~)6mIP>&bv-U<5CF#ZUh7K(H#pz0#pl9CZU?=@>%DH!)Y=2f zI?sUHj#mV4TrYSQ=Ni1gyE4{iWRpAlUi%v-;2JdR3omCy)@RA3;h%XkuD!VWF&#L7 zuiCFogPkvU*EbQLI6lAdYN%KM?{C;Mqb?3TmTA1ZI^(cLCl|k=rx}6DW~^KOY~QPK z|8_|DBv2svS^pxcc)NaJ*uU7xsKzhAkXoG(fY8Y9cdkzmkL`CYz05ocQZ}df4=E_e zc6NO@HgZj)s(h-Ngs?(CIYh{EMFZ#Vdb&S+p>_Cv^H7Bt;Z0Y)*Ufv6MPIZsN*-AJ z4n26-GEzSEDK^)B|B1w}l5plsuh_clJ+Aohn=Q4vhMyXMoA8ajz*kjHS62sxsX}sz z-mL3QZ;2I%=kW~(j;-|HthPV*h}sw4y63>O^nVb^{x_U9e~LW&BZL@>shD^6>Y@0u z?ICxs3Ob1^Zq2dOgt3RZ9cDMiHzR`}PQDznPY!Nm@>svh`>_1FWPuD^u^<3hK>MEp zs}Tro{s)KBKM1VvY7E4FkXRH3+@zrfzc1i+#I6(;6mj4#I>u|afh1Z=mTd$|WQq&D zLG2)%8Q@Y-fzrB-&+zv7PE59iefWy1nvRNYH$cIq@gzyl&H_`)ok$C=Oujxis}kD_^u&5?+u(& z-KAcz`tsQ}Qo7tH?zra31tHz%2yXDZ!Rl9+@8}=BlUe61#NVBHy)vof`fPUh-Bb0q z6kW(S^?jqqQWmP8H)}@b&JAt~E2@{#y&j2vtDO0mEZno7^wvIOg%PeGdP|=7LuQ;r z^e1My5!NAr#_dMh7gP3=0c1e=*i4qy=Yc`!qEDPp_qGgK{fieY$0H>aRAP8D<7k={ zDo)V88WCuX5g>$>oyl0W8pGCTDZLB*hy zw^5YYFQMyAlp%t^34$v*DK(WF?TNo6iIw4jJ*zl*yS!ZH`*My-)0hLh{1ub0pArb1 zVG0W~14|D!pqk1s3^FXTeW4zX=erfShoU;L=-G z`d8<~-$lVKo5NF@l<42{u$u-S z9&#VqjZ+#Ay7c18yMlY(L9?s3E4@k~l5n_P$leT#=%Piq^FKqThNSz}JO5ra2)xVbZsF z{FFT_re-v@yIZTFWoMCoWv6N&94q&rayQF&AlWKVKW{Ycd4a1-)oek`Mw}|0Tp}6$ zT%`|^_~FNG^yFz*cmI<^C*QKs!!+#z7Aw!lr>7blpLxv9hbC0a1J%}3G;-`bW9a)$ zH$D>vu~nlzj$+X|bu$T6+Ao4%wI5IsUk3$&^>L5*u1b z`T>pi3uXmQttC-`vfu$k;1VK{MPN>0<}V(Wn=}AI`b^`IDYeE3O#4sV@KbsgDjv85 z0EC4Agt!jBBN_g7Ka%-_xbfzKkg@|Hq8|QcMneh7y>R_cG6`RcD9(*FVF;)sE)US0 z-K;w9%qSokx>)vh3QVumQH@zTq1+KCDn?0jG;_V2aP1`;QjR-IC=P!;t-^A-!Lvfe zuZ}R~y)`XDQq3UzviIS8&9vnY>=Ce8>Ul{Z)Z>}NIY+nHxl#8ll{ckHkGy*y@(p6u z)pU9|sP<-{or|R=AZXry5d%Xa>pMWq+U@-n3Kh;gHXf*0^4zW1>vRe08ZY))nH0z# z>twWmaUXSD6_IUHUxv{PDyp_Dn}=1T_6h#~DaL;7z=Oyfqq@~4w(mQ(9ia=)xKeR$kaNzyxe&@?eipxEhA1xb3jo+j80s{mheywNv}Se0|2NVgIx&Mj0q+8Po!6>RwoL zF(_MOTdr^)R{u#?d*i);Y(^}CPV8#+hz|zRdi8;=FrIf_%Ek*9ry(gGYtt#kw-04V zQwXf|9u&-Vm??5V&21f6Yq&hlA?- zD*QC^LnVHvM%}<;DQGC-w*9QJ$U1luq%~m@i#>QUTMLu}y+Ko2+SY7N40Y=|pY%s* zv7gyyr19hiYi5Rv_sFTLEBLU$LZ`2K1+G@X2=yoi+;87}D_(e!=FC1<#H7BRZSnEz zLqfmT+7Gi{`QTVTj+iGDl6tZCgrct!RDB8qS6S}aF@d8R#*HEBW2(VckSoadAQc;7 z(QH4P3qvl1rj>>#1sx?3SMGI|HfussgtlBHLL118U5cKExRS+u1D_IjU7`T~;8R1M zmERLZlo(koY?LGTYq+S2t+#&c1}|`Fk+RJ+DZfQ!@ZZOV8?10q9IyuCDNDI|zE(S2 z**1L3+U8CyG8mOTnVvW!tLYQ3uPuwG7vfM8D`DJ5DQAuHT(|iFRmof3O#w-|4XPML z`9gBFD=kT%Zi(@i&>2~c8{`ipk~pK0kb_=YSi zW%!lw9_r8wrtwAQ0@Dv8IB%ivP=?pvLr{fI=+JKpJ2Y*_n&X?2VoLigf#D#P6nMrD zrQ=uv^H4gt^4BcUpug7jpUom1e!n8XPnH1vQLAXaI_SwKb#+WA`~z~8TXHo&^AcaJ`-4LVb7jzpVX%a;`}Nq>ZH$kdJh;F z1a1fSJ5G?l3Q^FfA42pjbLGkX7Vqx!RQWTDg$*)SCmor(hV^Rso^>51JVyeht(@86x9*=z8qfh-uK+~^lZu^ap(nHRMmWMpDb4v#e>pm0Jz1RfTADpTCI|MFG zU}i4Y=7S%Klakwcj0s$Zdsd>QhY!f#d8`&Rpp1$^KE-=8HhA2~e9rFN`l%nqTzpB* zVa{gOF1_6`(3&>OM+8Fv!U(d-pAmeW|Ovy|7%tuK99YhD+t z^%f=d-YNuCK~U@Wq$$gskW4q@Y{1^@Ta`LbHE7D|vk(`eY|-o3tyabg80y_br*rE| zTo`eO>hV)NIeE6j{YG7@HKZNb4j8p}##qRM76kel(-lG_9^?{0gBQlMg{tW;Oqq1nBd z)P4Aj{lv_J)I1}sVk7JlW4zK6qAC;8&nFD*Crn;Us~OK3+Aq2JuSX5%Jt%u~LSOTG0?M{4U2u!-=r zGIzzAdhJexMBn>c5Cp6+o$sfialG+3BKRV;;)-W`gqA~Yy=rm^?~>1l78tt$8O|>l zneRkj*AaLMf!js-SM&BiNc_KE%R#(9HvZcw^W!w&z+1|1&B6tm{pDIjhoc6yf_-!$ zU4#SUS~s@W5U6=sut_cj%=dwAzMc9YEfx-6DdV&M(sXg!GPGD1U?K?Ij`?>&5&q_} zrGbnY@YtToSv4}7Q;_amp4!kSjn8NZvSZn33ur2&t}bLl0dDlCGFO0iW51b*;e*Tp zYbDGKdpPNH@a~+zfedVbma$b+Qyo!lvSHrGm+-C(q+I1Qj2$bzuWAev#~<71OAFaQ z^A2!&o^Pn1n8?pQVooGWG2?zL@AYbHne7 zG7;gy85|BXdbqMSbvu&q8yKn5+>dRce=l7u(2OyZp2kU+XCW?V>LUMH)7bN!mu!xp zBEN_Rl{)p8$S3ExJ>HH3>$p~Pl%p3)up?L;Zw%SYDO4~(UkIMI=Z22K{+g$JRt;S8 zfX5KHU7z1cPX3!PvHrnRx~7$FuWss{zq}%qVptMF$r6uX&hn~-wy;t75-#C8MF>~BCcQU$qc5;4wehG0U!StH# z00ZHMPzjRjivR^8M}d835Q};Xi=J4FMJ^N3?Dx(>o7~Qn zWaKXOwov@RP?%Xwf{<#0zc?#Y7P539o-zpBPWX2MV*j?TZ~s_V+QDobLUuyb>pX(= zoPju4=^)Xuw?{rfF2|Jk*KD$+L8kggYgM&^qB2>#FY|AvJ8xd1Zvug@g0O}lpfo*D zI54-gH{v)M+{Xgc-hoZWMHxFMu|D{^k)-XPNWZ zv6N0Ydd3N-j%c!4l;AO&!;)#nQ_d_XZ5Sk_BPS`UUlXHyI$qEjIDjB7jp4uvNiMav&mDGpU51WhOdO*#i%tPowi7+sv7ChaT?v01 z9_=s|>EvC)$+mk}Gk0z~*MX0B#vxZ;KgcrD_T}`8p*726zz&cF++kIXCrFtF>#K`u zPnvgCdJdXSva`yD*m36w;V<7M^pjQfla~vLRG=#mdZr~XH&5L7;xKP>ih&uS{N?UL zDesAWOz5@1nza;=ck4L;S!dpTzWaSJ%vN}ejASp0jG?zix?#C2v1PoYRcHO4H|Q%0 z4Esynf$fc5`1P_4J#oE)Bxpe3cG-T%BltJPE%pZw)4pcK&?u7eYO$4UG!)!|SLY*t zA@U%%VFoeenIJ`#-TR>30*oeeNIyvBV-Tr9KGW-D@0qmbZtHJ=du z@@-g1YaSNsG7ss^ufpB~8YtyNw_?=X^XAj+K;M|CM45pjhc)bHxAWi$?M?S>g^5mq z&jk_0Q#k0-2m2J@BIMpu=@c1 zKV|rK{UC>-e0-lEUL%+JP`*q)hyNNexe7W%SDAp9Iv8w1*^>(#ThZxPV+H|Ua}Dk$ zs|)&ux{F4-I5}Z5UIO(OX9o)~;Yl=?6~$6U+5E5XJYgF-@ z%GY%FuQdF5v1_z1!7cJrl3xslI5_HZ_LDwE2ZC%!cH` zeOlx2N&ZWx)SsqSGNj2XK-C99;C80J6B7Ja0RT1sgImf&rX+z%k!)e9d{nQ*gBHLt z8utRi`1o4VSKQq_5)&Ch!_*Lw?iTo$4`7W9ONXVL`DGs-96*HM$w(2a#c1*SPc&`o zG1Jpsjiz**&c*(42%o%5Z1SQt>*`*0K|GnSnt)a>FPt427nWWXJvTF~(0GQQHXxTDkd0c~rh=5(<&({Tm&O6iZjk*F*iGV0GD90P0RxGy^s!>Du-cQk~7LApiK?WtvoYe#VxG&J^Nd|Cb z1-}`IKi5{J6`vX(2TcH-V``jt#W^nartdI>R{3a96TRlXWb>O0C>3HQ3|dsNto5Zf zvfvW=yy@y9+}+~?rLU*Au(AT@Smxsc)i1vc;^r|MCY#TO{P3xzU1F;P=pJwNcdEDOe(38Q3n!76GXg_2TIWAOtk^Zfk0 zuAyOQSeVDb-o5i+bhX%T!~LepYH2j&f|juvdg6I{`)nFG=@g*PkCwdeTcW@G^%k0B zScg3S##K-Y;3 zOUDJhTIt$91nQlgqr-zeudY5HHyW`>6{>@T$UbcaKHGcmO!_=B5%=?vkm$!iN-4JAkPB*)g$sh5ZqjV;7p!OF8sF#` zEg!%VWxeb7&L@AuHsFUkaFu9y1ZV%se})1ErmGv5Y! zVwGh(v(!cCv#_*1GFH*qaA}*)Wl*RGjQU1wH1Z4%Meab-qYXn4AGzFP4d!vDgVVSA zo%vYE&zA4ZjuOW}n*>LeCpwO34$>Xw-fe;Z5GFxVP^Hh73OrYE_VbuxKQdukd<=hLe0a&_DfGX80*8 zc3^UknEO5Fd{pc@OB=#lV1UXi6{mDg}4+K4WihZ~e>DoovZy>)G0luU`WQ zwuUQ7%^5g3Pk}~QH?M?bWKdIe^J0(59mK@M)_RhhuP>Z}S^1sBsinP3oTf;Zq_}=rI!AMeY3k%hejPWK6AZx8>dp)bq;*!bsN?MLFYS>lDan z=Nh8K*{3O%&BoJdrfhLkg%f8j`Id~)ZEiWqbE&_r8f7{1hGG*u3%Nf-GbW|n@?jZP z)$)0}CbsPRf&HdY-Vu~hy7(=Y;R#v;`*u-e+V*5D-6=J_F||7i(RKC#yGO=RVQ2>q z@x=!0GgFRM-V2O0(N6UJAWYie#cp({N8<;+vePvkO8Da814ET1xo7bu=!0o1mhXjH z5t&w4sxoZ1liAn8-K5RPX^NLbik&UiZQigC}VLf`|0RR5T{758o>_dz*{H z3>|BeXz9}0#Iis|NtCeV8#@}NZ`)%vZ-KgonX`CwhO{Q#lv#Ni$1>Vx#`!yDDZUPJ z4_FtK@{fedqP&~Tu`chG_j>c{MqH*@Bv%7?le*tHDQe+k;&RH&9g7*QQ=)bG5Au)M zYR)EnszL@0=1L+o4K@YYvmVzaJCFL;>lixQ>m7Dsg?yTbR~lLu`Kn~L$3_SW$6PxS8mLqKHSY=J3i50Lk0Ef&d;edoJs*DX z-XG<|kLDj;gvG3#9&3X6J3?@xEu zUg%S&;-_4_;c-0~`*x^vkp}~Jr#i)ZKyVi(<&Gh!2h#T;FRB{IjlQXOI$dkZ5~O<_ z3J=f3jNy%v{<5KL;>cI?1g>T|0{F@4I`p@hnFC2W&|#~Qnc)M^V3yHUp#1^{o;0^e zOfj-*@S#FwLGh}TLpv1smHwJmJv8o4*}!86+|ufIOh&h-;%&_{R8##R0Mi4A(Vz(g zYQ@BC!^7(r5Ezn?8BtJ}G%;BU3tNqg+sMxc8o8dYtemf{-JApUA;1}{mXCoiK7tS# zD1PRG0EdMi35o;{6Nk*-=a6pFLRMFu5y7(rMXd$hZ7C!v5*ttP`*x;>0ODE{wxHWe z90tDqCpF;b$^VG>kOUH?2Z7r;{(rF&{Sm3>(oH1`DJKsEWLyt+tWD)wd8Ix^fb@vngflVx-5EQtY7!p)}HdW%_Bu>?S$tJDFIKT~0}smaXjuZgtbYLImWh(-w9 z66tr$5cdH5f9f1R^}~7u7>}T#p%D=gfo@kwNJv;%SlHOuK)*#GL57NoiiU=Ulamw3 z!;z7Zk(USZaFor>&8@Ai?d|P>u2vBd5z*1ng@uJBB_-wMhk}2{F})iHWJHDZocEqhUI$WidND zyJ+vVbD-5`0Z`V#>U3x=H^b}`<;@C-FKf4n>&Cs%%hIp&yA-~M8o)8BG?To58JdvV76Et~T5Prna@-z_F;)cowcov~9l z4`*vK2lF!DiRlvRiAUav{53Ng6ozx`iM&%?2sFlob>V6xt}L|o{Q7u#Aaw&9$SX%` zigZK3!5SoYGw=cE6_$zK7;}!Yov~T~?8H<{fYsFptns?wh zo=<%P1U&?9dFOX*Hs4jNpP@2Ps<*sD?FCEcqZ#+^d0hGPcwiW1+VQ12@g=%0Wx5GP zx(UVl2?d6UdB*nn#z{HG$vGxKGOm5TNm34wgJYJQX`Y;Jo}6KkoNkqpYMqj7lbU3k znrN4rV4s@ckQV2Z7UPs2!{`FXr1U7Snh0{=&s}HspIIWX9tQP4K*;2xxN{5iyC_w zJ=sJ%{e^0}nRpH!U0Dd*0zpBMCQ4rfF#;YEpv%RLE7=I~pwGrHGYJ_r|r+ zi{6gFj%lMy78)7dB>@4eShTTq5EgXIY88>%-7b%Ji} zrdIKIZiw<|yFLYxt-r1*=82(XgiqUJd(CSF43KePoA|ndML)|ogZV3u$Y;p5O?UQe zk#Dk+WTb4DcFe8WNp;|-_@4QmxT7>K4V18RaWO*~d%*B~6bB@0qcKM$bMw!1KvI)@8iEwa9R8;v4426##m9Vpy>gzYUyLWkbbou)BL`4l} zW=^!Wu7iPGXE69eCL1yejvoS7*Beyti~%xy#KM}fr*8gK{!IO)GZpzh!F@0ov87o; zEkcj9+9Q9*H4q7&hzul=Ha@`1uW#_{sWzGKm@fj4A#i&p{Jv%GKYUSqKjaB0YX%Am z1eG-n6tX2NXeF!Uxkm)U{h7n~W0=XuP&2hVu8j=Utxs!{F}`$??e>xHwc+fya@^hZOK$^u@R*?jD z8MuH|r@)N1!KVIqckl@@ncu1_7z-uf7~#HES2UJPpfb7{`j*p8R+63UzOu~V3^n=e zPT;w84BKBR^wT;qsUfKai9dvd;6Nzk^six}|7@N3Q|_@^(cpc7-Pcw;4lju0McaYK zq<%|o_P)N$X~3EvzI@Nj=blkt!%8=RPuun9N=rZWrT*2TrBh%~5V#%K@7S0AdUpfW zLr4yUlIY^Y3 za$P;WD*JCp{qF#~;Q+t2!xp>u^K^2jK~JDdbn79Wg@rj05#d_g3RIPHmnt70pWu>P zwcCdIhBpd%TxXTtH)ULM!k#e0`ba9c<^8F~feB>Y z*y+*y2|bM0pMkK$rRZa!Fa8D>Ih)KrFZwrpv5?kr%WU6GIVP){h0zZVNsTqCx{;xh z|!uCjZVm#|Nv3)08654c?ys1<%wj@6*r$houQY8dcq5lW5@f zTDd5dDI9M81!Eoo&d|Dn`wILxzbB#;*pksrBA27~8D1<2mW1Hpg_e8wZKA8Pd&N1~A@qXJHBZNRzg z66UM&?$Y<*_eXtS^<4st&{dVWr-O$nv-itE2*oDfR&cwcgesymSvPat(z@K91?<6P zEmE*Y2vA_tVJ1JxPHgCBIF#s+>qYlL9$@0(XUYB~hTv%CNo z#o<~+DNh=eN43M03TO9=#OWRI#YnWxTs@T03JeG9vtn`tDE0=gQ{$%Lik?Fc+>dv* z6Bs_fm#~$LxENGdFVlGp)7d-YUgp&*^9ZBeRQC+JSK3a@q=tkg)v(
  • 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 literal 0 HcmV?d00001 diff --git a/resources/public/img/map-pins/flags/make-flag-pins.sh b/resources/public/img/map-pins/flags/make-flag-pins.sh new file mode 100644 index 0000000..143fd37 --- /dev/null +++ b/resources/public/img/map-pins/flags/make-flag-pins.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Assumes presence of ImageMajick + +unzip -u flags-mini.zip + +base=../basic_map_pin.png + +for flag in *.png +do + cc="$(tr '[:lower:]' '[:upper:]' <<< ${flag:0:1})${flag:1:1}" + composite -compose atop -geometry +0+5 $flag $base ../${cc}-pin.png + rm $flag +done From 58f05d4cd4cdcd3133abe580df72c922bda240b1 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 27 Feb 2020 14:22:53 +0000 Subject: [PATCH 9/9] lein-release plugin: preparing 0.1.3 release --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2a503c9..5afa166 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject geocsv "0.1.3-SNAPSHOT" +(defproject geocsv "0.1.3" :description "A wee tool to show comma-separated value data on a map." :url "https://github.com/simon-brooke/geocsv"