From 4c50bd502c1b1b699fdf4b53bf89af673f1908a9 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 9 Sep 2011 00:59:56 +0800
Subject: [PATCH 1/4] Fix typo in setMarkerSetLabel() API

---
 src/main/java/org/dynmap/markers/MarkerSet.java          | 2 +-
 src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/dynmap/markers/MarkerSet.java b/src/main/java/org/dynmap/markers/MarkerSet.java
index f1ac9619..9cdca429 100644
--- a/src/main/java/org/dynmap/markers/MarkerSet.java
+++ b/src/main/java/org/dynmap/markers/MarkerSet.java
@@ -55,7 +55,7 @@ public interface MarkerSet {
      * Update label for marker set
      * @param lbl - label for marker set
      */
-    public void setMarketSetLabel(String lbl);
+    public void setMarkerSetLabel(String lbl);
     /**
      * Test if marker set is persistent
      * @return true if the set is persistent
diff --git a/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java b/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
index 3d732b67..e81245c0 100644
--- a/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
+++ b/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
@@ -112,7 +112,7 @@ class MarkerSetImpl implements MarkerSet {
     }
 
     @Override
-    public void setMarketSetLabel(String lbl) {
+    public void setMarkerSetLabel(String lbl) {
         label = lbl;
         MarkerAPIImpl.markerSetUpdated(this, MarkerUpdate.UPDATED);
         if(ispersistent)

From 6d2193d597588cb336363290bb080a83166b9ff7 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Fri, 9 Sep 2011 11:02:32 +0800
Subject: [PATCH 2/4] Add hide-by-default attribute to marker sets, /dmarker
 updateset

---
 .../java/org/dynmap/markers/MarkerSet.java    | 10 ++++
 .../dynmap/markers/impl/MarkerAPIImpl.java    | 55 +++++++++++++++++--
 .../dynmap/markers/impl/MarkerSetImpl.java    | 17 +++++-
 src/main/resources/configuration.txt          |  2 -
 src/main/resources/plugin.yml                 |  4 ++
 web/js/markers.js                             |  5 +-
 6 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/dynmap/markers/MarkerSet.java b/src/main/java/org/dynmap/markers/MarkerSet.java
index 9cdca429..5409517b 100644
--- a/src/main/java/org/dynmap/markers/MarkerSet.java
+++ b/src/main/java/org/dynmap/markers/MarkerSet.java
@@ -86,4 +86,14 @@ public interface MarkerSet {
      * Delete marker set
      */
     public void deleteMarkerSet();
+    /**
+     * Set hide/show default
+     * @param hide - if true, layer for set will be hidden by default
+     */
+    public void setHideByDefault(boolean hide);
+    /**
+     * Get hide/show default
+     * @return true if layer for set will be hidden by default
+     */
+    public boolean getHideByDefault();
 }
diff --git a/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java b/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
index 80266849..14f263a1 100644
--- a/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
+++ b/src/main/java/org/dynmap/markers/impl/MarkerAPIImpl.java
@@ -123,9 +123,11 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
         /* Load persistence */
         api.loadMarkers();
         /* Initialize default marker set, if needed */
-        if(api.getMarkerSet(MarkerSet.DEFAULT) == null) {
-            api.createMarkerSet(MarkerSet.DEFAULT, "Markers", null, true);
+        MarkerSet set = api.getMarkerSet(MarkerSet.DEFAULT);
+        if(set == null) {
+            set = api.createMarkerSet(MarkerSet.DEFAULT, "Markers", null, true);
         }
+        
         /* Build paths for markers */
         api.markerdir = new File(plugin.getDataFolder(), "markers");
         if(api.markerdir.isDirectory() == false) {
@@ -404,7 +406,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
     }
 
     private static final Set<String> commands = new HashSet<String>(Arrays.asList(new String[] {
-        "add", "movehere", "update", "delete", "list", "icons", "addset", "deleteset", "listsets", "addicon"
+        "add", "movehere", "update", "delete", "list", "icons", "addset", "updateset", "deleteset", "listsets", "addicon"
     }));
 
     /* Parse argument strings : handle 'attrib:value' and quoted strings */
@@ -708,6 +710,9 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
                     sender.sendMessage("Error creating marker set");
                 }
                 else {
+                    String h = parms.get("hide");
+                    if((h != null) && (h.equals("true")))
+                        set.setHideByDefault(true);
                     sender.sendMessage("Added marker set id:'" + set.getMarkerSetID() + "' (" + set.getMarkerSetLabel() + ")");
                 }
             }
@@ -715,6 +720,47 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
                 sender.sendMessage("<label> or id:<set-id> required");
             }
         }
+        else if(c.equals("updateset") && plugin.checkPlayerPermission(sender, "marker.updateset")) {
+            if(args.length > 1) {
+                /* Parse arguements */
+                Map<String,String> parms = parseArgs(args, sender);
+                if(parms == null) return true;
+                if((parms.get("id") == null) && (parms.get("label") == null)) {
+                    sender.sendMessage("<label> or id:<marker-id> required");
+                    return true;
+                }
+                MarkerSet set = null;
+                if(parms.get("id") != null) {
+                    set = api.getMarkerSet(parms.get("id"));
+                    if(set == null) {
+                        sender.sendMessage("Error: set does not exist - id:" + set.getMarkerSetID());
+                        return true;
+                    }
+                }
+                else {
+                    Set<MarkerSet> sets = api.getMarkerSets();
+                    for(MarkerSet s : sets) {
+                        if(s.getMarkerSetLabel().equals(parms.get("label"))) {
+                            set = s;
+                            break;
+                        }
+                    }
+                    if(set == null) {
+                        sender.sendMessage("Error: matching set not found");
+                        return true;                        
+                    }
+                }
+                if(parms.get("newLabel") != null) {
+                    set.setMarkerSetLabel(parms.get("netlabel"));
+                }
+                if(parms.get("hide") != null) {
+                    set.setHideByDefault(parms.get("hide").equals("true"));
+                }
+            }
+            else {
+                sender.sendMessage("<label> or id:<set-id> required");
+            }
+        }
         else if(c.equals("deleteset") && plugin.checkPlayerPermission(sender, "marker.deleteset")) {
             if(args.length > 1) {
                 /* Parse arguements */
@@ -757,7 +803,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
         else if(c.equals("listsets") && plugin.checkPlayerPermission(sender, "marker.listsets")) {
             Set<MarkerSet> sets = api.getMarkerSets();
             for(MarkerSet set : sets) {
-                sender.sendMessage(set.getMarkerSetID() + ": label:\"" + set.getMarkerSetLabel() + "\"");
+                sender.sendMessage(set.getMarkerSetID() + ": label:\"" + set.getMarkerSetLabel() + "\", hide=" + set.getHideByDefault());
             }
         }
         /* Add new icon */
@@ -826,6 +872,7 @@ public class MarkerAPIImpl implements MarkerAPI, Event.Listener<DynmapWorld> {
         for(MarkerSet ms : markersets.values()) {
             HashMap<String, Object> msdata = new HashMap<String, Object>();
             msdata.put("label", ms.getMarkerSetLabel());
+            msdata.put("hide", ms.getHideByDefault());
             HashMap<String, Object> markers = new HashMap<String, Object>();
             for(Marker m : ms.getMarkers()) {
                 if(m.getWorld().equals(wname) == false) continue;
diff --git a/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java b/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
index e81245c0..6ea17efd 100644
--- a/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
+++ b/src/main/java/org/dynmap/markers/impl/MarkerSetImpl.java
@@ -20,7 +20,7 @@ class MarkerSetImpl implements MarkerSet {
     private String setid;
     private String label;
     private HashMap<String, MarkerIconImpl> allowedicons = null;
-    
+    private boolean hide_by_def;
     private boolean ispersistent;
     
     MarkerSetImpl(String id) {
@@ -204,6 +204,7 @@ class MarkerSetImpl implements MarkerSet {
             setnode.put("allowedicons", allowed);
         }
         setnode.put("markers", node);
+        setnode.put("hide", hide_by_def);
         return setnode;
     }
 
@@ -236,8 +237,22 @@ class MarkerSetImpl implements MarkerSet {
                     Log.info("Error loading allowed icon '" + id + "' for set '" + setid + "'");
             }
         }
+        hide_by_def = node.getBoolean("hide", false);
         ispersistent = true;
         
         return true;
     }
+    @Override
+    public void setHideByDefault(boolean hide) {
+        if(hide_by_def != hide) {
+            hide_by_def = hide;
+            MarkerAPIImpl.markerSetUpdated(this, MarkerUpdate.UPDATED);
+            if(ispersistent)
+                MarkerAPIImpl.saveMarkers();
+        }
+    }
+    @Override
+    public boolean getHideByDefault() {
+        return hide_by_def;
+    }
 }
diff --git a/src/main/resources/configuration.txt b/src/main/resources/configuration.txt
index 998475c2..1a80ffb7 100644
--- a/src/main/resources/configuration.txt
+++ b/src/main/resources/configuration.txt
@@ -47,8 +47,6 @@ components:
     #showlabel: true
     # If set, enables support for using signs for markers
     #enablesigns: true
-    # If set, make markers layer hidden by default
-    #hidebydefault: true
     # If set, show spawn points on each world
     showspawn: true
     # Marker used for spawn point
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index b81dc7b8..8a45511e 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -66,6 +66,7 @@ permissions:
       dynmap.marker.icons: true
       dynmap.marker.sign: true
       dynmap.marker.addset: true
+      dynmap.marker.updateset: true
       dynmap.marker.deleteset: true
       dynmap.marker.listsets: true
       dynmap.marker.addicon: true
@@ -126,6 +127,9 @@ permissions:
   dynmap.marker.addset:
     description: Allows /dmarker addset
     default: op
+  dynmap.marker.updateset:
+    description: Allows /dmarker updateset
+    default: op
   dynmap.marker.deleteset:
     description: Allows /dmarker deleteset
     default: op
diff --git a/web/js/markers.js b/web/js/markers.js
index cff32d74..2fa8a70f 100644
--- a/web/js/markers.js
+++ b/web/js/markers.js
@@ -20,7 +20,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 			$.each(data.sets, function(name, markerset) {
 				var ms = dynmapmarkersets[name];
 				if(!ms) {
-					ms = { label: markerset.label, markers: {} } ;
+					ms = { label: markerset.label, hide: markerset.hide, markers: {} } ;
 					createMarkerSet(ms, ts);
 				}
 				else {
@@ -30,6 +30,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 						dynmap.layercontrol.addOverlay(ms.layergroup, ms.label);
 					}
 					ms.markers = {};
+					ms.hide = markerset.hide;
 					ms.timestamp = ts;
 				}
 				dynmapmarkersets[name] = ms;
@@ -70,7 +71,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
 	function createMarkerSet(set, ts) {
 		set.layergroup = new L.LayerGroup();
 		set.timestamp = ts;
-		if(!configuration.hidebydefault)
+		if(!set.hide)
 			dynmap.map.addLayer(set.layergroup);
 		dynmap.layercontrol.addOverlay(set.layergroup, set.label);
 	}

From 03f62bd8f6c0279a39f30ce03a44ddb41bd46496 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Fri, 9 Sep 2011 20:35:22 +0200
Subject: [PATCH 3/4] Made the different version numbers refer to version in
 pom.xml.

---
 pom.xml                             | 18 ++++++++++++++++++
 src/main/assembly/package.xml       | 19 ++++++++++++++++---
 src/main/resources/lightings.txt    |  2 +-
 src/main/resources/perspectives.txt |  2 +-
 src/main/resources/plugin.yml       |  4 ++--
 web/index.html                      |  1 +
 web/js/map.js                       |  1 -
 web/version.js                      |  1 +
 8 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 web/version.js

diff --git a/pom.xml b/pom.xml
index b7ce19e0..dbdbf371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,24 @@
   	<url>https://github.com/FrozenCow/dynmap/issues</url>
   </issueManagement>
   <build>
+	  <resources>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>true</filtering>
+		  <includes>
+			<include>*.yml</include>
+			<include>*.txt</include>
+		  </includes>
+		</resource>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>false</filtering>
+		  <excludes>
+			<exclude>*.yml</exclude>
+			<exclude>*.txt</exclude>
+		  </excludes>
+		</resource>
+	  </resources>
       <plugins>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
index b11688c4..ad84a28f 100644
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -15,9 +15,20 @@
         <include>CHANGELOG*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/web/</directory>
+      <outputDirectory>/dynmap/web/</outputDirectory>
+	  <includes>
+		<include>version.js</include>
+	  </includes>
+      <filtered>true</filtered>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/web</directory>
       <outputDirectory>/dynmap/web</outputDirectory>
+	  <excludes>
+		<exclude>version.js</exclude>
+	  </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/colorschemes</directory>
@@ -32,7 +43,9 @@
   </fileSets>
   <files>
   	<file>
-  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
-  		<outputDirectory>/</outputDirectory>
-  		<destName>dynmap.jar</destName></file></files>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <outputDirectory>/</outputDirectory>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
 </assembly>
diff --git a/src/main/resources/lightings.txt b/src/main/resources/lightings.txt
index a5f6c97e..935cd856 100644
--- a/src/main/resources/lightings.txt
+++ b/src/main/resources/lightings.txt
@@ -1,4 +1,4 @@
-version: 0.22
+version: ${project.version}
 #
 # This file contains default standard lighting profiles.  The contents of this file CAN need to be replaced and updated
 # during upgrades, so new or updated lighting definitions should be done in the custom-lightings.txt file
diff --git a/src/main/resources/perspectives.txt b/src/main/resources/perspectives.txt
index 0fc3ca84..47407b31 100644
--- a/src/main/resources/perspectives.txt
+++ b/src/main/resources/perspectives.txt
@@ -1,4 +1,4 @@
-version: 0.22
+version: ${project.version}
 #
 # This file contains default standard perspective definitions.  The contents of this file CAN need to be replaced and updated
 # during upgrades, so new or updated perspective definitions should be done in the custom-perspectives.txt file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 8a45511e..04ef011e 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: dynmap
 main: org.dynmap.DynmapPlugin
-version: "0.22"
+version: "${project.version}"
 authors: [FrozenCow, mikeprimm, zeeZ]
 softdepend: [Permissions]
 commands:
@@ -139,4 +139,4 @@ permissions:
   dynmap.marker.addicon:
     description: Allows /dmarker addicon
     default: op
-            
\ No newline at end of file
+            
diff --git a/web/index.html b/web/index.html
index ba399cf9..d7e54ae0 100644
--- a/web/index.html
+++ b/web/index.html
@@ -27,6 +27,7 @@
 	<link rel="stylesheet" type="text/css" href="css/dynmap_style.css" media="screen" />
 	<!-- <link rel="stylesheet" type="text/css" href="css/override.css" media="screen" /> -->
 
+	<script type="text/javascript" src="version.js"></script>
 	<script type="text/javascript" src="js/jquery.json.js"></script>
 	<script type="text/javascript" src="js/jquery.mousewheel.js"></script>
 	<script type="text/javascript" src="js/minecraft.js"></script>
diff --git a/web/js/map.js b/web/js/map.js
index 9d1250cd..1fb8378f 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -1,7 +1,6 @@
 "use strict";
 //if (!console) console = { log: function() {} }; 
 
-var dynmapversion = "0.22";	// This needs to match plugin verison
 var componentconstructors = {};
 var maptypes = {};
 var map = null;	// Leaflet assumes top-level 'map'...
diff --git a/web/version.js b/web/version.js
new file mode 100644
index 00000000..463dc200
--- /dev/null
+++ b/web/version.js
@@ -0,0 +1 @@
+var dynmapversion = "${project.version}";
\ No newline at end of file

From 9570f03ec6ab1d0e1b7f0bb8b6b081e0943f20e7 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Fri, 9 Sep 2011 21:02:40 +0200
Subject: [PATCH 4/4] Changed version to 0.23.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dbdbf371..64e71e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.dynmap</groupId>
   <artifactId>dynmap</artifactId>
-  <version>0.22</version>
+  <version>0.23</version>
   <name>dynmap</name>
     <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>