From 359cd8e2a1807a3c6920f09163bf060be9c659a2 Mon Sep 17 00:00:00 2001 From: Dominik Schacht Date: Thu, 11 Jun 2015 14:55:21 +0200 Subject: [PATCH 1/9] small todo update --- src/main/java/org/uristmaps/StructureInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/uristmaps/StructureInfo.java b/src/main/java/org/uristmaps/StructureInfo.java index 9268922..3a55a42 100644 --- a/src/main/java/org/uristmaps/StructureInfo.java +++ b/src/main/java/org/uristmaps/StructureInfo.java @@ -135,6 +135,10 @@ private static void updateStructureConnections() { suffix.append("e"); } + // TODO: Let roads connect to bridges + + // TODO: Find orientation for bridges + // Remove the _ at the end if no suffixes were added. if (suffix.charAt(suffix.length()-1) == '_') suffix.deleteCharAt(suffix.length()-1); structures[x][y] = suffix.toString(); From 6bc9bedc4474afbc30166db70de3dc8f129a524f Mon Sep 17 00:00:00 2001 From: Dominik Schacht Date: Thu, 11 Jun 2015 14:56:05 +0200 Subject: [PATCH 2/9] and another todo --- src/main/java/org/uristmaps/StructureInfo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/uristmaps/StructureInfo.java b/src/main/java/org/uristmaps/StructureInfo.java index 3a55a42..bde782b 100644 --- a/src/main/java/org/uristmaps/StructureInfo.java +++ b/src/main/java/org/uristmaps/StructureInfo.java @@ -135,6 +135,8 @@ private static void updateStructureConnections() { suffix.append("e"); } + // TODO: Tunnel orientation/connection seems completely broken + // TODO: Let roads connect to bridges // TODO: Find orientation for bridges From 9f38126b1e4c9cc712a650a4d7f8fde16b8ae390 Mon Sep 17 00:00:00 2001 From: Dominik Schacht Date: Thu, 11 Jun 2015 15:04:13 +0200 Subject: [PATCH 3/9] fixed bg color for savanna tiles --- src/main/resources/tiles/16/.directory | 4 ++++ .../resources/tiles/16/temperate_savanna.png | Bin 186 -> 186 bytes .../resources/tiles/16/tropical_savanna.png | Bin 186 -> 186 bytes .../resources/tiles/4/temperate_savanna.png | Bin 305 -> 129 bytes src/main/resources/tiles/4/tropical_savanna.png | Bin 305 -> 129 bytes src/main/resources/tiles/8/.directory | 4 ++++ .../resources/tiles/8/temperate_savanna.png | Bin 149 -> 150 bytes src/main/resources/tiles/8/tropical_savanna.png | Bin 149 -> 150 bytes 8 files changed, 8 insertions(+) create mode 100644 src/main/resources/tiles/16/.directory create mode 100644 src/main/resources/tiles/8/.directory diff --git a/src/main/resources/tiles/16/.directory b/src/main/resources/tiles/16/.directory new file mode 100644 index 0000000..762fc61 --- /dev/null +++ b/src/main/resources/tiles/16/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2015,6,11,13,19,26 +Version=3 diff --git a/src/main/resources/tiles/16/temperate_savanna.png b/src/main/resources/tiles/16/temperate_savanna.png index 82c7c56a2cfaa78a49768a4daed5e9f944bca60e..6d3cbcafa4e3abde65c53862db61349a39822b9f 100644 GIT binary patch delta 128 zcmV-`0Du3w0lEQ@L3s-e02F2aG1UM709i>yK~y-)W8C^^>wg9c01Gn5yU&}ThOI?g zQTU877r->5E5K#}vKl6IlX1BMmjz7NoQG}*KG!i~3q)+Lz~wbYe6ir&=Z!Z^FuXtx i7&Ty67{Ewrb_M_q11puHLeXvj0000yK~y-)V_a~q^*;jzfCZV8u&A1#h6Qo0 zD11hk3t*bj6=1UfSq&4q$+%pB%K|2B&OWjLSXg)0000yK~y-)W8C^^>wg9c01Gn5yU&}ThOI?g zQTU877r->5E5K#}vKl6IlX1BMmjz7NoQG}*KG!i~3q)+Lz~wbYe6ir&=Z!Z^FuXtx i7&Ty67{Ewrb_M_q11puHLeXvj0000yK~y-)V_a~q^*;jzfCZV8u&A1#h6Qo0 zD11hk3t*bj6=1UfSq&4q$+%pB%K|2B&OWjLSXg)0000H=O_WNwyJl5LpUe0_Dlv40?aSY+Oo_yz5 whBh;gfuRDU7{}AQ&wD4_jM_4_v5}Es;uF>|&htm3fod5%UHx3vIVCg!0QWc@{Qv*} literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFp3?#42FMA8(q&xaLGB9lH=l+w(3gjy!dj$D1 zFjT2AFf_CU$So=IO?3^-bPWwc3@xpU y%&iQ}wGE7{3=E#|U9UmWkei>9nO2Fe!NAJY5~3kLfUyCnfx*+&&t;ucLK6UrMo6Ck diff --git a/src/main/resources/tiles/4/tropical_savanna.png b/src/main/resources/tiles/4/tropical_savanna.png index c1b7d9af4a41107139120b09d925a56f8bd6c109..1be6eff8256f375861d1d3ddb906081caa558d14 100644 GIT binary patch delta 92 zcmdnU)W|qNf|G-Zfq_A7GNH=O_WNwyJXYG@Kdo2>lv40?aSY+Oo_yz5 whBh;gfuRDU7{}AQ&wD4_jM_4_v5}Es;uF>|&htm3fod5%UHx3vIVCg!0Pq$a+yDRo literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFp3?#42FMA8(q&xaLGB9lH=l+w(3gjy!dj$D1 zFjT2AFf_CU$So=IO?3^-bPWwc3@xpU y%&iQ}wGE7{3=E#|U9UmWkei>9nO2Fe!NAJY5~3kLfUyCnfx*+&&t;ucLK6UrMo6Ck diff --git a/src/main/resources/tiles/8/.directory b/src/main/resources/tiles/8/.directory new file mode 100644 index 0000000..49e513e --- /dev/null +++ b/src/main/resources/tiles/8/.directory @@ -0,0 +1,4 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2015,6,11,13,40,12 +Version=3 diff --git a/src/main/resources/tiles/8/temperate_savanna.png b/src/main/resources/tiles/8/temperate_savanna.png index e509acfbe85f918a8f116f74a10beea50c1286e7..00a76c7185e9163513053d177c7b141ad40ffa82 100644 GIT binary patch delta 92 zcmbQrIE`_FV<%673_ w*BKkOW@xvmw22xxrW|Ft>kz=GteDTlu(VcCT&-!z5}*MLp00i_>zopr0PB4p3|E>T405nNNK~xyiV_a~q^*;k1z{EfRu)r7zi>fgs x7sRz9Ojr=tiXn+%1xyfGF+n#FRKQ5cn*fom4*`vz83F(R002ovPDHLkV1i)~9i#vN diff --git a/src/main/resources/tiles/8/tropical_savanna.png b/src/main/resources/tiles/8/tropical_savanna.png index 708e45d03f458c5355b6dd176be228a1ab8a9a80..a0dc991199fbe124526802c1fd9995917fd676b1 100644 GIT binary patch delta 92 zcmV-i0Hgnv0hR%fK~)P403+Q(l-d9Q05wTOK~xyiW8C^^>wgA3fQf+sV1Y5b`@AtE yw-#+hn6R~ID~2S76)-_$#RT0zPyr($Zvp_NeGwNXf~2GX0000fgs x7sRz9Ojr=tiXn+%1xyfGF+n#FRKQ5cn*fom4*`vz83F(R002ovPDHLkV1irV9g+Y5 From a39d2c7d0bbf6b66636df1e3bb5d5109ead4a837 Mon Sep 17 00:00:00 2001 From: dominiks Date: Mon, 10 Aug 2015 17:19:30 +0200 Subject: [PATCH 4/9] removing ide files --- .gitignore | 2 + .idea/.name | 1 - .idea/ant.xml | 6 - .idea/artifacts/uristmaps.xml | 11 - .idea/compiler.xml | 22 - .idea/copyright/profiles_settings.xml | 3 - .idea/dictionaries/dominik.xml | 3 - .idea/gradle.xml | 17 - .idea/inspectionProfiles/Project_Default.xml | 14 - .../inspectionProfiles/profiles_settings.xml | 7 - ...radle__com_esotericsoftware_kryo_3_0_1.xml | 11 - ...dle__com_esotericsoftware_minlog_1_3_0.xml | 11 - ...com_esotericsoftware_reflectasm_1_10_1.xml | 11 - ...son_core_jackson_annotations_2_6_0_rc1.xml | 11 - ...ml_jackson_core_jackson_core_2_6_0_rc1.xml | 11 - ...ackson_core_jackson_databind_2_6_0_rc1.xml | 11 - .../Gradle__com_sparkjava_spark_core_2_2.xml | 11 - ..._collections_commons_collections_3_2_1.xml | 11 - .../Gradle__commons_io_commons_io_2_4.xml | 11 - .../Gradle__commons_lang_commons_lang_2_4.xml | 11 - .idea/libraries/Gradle__junit_junit_4_11.xml | 11 - ...adle__org_apache_velocity_velocity_1_7.xml | 11 - ...lipse_jetty_jetty_http_9_0_2_v20130417.xml | 11 - ...eclipse_jetty_jetty_io_9_0_2_v20130417.xml | 11 - ...e_jetty_jetty_security_9_0_2_v20130417.xml | 11 - ...pse_jetty_jetty_server_9_0_2_v20130417.xml | 11 - ...se_jetty_jetty_servlet_9_0_2_v20130417.xml | 11 - ...lipse_jetty_jetty_util_9_0_2_v20130417.xml | 11 - ...pse_jetty_jetty_webapp_9_0_2_v20130417.xml | 11 - ...clipse_jetty_jetty_xml_9_0_2_v20130417.xml | 11 - ...rbit_javax_servlet_3_0_0_v201112011016.xml | 11 - ...Gradle__org_hamcrest_hamcrest_core_1_3.xml | 11 - .../Gradle__org_ini4j_ini4j_0_5_4.xml | 11 - .../Gradle__org_objenesis_objenesis_2_1.xml | 11 - .../Gradle__org_ow2_asm_asm_5_0_3.xml | 11 - .../Gradle__org_slf4j_slf4j_api_1_7_7.xml | 11 - .../Gradle__org_slf4j_slf4j_simple_1_7_7.xml | 11 - .idea/misc.xml | 20 - .idea/modules.xml | 8 - .idea/uiDesigner.xml | 124 -- .idea/uristmapsj.iml | 11 - .idea/vcs.xml | 7 - .idea/workspace.xml | 1963 ----------------- 43 files changed, 2 insertions(+), 2514 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/ant.xml delete mode 100644 .idea/artifacts/uristmaps.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/dictionaries/dominik.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_kryo_3_0_1.xml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_0.xml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_10_1.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_6_0_rc1.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_6_0_rc1.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_6_0_rc1.xml delete mode 100644 .idea/libraries/Gradle__com_sparkjava_spark_core_2_2.xml delete mode 100644 .idea/libraries/Gradle__commons_collections_commons_collections_3_2_1.xml delete mode 100644 .idea/libraries/Gradle__commons_io_commons_io_2_4.xml delete mode 100644 .idea/libraries/Gradle__commons_lang_commons_lang_2_4.xml delete mode 100644 .idea/libraries/Gradle__junit_junit_4_11.xml delete mode 100644 .idea/libraries/Gradle__org_apache_velocity_velocity_1_7.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_http_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_io_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_security_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_server_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_servlet_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_util_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_webapp_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_jetty_xml_9_0_2_v20130417.xml delete mode 100644 .idea/libraries/Gradle__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml delete mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Gradle__org_ini4j_ini4j_0_5_4.xml delete mode 100644 .idea/libraries/Gradle__org_objenesis_objenesis_2_1.xml delete mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml delete mode 100644 .idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_7.xml delete mode 100644 .idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_7.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/uristmapsj.iml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 089b1a1..126b765 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +.idea + diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 0561031..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Launcher \ No newline at end of file diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index a2a4769..0000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/uristmaps.xml b/.idea/artifacts/uristmaps.xml deleted file mode 100644 index 3d0e7ab..0000000 --- a/.idea/artifacts/uristmaps.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/uristmaps - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/dictionaries/dominik.xml b/.idea/dictionaries/dominik.xml deleted file mode 100644 index f33c82c..0000000 --- a/.idea/dictionaries/dominik.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index e70fe3f..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 956ac03..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_kryo_3_0_1.xml b/.idea/libraries/Gradle__com_esotericsoftware_kryo_3_0_1.xml deleted file mode 100644 index f856b18..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_kryo_3_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_0.xml b/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_0.xml deleted file mode 100644 index edce2f2..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_10_1.xml b/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_10_1.xml deleted file mode 100644 index 42eace6..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_10_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_6_0_rc1.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_6_0_rc1.xml deleted file mode 100644 index b3524dc..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_6_0_rc1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_6_0_rc1.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_6_0_rc1.xml deleted file mode 100644 index d1edfa4..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_6_0_rc1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_6_0_rc1.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_6_0_rc1.xml deleted file mode 100644 index 8f20b54..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_6_0_rc1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_sparkjava_spark_core_2_2.xml b/.idea/libraries/Gradle__com_sparkjava_spark_core_2_2.xml deleted file mode 100644 index 3067f18..0000000 --- a/.idea/libraries/Gradle__com_sparkjava_spark_core_2_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_1.xml deleted file mode 100644 index 71c6476..0000000 --- a/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml b/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml deleted file mode 100644 index 2ce45d1..0000000 --- a/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Gradle__commons_lang_commons_lang_2_4.xml deleted file mode 100644 index b0fb5ad..0000000 --- a/.idea/libraries/Gradle__commons_lang_commons_lang_2_4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml deleted file mode 100644 index dc26b34..0000000 --- a/.idea/libraries/Gradle__junit_junit_4_11.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Gradle__org_apache_velocity_velocity_1_7.xml deleted file mode 100644 index 766ac28..0000000 --- a/.idea/libraries/Gradle__org_apache_velocity_velocity_1_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_http_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_http_9_0_2_v20130417.xml deleted file mode 100644 index c78529c..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_http_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_io_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_io_9_0_2_v20130417.xml deleted file mode 100644 index 816a13d..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_io_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_security_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_security_9_0_2_v20130417.xml deleted file mode 100644 index 8faea66..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_security_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_server_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_server_9_0_2_v20130417.xml deleted file mode 100644 index 33f0407..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_server_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_servlet_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_servlet_9_0_2_v20130417.xml deleted file mode 100644 index 858af7e..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_servlet_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_util_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_util_9_0_2_v20130417.xml deleted file mode 100644 index efdea84..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_util_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_webapp_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_webapp_9_0_2_v20130417.xml deleted file mode 100644 index 92b54d9..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_webapp_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_xml_9_0_2_v20130417.xml b/.idea/libraries/Gradle__org_eclipse_jetty_jetty_xml_9_0_2_v20130417.xml deleted file mode 100644 index fb5fa04..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_jetty_xml_9_0_2_v20130417.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml b/.idea/libraries/Gradle__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml deleted file mode 100644 index 1b2a103..0000000 --- a/.idea/libraries/Gradle__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index 8262f72..0000000 --- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_ini4j_ini4j_0_5_4.xml b/.idea/libraries/Gradle__org_ini4j_ini4j_0_5_4.xml deleted file mode 100644 index bffc541..0000000 --- a/.idea/libraries/Gradle__org_ini4j_ini4j_0_5_4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_objenesis_objenesis_2_1.xml b/.idea/libraries/Gradle__org_objenesis_objenesis_2_1.xml deleted file mode 100644 index e6b52ad..0000000 --- a/.idea/libraries/Gradle__org_objenesis_objenesis_2_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml b/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml deleted file mode 100644 index 2f6ad78..0000000 --- a/.idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_7.xml deleted file mode 100644 index 3898c3d..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_7.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_7.xml deleted file mode 100644 index 0cae777..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index ba625e0..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 531be35..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uristmapsj.iml b/.idea/uristmapsj.iml deleted file mode 100644 index cc6fefb..0000000 --- a/.idea/uristmapsj.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index a6929d6..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 6bc0210..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1963 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - Android Lint - - - Code style issuesJava - - - General - - - Internationalization issues - - - Java - - - JavaScript - - - Potentially confusing code constructsJavaScript - - - Probable bugsJava - - - Properties Files - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1432642669729 - - - 1432642768804 - - - 1432645908880 - - - 1432646617620 - - - 1432663217721 - - - 1432721438636 - - - 1432722599353 - - - 1432722696319 - - - 1432723149036 - - - 1432725827435 - - - 1432726774512 - - - 1432727869963 - - - 1432732033980 - - - 1432732416982 - - - 1432733903370 - - - 1432736086792 - - - 1432744292647 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uristmaps - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - uristmaps - - - - - - - - Gradle: junit:junit:4.11 - - - - - - - - \ No newline at end of file From 5f9c679a3fa943525619909593a56207cc45b1fe Mon Sep 17 00:00:00 2001 From: dominiks Date: Mon, 10 Aug 2015 17:20:03 +0200 Subject: [PATCH 5/9] ignore more ide stuff --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 126b765..8c0e954 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ hs_err_pid* .idea - +uristmaps.iml From 53725378c64dd3b240c1953d3989de04d2f1552a Mon Sep 17 00:00:00 2001 From: dominiks Date: Mon, 10 Aug 2015 17:30:59 +0200 Subject: [PATCH 6/9] set target version explicitly --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6997c34..ccae104 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,8 @@ version '0.3.2' apply plugin: 'java' apply plugin: 'idea' +targetCompatibility = 1.8 + repositories { mavenCentral() } @@ -15,7 +17,6 @@ ext { onejar { product name: "uristmaps", launchers: [] - jvmMaxMemory "2048M" } sourceSets { From be0b859376594406cdb7b759506a335489e7b589 Mon Sep 17 00:00:00 2001 From: dominiks Date: Wed, 19 Aug 2015 22:15:25 +0200 Subject: [PATCH 7/9] replaced absolute paths with relative paths, to allow placement in subdir --- src/main/java/org/uristmaps/WorldSites.java | 2 +- .../java/org/uristmaps/data/SitemapInfo.java | 2 +- src/main/resources/templates/index.html.vm | 44 +++++++++---------- src/main/resources/templates/js/urist.js.vm | 8 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/uristmaps/WorldSites.java b/src/main/java/org/uristmaps/WorldSites.java index 4e25bf7..ee4ebcd 100644 --- a/src/main/java/org/uristmaps/WorldSites.java +++ b/src/main/java/org/uristmaps/WorldSites.java @@ -387,7 +387,7 @@ public static void geoJson() { props.put("name", site.getName()); props.put("type", site.getType()); props.put("id", site.getId()); - props.put("img", String.format("/icons/%s.png", site.getType().replace(" ", "_").toLowerCase())); + props.put("img", String.format("icons/%s.png", site.getType().replace(" ", "_").toLowerCase())); // Configure detailed map (if available) if (sitemaps.containsKey(site.getId())) { diff --git a/src/main/java/org/uristmaps/data/SitemapInfo.java b/src/main/java/org/uristmaps/data/SitemapInfo.java index 9de731a..0dc7171 100644 --- a/src/main/java/org/uristmaps/data/SitemapInfo.java +++ b/src/main/java/org/uristmaps/data/SitemapInfo.java @@ -16,7 +16,7 @@ public SitemapInfo(int id, int width, int height) { } public String getUrl() { - return String.format("/sitemaps/%d.png", siteId); + return String.format("sitemaps/%d.png", siteId); } public int getSiteId() { diff --git a/src/main/resources/templates/index.html.vm b/src/main/resources/templates/index.html.vm index 1ab17ae..6d69fc8 100644 --- a/src/main/resources/templates/index.html.vm +++ b/src/main/resources/templates/index.html.vm @@ -1,13 +1,13 @@ - - - - - - - + + + + + + + - - + + - + - + - + - - - - - - - - - - + + + + + + + + + + $worldInfo.getWorldName() - $worldInfo.getNameEnglish() diff --git a/src/main/resources/templates/js/urist.js.vm b/src/main/resources/templates/js/urist.js.vm index 18a2458..941450b 100644 --- a/src/main/resources/templates/js/urist.js.vm +++ b/src/main/resources/templates/js/urist.js.vm @@ -16,10 +16,10 @@ function init_uristmaps() { window.layerControl.addOverlay(window.heatmapLayer, "Population", "Overlays"); // Load the sites json containing short info for every site - jQuery.getJSON("/js/sitesgeo.json", process_loaded_sites); + jQuery.getJSON("js/sitesgeo.json", process_loaded_sites); // Load the regions data - jQuery.getJSON("/js/regionsgeo.json", process_loaded_regions); + jQuery.getJSON("js/regionsgeo.json", process_loaded_regions); setup_sidebars(); }; @@ -38,7 +38,7 @@ function init_layer_controls() { // Create and configure the layers for biome view. function init_static_layers() { - window.biome_layer = L.tileLayer('/tiles/{z}/{x}/{y}.png', { + window.biome_layer = L.tileLayer('tiles/{z}/{x}/{y}.png', { noWrap: true, minZoom: $conf.Map.min_zoom, maxZoom: $conf.Map.max_zoom, @@ -87,7 +87,7 @@ function toggle_detailed_map(site_id) { window.active_site_maps[site_id] = null; } else { // Create the overlay and add it to active_site_maps - var image_url = "/sites/" + site_id + ".png"; + var image_url = "sites/" + site_id + ".png"; // the .features object is a list in which the index is resolved as id-1 for (var i = 0; i < window.sites_geojson.features.length; i++) { From c4a196dc0f01dd6cf3dd69cd0bedb6857418452d Mon Sep 17 00:00:00 2001 From: dominiks Date: Tue, 2 Feb 2016 12:37:12 +0100 Subject: [PATCH 8/9] Removed .directory files. --- .gitignore | 1 + src/main/resources/tiles/16/.directory | 4 ---- src/main/resources/tiles/32/.directory | 5 ----- src/main/resources/tiles/64/.directory | 6 ------ src/main/resources/tiles/8/.directory | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 src/main/resources/tiles/16/.directory delete mode 100644 src/main/resources/tiles/32/.directory delete mode 100644 src/main/resources/tiles/64/.directory delete mode 100644 src/main/resources/tiles/8/.directory diff --git a/.gitignore b/.gitignore index 8c0e954..0bfdf4f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ hs_err_pid* .idea uristmaps.iml +.directory diff --git a/src/main/resources/tiles/16/.directory b/src/main/resources/tiles/16/.directory deleted file mode 100644 index 762fc61..0000000 --- a/src/main/resources/tiles/16/.directory +++ /dev/null @@ -1,4 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2015,6,11,13,19,26 -Version=3 diff --git a/src/main/resources/tiles/32/.directory b/src/main/resources/tiles/32/.directory deleted file mode 100644 index 90e329f..0000000 --- a/src/main/resources/tiles/32/.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2015,5,14,11,27,46 -Version=3 -ViewMode=1 diff --git a/src/main/resources/tiles/64/.directory b/src/main/resources/tiles/64/.directory deleted file mode 100644 index 19f0dc1..0000000 --- a/src/main/resources/tiles/64/.directory +++ /dev/null @@ -1,6 +0,0 @@ -[Dolphin] -PreviewsShown=true -SortRole=date -Timestamp=2014,8,21,14,14,13 -Version=3 -ViewMode=1 diff --git a/src/main/resources/tiles/8/.directory b/src/main/resources/tiles/8/.directory deleted file mode 100644 index 49e513e..0000000 --- a/src/main/resources/tiles/8/.directory +++ /dev/null @@ -1,4 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2015,6,11,13,40,12 -Version=3 From 667f3651ca9e8b08e230d3f789bcf79ee128fd35 Mon Sep 17 00:00:00 2001 From: dominiks Date: Tue, 2 Feb 2016 13:12:54 +0100 Subject: [PATCH 9/9] Bumped version to 0.3.3 --- build.gradle | 2 +- build.xml | 8 +++++++- src/main/java/org/uristmaps/Uristmaps.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ccae104..8d1c5ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'org.uristmaps' -version '0.3.2' +version '0.3.3' apply plugin: 'java' apply plugin: 'idea' diff --git a/build.xml b/build.xml index e0576a5..17efaa4 100644 --- a/build.xml +++ b/build.xml @@ -3,7 +3,7 @@ buildfile to create distributable package - + @@ -16,6 +16,12 @@ + + + + + + diff --git a/src/main/java/org/uristmaps/Uristmaps.java b/src/main/java/org/uristmaps/Uristmaps.java index e471fed..83a2109 100644 --- a/src/main/java/org/uristmaps/Uristmaps.java +++ b/src/main/java/org/uristmaps/Uristmaps.java @@ -24,7 +24,7 @@ */ public class Uristmaps { - public static final String VERSION = "0.3.2"; + public static final String VERSION = "0.3.3"; /** * The global configuration object.