diff --git a/.gitignore b/.gitignore
index 089b1a1..0bfdf4f 100644
--- 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
index 6997c34..8d1c5ba 100644
--- 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
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/StructureInfo.java b/src/main/java/org/uristmaps/StructureInfo.java
index 05fcfad..e984056 100644
--- 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
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.
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++) {
diff --git a/src/main/resources/tiles/16/temperate_savanna.png b/src/main/resources/tiles/16/temperate_savanna.png
index 82c7c56..6d3cbca 100644
Binary files a/src/main/resources/tiles/16/temperate_savanna.png and b/src/main/resources/tiles/16/temperate_savanna.png differ
diff --git a/src/main/resources/tiles/16/tropical_savanna.png b/src/main/resources/tiles/16/tropical_savanna.png
index 94184b8..d594da5 100644
Binary files a/src/main/resources/tiles/16/tropical_savanna.png and b/src/main/resources/tiles/16/tropical_savanna.png differ
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/4/temperate_savanna.png b/src/main/resources/tiles/4/temperate_savanna.png
index c1b7d9a..9cd740a 100644
Binary files a/src/main/resources/tiles/4/temperate_savanna.png and b/src/main/resources/tiles/4/temperate_savanna.png differ
diff --git a/src/main/resources/tiles/4/tropical_savanna.png b/src/main/resources/tiles/4/tropical_savanna.png
index c1b7d9a..1be6eff 100644
Binary files a/src/main/resources/tiles/4/tropical_savanna.png and b/src/main/resources/tiles/4/tropical_savanna.png differ
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/temperate_savanna.png b/src/main/resources/tiles/8/temperate_savanna.png
index e509acf..00a76c7 100644
Binary files a/src/main/resources/tiles/8/temperate_savanna.png and b/src/main/resources/tiles/8/temperate_savanna.png differ
diff --git a/src/main/resources/tiles/8/tropical_savanna.png b/src/main/resources/tiles/8/tropical_savanna.png
index 708e45d..a0dc991 100644
Binary files a/src/main/resources/tiles/8/tropical_savanna.png and b/src/main/resources/tiles/8/tropical_savanna.png differ