R Berliner fix for duplicate maps - thanks

SignalK · Jun 5, 2017 · 9de8fe6 · 9de8fe6
1 parent 895c166
commit 9de8fe6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/main/java/nz/co/fortytwo/signalk/server/RouteManager.java b/src/main/java/nz/co/fortytwo/signalk/server/RouteManager.java
@@ -48,6 +48,7 @@
 import java.io.File;
 import java.net.Inet4Address;
 import java.util.Arrays;
+import java.util.TreeMap;
 import java.util.UUID;
 
 import javax.jmdns.JmmDNS;
@@ -463,13 +464,18 @@ private void reloadCharts() {
 		logger.debug("Reloading charts from: "+mapDir.getAbsolutePath());
 		if(mapDir==null || !mapDir.exists() || mapDir.listFiles()==null)return;
 		UploadProcessor processor = new UploadProcessor();
+		TreeMap<String, Object> treeMap = new TreeMap<String, Object>(signalkModel.getSubMap("resources.charts"));
 		for(File chart:mapDir.listFiles()){
 			if(chart.isDirectory()){
-				logger.debug("Reloading: "+chart.getName());
-				try {
-					processor.loadChart(chart.getName());
-				} catch (Exception e) {
-					logger.warn(e.getMessage());
+				if (treeMap.containsValue(chart.getName())) {
+					  logger.info("chart "+chart.getName() + " already in model");
+				} else {
+					logger.debug("Reloading: "+chart.getName());
+					try {
+						processor.loadChart(chart.getName());
+					} catch (Exception e) {
+						logger.warn(e.getMessage());
+					}
 				}
 			}
 		}