package opticnav.ardd.instance;

import java.io.Closeable;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

import opticnav.ardd.protocol.GeoCoordFine;

/**
 * The Instance class represents an _active_ instance (the amalgamation of a map and its static/dynamic markers)
 *
 */
public class Instance implements AutoCloseable {
    private final InstanceInfo info;
    /** Map of entities by ARD id */
    private final Map<Integer, Entity> entities;
    private int nextMarkerID;
    
    public Instance(InstanceInfo info) {
        this.info = info;
        this.entities = new HashMap<>();
        this.nextMarkerID = 0;
    }
    
    @Override
    public void close() throws IOException {
        this.info.mapImage.delete();
    }
    
    public InstanceInfo getInfo() {
        return this.info;
    }
    
    public synchronized Entity createEntity(final int ardID, GeoCoordFine geoCoord, EntitySubscriber subscriber) {
        final int markerID = nextMarkerID++;
        final Entity entity;
        entity = new Entity(markerID, subscriber, new Closeable() {
            @Override
            public void close() throws IOException {
                removeEntity(ardID);
            }
        });
        
        // Add all existing entries as subscribers to the new entry
        // Additionally, add the new subscriber to all existing entries
        for (Entity e: this.entities.values()) {
            final String name = info.getARD(ardID).getName();
            
            entity.addSubscriber(e.getEntitySubscriber());
            e.addSubscriber(subscriber);
            e.getEntitySubscriber().newMarker(markerID, name, geoCoord);
        }
        this.entities.put(ardID, entity);
        return entity;
    }
    
    public synchronized void removeEntity(int ardID) {
        final Entity entity = this.entities.remove(ardID);
        
        for (Entity e: this.entities.values()) {
            e.removeSubscriber(entity.getEntitySubscriber());
        }
    }
}

@@ -706,32 +706,78 @@
 s IOException %7B%0A
+        if (this.info.mapImage != null) %7B%0A    
         this.inf
@@ -793,24 +793,34 @@
 e.delete();%0A
+        %7D%0A
     %7D%0A    %0A 

Fix bug with closing instance if there's no map image