Substantially complete but not yet working.
This commit is contained in:
parent
f8449367d4
commit
ef6538da9c
|
|
@ -1,11 +1,12 @@
|
|||
(ns yyy-data.core
|
||||
(:require [adl-support.utils :refer :all]
|
||||
[fastmath.core :refer [radians degrees sin cos sqrt atan2]]
|
||||
[fastmath.complex :refer [pow]]
|
||||
[fastmath.core :refer [radians degrees sin cos tan sqrt atan2]]
|
||||
[clojure.core.matrix :as mx]
|
||||
[clojure.data.json :as json]
|
||||
[clojure.string :as s]))
|
||||
|
||||
(declare Cartesian Point)
|
||||
(declare geopoint-to-osgrid vector3d-to-geopoint geopoint-to-vector3d osgrid-to-geopoint)
|
||||
|
||||
;;; Coordinate system conversion cribbed from https://www.movable-type.co.uk/scripts/latlong-os-gridref.html
|
||||
|
||||
|
|
@ -50,141 +51,355 @@
|
|||
|
||||
(defprotocol Location
|
||||
"A location on the surface of the earth"
|
||||
(datum [l])
|
||||
(datum-key [l])
|
||||
(ellipsoid [l])
|
||||
(grid-x [l])
|
||||
(grid-y [l])
|
||||
(latitude [l])
|
||||
(longitude [l])
|
||||
(to-cartesian [l])
|
||||
(to-point [l])
|
||||
(to-point [l d]))
|
||||
|
||||
|
||||
(defrecord Cartesian
|
||||
[x y z]
|
||||
Location
|
||||
;; datum is a bit meaningless for a Cartesian; get the default.
|
||||
(datum [x] (datums :WGS84))
|
||||
(datum-key [x] :WGS84)
|
||||
(ellipsoid [x] (:ellipsoid (datum x)))
|
||||
;; I already am cartesian; return myself
|
||||
(to-cartesian [x] x)
|
||||
(to-point [this datum] (let
|
||||
[a (:a (:ellipsoid datum))
|
||||
b (:b (:ellipsoid datum))
|
||||
f (:f (:ellipsoid datum))
|
||||
e2 (- (* 2 f) (* f f)) ;; first eccentricity squared
|
||||
ε2 (/ e2 (- 1 e2)) ;; second eccentricity squared
|
||||
p (sqrt (+ (* (:x this) (:x this)) (* (:y this) (:y this))))
|
||||
;; distance from minor radius
|
||||
R (sqrt (+ (* p p) (* (:z this) (:z this))))
|
||||
;; polar radius
|
||||
tanβ (* (/ (* b (:z this))(* a p)) (/ (* b (+ 1 ε2)) R))
|
||||
sinβ (/ tanβ (sqrt (+ 1 (* tanβ tanβ))))
|
||||
cosβ (/ sinβ tanβ)
|
||||
φ (if
|
||||
(Double/isNaN cosβ) 0
|
||||
(atan2 (+ z (* ε2 b sinβ sinβ sinβ))
|
||||
(- p (* e2 a cosβ cosβ cosβ))))
|
||||
λ (atan2 (:y this) (:x this))
|
||||
v (/ a (sqrt (- 1 (* e2 (sin φ) (sin φ)))))]
|
||||
(Point. (degrees φ) (degrees λ) datum)))
|
||||
(datum [location])
|
||||
(datum-key [location])
|
||||
(ellipsoid [location])
|
||||
(geopoint [location datum])
|
||||
(grid-x [location])
|
||||
(grid-y [location])
|
||||
(latitude [location])
|
||||
(longitude [location])
|
||||
(osgrid [location datum])
|
||||
(vector3d [location])
|
||||
)
|
||||
|
||||
|
||||
(defn inverse-transform [t]
|
||||
(defprotocol Transformable
|
||||
(apply-transform [this transform]))
|
||||
|
||||
|
||||
(defrecord Vector3d
|
||||
[x y z]
|
||||
Location
|
||||
;; datum is a bit meaningless for a Vector3d; get the default.
|
||||
(datum [x] (datums :WGS84))
|
||||
(datum-key [x] :WGS84)
|
||||
(ellipsoid [x] (:ellipsoid (datum x)))
|
||||
;; I already am vector3d; return myself
|
||||
(vector3d [x] x)
|
||||
(geopoint [this datum] (vector3d-to-geopoint))
|
||||
Transformable
|
||||
(apply-transform [this transform]
|
||||
(let
|
||||
[s1 (+ (/ (:s transform) 1e6) 1) ;; scale
|
||||
rx (radians (/ (:rx transform) 3600)) ;; x-rotation: normalise arcseconds to radians
|
||||
ry (radians (/ (:ry transform) 3600)) ;; y-rotation: normalise arcseconds to radians
|
||||
rz (radians (/ (:rz transform) 3600)) ;; z-rotation: normalise arcseconds to radians
|
||||
x2 (-
|
||||
(+ (:tx transform)
|
||||
(* (.x this) s1))
|
||||
(+
|
||||
(* (.y this) rz)
|
||||
(* (.z this) ry)))
|
||||
y2 (+
|
||||
(:ty transform)
|
||||
(* (.x this) rz)
|
||||
(* (.y this) s1)
|
||||
(- 0 (* (.z this) rx)))
|
||||
z2 (+
|
||||
(.z this)
|
||||
(- 0 (* (.x this) ry))
|
||||
(* (.y this) rx)
|
||||
(* (.z this) s1))]
|
||||
(.Vector3d x2 y2 z2))))
|
||||
|
||||
|
||||
(defn inverse-transform
|
||||
"Return a transform which is the inverse of `t`. More generally,
|
||||
expects a map `t` whose values are numbers, and returns a map which has
|
||||
for each key in `t` a number which is the inverse of the value of the
|
||||
same key in `t`."
|
||||
[t]
|
||||
(reduce
|
||||
merge
|
||||
{}
|
||||
(map
|
||||
#(if (number? (t %)) (hash-map % (- 0 (t %))))
|
||||
#(if (number? (t %)) (hash-map % (- 0 (t %))) (hash-map % (t %)))
|
||||
(keys t))))
|
||||
|
||||
;; (inverse-transform { :tx 89.5, :ty 93.8 :tz 123.1 :s -1.2 :rx 0.0 :ry 0.0 :rz 0.156 })
|
||||
|
||||
(defrecord Point
|
||||
"A point with an `x` co-ordinate, a `y` co-ordinate, and a datum `d`. We're
|
||||
agnostic as to whether `d` is passed as a keyword or a map, but it must be
|
||||
taken from `datums`, q.v."
|
||||
[x y d]
|
||||
(defn to-fixed
|
||||
"Round the number `n` to `p` places after the decimal point."
|
||||
[n p]
|
||||
(let [m (reduce *' 1 (repeat p 10))]
|
||||
(double (/ (int (*' n m)) m))))
|
||||
|
||||
|
||||
(defn to-datum
|
||||
;; TODO: this obviously doesn't work but I'm trying to debug a compilation problem
|
||||
[geopoint datum]
|
||||
geopoint)
|
||||
|
||||
|
||||
;; (to-fixed 1234.56789 4)
|
||||
|
||||
(defrecord GeoPoint
|
||||
[latitude longitude datum]
|
||||
;; "A point with an `x` co-ordinate, a `y` co-ordinate, and a datum `d`. We're
|
||||
;; agnostic as to whether `d` is passed as a keyword or a map, but it must be
|
||||
;; taken from `datums`, q.v."
|
||||
Location
|
||||
(datum [x]
|
||||
(datum [location]
|
||||
(cond
|
||||
(keyword? (:d x))
|
||||
(datums (:d x))
|
||||
(map? (:d x))
|
||||
(:d x)))
|
||||
(datum-key [x]
|
||||
(keyword? (:d location))
|
||||
(datums (:d location))
|
||||
(map? (:d location))
|
||||
(:d location)))
|
||||
(datum-key [location]
|
||||
(cond
|
||||
(keyword? (:d x))
|
||||
(:d x)
|
||||
(map? (:d x))
|
||||
(:key (:d x))))
|
||||
(ellipsoid [x]
|
||||
(:ellipsoid (datum [x])))
|
||||
(to-cartesian [x]
|
||||
(let [φ (radians (latitude x))
|
||||
λ (radians (longitude x))
|
||||
(keyword? (:d location))
|
||||
(:d location)
|
||||
(map? (:d location))
|
||||
(:key (:d location))))
|
||||
(ellipsoid [location]
|
||||
(:ellipsoid (datum [location])))
|
||||
(vector3d [this] (geopoint-to-vector3d this))
|
||||
(geopoint [location new-datum]
|
||||
(let [od (datum location)
|
||||
nd (if (keyword? new-datum) (datums new-datum) new-datum)
|
||||
c (vector3d location)]
|
||||
(cond
|
||||
(= od nd) location
|
||||
(= (:key od) :WGS84) (geopoint
|
||||
(apply-transform c (:transform nd))
|
||||
(:datum location))
|
||||
(= (:key nd) :WGS84) (geopoint
|
||||
(apply-transform
|
||||
c
|
||||
(inverse-transform (:datum location)))
|
||||
(:datum location))
|
||||
true
|
||||
(to-datum (to-datum location :WGS84) nd))))
|
||||
(latitude [location]
|
||||
(:latitude (to-datum location :WGS84)))
|
||||
(longitude [location]
|
||||
(:longitude (to-datum location :WGS84)))
|
||||
(grid-x [location]
|
||||
(:e (osgrid location (:datum location))))
|
||||
(grid-y [location]
|
||||
(:n (osgrid location (:datum location))))
|
||||
(osgrid [location datum]
|
||||
(geopoint-to-osgrid location (:datum location))))
|
||||
|
||||
;; clojure.lang.Compiler$CompilerException: java.lang.ClassCastException: clojure.lang.PersistentList cannot be cast to clojure.lang.IPersistentVector, compiling:(/home/simon/workspace/yyy-data/src/yyy_data/core.clj:129:1)
|
||||
(defrecord OsGrid
|
||||
[e n]
|
||||
Location
|
||||
;; "A location on the surface of the earth"
|
||||
(datum [location] (:WGS84 datums))
|
||||
(datum-key [location] :WGS84)
|
||||
(ellipsoid [location] (:ellipsoid :WGS84))
|
||||
(grid-x [location] e)
|
||||
(grid-y [location] n)
|
||||
(latitude [location] (latitude (geopoint location :WGS84)))
|
||||
(longitude [location] (longitude (geopoint location :WGS84)))
|
||||
(vector3d [location])
|
||||
(geopoint [location datum]
|
||||
(osgrid-to-geopoint location datum))
|
||||
(osgrid [location datum] location))
|
||||
|
||||
|
||||
(defn vector3d-to-geopoint
|
||||
[this datum]
|
||||
(let
|
||||
[a (:a (:ellipsoid datum))
|
||||
b (:b (:ellipsoid datum))
|
||||
f (:f (:ellipsoid datum))
|
||||
e² (- (* 2 f) (* f f)) ;; first eccentricity squared
|
||||
ε² (/ e² (- 1 e²)) ;; second eccentricity squared
|
||||
p (sqrt (+ (* (.x this) (.x this)) (* (.y this) (.y this))))
|
||||
;; distance from minor radius
|
||||
R (sqrt (+ (* p p) (* (:z this) (:z this))))
|
||||
;; polar radius
|
||||
tanβ (* (/ (* b (:z this))(* a p)) (/ (* b (+ 1 ε²)) R))
|
||||
sinβ (/ tanβ (sqrt (+ 1 (* tanβ tanβ))))
|
||||
cosβ (/ sinβ tanβ)
|
||||
φ (if
|
||||
(Double/isNaN cosβ) 0
|
||||
(atan2 (+ (.z this) (* ε² b sinβ sinβ sinβ))
|
||||
(- p (* e² a cosβ cosβ cosβ))))
|
||||
λ (atan2 (:y this) (:x this))
|
||||
v (/ a (sqrt (- 1 (* e² (sin φ) (sin φ)))))]
|
||||
(GeoPoint. (degrees φ) (degrees λ) datum)))
|
||||
|
||||
|
||||
(defn geopoint-to-osgrid
|
||||
[geopoint datum]
|
||||
;; for bizarrely over-complicated trigonometry, look no further.
|
||||
(let [point (geopoint geopoint (or datum :OSGB36))
|
||||
φ (radians (latitude point))
|
||||
λ (radians (longitude point))
|
||||
a 6377563.396 ;; Airy 1830 major & minor semi-axes
|
||||
b 6356256.909
|
||||
F0 0.9996012717 ;; OS Grid scale factor on central meridian
|
||||
φ0 (radians 49) ;; OS Grid true origin latitude
|
||||
λ0 (radians -2) ;; OS Grid true origin longitude
|
||||
Δφ (- φ φ0) ;; latitude offset from origin
|
||||
Δλ (- λ λ0) ;; longitude offset from origin
|
||||
Δλ² (reduce * 1 (repeat 2 Δλ))
|
||||
Δλ³ (reduce * 1 (repeat 3 Δλ))
|
||||
Δλ⁴ (reduce * 1 (repeat 4 Δλ))
|
||||
Δλ⁵ (reduce * 1 (repeat 5 Δλ))
|
||||
Δλ⁶ (reduce * 1 (repeat 6 Δλ))
|
||||
N0 -100000 ;; northing of true origin, metres
|
||||
E0 400000 ;; easting of true origin, metres
|
||||
e² (- 1 (/ (* b b) (* a a))) ;; eccentricity squared
|
||||
n (/ (- a b) (+ a b))
|
||||
n² (* n n)
|
||||
n³ (* n n n)
|
||||
sinφ (sin φ)
|
||||
sin²φ (* (sin φ) (sin φ))
|
||||
cosφ (cos φ)
|
||||
v (* a (/ F0 (sqrt (- 1 (* e² sin²φ)))))
|
||||
;; nu = transverse radius of curvature
|
||||
ρ (/ (* a F0 (- 1 e²)) (pow (- 1 (* e² sin²φ)) 1.5))
|
||||
;; rho = meridional radius of curvature
|
||||
η2 (/ v (- ρ 1)) ;; beware confusing η2 with n²
|
||||
Ma (* (+ 1 n (* (/ 5 4) n²) (* (/ 5 4) n³)) Δφ)
|
||||
Mb (*
|
||||
(+ (* 3 n) (* 3 n²) (* (/ 21 8) n³))
|
||||
(sin Δφ) (cos (+ φ φ0)))
|
||||
Mc (*
|
||||
(+ (* (/ 15 8) n²) (* (/ 15 8) n³))
|
||||
(sin (* 2 Δφ)) (cos (* 2 (+ φ φ0))))
|
||||
Md (* (/ 35 24) n³ (sin (* 3 Δφ)) (cos (* 3 (+ φ φ0))))
|
||||
M (* b F0 (+ (- Ma Mb) (- Mc Md)))
|
||||
;; meridional arc
|
||||
cos³φ (reduce * 1 (repeat 3 cosφ))
|
||||
cos⁵φ (reduce * 1 (repeat 5 cosφ))
|
||||
tan²φ (reduce * 1 (repeat 2 (tan φ)))
|
||||
tan⁴φ (reduce * 1 (repeat 4 (tan φ)))
|
||||
I (+ M N0)
|
||||
II (* (/ v 2) sinφ cosφ)
|
||||
III (* (/ v 24) sinφ cos³φ (- 5 (+ tan²φ (* 9 η2))))
|
||||
;; var IIIA = (ν/720)*sinφ*cos5φ*(61-58*tan2φ+tan4φ);
|
||||
;; TODO: CHECK JAVASCRIPT OPERATOR PRECEDENCE!
|
||||
IIIA (* (/ v 720) sinφ cos⁵φ (- 61 (+ (* 58 tan²φ) tan⁴φ)))
|
||||
IV (* v cosφ)
|
||||
V (* (/ v 6) cos³φ (- (/ v ρ) tan²φ))
|
||||
;; var VI = (ν/120) * cos5φ * (5 - 18*tan2φ + tan4φ + 14*η2 - 58*tan2φ*η2);
|
||||
VI (*
|
||||
(/ v 120)
|
||||
cos⁵φ
|
||||
(- 5
|
||||
(+ (* 18 tan²φ)
|
||||
tan⁴φ
|
||||
(* 14 η2) (- 0 (* 58 tan²φ η2)))))
|
||||
N (to-fixed (+ I (* II Δλ²) (+ III Δλ⁴) (* IIIA Δλ⁶)) 3)
|
||||
E (to-fixed (+ E0 (* IV Δλ) (* V Δλ³) (* VI Δλ⁵)) 3)]
|
||||
(OsGrid. E N)))
|
||||
|
||||
|
||||
(defn geopoint-to-vector3d
|
||||
[geopoint]
|
||||
(let [φ (radians (latitude geopoint))
|
||||
λ (radians (longitude geopoint))
|
||||
h 0
|
||||
a (:a (:ellipsoid (:datum x)))
|
||||
f (:f (:ellipsoid (:datum x)))
|
||||
a (:a (:ellipsoid (:datum geopoint)))
|
||||
f (:f (:ellipsoid (:datum geopoint)))
|
||||
sinφ (sin φ)
|
||||
cosφ (cos φ)
|
||||
sinλ (sin λ)
|
||||
cosλ (cos λ)
|
||||
e2 (- (* 2 f) (* f f))
|
||||
v (/ a (sqrt (- 1 (* e2 sinφ sinφ))))]
|
||||
(Cartesian.
|
||||
e² (- (* 2 f) (* f f))
|
||||
v (/ a (sqrt (- 1 (* e² sinφ sinφ))))]
|
||||
(Vector3d.
|
||||
(* (+ v h) cosφ cosλ)
|
||||
(* (+ v h) cosφ sinλ)
|
||||
(* v (+ h (- 1 e2)) sinφ))))
|
||||
(to-point [x] x)
|
||||
(to-point [x new-datum]
|
||||
(let [od (datum x)
|
||||
nd (if (keyword? new-datum) (datums new-datum) new-datum)
|
||||
c (to-cartesian x)]
|
||||
(cond
|
||||
(= od nd) x
|
||||
(= (:key od) :WGS84) (to-point
|
||||
(apply-transform c (:transform nd)))
|
||||
(= (:key nd) :WGS84) (to-point
|
||||
(apply-transform
|
||||
c
|
||||
(inverse-transformation (:datum x))))
|
||||
true
|
||||
(to-datum (to-datum x :WGS84) nd)))))
|
||||
(* v (+ h (- 1 e²)) sinφ))))
|
||||
|
||||
(latitude [x]
|
||||
(:y (to-datum
|
||||
;; (defn os-grid-x-to-lat-long
|
||||
;; ([x y]
|
||||
;; (os-grid-x-to-lat-long {:x x :y y})
|
||||
;; ([point]
|
||||
;; (let [datum
|
||||
;; )
|
||||
|
||||
;; (defn os-grid-y-to-latitude
|
||||
;; [y]
|
||||
;; )
|
||||
(defn osgrid-to-geopoint
|
||||
[osgrid datum]
|
||||
(let
|
||||
[d (or datum :WGS84)
|
||||
E (.e osgrid)
|
||||
N (.n osgrid)
|
||||
a 6377563.396 ;; Airy 1830 major semi-axis
|
||||
b 6356256.909 ;; Airy 1830 minor semi-axis
|
||||
F0 0.9996012717 ;; national grid scale factor on central meridian
|
||||
φ0 (radians 49) ;; national grid true origin latitude
|
||||
λ0 (radians -2) ;; national grid true origin longitude
|
||||
N0 -100000 ;; northing of true origin, metres
|
||||
E0 400000 ;; easting of true origin, metres
|
||||
e² (- 1
|
||||
(/
|
||||
(* b b)
|
||||
(* a a))) ;; eccentricity squared
|
||||
n (/ (- a b) (+ a b))
|
||||
n² (* n n)
|
||||
n³ (* n n n)
|
||||
[M φ] (loop [φ φ0 M 0]
|
||||
(let
|
||||
[φ₁ (+ φ (/ (- N N0 M) (* a F0)))
|
||||
Δφ (- φ φ0)
|
||||
Ma (* (+ 1 n (* 5/4 n²) (* 5/4 n³)) Δφ)
|
||||
Mb (* (+ (* n 3) (* n² 3) (* n³ 21/8)) (sin Δφ) (cos Δφ))
|
||||
Mc (* (+ (* n² 15/8) (* n³ 15/8)) (sin (* 2 Δφ)) (cos (* 2 Δφ)))
|
||||
Md (* 35/24 n³ (sin (* 3 Δφ)) (cos (* 3 Δφ)))
|
||||
M₁ (* b F0 (+ (- 0 Ma) Mb Mc (- 0 Md)))]
|
||||
(if
|
||||
(>= (- N N0 M₁) 0.00001)
|
||||
(recur M₁ φ₁)
|
||||
[M₁ φ₁])))
|
||||
sinφ (sin φ)
|
||||
sin²φ (* (sin φ) (sin φ))
|
||||
cosφ (cos φ)
|
||||
v (* a (/ F0 (sqrt (- 1 (* e² sin²φ)))))
|
||||
v³ (reduce * 1 (repeat 3 v))
|
||||
v⁵ (reduce * 1 (repeat 5 v))
|
||||
v⁷ (reduce * 1 (repeat 7 v))
|
||||
;; nu = transverse radius of curvature
|
||||
ρ (/ (* a F0 (- 1 e²)) (pow (- 1 (* e² sin²φ)) 1.5))
|
||||
;; rho = meridional radius of curvature
|
||||
η2 (/ v (- ρ 1)) ;; beware confusing η2 with n²
|
||||
tanφ (tan φ)
|
||||
tan²φ (reduce * 1 (repeat 2 tanφ))
|
||||
tan⁴φ (reduce * 1 (repeat 4 tanφ))
|
||||
tan⁶φ (reduce * 1 (repeat 6 tanφ))
|
||||
secφ (/ 1 cosφ)
|
||||
VII (/ tanφ (* 2 ρ v))
|
||||
;; TODO: check Javascript operator precedence!
|
||||
VIII (* (/ tanφ (* 24 ρ v³) (+ 5 (* 3 tan²φ) η2 (- 0 (* 9 tan²φ η2)))))
|
||||
;; var VIII = tanφ/(24*ρ*ν3)*(5+3*tan2φ+η2-9*tan2φ*η2);
|
||||
IX (* (/ tanφ (* 720 ρ v⁵)) (+ 61 (* 90 tan²φ) (* 45 tan⁴φ)))
|
||||
;; var IX = tanφ/(720*ρ*ν5)*(61+90*tan2φ+45*tan4φ);
|
||||
X (/ secφ v)
|
||||
XI (* (/ secφ (* 6 v³)) (+ (/ v ρ) (* 2 tan²φ)))
|
||||
;; var XI = secφ/(6*ν3)*(ν/ρ+2*tan2φ);
|
||||
XII (* (/ secφ (* 120 v⁵)) (+ 5 (* 28 tan²φ) (* 24 tan⁴φ)))
|
||||
;; var XII = secφ/(120*ν5)*(5+28*tan2φ+24*tan4φ);
|
||||
XIIA (* (/ secφ (* 5040 v⁷)) (+ 61 (* 622 tan²φ) (* 1322 tan⁴φ) (* 720 tan⁶φ)))
|
||||
;; var XIIA = secφ/(5040*ν7)*(61+662*tan2φ+1320*tan4φ+720*tan6φ);
|
||||
Δe (- E E0)
|
||||
Δe² (reduce * 1 (repeat 2 Δe))
|
||||
Δe³ (reduce * 1 (repeat 3 Δe))
|
||||
Δe⁴ (reduce * 1 (repeat 4 Δe))
|
||||
Δe⁵ (reduce * 1 (repeat 5 Δe))
|
||||
Δe⁶ (reduce * 1 (repeat 6 Δe))
|
||||
Δe⁷ (reduce * 1 (repeat 6 Δe))
|
||||
φ₁ (+ φ (- 0 (+ VII Δe²)) (* VIII Δe⁴) (- 0 (* IX Δe⁷)))
|
||||
λ₁ (+ λ0 + (* X Δe) (- 0 (* XI Δe³)) (* IX Δe⁶) (- 0 (* XIIA Δe⁷)))]
|
||||
(.geopoint (GeoPoint. (degrees φ₁) (degrees λ₁) :OSGB36) datum)))
|
||||
|
||||
(defn
|
||||
|
||||
(defn post-code-data-to-addresses
|
||||
[filename]
|
||||
(map
|
||||
(fn [a]
|
||||
(let [location (.geopoint (OsGrid. (:x_coordinate a) (:y_coordinate a)) :WGS84)]
|
||||
(s/join
|
||||
(list
|
||||
"insert into addresses (address:ellipsoid postcode}} latitude, longitude) values ('"
|
||||
(:address %) "', '" (:postcode %)
|
||||
"', " 0 "," 0 ");"))
|
||||
)
|
||||
(:address a) "', '" (:postcode a)
|
||||
"', " (.latitude location) "," (.longitude location) ");"))
|
||||
))
|
||||
(filter
|
||||
#(= (:classification_code_description %) "Dwelling")
|
||||
(:results (json/read-str (slurp filename) :key-fn #(keyword (.toLowerCase %)))))))
|
||||
(map
|
||||
:dpa
|
||||
(:results
|
||||
(json/read-str
|
||||
(slurp filename)
|
||||
:key-fn #(keyword (.toLowerCase %))))))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue