commit 0e87787bebebb8827f9dda4f4dcab0ee90302d65 Author: js0ny Date: Wed Oct 8 12:59:40 2025 +0100 Initial commit diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..367bf51 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,28 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile +{ + "name": "Existing Dockerfile", + "build": { + // Sets the run context to one level up instead of the .devcontainer folder. + "context": "..", + // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. + "dockerfile": "../Dockerfile" + }, + "customizations": { + "vscode": { + "extensions": [ + "ms-azuretools.vscode-containers" + ] + } + } + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + // Uncomment the next line to run commands after the container is created. + // "postCreateCommand": "cat /etc/os-release", + // Configure tool-specific properties. + // "customizations": {}, + // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "devcontainer" +} \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..107bf08 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM --platform=linux/amd64 openjdk:21 + +WORKDIR /app + +COPY ./build/libs/ilp-coursework-0.0.1-SNAPSHOT.jar app.jar + +EXPOSE 8080 + +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..09d7115 --- /dev/null +++ b/Makefile @@ -0,0 +1,57 @@ +# Makefile + +# --- Variables --- +IMAGE_NAME := ilp-coursework +IMAGE_TAG := 0.1 +FULL_IMAGE_NAME := ${IMAGE_NAME}:${IMAGE_TAG} +CONTAINER_NAME := ilp-coursework-app +SUBMISSION_FILE := ilp_submission_image.tar + + +# --- Targets --- + +# Default command +.PHONY: all +all: save + +.PHONY: build +build: + ./gradlew build + +.PHONY: docker-build +docker-build: build + podman build -t ${FULL_IMAGE_NAME} . + +# Run the container in detached mode. +# It will first stop and remove any existing container with the same name. +.PHONY: run +run: docker-build + @echo "Stopping and removing old container if it exists..." +# -podman stop ${CONTAINER_NAME} > /dev/null 2>&1 || true +# -podman rm ${CONTAINER_NAME} > /dev/null 2>&1 || true + podman-compose stop + @echo "Starting new container '${CONTAINER_NAME}' on http://localhost:8080" + podman-compose up -d + +.PHONY: stop +stop: + @echo "Stopping and removing container: ${CONTAINER_NAME}" +# -podman stop ${CONTAINER_NAME} > /dev/null 2>&1 || true +# -podman rm ${CONTAINER_NAME} > /dev/null 2>&1 || true + podman-compose stop > /dev/null 2>&1 || true + + +# --- Submission Target --- + +.PHONY: save +save: docker-build + podman save -o ${SUBMISSION_FILE} ${FULL_IMAGE_NAME} + @echo "Submission file '${SUBMISSION_FILE}' created successfully." + + +# --- Utility Target --- + +.PHONY: clean +clean: + ./gradlew clean + -rm -f ${SUBMISSION_FILE} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..81be9e6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'io.github.js0ny' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-actuator' + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..ac21ce2 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,8 @@ +# compose.yaml +services: + app: + build: . + image: ilp-coursework:0.1 + container_name: ilp-coursework-app + ports: + - "8080:8080" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c5fa2c9 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'ilp-coursework' diff --git a/src/main/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplication.java b/src/main/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplication.java new file mode 100644 index 0000000..2d3370f --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplication.java @@ -0,0 +1,13 @@ +package io.github.js0ny.ilp_coursework; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class IlpCourseworkApplication { + + public static void main(String[] args) { + SpringApplication.run(IlpCourseworkApplication.class, args); + } + +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/controller/ApiController.java b/src/main/java/io/github/js0ny/ilp_coursework/controller/ApiController.java new file mode 100644 index 0000000..9647226 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/controller/ApiController.java @@ -0,0 +1,57 @@ +package io.github.js0ny.ilp_coursework.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import io.github.js0ny.ilp_coursework.dto.DistanceRequestDto; +import io.github.js0ny.ilp_coursework.dto.LngLatDto; +import io.github.js0ny.ilp_coursework.dto.MovementRequestDto; +import io.github.js0ny.ilp_coursework.dto.RegionCheckRequestDto; +import io.github.js0ny.ilp_coursework.service.GpsCalculationService; + +@RestController +@RequestMapping("/api/v1") +public class ApiController { + + private final String myUid = "s2522255"; + private final GpsCalculationService gpsService; + + public ApiController(GpsCalculationService gpsService) { + this.gpsService = gpsService; + } + + @GetMapping("/uid") + public String getUid() { + return myUid; + } + + @PostMapping("/distanceTo") + public double getDistance(@RequestBody DistanceRequestDto request) { + + LngLatDto position1 = request.position1(); + LngLatDto position2 = request.position2(); + return gpsService.calculateDistance(position1, position2); + } + + @PostMapping("/isCloseTo") + public boolean getIsCloseTo(@RequestBody DistanceRequestDto request) { + LngLatDto position1 = request.position1(); + LngLatDto position2 = request.position2(); + return gpsService.isCloseTo(position1, position2); + } + + @PostMapping("/nextPosition") + public LngLatDto getNextPosition(@RequestBody MovementRequestDto request) { + LngLatDto start = request.start(); + double angle = request.angle(); + return gpsService.nextPosition(start, angle); + } + + @PostMapping("/isInRegion") + public boolean getIsInRegion(@RequestBody RegionCheckRequestDto request) { + return true; + } +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/dto/DistanceRequestDto.java b/src/main/java/io/github/js0ny/ilp_coursework/dto/DistanceRequestDto.java new file mode 100644 index 0000000..28b591e --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/dto/DistanceRequestDto.java @@ -0,0 +1,4 @@ +package io.github.js0ny.ilp_coursework.dto; + +public record DistanceRequestDto(LngLatDto position1, LngLatDto position2) { +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/dto/LngLatDto.java b/src/main/java/io/github/js0ny/ilp_coursework/dto/LngLatDto.java new file mode 100644 index 0000000..cf79262 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/dto/LngLatDto.java @@ -0,0 +1,5 @@ +package io.github.js0ny.ilp_coursework.dto; + +public record LngLatDto(double lng, double lat) { + +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/dto/MovementRequestDto.java b/src/main/java/io/github/js0ny/ilp_coursework/dto/MovementRequestDto.java new file mode 100644 index 0000000..2c6e0dd --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/dto/MovementRequestDto.java @@ -0,0 +1,8 @@ +package io.github.js0ny.ilp_coursework.dto; + +/** + * Represents the data transfer object for a movement action request. + * Used for endpoint: `/api/v1/nextPosition` + */ +public record MovementRequestDto(LngLatDto start, double angle) { +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionCheckRequestDto.java b/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionCheckRequestDto.java new file mode 100644 index 0000000..9e59933 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionCheckRequestDto.java @@ -0,0 +1,5 @@ +package io.github.js0ny.ilp_coursework.dto; + +public record RegionCheckRequestDto(LngLatDto position) { + +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionDto.java b/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionDto.java new file mode 100644 index 0000000..72a88a2 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/dto/RegionDto.java @@ -0,0 +1,19 @@ +package io.github.js0ny.ilp_coursework.dto; + +import java.util.List; +import java.util.Objects; + +public record RegionDto(String name, List vertices) { + + public boolean isClose() { + // Magic number 4: For a polygon, 3 edges is required. + // In this dto, edges + 1 vertices is required. + if (vertices == null || vertices.size() < 4) { + return false; + } + LngLatDto first = vertices.get(0); + LngLatDto last = vertices.get(vertices.size() - 1); + return Objects.equals(last, first); + } + +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/exception/GlobalExceptionHandler.java b/src/main/java/io/github/js0ny/ilp_coursework/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..f479c23 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/exception/GlobalExceptionHandler.java @@ -0,0 +1,5 @@ +package io.github.js0ny.ilp_coursework.exception; + +public class GlobalExceptionHandler { + +} diff --git a/src/main/java/io/github/js0ny/ilp_coursework/service/GpsCalculationService.java b/src/main/java/io/github/js0ny/ilp_coursework/service/GpsCalculationService.java new file mode 100644 index 0000000..10efcd3 --- /dev/null +++ b/src/main/java/io/github/js0ny/ilp_coursework/service/GpsCalculationService.java @@ -0,0 +1,30 @@ +package io.github.js0ny.ilp_coursework.service; + +import org.springframework.stereotype.Service; + +import io.github.js0ny.ilp_coursework.dto.LngLatDto; + +@Service +public class GpsCalculationService { + private static final double STEP = 0.00015; + private static final double CLOSE_THRESHOLD = STEP; + + public double calculateDistance(LngLatDto position1, LngLatDto position2) { + double lngDistance = position2.lng() - position1.lng(); + double latDistance = position2.lat() - position1.lat(); + return Math.sqrt(lngDistance * lngDistance + latDistance * latDistance); + } + + public boolean isCloseTo(LngLatDto position1, LngLatDto position2) { + double distance = calculateDistance(position1, position2); + return distance < CLOSE_THRESHOLD; + } + + public LngLatDto nextPosition(LngLatDto start, double angle) { + double rad = Math.toRadians(angle); + double newLng = Math.cos(rad) * STEP + start.lng(); + double newLat = Math.sin(rad) * STEP + start.lat(); + return new LngLatDto(newLng, newLat); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..3cd2c11 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=ilp-coursework diff --git a/src/test/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplicationTests.java b/src/test/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplicationTests.java new file mode 100644 index 0000000..25e3b6b --- /dev/null +++ b/src/test/java/io/github/js0ny/ilp_coursework/IlpCourseworkApplicationTests.java @@ -0,0 +1,13 @@ +package io.github.js0ny.ilp_coursework; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IlpCourseworkApplicationTests { + + @Test + void contextLoads() { + } + +}