diff --git a/project.clj b/project.clj index c264426..a628458 100644 --- a/project.clj +++ b/project.clj @@ -57,8 +57,9 @@ [vega-lite "4.1.1"] [mermaid "8.4.6"] [photoswipe "4.1.3"] + [showdown "1.9.1"] [tablesort "5.2.0"] - [geocsv-js "simon-brooke/geocsv-js#80e5198"]] + [geocsv-js "simon-brooke/geocsv-js#3a34ba7"]] :root "resources/public/vendor"} :docker {:image-name "simonbrooke/smeagol" diff --git a/resources/config.edn b/resources/config.edn index a929a9d..63a2c00 100644 --- a/resources/config.edn +++ b/resources/config.edn @@ -38,11 +38,13 @@ :scripts {} :styles {}} :geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv" - :scripts {:core {:local "vendor/node_modules/geocsv-js/js/geocsv.js"} + :scripts {:core {:local "vendor/node_modules/@simon_brooke/geocsv/js/geocsv.js"} :leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js" :remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"} :papaparse {:local "vendor/node_modules/papaparse/papaparse.js" - :remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"}} + :remote "https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.1.0/papaparse.min.js"} + :showdown {:local "vendor/node_modules/showdown/bin/showdown.js" + :remote "https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js"}} :styles {:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.css" :remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"}} :icon-url-base "map-pin/"} diff --git a/src/smeagol/extensions/geocsv.clj b/src/smeagol/extensions/geocsv.clj index 925fd50..95c06b8 100644 --- a/src/smeagol/extensions/geocsv.clj +++ b/src/smeagol/extensions/geocsv.clj @@ -21,7 +21,7 @@ ;;;; ;;;; You should have received a copy of the GNU General Public License ;;;; along with this program; if not, write to the Free Software -;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ;;;; USA. ;;;; ;;;; Copyright (C) 2017 Simon Brooke @@ -48,7 +48,7 @@ GeoCSV.setIconUrlBase( \"" (-> config :formatters :geocsv :icon-url-base) "\"); GeoCSV.initialiseMapElement(\"geocsv-" index "\", - document.getElementById(\"geocsv-" index "\").innerText.trim()); // local-links here! + document.getElementById(\"geocsv-" index "\").innerText.trim().replace(/\\[\\[([^\\[\\]]*)\\]\\]/, \"$1\")); }}; //]] diff --git a/src/smeagol/finder.clj b/src/smeagol/finder.clj index 851b93e..911979b 100644 --- a/src/smeagol/finder.clj +++ b/src/smeagol/finder.clj @@ -108,14 +108,14 @@ (response/file-response s) s))) -(find-image "froboz.jpg" "resources/public/img/Unknown-pin.png" - [;; TODO: should map over the configured - ;; thumbnail paths in ascending order - ;; by size - for map pins, smaller images are - ;; better. - (fs/file upload-dir "map-pin") - (fs/file upload-dir "small") - (fs/file upload-dir "med")]) +;; (find-image "froboz.jpg" "resources/public/img/Unknown-pin.png" +;; [;; TODO: should map over the configured +;; ;; thumbnail paths in ascending order +;; ;; by size - for map pins, smaller images are +;; ;; better. +;; (fs/file upload-dir "map-pin") +;; (fs/file upload-dir "small") +;; (fs/file upload-dir "med")]) diff --git a/src/smeagol/util.clj b/src/smeagol/util.clj index caf1396..5cda9ee 100644 --- a/src/smeagol/util.clj +++ b/src/smeagol/util.clj @@ -129,11 +129,11 @@ (do (log/error "In `smeagol.util/local-url `" file-path "` is not a servable resource.") - (str "404-not-found?path=" file-path)))) + file-path))) (catch Exception any (log/error "In `smeagol.util/local-url `" file-path "` is not a servable resource:" any) - (str "404-not-found?path=" file-path)))) + file-path))) ;; (local-url? "vendor/node_modules/photoswipe/dist/photoswipe.min.js") ;; (local-url? "/home/simon/workspace/smeagol/resources/public/vendor/node_modules/photoswipe/dist/photoswipe.min.js")