Changeset 33974 in osm for applications/editors/josm/plugins/indoorhelper/src/org

Timestamp:

2018-01-04T11:05:03+01:00 (7 years ago)

Author:

rebeccas95

Message:

Update indoorhelper plugin to support the Simple Indoor Tagging scheme

File:

• applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (modified) (8 diffs)

applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.autofilter.AutoFilter;
+import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -36 +44 @@
  *
  * @author egru
+ * @author rebsc
  *
  */
-public class IndoorHelperPlugin extends Plugin {
-
-
-    @SuppressWarnings("unused")
+public class IndoorHelperPlugin extends Plugin implements PaintableInvalidationListener, ActiveLayerChangeListener {
+
+
+        @SuppressWarnings("unused")
     private IndoorHelperController controller;
     String sep = System.getProperty("file.separator");
@@ -54 +63 @@
     public IndoorHelperPlugin(PluginInformation info) throws Exception {
         super(info);
-
+        MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this);
         this.exportValidator("/data/indoorhelper.validator.mapcss");
-        this.exportStyleFile("indoor.mapcss");
+        this.exportStyleFile("sit.mapcss");
         this.exportStyleFile("entrance_door_icon.png");
         this.exportStyleFile("entrance_icon.png");
-//        this.setIndoorValidator();
-    }
+        this.exportStyleFile("elevator_icon.png");
+
+        //this.setIndoorValidator();
+    }
+
 
     /**
@@ -74 +86 @@
     }
 
+
     /**
      * Exports the mapcss validator file to the preferences directory.
      */
-    private void exportValidator(String resourceName) throws Exception {
+    @SuppressWarnings("deprecation")
+        private void exportValidator(String resourceName) throws Exception {
         InputStream stream = null;
         OutputStream resStreamOut = null;
-
 
         try {
@@ -93 +106 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getDirs().getUserDataDirectory(false) + sep + "validator";
+            String valDirPath = Main.pref.getUserDataDirectory() + sep + "validator";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -129 +142 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getDirs().getUserDataDirectory(false) + sep + "styles";
+            @SuppressWarnings("deprecation")
+                        String valDirPath = Main.pref.getUserDataDirectory() + sep + "styles";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -146 +160 @@
         }
     }
+
+        @Override
+        public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+                OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        if (editLayer != null) {
+            editLayer.addInvalidationListener(this);
+        }
+        }
+
+        @Override
+        public void paintableInvalidated(PaintableInvalidationEvent event){
+                AutoFilter currentAutoFilter = AutoFilterManager.getInstance().getCurrentAutoFilter();
+                String currentFilterValue = new String();
+
+                if(currentAutoFilter != null) {
+                        currentFilterValue = currentAutoFilter.getFilter().text.split("=")[1];
+
+                        this.controller.setIndoorLevel(currentFilterValue);
+                        this.controller.getIndoorLevel(currentFilterValue);
+                        this.controller.unsetSpecificKeyFilter("repeat_on");
+
+                }else{
+                        currentFilterValue = "";
+                        this.controller.setIndoorLevel(currentFilterValue);
+                        this.controller.getIndoorLevel(currentFilterValue);
+                };
+
+        }
 
     /**
@@ -189 +231 @@
 //        }
 //    }
+
+/**
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
 }