Add Elixir map web server

jj1bdx · May 27, 2018 · 6911b4c · 6911b4c
1 parent facbeab
commit 6911b4c
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 2 deletions.
diff --git a/js-libs/LeafLet-1.3.1/example-overlays.html b/js-libs/LeafLet-1.3.1/example-overlays.html
@@ -23,15 +23,15 @@
 
 
 
-<div id="mapid" style="width: 1024px; height: 768px;"></div>
+<div id="mapid" style="width: 1280px; height: 768px;"></div>
 <script>
 
     function sleep(ms) {
         return new Promise(resolve => setTimeout(resolve, ms));
     }
 
     async function demo() {
-	    var mymap = L.map('mapid').setView([34.786, 135.44], 13);
+	    var mymap = L.map('mapid').setView([0, 0], 1);
         L.gridLayer.googleMutant({type: 'roadmap'}).addTo(mymap);
 
 	    var layer = L.marker([34.786, 135.44]).addTo(mymap)

diff --git a/lib/apresse_web.ex b/lib/apresse_web.ex
@@ -6,6 +6,8 @@ defmodule ApresseWeb do
   def start(_type, _args) do
     import Supervisor.Spec, warn: false
 
+    :aprs_receiver.start()
+
     children = [
       # Start the endpoint when the application starts
       supervisor(ApresseWeb.Endpoint, []),

diff --git a/lib/apresse_web_aprsmap.ex b/lib/apresse_web_aprsmap.ex
@@ -0,0 +1,66 @@
+defmodule ApresseWeb.APRSMap do
+  @moduledoc """
+
+  TBD. A standalone plug module to pick APRS data from ETS
+  and convert them into map data through templates.
+
+
+  """
+
+  # Note for module development:
+  # No compression
+  # No caching (since the contents of directory may vary every time)
+
+  @behaviour Plug
+  @allowed_methods ~w(GET HEAD)
+
+  import Plug.Conn
+  alias Plug.Conn
+
+  def init(_opts) do
+    # do nothing here
+  end
+
+  def call(conn = %Conn{method: meth}, _)
+    when meth in @allowed_methods do
+    dump_aprs_map(conn)
+  end
+
+  def call(conn, _opts) do
+    conn
+  end
+
+  defp dump_aprs_map(conn) do
+    conn
+    |> put_resp_header("content-type", "text/html")
+    |> send_resp(200, make_aprs_map())
+    |> halt
+  end
+
+  require EEx
+
+  EEx.function_from_file(:defp, :header_html,
+    "lib/templates/apresse_web_header.html.eex", [
+  ])
+
+  EEx.function_from_file(:defp, :footer_html,
+    "lib/templates/apresse_web_footer.html.eex", [
+  ])
+
+  EEx.function_from_file(:defp, :mapentry_html,
+    "lib/templates/apresse_web_mapentry.html.eex", [
+      :source,
+      :lat,
+      :long
+    ])
+
+  defp make_aprs_map() do
+    # Plug.conn.send_resp/3 accepts IOlist in the body
+    [
+      header_html(),
+      Enum.map(:ets.tab2list(:aprs_positions),
+        fn({_, source, lat, long}) -> mapentry_html(source, lat, long) end),
+      footer_html()
+    ]
+  end
+end
diff --git a/lib/templates/apresse_web_footer.html.eex b/lib/templates/apresse_web_footer.html.eex
@@ -0,0 +1,5 @@
+  }
+  showmap();
+</script>
+</body>
+</html>
diff --git a/lib/templates/apresse_web_header.html.eex b/lib/templates/apresse_web_header.html.eex
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>apresse APRS map</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<!-- Google Maps API -->
+<script
+    src="http://maps.google.com/maps/api/js?sensor=false&libraries=geomtry">
+</script>
+<link rel="stylesheet" href="static/leaflet.css">
+<script src="static/leaflet.js"></script>
+<script src='static/Leaflet.GoogleMutant.js'></script>
+</head> 
+<body>
+<h1>apresse APRS map</h1>
+<div id="mapid" style="width: 1280px; height: 768px;"></div>
+<script>
+  function showmap() {
+    var mymap = L.map('mapid').setView([0.0, 0.0], 1);
+    L.gridLayer.googleMutant({type: 'roadmap'}).addTo(mymap);
diff --git a/lib/templates/apresse_web_mapentry.html.eex b/lib/templates/apresse_web_mapentry.html.eex
@@ -0,0 +1,5 @@
+<%
+popup = :io_lib.format("Source: ~s<br>Lat: ~.4f<br>Long: ~.4f",
+                   [source, lat, long])
+%>
+var marker = L.marker([<%= lat %>, <%= long %>]).addTo(mymap).bindPopup('<%= popup %>');
diff --git a/src/aprs_receiver.erl b/src/aprs_receiver.erl
@@ -85,6 +85,9 @@ parse_message(
     {Lat, Long};
 parse_message(_) -> undefined.
 
+put_ets(_Time, undefined, {_Lat, _Long}) -> undefined;
+put_ets(_Time, _Source, {undefined, _Long}) -> undefined;
+put_ets(_Time, _Source, {_Lat, undefined}) -> undefined;
 put_ets(Time, Source, {Lat, Long}) ->
     % io:format("~p~n", [{Time, Source, Lat, Long}]),
     ets:insert(aprs_positions, {Time, Source, Lat, Long});