Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16991)
+++ trunk/resources/data/defaultpresets.xml	(revision 16992)
@@ -1022,5 +1022,23 @@
             </optional>
             <reference ref="link_road_access_restrictions" />
+            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
+            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
         </item> <!-- Roundabout -->
+        <item name="Circular junction" icon="presets/vehicle/restriction/junction_circular.svg" type="way,closedway" preset_name_label="true">
+            <link wiki="Tag:junction=circular" />
+            <space />
+            <key key="junction" value="circular" />
+            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" />
+            <optional>
+                <reference ref="name_layer" />
+                <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
+                <reference ref="highway_yesno" />
+                <check key="oneway" text="Oneway" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+            <reference ref="link_road_access_restrictions" />
+            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
+            <preset_link preset_name="Mini-Roundabout" text="Similar but different tags:" />
+        </item> <!-- Circular junction -->
         <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:ford=yes" />
@@ -1303,4 +1321,6 @@
             <space />
             <combo key="direction" text="Direction" values="clockwise" />
+            <preset_link preset_name="Roundabout" text="Similar but different tags:" />
+            <preset_link preset_name="Circular junction" text="Similar but different tags:" />
         </item> <!-- Mini-Roundabout -->
         <item name="Pedestrian Crossing" icon="presets/vehicle/crossing.svg" type="node" preset_name_label="true">
Index: trunk/resources/images/presets/vehicle/restriction/junction_circular.svg
===================================================================
--- trunk/resources/images/presets/vehicle/restriction/junction_circular.svg	(revision 16992)
+++ trunk/resources/images/presets/vehicle/restriction/junction_circular.svg	(revision 16992)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="junction_circular16.svg">
+  <defs
+     id="defs4266">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective981" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.230647"
+     inkscape:cx="7.9465741"
+     inkscape:cy="8.0816614"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3621)">
+    <circle
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08;stroke-opacity:1"
+       id="path844-6-3"
+       cx="7.9999995"
+       cy="1045.3621"
+       r="3.9999998" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path861-8-9-5"
+       d="M 0,1045.3621 H 4"
+       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8,1037.3621 v 4"
+       id="path861-3-0-5-5" />
+    <path
+       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16,1045.3621 H 12"
+       id="path861-8-9-5-8"
+       sodipodi:nodetypes="cc" />
+    <path
+       id="path861-3-0-5-5-5"
+       d="m 8,1053.3621 v -4"
+       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 16991)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 16992)
@@ -75,5 +75,5 @@
                 "waterway=stream | waterway=river | waterway=ditch | waterway=drain | waterway=tidal_channel | "+
                 "(\"piste:type\"=downhill & -area=yes) | (\"piste:type\"=sled & -area=yes) | (man_made=\"piste:halfpipe\" & -area=yes) | "+
-                "junction=circular | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
+                "(junction=circular & -oneway=no) | junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
                 "(highway=motorway_link & -oneway=no & -oneway=reversible)";