simon/geocsv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Resources now working.

Browse source
This commit is contained in:
Simon Brooke 2020-01-29 12:56:06 +00:00
parent b4f441bfd0
commit cf8f93ac9b
13 changed files with 97 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
README.md
View file

@ -20,18 +20,32 @@ If you run the server running **geocsv**, the simplest way to add CSV files is s
https://geocsv.example.com/ https://geocsv.example.com/
and the file you want to view is `myfile.csv`, then you would specify this as and the file you want to view is `myfile.csv`, then you would specify this as the value of `file` in the query part of the URL.
https://geocsv.example.com/?file=myfile.csv https://geocsv.example.com/?file=myfile.csv
### Loading CSV file onto another public server
If you're not running the **geocsv** server yourself, you can upload the CSV to another server which is accessible by the **geocsv** server. You can then map data from the CSV file by specifying the URL of the file as the value of `uri` in the query part of the URL:
https://geocsv.example.com/?uri=http://my.other.server/path/to/myfile.csv
### Using a Google spreadsheet ### Using a Google spreadsheet
If you use [Google Sheets](https://www.google.co.uk/sheets/about/), then every sheet has a 'document id', a long string of characters which uniquely identifies that sheet. Suppose your Google spreadsheet has a document id of `abcdefghijklmnopqrstuvwxyz-12345`, then you could pull data from this spreadsheet by specifying: If you use [Google Sheets](https://www.google.co.uk/sheets/about/), then every sheet has a 'document id', a long string of characters which uniquely identifies that sheet. Suppose your Google spreadsheet has a document id of `abcdefghijklmnopqrstuvwxyz-12345`, then you could pull data from this spreadsheet by specifying this as the value of `docid` in the query part of the URL:
https://geocsv.example.com/?docid=abcdefghijklmnopqrstuvwxyz-12345 https://geocsv.example.com/?docid=abcdefghijklmnopqrstuvwxyz-12345
The spreadsheet **must** be publicly readable. The spreadsheet **must** be publicly readable.
### Precedence
Nothing, of course, stops you from specifying multiple arguments in the query part of the URL, but only one will be used. The precedence is in this order:
1. `docid` is considered first, and overrides anything else;
2. `uri` is considered next, and overrides `file`;
3. the value of `file` is considered only if neither of the other two are present.
## Not yet working ## 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.

6
project.clj
View file

@ -32,6 +32,7 @@
[org.clojure/tools.cli "0.4.2"] [org.clojure/tools.cli "0.4.2"]
[org.clojure/tools.logging "0.5.0"] [org.clojure/tools.logging "0.5.0"]
[org.webjars.npm/bulma "0.8.0"] [org.webjars.npm/bulma "0.8.0"]
[org.webjars.npm/leaflet "1.6.0"]
[org.webjars.npm/material-icons "0.3.1"] [org.webjars.npm/material-icons "0.3.1"]
[org.webjars/webjars-locator "0.38"] [org.webjars/webjars-locator "0.38"]
[re-frame "0.10.9"] [re-frame "0.10.9"]
@ -43,10 +44,6 @@
[selmer "1.12.18"]] [selmer "1.12.18"]]
:min-lein-version "2.0.0" :min-lein-version "2.0.0"
:npm {:dependencies [[bulma "0.8.0"]
[leaflet "1.3.1"]
[material-design-icons "3.0.1"]]
:root "resources/public/js/lib/node_modules"}
:source-paths ["src/clj" "src/cljs" "src/cljc"] :source-paths ["src/clj" "src/cljs" "src/cljc"]
:test-paths ["test/clj"] :test-paths ["test/clj"]
@ -56,7 +53,6 @@
:plugins [[lein-cljsbuild "1.1.7"] :plugins [[lein-cljsbuild "1.1.7"]
[lein-codox "0.10.7"] [lein-codox "0.10.7"]
[lein-npm "0.6.2"]
[lein-release "1.0.5"]] [lein-release "1.0.5"]]
:clean-targets ^{:protect false} :clean-targets ^{:protect false}

18
resources/docs/docs.md
View file

@ -20,18 +20,32 @@ If you run the server running **geocsv**, the simplest way to add CSV files is s
https://geocsv.example.com/ https://geocsv.example.com/
and the file you want to view is `myfile.csv`, then you would specify this as and the file you want to view is `myfile.csv`, then you would specify this as the value of `file` in the query part of the URL.
https://geocsv.example.com/?file=myfile.csv https://geocsv.example.com/?file=myfile.csv
### Loading CSV file onto another public server
If you're not running the **geocsv** server yourself, you can upload the CSV to another server which is accessible by the **geocsv** server. You can then map data from the CSV file by specifying the URL of the file as the value of `uri` in the query part of the URL:
https://geocsv.example.com/?uri=http://my.other.server/path/to/myfile.csv
### Using a Google spreadsheet ### Using a Google spreadsheet
If you use [Google Sheets](https://www.google.co.uk/sheets/about/), then every sheet has a 'document id', a long string of characters which uniquely identifies that sheet. Suppose your Google spreadsheet has a document id of `abcdefghijklmnopqrstuvwxyz-12345`, then you could pull data from this spreadsheet by specifying: If you use [Google Sheets](https://www.google.co.uk/sheets/about/), then every sheet has a 'document id', a long string of characters which uniquely identifies that sheet. Suppose your Google spreadsheet has a document id of `abcdefghijklmnopqrstuvwxyz-12345`, then you could pull data from this spreadsheet by specifying this as the value of `docid` in the query part of the URL:
https://geocsv.example.com/?docid=abcdefghijklmnopqrstuvwxyz-12345 https://geocsv.example.com/?docid=abcdefghijklmnopqrstuvwxyz-12345
The spreadsheet **must** be publicly readable. The spreadsheet **must** be publicly readable.
### Precedence
Nothing, of course, stops you from specifying multiple arguments in the query part of the URL, but only one will be used. The precedence is in this order:
1. `docid` is considered first, and overrides anything else;
2. `uri` is considered next, and overrides `file`;
3. the value of `file` is considered only if neither of the other two are present.
## Not yet working ## 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.

2
resources/html/error.html
View file

@ -4,7 +4,7 @@
<title>Something Bad Happened</title> <title>Something Bad Happened</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
{% style "/js/lib/node_modules/bulma/css/bulma.min.css" %} {% style "/assets/bulma/css/bulma.min.css" %}
<style type="text/css"> <style type="text/css">
html { html {
height: 100%; height: 100%;

53
resources/html/home.html
View file

@ -1,32 +1,31 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Welcome to geocsv</title> <title>Welcome to geocsv</title>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div class="splash-screen"> <section class="section">
<div class="sk-fading-circle"> <div class="container is-fluid">
<div class="sk-circle1 sk-circle"></div> <div class="content">
<div class="sk-circle2 sk-circle"></div> <h4 class="title">Welcome to geocsv</h4>
<div class="sk-circle3 sk-circle"></div> <p>If you're seeing this message, that means you haven't yet compiled your ClojureScript!</p>
<div class="sk-circle4 sk-circle"></div> <p>Please run <code>lein figwheel</code> to start the ClojureScript compiler and reload the page.</p>
<div class="sk-circle5 sk-circle"></div> <h4>For better ClojureScript development experience in Chrome follow these steps:</h4>
<div class="sk-circle6 sk-circle"></div> <ul>
<div class="sk-circle7 sk-circle"></div> <li>Open DevTools
<div class="sk-circle8 sk-circle"></div> <li>Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 > General > Console)
<div class="sk-circle9 sk-circle"></div> <li>Check-in "Enable custom formatters"
<div class="sk-circle10 sk-circle"></div> <li>Close DevTools
<div class="sk-circle11 sk-circle"></div> <li>Open DevTools
<div class="sk-circle12 sk-circle"></div> </ul>
<p>See <a href="http://www.luminusweb.net/docs/clojurescript.md">ClojureScript</a> documentation for further details.</p>
</div>
</div> </div>
</div> </section>
<p class="footer">
<b>geocsv</b> is loading.
You must enable JavaScript to use <b>geocsv</b>.
</p>
</div> </div>
{% block foot %} {% block foot %}
@ -44,20 +43,20 @@
{% endblock %} {% endblock %}
<!-- scripts and styles --> <!-- scripts and styles -->
{% style "/js/lib/node_modules/bulma/css/bulma.min.css" %} {% style "/assets/bulma/css/bulma.min.css" %}
{% style "/js/lib/node_modules/material-icons/iconfont/material-icons.css" %} {% style "/assets/material-icons/css/material-icons.min.css" %}
{% style "/css/screen.css" %} {% style "/css/screen.css" %}
{% style "/css/geocsv.css" %} {% style "/css/geocsv.css" %}
<script type="text/javascript"> <script type="text/javascript">
var csrfToken = "{{csrf-token}}"; var csrfToken = "{{csrf-token}}";
</script> </script>
<!-- scripts and styles --> <!-- scripts and styles -->
<!-- ATTENTION \/ --> <!-- ATTENTION \/ -->
<!-- ATTENTION /\ --> <!-- ATTENTION /\ -->
<!-- Leaflet --> <!-- Leaflet -->
{% style "js/lib/node_modules/leaflet/dist/leaflet.css" %} {% style "/assets/leaflet/dist/leaflet.css" %}
{% script "/js/lib/node_modules/leaflet/dist/leaflet.js" %} {% script "/assets/leaflet/dist/leaflet.js" %}
{% script "/js/app.js" %} {% script "/js/app.js" %}
</body> </body>
</html> </html>

8
resources/public/css/screen.css
View file

@ -6,12 +6,12 @@ body {
font-family: 'Material Icons'; font-family: 'Material Icons';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */ src: url(/assets/material-icons/iconfont/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'), src: local('Material Icons'),
local('MaterialIcons-Regular'), local('MaterialIcons-Regular'),
url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.woff2) format('woff2'), url(/assets/material-icons/iconfont/MaterialIcons-Regular.woff2) format('woff2'),
url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.woff) format('woff'), url(/assets/material-icons/iconfont/MaterialIcons-Regular.woff) format('woff'),
url(/js/lib/node_modules/material-icons/iconfont/MaterialIcons-Regular.ttf) format('truetype'); url(/assets/material-icons/iconfont/MaterialIcons-Regular.ttf) format('truetype');
} }
.material-icons { .material-icons {
font-family: 'Material Icons'; font-family: 'Material Icons';

0
resources/public/img/map-pins/unknown-pin.png → resources/public/img/map-pins/Unknown-pin.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
resources/public/img/map-pins/unknown-pin.svg → resources/public/img/map-pins/Unknown-pin.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
resources/public/img/map-pins/unknown-pin.xcf
View file

Binary file not shown.

9
src/clj/geocsv/handler.clj
View file

@ -22,13 +22,14 @@
(routes (routes
(-> #'home-routes (-> #'home-routes
(wrap-routes middleware/wrap-csrf) (wrap-routes middleware/wrap-csrf)
(wrap-routes middleware/wrap-formats)) (wrap-routes middleware/wrap-formats)
wrap-webjars)
(-> #'rest-routes (-> #'rest-routes
(wrap-routes middleware/wrap-csrf) (wrap-routes middleware/wrap-csrf)
(wrap-routes middleware/wrap-formats)) (wrap-routes middleware/wrap-formats))
(ring/create-resource-handler ;; (ring/create-resource-handler
{:path "/"}) ;; {:path "/"})
;; (route/resources "/") (route/resources "/")
(route/not-found (route/not-found
(:body (:body
(error-page {:status 404 (error-page {:status 404

14
src/clj/geocsv/routes/resources.clj
View file

@ -1,14 +0,0 @@
(ns geocsv.routes.resources
"Serve resources for geocsv."
(:require [adl-support.core :as ac]
[adl-support.rest-support :as ar]
[clojure.core.memoize :as memo]
[clojure.java.io :as io]
[clojure.string :as s]
[clojure.tools.logging :as log]
[compojure.core :refer [defroutes GET POST]]
[csv2edn.csv2edn :refer :all]
[noir.response :as nresponse]
[noir.util.route :as route]
[ring.util.http-response :as response]
))

29
src/cljs/geocsv/core.cljs
View file

@ -3,6 +3,7 @@
[day8.re-frame.http-fx] [day8.re-frame.http-fx]
[reagent.core :as r] [reagent.core :as r]
[re-frame.core :as rf] [re-frame.core :as rf]
[geocsv.gis :as gis]
[geocsv.views.map :as mv] [geocsv.views.map :as mv]
[goog.events :as events] [goog.events :as events]
[goog.history.EventType :as HistoryEventType] [goog.history.EventType :as HistoryEventType]
@ -11,7 +12,7 @@
[geocsv.events] [geocsv.events]
[reitit.core :as reitit] [reitit.core :as reitit]
[reitit.frontend.easy :as rfe] [reitit.frontend.easy :as rfe]
[clojure.string :as string]) [clojure.string :as s])
(:import goog.History)) (:import goog.History))
(defn nav-link [uri title page] (defn nav-link [uri title page]
@ -39,7 +40,31 @@
(defn about-page [] (defn about-page []
[:section.section>div.container>div.content [:section.section>div.container>div.content
[:img {:src "/img/warning_clojure.png"}]]) [: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 [] (defn home-page []
[:section.section>div.container>div.content [:section.section>div.container>div.content

2
src/cljs/geocsv/gis.cljs
View file

@ -81,7 +81,7 @@
(if (if
(available category) (available category)
(str category "-pin") (str category "-pin")
"unknown-pin"))) "Unknown-pin")))
(defn popup-content (defn popup-content
"Appropriate content for the popup of a map pin for this `record`." "Appropriate content for the popup of a map pin for this `record`."