Fixed the regression with the map, and two issues in autogenerated code
This commit is contained in:
parent
3a49e50a51
commit
ff5c78d030
42 changed files with 668 additions and 320 deletions
|
|
@ -1,6 +1,6 @@
|
|||
(ns
|
||||
youyesyet.routes.auto
|
||||
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180703T122351.613Z"
|
||||
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180703T230819.733Z"
|
||||
(:require
|
||||
[adl-support.core :as support]
|
||||
[clojure.java.io :as io]
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
list-addresses-Addresses
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-addresses-Addresses.html")
|
||||
(:session r)
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
form-addresses-Address
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-addresses-Address.html")
|
||||
(:session r)
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
list-authorities-Authorities
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-authorities-Authorities.html")
|
||||
(:session r)
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
form-authorities-Authority
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-authorities-Authority.html")
|
||||
(:session r)
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
list-canvassers-Canvassers
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-canvassers-Canvassers.html")
|
||||
(:session r)
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
form-canvassers-Canvasser
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-canvassers-Canvasser.html")
|
||||
(:session r)
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
list-districts-Districts
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-districts-Districts.html")
|
||||
(:session r)
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
form-districts-District
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-districts-District.html")
|
||||
(:session r)
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
list-dwellings-Dwellings
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-dwellings-Dwellings.html")
|
||||
(:session r)
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
form-dwellings-Dwelling
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-dwellings-Dwelling.html")
|
||||
(:session r)
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
list-electors-Electors
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-electors-Electors.html")
|
||||
(:session r)
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
form-electors-Elector
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-electors-Elector.html")
|
||||
(:session r)
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
list-followupactions-Followupactions
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"list-followupactions-Followupactions.html")
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
form-followupactions-Followupaction
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"form-followupactions-Followupaction.html")
|
||||
|
|
@ -255,7 +255,7 @@
|
|||
list-followupmethods-Followupmethods
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"list-followupmethods-Followupmethods.html")
|
||||
|
|
@ -272,7 +272,7 @@
|
|||
form-followupmethods-Followupmethod
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"form-followupmethods-Followupmethod.html")
|
||||
|
|
@ -289,7 +289,7 @@
|
|||
list-followuprequests-Followuprequests
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"list-followuprequests-Followuprequests.html")
|
||||
|
|
@ -306,7 +306,7 @@
|
|||
form-followuprequests-Followuprequest
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template
|
||||
"form-followuprequests-Followuprequest.html")
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
list-genders-Genders
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-genders-Genders.html")
|
||||
(:session r)
|
||||
|
|
@ -343,7 +343,7 @@
|
|||
form-genders-Gender
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-genders-Gender.html")
|
||||
(:session r)
|
||||
|
|
@ -359,7 +359,7 @@
|
|||
list-intentions-Intentions
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"Id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-intentions-Intentions.html")
|
||||
(:session r)
|
||||
|
|
@ -375,7 +375,7 @@
|
|||
form-intentions-Intention
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"Id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-intentions-Intention.html")
|
||||
(:session r)
|
||||
|
|
@ -394,7 +394,7 @@
|
|||
list-issues-Issues
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-issues-Issues.html")
|
||||
(:session r)
|
||||
|
|
@ -410,7 +410,7 @@
|
|||
form-issues-Issue
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-issues-Issue.html")
|
||||
(:session r)
|
||||
|
|
@ -423,7 +423,7 @@
|
|||
list-options-Options
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-options-Options.html")
|
||||
(:session r)
|
||||
|
|
@ -439,7 +439,7 @@
|
|||
form-options-Option
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-options-Option.html")
|
||||
(:session r)
|
||||
|
|
@ -455,7 +455,7 @@
|
|||
list-roles-Roles
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-roles-Roles.html")
|
||||
(:session r)
|
||||
|
|
@ -471,7 +471,7 @@
|
|||
form-roles-Role
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-roles-Role.html")
|
||||
(:session r)
|
||||
|
|
@ -485,7 +485,7 @@
|
|||
list-teams-Teams
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-teams-Teams.html")
|
||||
(:session r)
|
||||
|
|
@ -501,7 +501,7 @@
|
|||
form-teams-Team
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-teams-Team.html")
|
||||
(:session r)
|
||||
|
|
@ -516,7 +516,7 @@
|
|||
list-visits-Visits
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "list-visits-Visits.html")
|
||||
(:session r)
|
||||
|
|
@ -532,7 +532,7 @@
|
|||
form-visits-Visit
|
||||
[r]
|
||||
(let
|
||||
[p (support/massage-params (:params r))]
|
||||
[p (support/massage-params (:params r) (:form-params r) #{"id"})]
|
||||
(l/render
|
||||
(support/resolve-template "form-visits-Visit.html")
|
||||
(:session r)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -29,12 +29,12 @@
|
|||
"Compute the locality index for this `latitude`/`longitude` pair."
|
||||
[latitude longitude]
|
||||
(+
|
||||
(* 10000 ;; left-shift the latitude component four digits
|
||||
(* 1000 ;; left-shift the latitude component three digits
|
||||
(int
|
||||
(* latitude 1000)))
|
||||
(* latitude 100)))
|
||||
(- ;; invert the sign of the longitude component, since
|
||||
(int ;; we're interested in localities West of Greenwich.
|
||||
(* longitude 1000)))))
|
||||
(* longitude 100)))))
|
||||
|
||||
(defn neighbouring-localities
|
||||
"Return this locality with the localities immediately
|
||||
|
|
@ -43,12 +43,14 @@
|
|||
;; TODO: I'm not absolutely confident of my arithmetic here!
|
||||
[locality]
|
||||
(list
|
||||
(- locality 9999)
|
||||
(- locality 10000)
|
||||
(- locality 10001)
|
||||
(- locality 99)
|
||||
(- locality 100)
|
||||
(- locality 101)
|
||||
(- locality 1)
|
||||
locality
|
||||
(+ locality 1)
|
||||
(+ locality 9999)
|
||||
(+ locality 10000)
|
||||
(+ locality 10001)))
|
||||
(+ locality 99)
|
||||
(+ locality 100)
|
||||
(+ locality 101)))
|
||||
|
||||
(neighbouring-localities 5482391)
|
||||
|
|
|
|||
|
|
@ -159,16 +159,17 @@
|
|||
(defn map-remove-pins
|
||||
"Remove all pins from this map `view`. Side-effecty; liable to be problematic."
|
||||
[view]
|
||||
(try
|
||||
(if
|
||||
|
||||
(if
|
||||
view
|
||||
(.eachLayer
|
||||
view
|
||||
(.eachLayer
|
||||
view
|
||||
(fn [layer]
|
||||
(fn [layer]
|
||||
(try
|
||||
(if
|
||||
(instance? layer js/L.Marker)
|
||||
(.removeLayer view layer)))))
|
||||
(catch js/Object any (js/console.log (str "Failed to remove pins from map: " any))))
|
||||
(instance? js/L.Marker layer)
|
||||
(.removeLayer view layer))
|
||||
(catch js/Object any (js/console.log (str "Failed to remove pin '" layer "' from map: " any)))))))
|
||||
view)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -151,6 +151,6 @@
|
|||
:page :home
|
||||
:view nil
|
||||
:latitude 54.82
|
||||
:longitude -3.90
|
||||
:longitude -3.92
|
||||
:zoom 12})
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@
|
|||
(clj->js {:zoomControl false}))
|
||||
#js [@(subscribe [:latitude]) @(subscribe [:longitude])]
|
||||
@(subscribe [:zoom]))]
|
||||
(.addTo (.tileLayer js/L osm-url
|
||||
(clj->js {:attribution osm-attrib
|
||||
:maxZoom 18}))
|
||||
view)
|
||||
(dispatch-sync [:set-view view])
|
||||
(refresh-map-pins)
|
||||
view))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue