Changeset 31156 in osm for applications/editors/josm/plugins

Timestamp:

2015-05-28T21:06:56+02:00 (9 years ago)

Author:

malcolmh

Message:

clip to map bounds

Location:

applications/editors/josm/plugins/seachartedit/src

Files:

• panels/PanelS57.java (modified) (1 diff)
• panels/ShowFrame.java (modified) (1 diff)
• scedit/SCeditAction.java (modified) (3 diffs)

applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java

@@ -65 +65 @@
                         tin.close();
                 }
-                map = new S57map();
+                map = new S57map(true);
                 MapBounds bounds = S57dec.decodeFile(in, map);
 

applications/editors/josm/plugins/seachartedit/src/panels/ShowFrame.java

@@ -41 +41 @@
                         id = osm.getUniqueId();
                         feature = map.index.get(id);
-                        showMap = new S57map();
+                        showMap = new S57map(true);
                         showMap.nodes = map.nodes;
                         showMap.edges = map.edges;

applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.layer.*;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.*;
 import org.openstreetmap.josm.data.osm.event.*;
@@ -198 +200 @@
 
         void makeMap() {
-                map = new S57map();
+                map = new S57map(true);
                 if (data != null) {
+                        double minlat = 90;
+                        double maxlat = -90;
+                        double minlon = 180;
+                        double maxlon = -180;
+                        for (Bounds bounds : data.getDataSourceBounds()) {
+                                if (bounds.getMinLat() < minlat) {
+                                        minlat = bounds.getMinLat();
+                                }
+                                if (bounds.getMaxLat() > maxlat) {
+                                        maxlat = bounds.getMaxLat();
+                                }
+                                if (bounds.getMinLon() < minlon) {
+                                        minlon = bounds.getMinLon();
+                                }
+                                if (bounds.getMaxLon() > maxlon) {
+                                        maxlon = bounds.getMaxLon();
+                                }
+                        }
+                        map.addNode(1, maxlat, minlon);
+                        map.addNode(2, minlat, minlon);
+                        map.addNode(3, minlat, maxlon);
+                        map.addNode(4, maxlat, maxlon);
+                        map.bounds.minlat = Math.toRadians(minlat);
+                        map.bounds.maxlat = Math.toRadians(maxlat);
+                        map.bounds.minlon = Math.toRadians(minlon);
+                        map.bounds.maxlon = Math.toRadians(maxlon);
                         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());
+                                LatLon coor = node.getCoor();
+                                if (coor != null) {
+                                        map.addNode(node.getUniqueId(), coor.lat(), coor.lon());
+                                        for (Entry<String, String> entry : node.getKeys().entrySet()) {
+                                                map.addTag(entry.getKey(), entry.getValue());
+                                        }
+                                        map.tagsDone(node.getUniqueId());
+                                }
                         }
                         for (Way way : data.getWays()) {
@@ -232 +263 @@
                                 }
                         }
+                        map.mapDone();
                 }
         }