Gerber export writes drill files in Excellon format, picked by a constant in GerberExporter, through gerber-writer 1.2.0; a Drill Hole no longer adds its outline and crosshair to the drill file

diylc/diylc-library/pom.xml

@@ -73,10 +73,10 @@
         </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>
-            <artifactId>gerber-writer-api-1.1.0</artifactId>
+            <artifactId>gerber-writer-api-1.2.0</artifactId>
             <version>1.0</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/../lib/gerber-writer-api-1.1.0.jar</systemPath>
+            <systemPath>${project.basedir}/../lib/gerber-writer-api-1.2.0.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>

diylc/diylc-library/src/main/java/org/diylc/components/connectivity/Via.java

@@ -71,9 +71,6 @@ public class Via extends AbstractTransparentComponent<Void>
   public static Size HOLE_SIZE = new Size(0.4d, SizeUnit.mm);
   public static Color COLOR = Color.black;
 
-  // gerber-writer has no constant for it
-  private static final String VIA_DRILL = "ViaDrill";
-
   private Size size = SIZE;
   private Size holeSize = HOLE_SIZE;
   private Color color = COLOR;
@@ -112,7 +109,8 @@ public class Via extends AbstractTransparentComponent<Void>
     if (gerberDrawingObserver != null) {
       gerberDrawingObserver.stopGerberOutput(GerberLayer.CopperTop);
       gerberDrawingObserver.stopGerberOutput(GerberLayer.CopperBot);
-      gerberDrawingObserver.startGerberOutput(GerberLayer.DrillPlated, VIA_DRILL, false);
+      gerberDrawingObserver.startGerberOutput(GerberLayer.DrillPlated, GerberFunctions.VIA_DRILL,
+          false);
     }
     g2d.setColor(Constants.CANVAS_COLOR);
     g2d.fill(new Ellipse2D.Double(point.getX() - holeDiameter / 2,

diylc/diylc-library/src/test/java/org/diylc/components/connectivity/SolderPadGerberTest.java

@@ -21,18 +21,20 @@
 */
 package org.diylc.components.connectivity;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
-import java.util.Map;
+import java.util.EnumSet;
 import java.util.Set;
 
-import com.bancika.gerberwriter.DataLayer;
+import com.bancika.gerberwriter.DrillFormat;
 
 import org.diylc.common.PCBLayer;
+import org.diylc.components.electromechanical.DrillHole;
 import org.diylc.core.ComponentState;
 import org.diylc.core.Project;
 import org.diylc.core.gerber.GerberG2DWrapper;
@@ -79,7 +81,7 @@ public class SolderPadGerberTest {
   @Test
   public void testViaIsOnBothLayersAndTented() {
     Via via = new Via();
-    Set<GerberLayer> layers = drawGerber(via).keySet();
+    Set<GerberLayer> layers = layersOf(drawGerber(via));
     assertTrue(layers.contains(GerberLayer.CopperTop));
     assertTrue(layers.contains(GerberLayer.CopperBot));
     assertTrue(layers.contains(GerberLayer.DrillPlated));
@@ -95,11 +97,32 @@ public class SolderPadGerberTest {
     assertNoCutOut(drawGerber(new Via()));
   }
 
+  @Test
+  public void testViaIsDrilledOnceAsViaDrill() {
+    String excellon = drawGerber(new Via()).getDrillLayerMap().get(GerberLayer.DrillPlated)
+        .dumpToString(DrillFormat.EXCELLON);
+    assertTrue(excellon.contains("; #@! TA.AperFunction,Plated,PTH,ViaDrill\nT1C0.4\n"));
+    assertEquals(1, countHoles(excellon));
+  }
+
+  @Test
+  public void testDrillHoleMarkerIsDrilledOnce() {
+    // the marker's border and crosshair are drawn too, but they are not holes
+    String excellon = drawGerber(new DrillHole()).getDrillLayerMap()
+        .get(GerberLayer.DrillNonPlated).dumpToString(DrillFormat.EXCELLON);
+    assertTrue(excellon.contains("T1C3.0\n"));
+    assertEquals(1, countHoles(excellon));
+  }
+
+  private static long countHoles(String excellon) {
+    return excellon.lines().filter(line -> line.startsWith("X")).count();
+  }
+
   // a cut-out is drawn with clear polarity, %LPC*%
-  private static void assertNoCutOut(Map<GerberLayer, DataLayer> layers) {
+  private static void assertNoCutOut(GerberG2DWrapper g2d) {
     for (GerberLayer copperLayer : new GerberLayer[] {GerberLayer.CopperTop,
         GerberLayer.CopperBot}) {
-      String gerber = layers.get(copperLayer).dumpGerberToString();
+      String gerber = g2d.getLayerMap().get(copperLayer).dumpGerberToString();
       assertTrue(gerber.contains("D03*"));
       assertFalse(gerber.contains("%LPC*%"));
     }
@@ -113,10 +136,17 @@ public class SolderPadGerberTest {
     SolderPad pad = new SolderPad();
     pad.setLayer(layer);
     pad.setHoleType(holeType);
-    return drawGerber(pad).keySet();
+    return layersOf(drawGerber(pad));
   }
 
-  private static Map<GerberLayer, DataLayer> drawGerber(IGerberComponentCustom component) {
+  private static Set<GerberLayer> layersOf(GerberG2DWrapper g2d) {
+    Set<GerberLayer> layers = EnumSet.noneOf(GerberLayer.class);
+    layers.addAll(g2d.getLayerMap().keySet());
+    layers.addAll(g2d.getDrillLayerMap().keySet());
+    return layers;
+  }
+
+  private static GerberG2DWrapper drawGerber(IGerberComponentCustom component) {
     BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB);
     Graphics2D graphics = img.createGraphics();
     GerberG2DWrapper g2d =
@@ -124,6 +154,6 @@ public class SolderPadGerberTest {
     g2d.startedDrawingComponent();
     component.draw(g2d, ComponentState.NORMAL, false, new Project(), g2d, g2d);
     graphics.dispose();
-    return g2d.getLayerMap();
+    return g2d;
   }
 }