Changeset 29156 in osm for applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

Timestamp:

2013-01-03T13:37:21+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java (modified) (4 diffs)

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

@@ -41 +41 @@
                 @Override
                 public void dataChanged(DataChangedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void nodeMoved(NodeMovedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void otherDatasetChange(AbstractDatasetChangedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void primitivesAdded(PrimitivesAddedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void primitivesRemoved(PrimitivesRemovedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void relationMembersChanged(RelationMembersChangedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void tagsChanged(TagsChangedEvent e) {
-                        reMap();
+                        // reMap();
                 }
 
                 @Override
                 public void wayNodesChanged(WayNodesChangedEvent e) {
-                        reMap();
+                        // reMap();
                 }
         };
@@ -119 +119 @@
                 panelS57.setVisible(false);
                 frame.add(panelS57);
-//              System.out.println("hello");
+                // System.out.println("hello");
                 rendering = ImageryLayer.create(new ImageryInfo("OpenSeaMap"));
                 Main.main.addLayer(rendering);
@@ -144 +144 @@
                         data = newLayer.data.allPrimitives();
                         reMap();
-                } else {
+                } else {
                         data = null;
                         map = null;
@@ -155 +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());
+                        System.out.println(osm);
+                        if ((osm instanceof Node) || (osm instanceof Way)) {
+                                if (osm instanceof Node) {
+                                        map.addNode(((Node) osm).getUniqueId(), ((Node) osm).getCoor().lat(), ((Node) osm).getCoor().lon());
+                                } else {
+                                        map.addWay(((Way) osm).getUniqueId());
+                                        for (Node node : ((Way) osm).getNodes()) {
+                                                map.addToWay((node.getUniqueId()));
+                                        }
+                                }
+                                for (Entry<String, String> entry : osm.getKeys().entrySet()) {
+                                        map.addTag(entry.getKey(), entry.getValue());
+                                }
+                                map.tagsDone();
+                        } else if ((osm instanceof Relation) && ((Relation) osm).isMultipolygon()) {
+                                map.addMpoly(((Relation) osm).getUniqueId());
+                                for (RelationMember mem : ((Relation) osm).getMembers()) {
+                                        if (mem.getType() == OsmPrimitiveType.WAY)
+                                                map.addToMpoly(mem.getUniqueId(), (mem.getRole().equals("outer")));
                                 }
                         }
-                        for (Entry<String, String> entry : osm.getKeys().entrySet()) {
-                                map.addTag(entry.getKey(), entry.getValue());
-                        }
                 }
-        
         }