Update dependencies

Author: willcohen

README.md

@@ -39,7 +39,7 @@ Using `tools.deps.alpha`, run `clj -A:test:runner`. Depends on the (still incomp
 ## License
 
 ```
-Copyright (c) 2019, 2020 Will Cohen
+Copyright (c) 2019, 2020, 2024 Will Cohen
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

deps.edn

@@ -1,11 +1,11 @@
 {:paths ["resources" "src"]
  :deps {byte-streams/byte-streams {:mvn/version "0.2.5-alpha2"}
-        factual/geo {:git/url "https://github.com/Factual/geo"
-                     :sha "4566f37e2681113373350632087d2dbf8f145b96"}
-        manifold/manifold {:mvn/version "0.1.9-alpha3"}
-        org.clojure/clojure {:mvn/version "1.10.1"}
-        org.clojure/spec.alpha {:mvn/version "0.2.176"}
-        org.clojure/test.check {:mvn/version "0.10.0"}}
+        factual/geo {:git/url "https://github.com/willcohen/geo"
+                     :git/sha "479420ae259b17ec759fe0613e470c4d9c979e68"}
+        manifold/manifold {:mvn/version "0.4.2"}
+        org.clojure/clojure {:mvn/version "1.11.2"}
+        org.clojure/spec.alpha {:mvn/version "0.4.233"}
+        org.clojure/test.check {:mvn/version "1.1.1"}}
  :aliases
  {:test {:extra-paths ["test"]
          :extra-deps {org.clojure/test.check {:mvn/version "0.10.0"}}}
@@ -19,5 +19,5 @@
   {:extra-deps {seancorfield/depstar {:mvn/version "0.1.5"}}
    :main-opts ["-m" "hf.depstar.jar" "ovid.jar"]}
   :deploy
-  {:extra-deps {deps-deploy {:mvn/version "0.0.9"}}
+  {:extra-deps {deps-deploy/deps-deploy {:mvn/version "0.0.9"}}
    :main-opts ["-m" "deps-deploy.deps-deploy" "deploy" "ovid.jar"]}}}

src/ovid/feature.clj

@@ -1,4 +1,4 @@
-;; Copyright (c) 2019, 2020 Will Cohen
+;; Copyright (c) 2019, 2020, 2024 Will Cohen
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
             [geo.geohash :as geo.geohash]
             [geo.h3 :as geo.h3])
   (:import (ch.hsr.geohash GeoHash WGS84Point)
-           (com.uber.h3core.util GeoCoord)
+           (com.uber.h3core.util LatLng)
            (org.locationtech.jts.geom Geometry)
            (org.locationtech.spatial4j.shape Shape)
            (org.locationtech.spatial4j.shape.impl
@@ -180,7 +180,7 @@
   (-assoc-properties [this p] (-to-feature this p))
   (-update-properties [this f] (-update-properties (-to-feature this) f))
 
-  GeoCoord
+  LatLng
   (-to-shape [this] (geo.spatial/to-shape this))
   (-to-jts
     ([this] (geo.spatial/to-jts this))
@@ -282,17 +282,17 @@
   (-geometry [this] (:geometry this))
   (-properties [this] (:properties this))
   (-assoc-geometry [this s] (assoc this :geometry s))
+  (-update-geometry
+   ([this f] (update this :geometry f))
+   ([this f & args]
     (-update-geometry
-     ([this f] (update this :geometry f))
-     ([this f & args]
-      (-update-geometry
-       this (fn [x] (apply f (cons x args))))))
+     this (fn [x] (apply f (cons x args))))))
   (-assoc-properties [this p] (assoc this :properties p))
   (-update-properties [this f] (update this :properties f)))
 
-(defn h3->feature
-  [h3]
-  {:geometry (geo.h3/to-jts h3) :properties {:h3 h3}})
+;; (defn h3->feature
+;;   [h3]
+;;   {:geometry (geo.h3/to-jts h3) :properties {:h3 h3}})
 
 (defn ^Shape to-shape
   "Get Shape from geometry of Featurelike