Changeset 29272 in osm

Timestamp:

2013-02-21T21:01:44+01:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• seamap/SeaMap.java (modified) (8 diffs)
• smed2/Smed2Action.java (modified) (4 diffs)

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

@@ -201 +201 @@
 
                 public boolean hasNext() {
-                        return (edge != null) && ((it == null) || (forward && it.hasNext()) || (!forward && it.hasPrevious()));
+                        return (edge != null) && ((it == null) || (edge.nodes.isEmpty()) || (forward && it.hasNext()) || (!forward && it.hasPrevious()));
                 }
 
@@ -371 +371 @@
 
         public void tagsDone(long id) {
-                if ((feature.type != Obj.UNKOBJ) && !((edge != null) && (edge.last == 0))) {
-                        index.put(id, feature);
-                        if (features.get(feature.type) == null) {
-                                features.put(feature.type, new ArrayList<Feature>());
-                        }
-                        features.get(feature.type).add(feature);
-                }
                 switch (feature.flag) {
                 case POINT:
@@ -432 +425 @@
                         break;
                 }
-                feature.centre = findCentroid(feature);
+                if ((feature.type != Obj.UNKOBJ) && !((edge != null) && (edge.last == 0))) {
+                        index.put(id, feature);
+                        if (features.get(feature.type) == null) {
+                                features.put(feature.type, new ArrayList<Feature>());
+                        }
+                        feature.centre = findCentroid(feature);
+                        features.get(feature.type).add(feature);
+                }
         }
 
@@ -461 +461 @@
 
         public Snode findCentroid(Feature feature) {
-                double lat, lon, slat, slon, sarc, llat, llon;
-                lat = lon = slat = slon = sarc = llat = llon = 0;
+                double lat, lon, slat, slon, llat, llon;
+                llat = llon = lat = lon = slat = slon = 0;
+                double sarc = 0;
+                boolean first = true;
                 switch (feature.flag) {
                 case POINT:
@@ -473 +475 @@
                                 lat = node.lat;
                                 lon = node.lon;
-                                sarc += (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                                if (first) {
+                                        first = false;
+                                } else {
+                                        sarc += (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                                }
                                 llat = lat;
                                 llon = lon;
@@ -479 +485 @@
                         double harc = sarc / 2;
                         sarc = 0;
+                        first = true;
                         eit = new EdgeIterator(edge, true);
                         while (eit.hasNext()) {
@@ -484 +491 @@
                                 lat = node.lat;
                                 lon = node.lon;
-                                sarc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
-                                if (sarc > harc)
-                                        break;
+                                if (first) {
+                                        first = false;
+                                } else {
+                                        sarc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                                        if (sarc > harc)
+                                                break;
+                                }
                                 harc -= sarc;
                                 llat = lat;
@@ -497 +508 @@
                         BoundIterator bit = new BoundIterator(bound);
                         while (bit.hasNext()) {
-                                llon = lon;
-                                llat = lat;
                                 Snode node = bit.next();
                                 lat = node.lat;
                                 lon = node.lon;
-                                double arc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
-                                slat += (lat * arc);
-                                slon += (lon * arc);
-                                sarc += arc;
+                                if (first) {
+                                        first = false;
+                                } else {
+                                        double arc = (Math.acos(Math.cos(lon - llon) * Math.cos(lat - llat)));
+                                        slat += (lat * arc);
+                                        slon += (lon * arc);
+                                        sarc += arc;
+                                }
+                                llon = lon;
+                                llat = lat;
                         }
                         return new Snode((sarc > 0.0 ? slat / sarc : 0.0), (sarc > 0.0 ? slon / sarc : 0.0));

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

@@ -35 +35 @@
         public MapImage rendering;
         public SeaMap map = null;
-        public Collection<OsmPrimitive> data = null;
+        public DataSet data = null;
 
         private final DataSetListener dataSetListener = new DataSetListener() {
@@ -46 +46 @@
                 @Override
                 public void nodeMoved(NodeMovedEvent e) {
-                        if (map != null) {
-                                makeMap();
-                        }
+                        System.out.println("NodeMovedEvent");
                 }
 
@@ -154 +152 @@
                 if (newLayer != null) {
                         newLayer.data.addDataSetListener(dataSetListener);
-                        data = newLayer.data.allPrimitives();
+                        data = newLayer.data;
                         makeMap();
                         if (rendering != null) rendering.zoomChanged();
@@ -205 +203 @@
                 map = new SeaMap();
                 if (data != null) {
-                        for (OsmPrimitive osm : data) {
-                                if (osm instanceof Node) {
-                                        map.addNode(((Node) osm).getUniqueId(), ((Node) osm).getCoor().lat(), ((Node) osm).getCoor().lon());
-                                } else if (osm instanceof Way) {
-                                        map.addEdge(((Way) osm).getUniqueId());
-                                        for (Node node : ((Way) osm).getNodes()) {
-                                                map.addToEdge((node.getUniqueId()));
-                                        }
-                                } else if ((osm instanceof Relation) && ((Relation) osm).isMultipolygon()) {
-                                        map.addArea(((Relation) osm).getUniqueId());
-                                        for (RelationMember mem : ((Relation) osm).getMembers()) {
+                        for (Node node : data.getNodes()) {
+                                map.addNode(node.getUniqueId(), node.getCoor().lat(), node.getCoor().lon());
+                                for (Entry<String, String> entry : node.getKeys().entrySet()) {
+                                        map.addTag(entry.getKey(), entry.getValue());
+                                }
+                                map.tagsDone(node.getUniqueId());
+                        }
+                        for (Way way : data.getWays()) {
+                                map.addEdge(way.getUniqueId());
+                                for (Node node : way.getNodes()) {
+                                        map.addToEdge((node.getUniqueId()));
+                                }
+                                for (Entry<String, String> entry : way.getKeys().entrySet()) {
+                                        map.addTag(entry.getKey(), entry.getValue());
+                                }
+                                map.tagsDone(way.getUniqueId());
+                        }
+                        for (Relation rel : data.getRelations()) {
+                                if (rel.isMultipolygon()) {
+                                        map.addArea(rel.getUniqueId());
+                                        for (RelationMember mem : rel.getMembers()) {
                                                 if (mem.getType() == OsmPrimitiveType.WAY)
                                                         map.addToArea(mem.getUniqueId(), (mem.getRole().equals("outer")));
                                         }
                                 }
-                                for (Entry<String, String> entry : osm.getKeys().entrySet()) {
+                                for (Entry<String, String> entry : rel.getKeys().entrySet()) {
                                         map.addTag(entry.getKey(), entry.getValue());
                                 }
-                                map.tagsDone(osm.getUniqueId());
+                                map.tagsDone(rel.getUniqueId());
                         }
                 }