Index: /applications/editors/josm/plugins/multipoly/build.xml
===================================================================
--- /applications/editors/josm/plugins/multipoly/build.xml (revision 19455)
+++ /applications/editors/josm/plugins/multipoly/build.xml (revision 19456)
@@ -1,76 +1,213 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building against core revision ${coreversion.info.entry.revision}.
+ Plugin-Mainversion is set to ${plugin.main.version}.
+
+
+
+
+
+ Commiting the plugin source with message '${commit.message}' ...
+
+
+
+
+
+
+
+
+
+
+ Updating plugin source ...
+
+
+
+
+
+ Updating ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+ ***** Properties of published ${plugin.jar} *****
+ Commit message : '${commit.message}'
+ Plugin-Mainversion: ${plugin.main.version}
+ JOSM build version: ${coreversion.info.entry.revision}
+ Plugin-Version : ${version.entry.commit.revision}
+ ***** / Properties of published ${plugin.jar} *****
+
+ Now commiting ${plugin.jar} ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java
===================================================================
--- /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java (revision 19455)
+++ /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java (revision 19456)
@@ -30,130 +30,152 @@
/**
* Create multipolygon from selected ways automatically.
- *
+ *
* New relation with type=multipolygon is created
- *
- * If one or more of ways is already in relation with type=multipolygon or the way is not closed,
- * then error is reported and no relation is created
- *
- * The "inner" and "outer" roles are guessed automatically.
- * First, bbox is calculated for each way. then the largest area is assumed to be outside
- * and the rest inside
- * In cases with one "outside" area and several cut-ins, the guess should be always good ...
- * In more complex (multiple outer areas) or buggy (inner and outer ways intersect) scenarios
- * the result is likely to be wrong.
+ *
+ * If one or more of ways is already in relation with type=multipolygon or the
+ * way is not closed, then error is reported and no relation is created
+ *
+ * The "inner" and "outer" roles are guessed automatically. First, bbox is
+ * calculated for each way. then the largest area is assumed to be outside and
+ * the rest inside In cases with one "outside" area and several cut-ins, the
+ * guess should be always good ... In more complex (multiple outer areas) or
+ * buggy (inner and outer ways intersect) scenarios the result is likely to be
+ * wrong.
*/
public class MultipolyAction extends JosmAction {
- public MultipolyAction() {
- super(tr("Create multipolygon"), "multipoly_create", tr("Create multipolygon."),
- Shortcut.registerShortcut("tools:multipoly", tr("Tool: {0}", tr("Create multipolygon")),
- KeyEvent.VK_M, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
- }
+ public MultipolyAction() {
+ super(tr("Create multipolygon"), "multipoly_create",
+ tr("Create multipolygon."), Shortcut.registerShortcut(
+ "tools:multipoly", tr("Tool: {0}",
+ tr("Create multipolygon")), KeyEvent.VK_M,
+ Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+ }
- /**
- * The action button has been clicked
- * @param e Action Event
- */
- public void actionPerformed(ActionEvent e) {
+ /**
+ * The action button has been clicked
+ *
+ * @param e
+ * Action Event
+ */
+ public void actionPerformed(ActionEvent e) {
- // Get all ways in some type=multipolygon relation
- HashSet relationsInMulti = new HashSet();
- for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
- if (!r.isUsable()) continue;
- if (r.get("type")!="multipolygon") continue;
- for (RelationMember rm : r.getMembers()) {
- OsmPrimitive m=rm.getMember();
- if (m instanceof Way) {
- relationsInMulti.add(m);
- }
- }
- }
+ // Get all ways in some type=multipolygon relation
+ HashSet relationsInMulti = new HashSet();
+ for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
+ if (!r.isUsable())
+ continue;
+ if (r.get("type") != "multipolygon")
+ continue;
+ for (RelationMember rm : r.getMembers()) {
+ OsmPrimitive m = rm.getMember();
+ if (m instanceof Way) {
+ relationsInMulti.add(m);
+ }
+ }
+ }
- //List of selected ways
- List selectedWays = new ArrayList();
- //Area of largest way (in square degrees)
- double maxarea=0;
- //Which way is the largest one (outer)
- Way maxWay=null;
+ // List of selected ways
+ List selectedWays = new ArrayList();
+ // Area of largest way (in square degrees)
+ double maxarea = 0;
+ // Which way is the largest one (outer)
+ Way maxWay = null;
- // For every selected way
- for (OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
- if (osm instanceof Way) {
- Way way = (Way)osm;
- //Check if way is already in another multipolygon
- if (relationsInMulti.contains(osm)) {
- JOptionPane.showMessageDialog(Main.parent,tr("One of the selected ways is already part of another multipolygon."));
- return;
- }
- EastNorth first=null,last=null;
- //Boundingbox of way
- double minx=9999,miny=9999,maxx=-9999,maxy=-9999;
- for (Pair seg : way.getNodePairs(false)) {
- if (first==null) first=seg.a.getEastNorth();
- last=seg.b.getEastNorth();
- double x=seg.a.getEastNorth().east();
- double y=seg.a.getEastNorth().north();
- if (xmaxx) maxx=x;
- if (y>maxy) maxy=y;
- }
- //Check if first and last node are the same
- if (!first.equals(last)) {
- JOptionPane.showMessageDialog(Main.parent,tr("Multipolygon must consist only of closed ways."));
- return;
- }
- //Determine area
- double area=(maxx-minx)*(maxy-miny);
- selectedWays.add(way);
- if (area>maxarea) {
- maxarea=area;
- maxWay=way;
- }
- }
- }
+ // For every selected way
+ for (OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
+ if (osm instanceof Way) {
+ Way way = (Way) osm;
+ // Check if way is already in another multipolygon
+ if (relationsInMulti.contains(osm)) {
+ JOptionPane
+ .showMessageDialog(
+ Main.parent,
+ tr("One of the selected ways is already part of another multipolygon."));
+ return;
+ }
+ EastNorth first = null, last = null;
+ // Boundingbox of way
+ double minx = 9999, miny = 9999, maxx = -9999, maxy = -9999;
+ for (Pair seg : way.getNodePairs(false)) {
+ if (first == null)
+ first = seg.a.getEastNorth();
+ last = seg.b.getEastNorth();
+ double x = seg.a.getEastNorth().east();
+ double y = seg.a.getEastNorth().north();
+ if (x < minx)
+ minx = x;
+ if (y < miny)
+ miny = y;
+ if (x > maxx)
+ maxx = x;
+ if (y > maxy)
+ maxy = y;
+ }
+ // Check if first and last node are the same
+ if (!first.equals(last)) {
+ JOptionPane
+ .showMessageDialog(
+ Main.parent,
+ tr("Multipolygon must consist only of closed ways."));
+ return;
+ }
+ // Determine area
+ double area = (maxx - minx) * (maxy - miny);
+ selectedWays.add(way);
+ if (area > maxarea) {
+ maxarea = area;
+ maxWay = way;
+ }
+ }
+ }
- if (Main.map == null) {
- JOptionPane.showMessageDialog(Main.parent, tr("No data loaded."));
- return;
- }
+ if (Main.map == null) {
+ JOptionPane.showMessageDialog(Main.parent, tr("No data loaded."));
+ return;
+ }
- if (selectedWays.size()<2) {
- JOptionPane.showMessageDialog(Main.parent, tr("You must select at least two ways."));
- return;
- }
+ if (selectedWays.size() < 2) {
+ JOptionPane.showMessageDialog(Main.parent,
+ tr("You must select at least two ways."));
+ return;
+ }
- Collection cmds = new LinkedList();
- //Create new relation
- Relation rel=new Relation();
- rel.put("type","multipolygon");
- //Add ways to it
- for (int i=0;i cmds = new LinkedList();
+ // Create new relation
+ Relation rel = new Relation();
+ rel.put("type", "multipolygon");
+ // Add ways to it
+ for (int i = 0; i < selectedWays.size(); i++) {
+ Way s = selectedWays.get(i);
+ String xrole = "inner";
+ if (s == maxWay)
+ xrole = "outer";
+ RelationMember rm = new RelationMember(xrole, s);
+ rel.addMember(rm);
+ }
+ // Add relation
+ cmds.add(new AddCommand(rel));
+ // Commit
+ Main.main.undoRedo.add(new SequenceCommand(tr("Create multipolygon"),
+ cmds));
+ Main.map.repaint();
+ }
- /** Enable this action only if something is selected */
- @Override protected void updateEnabledState() {
- if (getCurrentDataSet()==null) {
- setEnabled(false);
- } else {
- updateEnabledState(getCurrentDataSet().getSelected());
- }
- }
+ /** Enable this action only if something is selected */
+ @Override
+ protected void updateEnabledState() {
+ if (getCurrentDataSet() == null) {
+ setEnabled(false);
+ } else {
+ updateEnabledState(getCurrentDataSet().getSelected());
+ }
+ }
- /** Enable this action only if something is selected */
- @Override protected void updateEnabledState(Collection selection) {
- setEnabled(selection != null && !selection.isEmpty());
- }
-
+ /** Enable this action only if something is selected */
+ @Override
+ protected void updateEnabledState(
+ Collection selection) {
+ setEnabled(selection != null && !selection.isEmpty());
+ }
}
Index: /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyPlugin.java
===================================================================
--- /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyPlugin.java (revision 19455)
+++ /applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyPlugin.java (revision 19456)
@@ -8,4 +8,5 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
/**
@@ -14,27 +15,26 @@
public class MultipolyPlugin extends Plugin {
- protected String name;
+ protected String name;
- public MultipolyPlugin() {
- name = tr("Create multipolygon");
- JMenu toolsMenu = null;
- for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
- JMenu menu = Main.main.menu.getMenu(i);
- String name = menu.getText();
- if (name != null && name.equals(tr("Tools"))) {
- toolsMenu = menu;
- }
- }
+ public MultipolyPlugin(PluginInformation info) {
+ super(info);
+ name = tr("Create multipolygon");
+ JMenu toolsMenu = null;
+ for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
+ JMenu menu = Main.main.menu.getMenu(i);
+ String name = menu.getText();
+ if (name != null && name.equals(tr("Tools"))) {
+ toolsMenu = menu;
+ }
+ }
- if (toolsMenu == null) {
- toolsMenu = new JMenu(name);
- toolsMenu.add(new JMenuItem(new MultipolyAction()));
- Main.main.menu.add(toolsMenu, 2);
- } else {
- toolsMenu.addSeparator();
- toolsMenu.add(new JMenuItem(new MultipolyAction()));
- }
-
- }
-
+ if (toolsMenu == null) {
+ toolsMenu = new JMenu(name);
+ toolsMenu.add(new JMenuItem(new MultipolyAction()));
+ Main.main.menu.add(toolsMenu, 2);
+ } else {
+ toolsMenu.addSeparator();
+ toolsMenu.add(new JMenuItem(new MultipolyAction()));
+ }
+ }
}