From d3b8cb19a27e1bf31801bae7e2aa6294103db768 Mon Sep 17 00:00:00 2001 From: frillweeman Date: Wed, 24 Sep 2025 14:11:25 -0600 Subject: [PATCH] remove redundant scala modules --- .../me/deflock/shotgun/ShotgunServer.scala | 11 ------ .../main/scala/services/OverpassClient.scala | 38 ------------------- 2 files changed, 49 deletions(-) delete mode 100644 shotgun/src/main/scala/services/OverpassClient.scala diff --git a/shotgun/src/main/scala/me/deflock/shotgun/ShotgunServer.scala b/shotgun/src/main/scala/me/deflock/shotgun/ShotgunServer.scala index 92f3043..466e965 100644 --- a/shotgun/src/main/scala/me/deflock/shotgun/ShotgunServer.scala +++ b/shotgun/src/main/scala/me/deflock/shotgun/ShotgunServer.scala @@ -29,7 +29,6 @@ object ShotgunServer { implicit val executionContext: ExecutionContextExecutor = system.dispatcher val logging = Logging(system, getClass) - val client = new services.OverpassClient() val nominatim = new services.NominatimClient() val githubClient = new services.GithubClient() @@ -56,16 +55,6 @@ object ShotgunServer { val apiRoutes = pathPrefix("api") { concat ( - path("alpr") { - get { - parameters("minLat".as[Double], "minLng".as[Double], "maxLat".as[Double], "maxLng".as[Double]) { (minLat, minLng, maxLat, maxLng) => - val bBox = services.BoundingBox(minLat, minLng, maxLat, maxLng) - onSuccess(client.getALPRs(bBox)) { json => - complete(json) - } - } - } - }, path("geocode") { get { parameters("query".as[String]) { query => diff --git a/shotgun/src/main/scala/services/OverpassClient.scala b/shotgun/src/main/scala/services/OverpassClient.scala deleted file mode 100644 index 44f2a92..0000000 --- a/shotgun/src/main/scala/services/OverpassClient.scala +++ /dev/null @@ -1,38 +0,0 @@ -package services - -import org.apache.pekko -import org.apache.pekko.actor.ActorSystem -import pekko.http.scaladsl.Http -import pekko.http.scaladsl.model._ -import pekko.http.scaladsl.unmarshalling.Unmarshal -import spray.json._ -import scala.concurrent.{ExecutionContextExecutor, Future} - -case class BoundingBox(minLat: Double, minLng: Double, maxLat: Double, maxLng: Double) - -class OverpassClient(implicit val system: ActorSystem, implicit val executionContext: ExecutionContextExecutor) { - val baseUrl = "https://overpass-api.de/api/interpreter" - - def getALPRs(bBox: BoundingBox): Future[JsValue] = { - val query = s"""[out:json][bbox:${bBox.minLat},${bBox.minLng},${bBox.maxLat},${bBox.maxLng}];node["man_made"="surveillance"]["surveillance:type"="ALPR"];out body;>;out skel qt;""" - val formData = FormData("data" -> query).toEntity - val request = HttpRequest( - method = HttpMethods.POST, - uri = baseUrl, - entity = formData - ) - - Http().singleRequest(request).flatMap { response => - response.status match { - case StatusCodes.OK => - Unmarshal(response.entity).to[String].map { jsonString => - jsonString.parseJson - } - case _ => - response.discardEntityBytes() - Future.failed(new Exception(s"Failed to get ALPRs: ${response.status}")) - } - } - } - -}