diff --git a/.gitignore b/.gitignore index a13bf7e..6410585 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,8 @@ profiles.clj 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/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----- diff --git a/project.clj b/project.clj index dff2acc..5afa166 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject geocsv "0.1.2" +(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" diff --git a/resources/public/img/map-pins/Anchor-customer-pin.png b/resources/public/img/map-pins/Anchor-customer-pin.png index 4cbe582..ec9eca7 100644 Binary files a/resources/public/img/map-pins/Anchor-customer-pin.png and b/resources/public/img/map-pins/Anchor-customer-pin.png differ diff --git a/resources/public/img/map-pins/Anchor-customer-pin.svg b/resources/public/img/map-pins/Anchor-customer-pin.svg index 4fc6591..525e873 100644 --- a/resources/public/img/map-pins/Anchor-customer-pin.svg +++ b/resources/public/img/map-pins/Anchor-customer-pin.svg @@ -57,9 +57,9 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.98994949" - inkscape:cx="-545.31499" - inkscape:cy="-35.174076" + inkscape:zoom="1.4" + inkscape:cx="-80.735278" + inkscape:cy="184.16561" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -112,7 +112,7 @@ id="layer1" transform="translate(-384.75,-187.11218)"> @@ -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 0000000..9cad063 Binary files /dev/null and b/resources/public/img/map-pins/Developer-pin.png differ diff --git a/resources/public/img/map-pins/Developer-pin.svg b/resources/public/img/map-pins/Developer-pin.svg new file mode 100644 index 0000000..0c5df38 --- /dev/null +++ b/resources/public/img/map-pins/Developer-pin.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + 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 0000000..89c4038 Binary files /dev/null and b/resources/public/img/map-pins/Further-education-pin.png differ 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 0000000..c95de40 Binary files /dev/null and b/resources/public/img/map-pins/Higher-education-pin.png differ 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/Operator-pin.png b/resources/public/img/map-pins/Operator-pin.png index 114a5f7..56f3d2a 100644 Binary files a/resources/public/img/map-pins/Operator-pin.png and b/resources/public/img/map-pins/Operator-pin.png differ diff --git a/resources/public/img/map-pins/Operator-pin.svg b/resources/public/img/map-pins/Operator-pin.svg index fb2ddfc..57e6498 100644 --- a/resources/public/img/map-pins/Operator-pin.svg +++ b/resources/public/img/map-pins/Operator-pin.svg @@ -18,7 +18,7 @@ inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="Operator-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/Operator-pin.png" inkscape:export-xdpi="11.98" inkscape:export-ydpi="11.98" version="1.1"> @@ -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/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---engaged-pin.png b/resources/public/img/map-pins/Planning-authority---engaged-pin.png new file mode 100644 index 0000000..282c958 Binary files /dev/null and b/resources/public/img/map-pins/Planning-authority---engaged-pin.png differ 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 0000000..282c958 Binary files /dev/null and b/resources/public/img/map-pins/Planning-authority-engaged-pin.png differ diff --git a/resources/public/img/map-pins/Planning-authority-not-engaged-pin.png b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.png new file mode 100644 index 0000000..167e4be Binary files /dev/null and b/resources/public/img/map-pins/Planning-authority-not-engaged-pin.png differ 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 12061ea..282c958 100644 Binary files a/resources/public/img/map-pins/Planning-authority-pin.png and b/resources/public/img/map-pins/Planning-authority-pin.png differ diff --git a/resources/public/img/map-pins/Planning-authority-pin.svg b/resources/public/img/map-pins/Planning-authority-pin.svg index 1bbde07..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/youyesyet/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/Planning-authority-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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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" 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 0000000..007b28c Binary files /dev/null and b/resources/public/img/map-pins/flags/flags-mini.zip differ 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 diff --git a/src/cljs/geocsv/client/core.cljs b/src/cljs/geocsv/client/core.cljs index b67025d..5cdfd0d 100644 --- a/src/cljs/geocsv/client/core.cljs +++ b/src/cljs/geocsv/client/core.cljs @@ -34,42 +34,38 @@ [:div#nav-menu.navbar-menu {:class (when @expanded? :is-active)} [:div.navbar-start - [nav-link "#/" "Home" :home] - [nav-link "#/map" "Map" :map] + [nav-link "#/" "Map" :map] [nav-link "#/about" "About" :about]]]])) (defn about-page [] [:section.section>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