From 4f90e9fb8d86ecb750c653a3c070cb8533747244 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 29 Jan 2020 20:43:48 +0000 Subject: [PATCH 1/9] lein-release plugin: bumped version from 0.1.1 to 0.1.2-SNAPSHOT for next development cycle --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index e4a5781..f86e917 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject geocsv "0.1.1" +(defproject geocsv "0.1.2-SNAPSHOT" :description "A wee tool to show comma-separated value data on a map." :url "http://example.com/FIXME" From f27106a9968309db5b5f112eeb0b6867a96f4794 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 29 Jan 2020 20:46:03 +0000 Subject: [PATCH 2/9] Fixed URL and licence in project file in response to nagging from lein-release. --- pom.xml.asc | 16 ++++++++-------- project.clj | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pom.xml.asc b/pom.xml.asc index 1b6b04c..b14b9d6 100644 --- a/pom.xml.asc +++ b/pom.xml.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAABCAAdFiEEgk5pWlj1vvTbfWCZp6TxjR1N+YcFAl4wte0ACgkQp6TxjR1N -+YdU8wgA3OSP8XYP/mI5EAmuR11ryXwTspVgbwBxIK82m+xDwTLQE9Za0I4FdS+g -RGEzo+S5LiYG1dD5fXkmtNr4WcnUJ7v5TFJZWE9eBAX3De0uVsksfF5u7F7I5oGy -mciv/C8hxyM6AQE9OviWE5UtDbJT1NxaLmLZwiZrnG2uq5JDR7h+7N4exWM99g7u -1FpHs/ed3ui+IIgsJdBnHsUBh8eOogvVmPpPePRIE8lQxoGzX/BTkZT3ed9xmdIF -ruyXwgVc9tMzy2wYu05kbOCcYqGeJK94UtPUhOmPbs3Z6nGRaVH5zQb3kiRo4P+S -KlAZkC9+sLY1mACD4JVjV1EWMAYOHg== -=GbQE +iQFIBAABCgAyFiEEgk5pWlj1vvTbfWCZp6TxjR1N+YcFAl4x7nAUHHNpbW9uQGpv +dXJuZXltYW4uY2MACgkQp6TxjR1N+Yfg+Qf/RszgXEwAJo/bud7klPSxk5jfPrMF +lth0h3gjS0UuyWxKsyoiij1CXswbjZYudGPMF923YX/9oIj2sn2ZlaohDtMi6/xY +vTmcfijNK8pHm31Sbi6oPSSTS211o1YjWYRbSg399NaxRc18vi8sTy2e49LOVmU7 +mSrwIOoWelMaCoctB2opSsLy0FhTFFA6rvaXBWxuNsRh5ULAICCerRIxWJJp0lO1 +e5A9wDM/0AOvZYAhma5TzMRc3z0aT3sy+/eEay6PT+0QTyQ65AeHks7XFIfvCGM+ +5EaPeUj+qOkVBR7ppPGHxcy19sdQMQ3s9OWRYE/Sc+dNmmbQ/T91uZ9vKg== +=45nJ -----END PGP SIGNATURE----- diff --git a/project.clj b/project.clj index f86e917..b200e61 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,9 @@ (defproject geocsv "0.1.2-SNAPSHOT" :description "A wee tool to show comma-separated value data on a map." - :url "http://example.com/FIXME" + :url "https://github.com/simon-brooke/geocsv" + :license {:name "GPL-2.0-or-later WITH Classpath-exception-2.0" + :url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"} :dependencies [[adl-support "0.1.6"] [ch.qos.logback/logback-classic "1.2.3"] From 1c2c8bc2387086db3e9508bb8320b4b062cf1e29 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 30 Jan 2020 08:17:09 +0000 Subject: [PATCH 3/9] Minor presentational cleanup. --- README.md | 6 ++- resources/docs/docs.md | 6 ++- resources/html/home.html | 41 +++++++++++------- resources/public/favicon.ico | Bin 1150 -> 3886 bytes resources/public/favicon.xcf | Bin 0 -> 2358 bytes .../public/img/map-pins/basic_map_pin.png | Bin 333 -> 1848 bytes .../public/img/map-pins/basic_map_pin.svg | 10 ++--- src/clj/geocsv/handler serves resources.clj | 40 ----------------- src/clj/geocsv/layout.clj | 1 + src/cljs/geocsv/client/db.cljs | 7 +-- 10 files changed, 44 insertions(+), 67 deletions(-) create mode 100644 resources/public/favicon.xcf delete mode 100644 src/clj/geocsv/handler serves resources.clj diff --git a/README.md b/README.md index 3e2cb03..aedaa70 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ 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) + The CSV file must have * column names in the first row; @@ -48,11 +50,11 @@ Nothing, of course, stops you from specifying multiple arguments in the query pa ## Not yet working -GeoCSV is at an early stage of development, and some features are not yet working. +**geocsv** is at an early stage of development, and some features are not yet working. ### Missing map pin images -At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. **TODO:** I intend at some point to make missing pin images default to `unknown-pin.png`, which does exist. +At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. See [issue #4](https://github.com/simon-brooke/geocsv/issues/4). If you fancy adding some more, I'll happily accept a pull request. ## Prerequisites diff --git a/resources/docs/docs.md b/resources/docs/docs.md index 3e2cb03..aedaa70 100644 --- a/resources/docs/docs.md +++ b/resources/docs/docs.md @@ -2,6 +2,8 @@ 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) + The CSV file must have * column names in the first row; @@ -48,11 +50,11 @@ Nothing, of course, stops you from specifying multiple arguments in the query pa ## Not yet working -GeoCSV is at an early stage of development, and some features are not yet working. +**geocsv** is at an early stage of development, and some features are not yet working. ### Missing map pin images -At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. **TODO:** I intend at some point to make missing pin images default to `unknown-pin.png`, which does exist. +At the current stage of development, if no appropriate image exists in the `resources/public/img/map-pins` folder, that's your problem. See [issue #4](https://github.com/simon-brooke/geocsv/issues/4). If you fancy adding some more, I'll happily accept a pull request. ## Prerequisites diff --git a/resources/html/home.html b/resources/html/home.html index 74314ba..928081b 100644 --- a/resources/html/home.html +++ b/resources/html/home.html @@ -1,9 +1,9 @@ - - - Welcome to geocsv + + + Welcome to geocsv @@ -12,17 +12,26 @@

Welcome to geocsv

-

If you're seeing this message, that means you haven't yet compiled your ClojureScript!

-

Please run lein figwheel to start the ClojureScript compiler and reload the page.

-

For better ClojureScript development experience in Chrome follow these steps:

-
    -
  • Open DevTools -
  • Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 > General > Console) -
  • Check-in "Enable custom formatters" -
  • Close DevTools -
  • Open DevTools -
-

See ClojureScript documentation for further details.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ You Yes Yet is loading. + You must enable JavaScript to use the geocsv app. +

@@ -33,6 +42,7 @@