Merge branch 'develop' for version 0.3.3

dominiks · Feb 2, 2016 · 2d6d886 · 2d6d886
2 parents 444a53a + 667f365
commit 2d6d886
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,7 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+.idea
+uristmaps.iml
 
+.directory
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,11 @@
 group 'org.uristmaps'
-version '0.3.2'
+version '0.3.3'
 
 apply plugin: 'java'
 apply plugin: 'idea'
 
+targetCompatibility = 1.8
+
 repositories {
     mavenCentral()
 }
@@ -15,7 +17,6 @@ ext {
 
 onejar {
     product name: "uristmaps", launchers: []
-    jvmMaxMemory "2048M"
 }
 
 sourceSets {

diff --git a/build.xml b/build.xml
@@ -3,7 +3,7 @@
         buildfile to create distributable package
     </description>
     <!-- set global properties for this build -->
-    <property name="version" value="0.3.2" />
+    <property name="version" value="0.3.3" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist" location="dist" />
@@ -16,6 +16,12 @@
         <mkdir dir="${dist}"/>
     </target>
 
+    <target name="package">
+        <exec executable="gradle">
+            <arg value="buildProduct_uristmaps" />
+        </exec>
+    </target>
+
     <target name="copy_res" description="copy resources to build dir">
         <copy todir="${assemble}" overwrite="true">
             <fileset dir="${src}/main/resources/">

diff --git a/src/main/java/org/uristmaps/StructureInfo.java b/src/main/java/org/uristmaps/StructureInfo.java
@@ -143,6 +143,12 @@ 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
+
                 // 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();

diff --git 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.

diff --git 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
@@ -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
@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
     <head>
-        <link href="/css/font-awesome.css" rel="stylesheet">
-        <link rel="stylesheet" href="/css/leaflet.css" type="text/css">
-        <link rel="stylesheet" href="/css/MarkerCluster.Default.css" type="text/css">
-        <link rel="stylesheet" href="/css/MarkerCluster.css" type="text/css">
-        <link rel="stylesheet" href="/css/leaflet-sidebar.min.css" type="text/css">
-        <link rel="stylesheet" href="/css/urist.css" type="text/css">
-        <link rel="stylesheet" href="/css/leaflet.groupedlayercontrol.min.css" type="text/css" />
+        <link href="css/font-awesome.css" rel="stylesheet">
+        <link rel="stylesheet" href="css/leaflet.css" type="text/css">
+        <link rel="stylesheet" href="css/MarkerCluster.Default.css" type="text/css">
+        <link rel="stylesheet" href="css/MarkerCluster.css" type="text/css">
+        <link rel="stylesheet" href="css/leaflet-sidebar.min.css" type="text/css">
+        <link rel="stylesheet" href="css/urist.css" type="text/css">
+        <link rel="stylesheet" href="css/leaflet.groupedlayercontrol.min.css" type="text/css" />
 
         <style>
         body {
@@ -24,27 +24,27 @@
         </style>
 
         <!-- Everyone needs it, so here it is -->
-        <script src="/js/jquery.js" type="text/javascript"></script>
-        <script src="/js/jquery.tablesorter.min.js" type="text/javascript"></script>
+        <script src="js/jquery.js" type="text/javascript"></script>
+        <script src="js/jquery.tablesorter.min.js" type="text/javascript"></script>
 
         <!-- Oh all the bootstrap -->
         <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="/css/bootstrap.min.css">
+        <link rel="stylesheet" href="css/bootstrap.min.css">
         <!-- Optional theme -->
-        <link rel="stylesheet" href="/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="css/bootstrap-theme.min.css">
         <!-- Latest compiled and minified JavaScript -->
-        <script src="/js/bootstrap.min.js"></script>
+        <script src="js/bootstrap.min.js"></script>
 
-        <script src="/js/leaflet.js" type="text/javascript"></script>
-        <script src="/js/leaflet-sidebar.min.js" type="text/javascript"></script>
-        <script src="/js/heatmap.min.js" type="text/javascript"></script>
-        <script src="/js/leaflet-heatmap.js" type="text/javascript"></script>
-        <script src="/js/leaflet.markercluster.js" type="text/javascript"></script>
-        <script src="/js/easy-button.js" type="text/javascript"></script>
-        <script src="/js/leaflet.groupedlayercontrol.min.js" type="text/javascript"></script>
-        <script src="/js/icons.js" type="text/javascript"></script>
-        <script src="/js/urist.populations.js" type="text/javascript"></script>
-        <script src="/js/urist.js" type="text/javascript"></script>
+        <script src="js/leaflet.js" type="text/javascript"></script>
+        <script src="js/leaflet-sidebar.min.js" type="text/javascript"></script>
+        <script src="js/heatmap.min.js" type="text/javascript"></script>
+        <script src="js/leaflet-heatmap.js" type="text/javascript"></script>
+        <script src="js/leaflet.markercluster.js" type="text/javascript"></script>
+        <script src="js/easy-button.js" type="text/javascript"></script>
+        <script src="js/leaflet.groupedlayercontrol.min.js" type="text/javascript"></script>
+        <script src="js/icons.js" type="text/javascript"></script>
+        <script src="js/urist.populations.js" type="text/javascript"></script>
+        <script src="js/urist.js" type="text/javascript"></script>
 
         <title>$worldInfo.getWorldName() - $worldInfo.getNameEnglish()</title>
     </head>

diff --git 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++) {

diff --git a/src/main/resources/tiles/16/temperate_savanna.png b/src/main/resources/tiles/16/temperate_savanna.png
diff --git a/src/main/resources/tiles/16/tropical_savanna.png b/src/main/resources/tiles/16/tropical_savanna.png
diff --git a/src/main/resources/tiles/32/.directory b/src/main/resources/tiles/32/.directory
diff --git a/src/main/resources/tiles/4/temperate_savanna.png b/src/main/resources/tiles/4/temperate_savanna.png
diff --git a/src/main/resources/tiles/4/tropical_savanna.png b/src/main/resources/tiles/4/tropical_savanna.png
diff --git a/src/main/resources/tiles/64/.directory b/src/main/resources/tiles/64/.directory
diff --git a/src/main/resources/tiles/8/temperate_savanna.png b/src/main/resources/tiles/8/temperate_savanna.png
diff --git a/src/main/resources/tiles/8/tropical_savanna.png b/src/main/resources/tiles/8/tropical_savanna.png