Changeset 29153 in osm for applications/editors

Timestamp:

2013-01-01T22:48:01+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• seamap/Map.java (modified) (2 diffs)
• smed2/Smed2Action.java (modified) (3 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Map.java

@@ -38 +38 @@
 
         public class Feature {
-                public long id;
                 public Fflag flag;
                 public ArrayList<Long> refs;
@@ -50 +49 @@
                 
                 void clean() {
-                        id = 0;
                         flag = Fflag.UNKN;
                         refs = new ArrayList<Long>();

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -41 +41 @@
                 @Override
                 public void dataChanged(DataChangedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void nodeMoved(NodeMovedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void otherDatasetChange(AbstractDatasetChangedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void primitivesAdded(PrimitivesAddedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void primitivesRemoved(PrimitivesRemovedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void relationMembersChanged(RelationMembersChangedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void tagsChanged(TagsChangedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
 
                 @Override
                 public void wayNodesChanged(WayNodesChangedEvent e) {
-                        System.out.println(e);
+                        reMap();
                 }
         };
@@ -143 +143 @@
                         newLayer.data.addDataSetListener(dataSetListener);
                         data = newLayer.data.allPrimitives();
-                        map = new Map();
-                        for (OsmPrimitive osm : data) {
-                                if (osm instanceof Node) {
-                                        map.addNode(((Node)osm).getId(), ((Node)osm).getCoor().lat(), ((Node)osm).getCoor().lon());
-                                } else if (osm instanceof Way) {
-                                        map.addWay(((Way)osm).getId());
-                                }
-                                for (Entry<String, String> entry : osm.getKeys().entrySet()) {
-                                        map.addTag(entry.getKey(), entry.getValue());
-                                }
-                        }
+                        reMap();
                 } else {
                         data = null;
@@ -165 +155 @@
 
         }
+        
+        void reMap() {
+                map = new Map();
+                for (OsmPrimitive osm : data) {
+                        if (osm instanceof Node) {
+                                map.addNode(((Node)osm).getId(), ((Node)osm).getCoor().lat(), ((Node)osm).getCoor().lon());
+                        } else if (osm instanceof Way) {
+                                map.addWay(((Way)osm).getId());
+                                for (Node node : ((Way)osm).getNodes()) {
+                                        map.addToWay(((Way)osm).getUniqueId(), node.getUniqueId());
+                                }
+                        }
+                        for (Entry<String, String> entry : osm.getKeys().entrySet()) {
+                                map.addTag(entry.getKey(), entry.getValue());
+                        }
+                }
+        
+        }
 
 }