From 58f57cd63725411b1843e18c1481f34aca991fb3 Mon Sep 17 00:00:00 2001
From: Mike Barry <msb5014@gmail.com>
Date: Wed, 5 May 2021 06:29:12 -0400
Subject: [PATCH] serving script

---
 scripts/serve-tiles-docker.sh                 |  9 +++++
 .../onthegomap/flatmap/OpenMapTilesMain.java  |  2 +-
 .../onthegomap/flatmap/read/LongAddTest.java  | 38 -------------------
 .../flatmap/read/NaturalEarthReader.java      |  8 ++++
 .../com/onthegomap/flatmap/write/Mbtiles.java |  8 ++++
 5 files changed, 26 insertions(+), 39 deletions(-)
 create mode 100755 scripts/serve-tiles-docker.sh
 delete mode 100644 src/main/java/com/onthegomap/flatmap/read/LongAddTest.java

diff --git a/scripts/serve-tiles-docker.sh b/scripts/serve-tiles-docker.sh
new file mode 100755
index 00000000..d13488a1
--- /dev/null
+++ b/scripts/serve-tiles-docker.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+set -x
+
+docker run --rm -it -v "$(git rev-parse --show-toplevel)/data":/data -p 8080:8080 \
+  maptiler/tileserver-gl -p 8080
diff --git a/src/main/java/com/onthegomap/flatmap/OpenMapTilesMain.java b/src/main/java/com/onthegomap/flatmap/OpenMapTilesMain.java
index eb888e61..abc10ecc 100644
--- a/src/main/java/com/onthegomap/flatmap/OpenMapTilesMain.java
+++ b/src/main/java/com/onthegomap/flatmap/OpenMapTilesMain.java
@@ -39,7 +39,7 @@ public class OpenMapTilesMain {
     boolean useWikidata = arguments.get("use_wikidata", "use wikidata translations", true);
     Path wikidataNamesFile = arguments.file("wikidata_cache", "wikidata cache file",
       Path.of("data", "sources", "wikidata_names.json"));
-    Path output = arguments.file("output", "mbtiles output file", Path.of("massachusetts.mbtiles"));
+    Path output = arguments.file("output", "mbtiles output file", Path.of("data", "massachusetts.mbtiles"));
     List<String> languages = arguments.get("name_languages", "languages to use",
       "en,ru,ar,zh,ja,ko,fr,de,fi,pl,es,be,br,he".split(","));
     CommonParams config = CommonParams.from(arguments, osmInputFile);
diff --git a/src/main/java/com/onthegomap/flatmap/read/LongAddTest.java b/src/main/java/com/onthegomap/flatmap/read/LongAddTest.java
deleted file mode 100644
index 293c0978..00000000
--- a/src/main/java/com/onthegomap/flatmap/read/LongAddTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.onthegomap.flatmap.read;
-
-import com.graphhopper.util.StopWatch;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.LongAdder;
-
-public class LongAddTest {
-
-  private static void time(Runnable r) {
-    StopWatch w = new StopWatch().start();
-    r.run();
-    System.err.println(w.stop());
-  }
-
-  public static void main(String[] args) {
-    time(() -> {
-      long count = 0;
-      for (long i = 0; i < 1_000_000_000L; i++) {
-        count++;
-      }
-      System.err.println(count);
-    });
-    time(() -> {
-      LongAdder adder = new LongAdder();
-      for (long i = 0; i < 1_000_000_000L; i++) {
-        adder.increment();
-      }
-      System.err.println(adder.longValue());
-    });
-    time(() -> {
-      AtomicLong adder = new AtomicLong();
-      for (long i = 0; i < 1_000_000_000L; i++) {
-        adder.incrementAndGet();
-      }
-      System.err.println(adder.longValue());
-    });
-  }
-}
diff --git a/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java b/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java
index 0fcb90df..0fa67793 100644
--- a/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java
+++ b/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java
@@ -29,6 +29,14 @@ public class NaturalEarthReader extends Reader {
   private final Connection conn;
   private Path extracted;
 
+  static {
+    try {
+      Class.forName("org.sqlite.JDBC");
+    } catch (ClassNotFoundException e) {
+      throw new IllegalStateException("JDBC driver not found");
+    }
+  }
+
   public NaturalEarthReader(Path input, Profile profile, Stats stats) {
     this(input, null, profile, stats);
   }
diff --git a/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java b/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java
index c71bb90c..9376035e 100644
--- a/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java
+++ b/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java
@@ -50,6 +50,14 @@ public record Mbtiles(Connection connection) implements Closeable {
     .registerModules(new Jdk8Module())
     .setSerializationInclusion(NON_ABSENT);
 
+  static {
+    try {
+      Class.forName("org.sqlite.JDBC");
+    } catch (ClassNotFoundException e) {
+      throw new IllegalStateException("JDBC driver not found");
+    }
+  }
+
   public static Mbtiles newInMemoryDatabase() {
     try {
       return new Mbtiles(DriverManager.getConnection("jdbc:sqlite::memory:")).init();