Changeset 26290 in osm for applications/editors/josm

Timestamp:

2011-07-10T08:55:51+02:00 (13 years ago)

Author:

zverik

Message:

implemented most TODO requests, fixed some bugs

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• TODO (modified) (1 diff)
• src/relcontext/ChosenRelation.java (modified) (2 diffs)
• src/relcontext/RelContextDialog.java (modified) (2 diffs)
• src/relcontext/actions/CreateMultipolygonAction.java (modified) (4 diffs)
• src/relcontext/actions/DuplicateChosenRelationAction.java (added)

applications/editors/josm/plugins/reltoolbox/TODO

@@ -4 +4 @@
 - Solve width problem for narrows buttons when "fix" and "download" appear simultaneously
 - "Reverse multipolygon": create a closed area out of outer members, move tags, delete relation and empty ways
-- Fix tags for public_transport relations
-- âûêëþ÷àòü ïîäñâåòêó âûáðàííîãî îòíîøåíèÿ ïðè âûêëþ÷åíèè ñëîÿ ñ äàííûìè
-- èêîíêà â ïàíåëè ñëåâà íå ðàáîòàåò, à ÷åêáîêñ (åñëè íà >> íàæàòü) âêëþ÷àåò ïàíåëü ñî âòîðîãî ðàçà
-- ðåæèì äëÿ ñîçäàíèÿ ìóëüòèïîëèãîíîâ áåç òðåáîâàíèÿ ïðèñóòñòâèÿ òåãîâ íà âñåõ ëèíèÿõ,
-  êîãäà ïëîùàäíûå òýãè ñîáèðàþòñÿ ñ êóñêîâ äàæå åñëè îíè ïðèñóòñòâóþò íå íà âñåõ (íàñòðîéêà)
-- êîãäà ñîçäà¸òñÿ ìóëüòèïîëèãîí è âêëþ÷åíî "ïåðåìåñòèòü òåãè", íî òåãè òîëüêî íà îäíîé ëèíèè, òî fail
-- ïðè ñîçäàíèè ãðàíèö äîáàâëÿåòñÿ òîëüêî admin_level, íî íå boundary
-- ïóíêò â ìåíþ äëÿ äóáëèðîâàíèÿ îòíîøåíèÿ
+? èêîíêà â ïàíåëè ñëåâà íå ðàáîòàåò, à ÷åêáîêñ (åñëè íà >> íàæàòü) âêëþ÷àåò ïàíåëü ñî âòîðîãî ðàçà
+? êîãäà ñîçäà¸òñÿ ìóëüòèïîëèãîí è âêëþ÷åíî "ïåðåìåñòèòü òåãè", íî òåãè òîëüêî íà îäíîé ëèíèè, òî fail
 
 == NEW ALGORITHM ==

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -101 +101 @@
         // todo: dim chosen relation when changing layer
         // todo: check this WTF!
+        System.out.println("editLayerChanged() oldLayer=" + oldLayer + ", newLayer=" + newLayer);
         clear();
         if( newLayer != null && oldLayer == null ) {
@@ -114 +115 @@
         }
 
+        OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
+        float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float)dataLayer.getOpacity();
+        if( opacity < 0.01 )
+            return;
+
         Stroke oldStroke = g.getStroke();
         Composite oldComposite = g.getComposite();
         g.setColor(Color.yellow);
         g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
+        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity));
         for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) {
             if( element.getType() == OsmPrimitiveType.NODE ) {

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -453 +453 @@
             add(new SelectMembersAction(chosenRelation));
             add(new SelectRelationAction(chosenRelation));
+            add(new DuplicateChosenRelationAction(chosenRelation));
             add(new DeleteChosenRelationAction(chosenRelation));
             add(new DownloadParentsAction(chosenRelation));
@@ -514 +515 @@
             addMenuItem("boundaryways", tr("Add tags boundary and admin_level to boundary relation ways"));
             addMenuItem("tags", tr("Move area tags from contour to relation"));
+            addMenuItem("alltags", tr("When moving tags, consider even non-repeating ones"));
         }
 

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

@@ -44 +44 @@
         else if( property.equals("boundaryways") ) return true;
         else if( property.equals("tags") ) return true;
+        else if( property.equals("alltags") ) return false;
         else if( property.equals("single") ) return true;
         throw new IllegalArgumentException(property);
@@ -74 +75 @@
                 rel.addMember(new RelationMember("inner", w));
         List<Command> list = removeTagsFromInnerWays(rel);
+        if( !list.isEmpty() && isBoundary ) {
+            Main.main.undoRedo.add(new SequenceCommand(tr("Move tags from ways to relation"), list));
+            list = new ArrayList<Command>();
+        }
         if( isBoundary ) {
             if( !askForAdminLevelAndName(rel) )
@@ -231 +236 @@
 
         // filter out empty key conflicts - we need second iteration
+        boolean isBoundary = getPref("boundary");
+        if( isBoundary || !getPref("alltags") )
         for( RelationMember m: relation.getMembers() )
             if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
@@ -246 +253 @@
             values.remove("natural");
 
-        boolean isBoundary = getPref("boundary");
         String name = values.get("name");
-        String adminLevel = values.get("admin_level");
         if( isBoundary ) {
             Set<String> keySet = new TreeSet<String>(values.keySet());