Changeset 26290 in osm for applications/editors/josm
- Timestamp:
- 2011-07-10T08:55:51+02:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/reltoolbox
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reltoolbox/TODO
r26285 r26290 4 4 - Solve width problem for narrows buttons when "fix" and "download" appear simultaneously 5 5 - "Reverse multipolygon": create a closed area out of outer members, move tags, delete relation and empty ways 6 - Fix tags for public_transport relations 7 - âûêëþ÷àòü ïîäñâåòêó âûáðàííîãî îòíîøåíèÿ ïðè âûêëþ÷åíèè ñëîÿ ñ äàííûìè 8 - èêîíêà â ïàíåëè ñëåâà íå ðàáîòàåò, à ÷åêáîêñ (åñëè íà >> íàæàòü) âêëþ÷àåò ïàíåëü ñî âòîðîãî ðàçà 9 - ðåæèì äëÿ ñîçäàíèÿ ìóëüòèïîëèãîíîâ áåç òðåáîâàíèÿ ïðèñóòñòâèÿ òåãîâ íà âñåõ ëèíèÿõ, 10 êîãäà ïëîùàäíûå òýãè ñîáèðàþòñÿ ñ êóñêîâ äàæå åñëè îíè ïðèñóòñòâóþò íå íà âñåõ (íàñòðîéêà) 11 - êîãäà ñîçäà¸òñÿ ìóëüòèïîëèãîí è âêëþ÷åíî "ïåðåìåñòèòü òåãè", íî òåãè òîëüêî íà îäíîé ëèíèè, òî fail 12 - ïðè ñîçäàíèè ãðàíèö äîáàâëÿåòñÿ òîëüêî admin_level, íî íå boundary 13 - ïóíêò â ìåíþ äëÿ äóáëèðîâàíèÿ îòíîøåíèÿ 6 ? èêîíêà â ïàíåëè ñëåâà íå ðàáîòàåò, à ÷åêáîêñ (åñëè íà >> íàæàòü) âêëþ÷àåò ïàíåëü ñî âòîðîãî ðàçà 7 ? êîãäà ñîçäà¸òñÿ ìóëüòèïîëèãîí è âêëþ÷åíî "ïåðåìåñòèòü òåãè", íî òåãè òîëüêî íà îäíîé ëèíèè, òî fail 14 8 15 9 == NEW ALGORITHM == -
applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java
r25751 r26290 101 101 // todo: dim chosen relation when changing layer 102 102 // todo: check this WTF! 103 System.out.println("editLayerChanged() oldLayer=" + oldLayer + ", newLayer=" + newLayer); 103 104 clear(); 104 105 if( newLayer != null && oldLayer == null ) { … … 114 115 } 115 116 117 OsmDataLayer dataLayer = Main.map.mapView.getEditLayer(); 118 float opacity = dataLayer == null ? 0.0f : !dataLayer.isVisible() ? 0.0f : (float)dataLayer.getOpacity(); 119 if( opacity < 0.01 ) 120 return; 121 116 122 Stroke oldStroke = g.getStroke(); 117 123 Composite oldComposite = g.getComposite(); 118 124 g.setColor(Color.yellow); 119 125 g.setStroke(new BasicStroke(9, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); 120 g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f ));126 g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f * opacity)); 121 127 for( OsmPrimitive element : chosenRelation.getMemberPrimitives() ) { 122 128 if( element.getType() == OsmPrimitiveType.NODE ) { -
applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
r26125 r26290 453 453 add(new SelectMembersAction(chosenRelation)); 454 454 add(new SelectRelationAction(chosenRelation)); 455 add(new DuplicateChosenRelationAction(chosenRelation)); 455 456 add(new DeleteChosenRelationAction(chosenRelation)); 456 457 add(new DownloadParentsAction(chosenRelation)); … … 514 515 addMenuItem("boundaryways", tr("Add tags boundary and admin_level to boundary relation ways")); 515 516 addMenuItem("tags", tr("Move area tags from contour to relation")); 517 addMenuItem("alltags", tr("When moving tags, consider even non-repeating ones")); 516 518 } 517 519 -
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java
r25727 r26290 44 44 else if( property.equals("boundaryways") ) return true; 45 45 else if( property.equals("tags") ) return true; 46 else if( property.equals("alltags") ) return false; 46 47 else if( property.equals("single") ) return true; 47 48 throw new IllegalArgumentException(property); … … 74 75 rel.addMember(new RelationMember("inner", w)); 75 76 List<Command> list = removeTagsFromInnerWays(rel); 77 if( !list.isEmpty() && isBoundary ) { 78 Main.main.undoRedo.add(new SequenceCommand(tr("Move tags from ways to relation"), list)); 79 list = new ArrayList<Command>(); 80 } 76 81 if( isBoundary ) { 77 82 if( !askForAdminLevelAndName(rel) ) … … 231 236 232 237 // filter out empty key conflicts - we need second iteration 238 boolean isBoundary = getPref("boundary"); 239 if( isBoundary || !getPref("alltags") ) 233 240 for( RelationMember m: relation.getMembers() ) 234 241 if( m.hasRole() && m.getRole().equals("outer") && m.isWay() ) … … 246 253 values.remove("natural"); 247 254 248 boolean isBoundary = getPref("boundary");249 255 String name = values.get("name"); 250 String adminLevel = values.get("admin_level");251 256 if( isBoundary ) { 252 257 Set<String> keySet = new TreeSet<String>(values.keySet());
Note:
See TracChangeset
for help on using the changeset viewer.