Undone moving web root into root of project

Because that breaks figwheel. Before the next production release I need to do something to keep the github.io site working, but this was not the right solution.
This commit is contained in:
Simon Brooke 2020-04-06 13:47:25 +01:00
parent a5204c66b9
commit 2169725640
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
4 changed files with 454 additions and 3 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

18
resources/public/vendor/package-lock.json generated vendored Normal file
View file

@ -0,0 +1,18 @@
{
"name": "geocsv-lite",
"version": "0.1.0-SNAPSHOT",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"leaflet": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",
"integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="
},
"papaparse": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.1.0.tgz",
"integrity": "sha512-3jEYMiCc8qN7V5ffi2BTS2mRauKxCu5AIED6DxbjnHhIm7OY7fzKYkndfPlHWaaKUDCTml5XTU6V+hiuxGlZuw=="
}
}
}

View file

@ -104,13 +104,14 @@
;; string is not one. So we will assume that what we've been passed is a ;; string is not one. So we will assume that what we've been passed is a
;; URL unless we've been able to parse valid data out of it. ;; URL unless we've been able to parse valid data out of it.
(js/console.debug "Found records: " (clj->js data)) (js/console.debug "Found records: " (clj->js data))
(if (cond
;; it looks like valid data if it's a vector of vectors. ;; CSV will appear as a vector of vectors.
(and (vector? data) (every? vector? data)) (and (vector? data) (every? vector? data))
(let [records (prepare-records data)] (let [records (prepare-records data)]
(n/message (str "Found " (count records) " records of inline data for map `" k "`")) (n/message (str "Found " (count records) " records of inline data for map `" k "`"))
(gis/refresh-map-pins (get-view k) (prepare-records data))) (gis/refresh-map-pins (get-view k) (prepare-records data)))
; else ;; TODO: clauses to handle GeoJSON, KML here.
:else
(get-data-from-uri k data-source)))) (get-data-from-uri k data-source))))
@ -133,6 +134,9 @@
;; :keywordize-keys true))) ;; :keywordize-keys true)))
;; (get-data :inline-csv-map "http://localhost:3449/data/data.csv") ;; (get-data :inline-csv-map "http://localhost:3449/data/data.csv")
;; (get-data :foo "file:///home/simon/workspace/geocsv-lite/resources/public/data/wild-lands/doc.kml")
;; (get-data :inline-csv-map data-source) ;; (get-data :inline-csv-map data-source)
;; (every? (fn [r] (and (vector? r) (every? vector? r))) (:data (js->clj (.parse js/Papa data-source) ;; (every? (fn [r] (and (vector? r) (every? vector? r))) (:data (js->clj (.parse js/Papa data-source)
;; :keywordize-keys true))) ;; :keywordize-keys true)))