diff --git a/.idea/artifacts/project_jar.xml b/.idea/artifacts/project_jar.xml index 720fc8e..db2266b 100644 --- a/.idea/artifacts/project_jar.xml +++ b/.idea/artifacts/project_jar.xml @@ -1,42 +1,20 @@ - + $PROJECT_DIR$/out/artifacts/project_jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + \ No newline at end of file diff --git a/.idea/libraries/com_fasterxml_jackson_core_jackson_databind_2_10_3.xml b/.idea/libraries/fasterxml_jackson_core_databind.xml similarity index 51% rename from .idea/libraries/com_fasterxml_jackson_core_jackson_databind_2_10_3.xml rename to .idea/libraries/fasterxml_jackson_core_databind.xml index 3e58f25..d603a29 100644 --- a/.idea/libraries/com_fasterxml_jackson_core_jackson_databind_2_10_3.xml +++ b/.idea/libraries/fasterxml_jackson_core_databind.xml @@ -1,10 +1,10 @@ - - + + - - - + + + diff --git a/.idea/libraries/io_javalin.xml b/.idea/libraries/io_javalin.xml new file mode 100644 index 0000000..7927466 --- /dev/null +++ b/.idea/libraries/io_javalin.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/io_javalin_javalin_3_13_7.xml b/.idea/libraries/io_javalin_javalin_3_13_7.xml deleted file mode 100644 index a41e530..0000000 --- a/.idea/libraries/io_javalin_javalin_3_13_7.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/org_locationtech_spatial4j_spatial4j_0_8.xml b/.idea/libraries/org_locationtech_spatial4j.xml similarity index 76% rename from .idea/libraries/org_locationtech_spatial4j_spatial4j_0_8.xml rename to .idea/libraries/org_locationtech_spatial4j.xml index f136eaf..75361a7 100644 --- a/.idea/libraries/org_locationtech_spatial4j_spatial4j_0_8.xml +++ b/.idea/libraries/org_locationtech_spatial4j.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/org_slf4j_slf4j_simple_1_7_30.xml b/.idea/libraries/org_slf4j_slf4j_simple_1_7_30.xml deleted file mode 100644 index 832d7d9..0000000 --- a/.idea/libraries/org_slf4j_slf4j_simple_1_7_30.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/slf4j_simple.xml b/.idea/libraries/slf4j_simple.xml new file mode 100644 index 0000000..a696910 --- /dev/null +++ b/.idea/libraries/slf4j_simple.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/project.iml b/project.iml index a066afd..bd422a0 100644 --- a/project.iml +++ b/project.iml @@ -10,9 +10,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index 7c0f9e6..52592b7 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,16 @@ Manifest-Version: 1.0 Main-Class: huskymaps.MapServer +Class-Path: slf4j-simple-1.7.31.jar slf4j-api-1.7.31.jar jackson-databin + d-2.12.4.jar jackson-annotations-2.12.4.jar jackson-core-2.12.4.jar spa + tial4j-0.8.jar javalin-4.0.0.RC3.jar slf4j-api-1.7.31.jar jetty-server- + 9.4.43.v20210629.jar javax.servlet-api-3.1.0.jar jetty-http-9.4.43.v202 + 10629.jar jetty-util-9.4.43.v20210629.jar jetty-io-9.4.43.v20210629.jar + jetty-webapp-9.4.43.v20210629.jar jetty-xml-9.4.43.v20210629.jar jetty + -servlet-9.4.43.v20210629.jar jetty-security-9.4.43.v20210629.jar jetty + -util-ajax-9.4.43.v20210629.jar websocket-server-9.4.43.v20210629.jar w + ebsocket-common-9.4.43.v20210629.jar websocket-api-9.4.43.v20210629.jar + websocket-client-9.4.43.v20210629.jar jetty-client-9.4.43.v20210629.ja + r websocket-servlet-9.4.43.v20210629.jar kotlin-stdlib-jdk8-1.5.30.jar + kotlin-stdlib-1.5.30.jar annotations-13.0.jar kotlin-stdlib-common-1.5. + 30.jar kotlin-stdlib-jdk7-1.5.30.jar diff --git a/src/huskymaps/MapServer.java b/src/huskymaps/MapServer.java index 0c9adf0..b607efd 100644 --- a/src/huskymaps/MapServer.java +++ b/src/huskymaps/MapServer.java @@ -55,7 +55,7 @@ public static void main(String[] args) throws Exception { config.addSinglePageRoot("/", "huskymaps/index.html"); }).start(port()); ConcurrentHashMap cache = new ConcurrentHashMap<>(); - app.get("/map/:coordinates/:dimensions", ctx -> { + app.get("/map/{coordinates}/{dimensions}", ctx -> { String[] coordinates = ctx.pathParam("coordinates").split(","); Point center = pointLonLat(context, coordinates); int zoom = Integer.parseInt(coordinates[2]);