Implemented default airports, fixed loading airport endpoints

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "rust-analyzer.showUnlinkedFileNotification": false
+    "rust-analyzer.showUnlinkedFileNotification": false,
+    "editor.tabSize": 2
 }

weather-service/migrations/000000_create_airports/up.sql

@@ -1,7 +1,16 @@
 CREATE TABLE IF NOT EXISTS airports (
-    id SERIAL PRIMARY KEY,
+    id INTEGER PRIMARY KEY GENERATED  ALWAYS AS IDENTITY,
-    full_name TEXT NOT NULL,
     icao TEXT NOT NULL,
+    category TEXT NOT NULL,
+    full_name TEXT NOT NULL,
+    elevation_ft INTEGER,
+    continent TEXT NOT NULL,
+    iso_country TEXT NOT NULL,
+    iso_region TEXT NOT NULL,
+    municipality TEXT NOT NULL,
+    gps_code TEXT NOT NULL,
+    iata_code TEXT NOT NULL,
+    local_code TEXT NOT NULL,
     latitude DOUBLE PRECISION NOT NULL,
     longitude DOUBLE PRECISION NOT NULL
 )

weather-service/src/airports/model.rs

@@ -7,8 +7,17 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, AsChangeset, Insertable)]
 #[table_name = "airports"]
 pub struct Airport {
-  pub full_name: String,
   pub icao: String,
+  pub category: String,
+  pub full_name: String,
+  pub elevation_ft: Option<i32>,
+  pub continent: String,
+  pub iso_country: String,
+  pub iso_region: String,
+  pub municipality: String,
+  pub gps_code: String,
+  pub iata_code: String,
+  pub local_code: String,
   pub latitude: f64,
   pub longitude: f64,
 }
@@ -16,16 +25,28 @@ pub struct Airport {
 #[derive(Serialize, Deserialize, Queryable)]
 pub struct Airports {
   pub id: i32,
-  pub full_name: String,
   pub icao: String,
+  pub category: String,
+  pub full_name: String,
+  pub elevation_ft: Option<i32>,
+  pub continent: String,
+  pub iso_country: String,
+  pub iso_region: String,
+  pub municipality: String,
+  pub gps_code: String,
+  pub iata_code: String,
+  pub local_code: String,
   pub latitude: f64,
   pub longitude: f64,
 }
 
 impl Airports {
-  pub fn find_all() -> Result<Vec<Self>, CustomError> {
+  pub fn find_all(limit: i32, page: i32) -> Result<Vec<Self>, CustomError> {
     let conn = db::connection()?;
-    let airports = airports::table.load::<Airports>(&conn)?;
+    let airports = airports::table
+      .limit(limit as i64)
+      .filter(airports::id.gt(page * limit))
+      .load::<Airports>(&conn)?;
     Ok(airports)
   }
 

weather-service/src/airports/routes.rs

@@ -1,11 +1,19 @@
 use crate::airports::{Airport, Airports};
-use actix_web::{delete, get, post, put, web, HttpResponse};
+use actix_web::{delete, get, post, put, web, HttpResponse, HttpRequest};
 use log::error;
+use serde::{Serialize, Deserialize};
 use serde_json::json;
 
+#[derive(Debug, Serialize, Deserialize)]
+struct FindAllParams {
+    limit: i32,
+    page: i32
+}
+
 #[get("/airports")]
-async fn find_all() -> HttpResponse {
+async fn find_all(req: HttpRequest) -> HttpResponse {
-    match web::block(|| Airports::find_all()).await.unwrap() {
+    let params = web::Query::<FindAllParams>::from_query(req.query_string()).unwrap();
+    match web::block(move || Airports::find_all(params.limit, params.page)).await.unwrap() {
         Ok(a) => HttpResponse::Ok().json(a),
         Err(err) => {
             error!("{}", err);

weather-service/src/db.rs

@@ -1,8 +1,8 @@
-use crate::error_handler::CustomError;
+use crate::{error_handler::CustomError, airports::{Airport, Airports}};
 use diesel::pg::PgConnection;
 use diesel::r2d2::ConnectionManager;
 use lazy_static::lazy_static;
-use log::{error, info};
+use log::{error, info, debug};
 use r2d2;
 use std::env;
 
@@ -12,26 +12,38 @@ pub type DbConnection = r2d2::PooledConnection<ConnectionManager<PgConnection>>;
 diesel_migrations::embed_migrations!();
 
 lazy_static! {
-    static ref POOL: Pool = {
+  static ref POOL: Pool = {
-        let username = env::var("DATABASE_USER").expect("Database username is not set");
+    let username = env::var("DATABASE_USER").expect("Database username is not set");
-        let password = env::var("DATABASE_PASSWORD").expect("Database password is not set");
+    let password = env::var("DATABASE_PASSWORD").expect("Database password is not set");
-        let name = env::var("DATABASE_NAME").expect("Database name is not set");
+    let name = env::var("DATABASE_NAME").expect("Database name is not set");
-        let url = format!("postgres://{}:{}@localhost:5433/{}", username, password, name);
+    let url = format!("postgres://{}:{}@localhost:5433/{}", username, password, name);
-        let manager = ConnectionManager::<PgConnection>::new(url);
+    let manager = ConnectionManager::<PgConnection>::new(url);
-        Pool::new(manager).expect("Failed to create db pool")
+    Pool::new(manager).expect("Failed to create db pool")
-    };
+  };
 }
 
 pub fn init() {
-    lazy_static::initialize(&POOL);
+  lazy_static::initialize(&POOL);
-    let conn = connection().expect("Failed to get db connection");
+  let conn = connection().expect("Failed to get db connection");
-    match embedded_migrations::run(&conn) {
+  match embedded_migrations::run(&conn) {
-        Ok(_) => info!("Database initialized"),
+    Ok(_) => info!("Database initialized"),
-        Err(err) => error!("Failed to initialize database; {}", err),
+    Err(err) => error!("Failed to initialize database; {}", err),
-    };
+  };
 }
 
 pub fn connection() -> Result<DbConnection, CustomError> {
-    POOL.get()
+  POOL.get()
-        .map_err(|e| CustomError::new(500, format!("Failed getting db connection: {}", e)))
+    .map_err(|e| CustomError::new(500, format!("Failed getting db connection: {}", e)))
+}
+
+pub fn import_data() {
+  let contents: String = std::fs::read_to_string("airport-codes.json").expect("Failed to read file");
+  let airports: Vec<Airport> = serde_json::from_str(&contents).expect("JSON was not well formed.");
+  for airport in airports {
+    match Airports::create(airport) {
+      Ok(_) => {},
+      Err(err) => error!("Error inserting airport; {}", err)
+    };
+  }
+  debug!("Imported data");
 }

weather-service/src/schema.rs

@@ -1,8 +1,17 @@
 diesel::table! {
   airports (id) {
     id -> Integer,
-    full_name -> Text,
     icao -> Text,
+    category -> Text,
+    full_name -> Text,
+    elevation_ft -> Nullable<Integer>,
+    continent -> Text,
+    iso_country -> Text,
+    iso_region -> Text,
+    municipality -> Text,
+    gps_code -> Text,
+    iata_code -> Text,
+    local_code -> Text,
     latitude -> Double,
     longitude -> Double,
   }

weather-ui/src/app/airport/[icao]/page.tsx

@@ -1,13 +1,15 @@
-import { getAirport } from "@/js/state";
+import { getAirport } from '@/js/api/airport';
-import Link from "next/link";
+import { Airport } from '@/js/api/airport.types';
+import Link from 'next/link';
 
-
+export default async function Page({ params }: { params: { icao: string } }) {
-export default function Page({ params }: { params: { icao: string } }) {
+  const airport: Airport = await getAirport({ icao: params.icao });
-    const airport = getAirport(params.icao);
+  return (
-    return <>
+    <>
-        <div className="border-b border-gray-200 bg-gray-400 px-4 py-5 sm:px-6 flex justify-between">
+      <div className='border-b border-gray-200 bg-gray-400 px-4 py-5 sm:px-6 flex justify-between'>
-            <h3 className="text-base font-semibold leading-6 text-gray-900">{airport?.name}</h3>
+        <h3 className='text-base font-semibold leading-6 text-gray-900'>{airport?.name}</h3>
-            <Link href={"/"}>Back</Link>
+        <Link href={'/'}>Back</Link>
-        </div>
+      </div>
-    </>;
+    </>
-}
+  );
+}

weather-ui/src/app/layout.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import RecoilRootWrapper from '@app/recoil-root-wrapper';
 
-
 import '@fortawesome/fontawesome-svg-core/styles.css';
 // Prevent fontawesome from adding its CSS since we did it manually above:
 import { config } from '@fortawesome/fontawesome-svg-core';
@@ -9,20 +8,23 @@ config.autoAddCss = false;
 import 'styles/globals.css';
 import Link from 'next/link';
 
+import 'styles/leaflet.css';
+
 export default function RootLayout({ children }: { children: React.ReactNode }) {
-    return (
+  return (
-        <html lang="en">
+    <html lang='en'>
-            <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.1/dist/leaflet.css" />
+      <head>
-            <head>
+        <title>Aviation Weather</title>
-                <title>Aviation Weather</title>
+      </head>
-            </head>
+      <body className='bg-gray-600'>
-            <body className='bg-gray-600'>
+        <div className='flex justify-between bg-gray-700 px-4 py-1 sm:px-6 select-none'>
-                <div className="flex justify-between bg-gray-700 px-4 py-1 sm:px-6 select-none">
+          <h3 className='text-lg font-bold leading-6 text-gray-200'>Aviation Weather</h3>
-                    <h3 className="text-lg font-bold leading-6 text-gray-200">Aviation Weather</h3>
+          <Link className='text-base text-gray-200' href={'/profile'}>
-                    <Link className='text-base text-gray-200' href={'/profile'}>Profile</Link>
+            Profile
-                </div>
+          </Link>
-                <RecoilRootWrapper>{children}</RecoilRootWrapper>
+        </div>
-            </body>
+        <RecoilRootWrapper>{children}</RecoilRootWrapper>
-        </html>
+      </body>
-    );
+    </html>
+  );
 }

weather-ui/src/app/page.tsx

@@ -1,28 +1,12 @@
 import React from 'react';
-import { setAirport } from "@/js/state";
-import { Airport } from "@/js/airport";
 import Metar from '@/components/Metar';
 
-// setAirport('KJYO', new Airport('Leesburg Executive Airport', 'KJYO'))
-// setAirport('KHEF', new Airport('Manassas Regional Airpoirt', 'KHEF', 38.724, -77517))
-// setAirport('KIAD', new Airport('Dulles International Airport', 'KIAD'))
-// setAirport('KFDK', new Airport('Frederick Municipal Airport', 'KFDK'))
-// setAirport('KMRB', new Airport('Eastern West Virginia Regional Airport', 'KMRB'))
-// setAirport('KOKV', new Airport('Winchester Regional Airport', 'KOKV'))
-// setAirport('KFRR', new Airport('Front Royal-Warren County Airport', 'KFRR'))
-// setAirport('KLUA', new Airport('Luray Caverns Airport', 'KLUA'))
-// setAirport('KSHD', new Airport('Shenandoah Valley Airport', 'KSHD'))
-// setAirport('KCHO', new Airport('Charlottesville-Albemarle Airport', 'KCHO'))
-// setAirport('KCJR', new Airport('Culpeper Regional Airport', 'KCJR'))
-// setAirport('KHWY', new Airport('Warrenton-Fauquier Airport', 'KHWY'))
-// setAirport('KRMN', new Airport('Stafford Regional Airport', 'KRMN'))
-// setAirport('KEZF', new Airport('Shannon Airport', 'KEZF'))
-// setAirport('KDCA', new Airport('Ronald Reagan Washington National Airport', 'KDCA'))
-
 export default function Page() {
-    return <>
+  return (
-        <div>
+    <>
-            <Metar/>
+      <div>
-        </div>
+        <Metar />
+      </div>
     </>
+  );
 }

weather-ui/src/components/Metar.tsx

@@ -19,7 +19,7 @@ export default async function Metar() {
   let airports: Airport[] = [];
 
   async function update() {
-    airports = await getAirports();
+    airports = await getAirports({ limit: 10, page: 1 });
     const metars = await getMetars(airports);
     for (let i = 0; i < metars.length; i++) {
       airports[i].metar = metars[i];

weather-ui/src/components/MetarMap.tsx

@@ -10,7 +10,7 @@ import ReactDOMServer from 'react-dom/server';
 import { MapContainer, Marker, Popup, TileLayer, Tooltip, useMapEvents } from 'react-leaflet';
 
 export default function Map({ airportString }: { airportString: string }) {
-  const [airports, setAirports] = useState<Airport[]>(JSON.parse(airportString));
+  const [airports] = useState<Airport[]>(JSON.parse(airportString));
 
   return (
     <MapContainer
@@ -35,6 +35,9 @@ function MapTiles({ airports }: { airports: Airport[] }) {
   const mapEvents = useMapEvents({
     zoomend: () => {
       setZoomLevel(mapEvents.getZoom());
+    },
+    moveend: () => {
+      console.log(mapEvents.getBounds());
     }
     // mouseup: () => {
     //   setCenter([mapEvents.getCenter().lat, mapEvents.getCenter().lng]);
@@ -114,7 +117,7 @@ function MapTiles({ airports }: { airports: Airport[] }) {
       />
       {airports.map((airport) => (
         <>
-          <Marker position={[airport.latitude, airport.longitude]} icon={icon(airport)}>
+          <Marker key={airport.icao} position={[airport.latitude, airport.longitude]} icon={icon(airport)}>
             <Tooltip className='metar-tooltip' direction='top' offset={[5, -5]} opacity={1}>
               {airport.icao}
             </Tooltip>

weather-ui/src/js/api/airport.ts

@@ -1,7 +1,23 @@
 import axios from 'axios';
 import { Airport } from './airport.types';
 
-export async function getAirports(): Promise<Airport[]> {
+interface GetAirportsProps {
-  const response = await axios.get(`http://localhost:5000/airports`).catch((error) => console.error(error));
+  page: number;
+  limit: number;
+}
+
+interface GetAirportProps {
+  icao: string;
+}
+
+export async function getAirport({ icao }: GetAirportProps) {
+  const response = await axios.get(`http://localhost:5000/airports/${icao}`).catch((error) => console.error(error));
+  return response?.data;
+}
+
+export async function getAirports({ limit = 10, page = 1 }: GetAirportsProps): Promise<Airport[]> {
+  const response = await axios
+    .get(`http://localhost:5000/airports`, { params: { page: page, limit: limit } })
+    .catch((error) => console.error(error));
   return response?.data;
 }

weather-ui/styles/leaflet.css

@@ -0,0 +1,623 @@
+/* required styles */
+
+.leaflet-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-container,
+.leaflet-map-pane svg,
+.leaflet-map-pane canvas,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
+.leaflet-container {
+	overflow: hidden;
+	}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	        user-select: none;
+	  -webkit-user-drag: none;
+	}
+/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
+.leaflet-safari .leaflet-tile {
+	image-rendering: -webkit-optimize-contrast;
+	}
+/* hack that prevents hw layers "stretching" when loading new tiles */
+.leaflet-safari .leaflet-tile-container {
+	width: 1600px;
+	height: 1600px;
+	-webkit-transform-origin: 0 0;
+	}
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	display: block;
+	}
+/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
+/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-marker-pane img,
+.leaflet-container .leaflet-tile-pane img,
+.leaflet-container img.leaflet-image-layer {
+	max-width: none !important;
+	}
+
+.leaflet-container.leaflet-touch-zoom {
+	-ms-touch-action: pan-x pan-y;
+	touch-action: pan-x pan-y;
+	}
+.leaflet-container.leaflet-touch-drag {
+	-ms-touch-action: pinch-zoom;
+	}
+.leaflet-container.leaflet-touch-drag.leaflet-touch-drag {
+	-ms-touch-action: none;
+	touch-action: none;
+}
+.leaflet-tile {
+	filter: inherit;
+	visibility: hidden;
+	}
+.leaflet-tile-loaded {
+	visibility: inherit;
+	}
+.leaflet-zoom-box {
+	width: 0;
+	height: 0;
+	-moz-box-sizing: border-box;
+	     box-sizing: border-box;
+	z-index: 800;
+	}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+	-moz-user-select: none;
+	}
+
+.leaflet-pane         { z-index: 400; }
+
+.leaflet-tile-pane    { z-index: 200; }
+.leaflet-overlay-pane { z-index: 400; }
+.leaflet-shadow-pane  { z-index: 500; }
+.leaflet-marker-pane  { z-index: 600; }
+.leaflet-tooltip-pane   { z-index: 650; }
+.leaflet-popup-pane   { z-index: 700; }
+
+.leaflet-map-pane canvas { z-index: 100; }
+.leaflet-map-pane svg    { z-index: 200; }
+
+.leaflet-vml-shape {
+	width: 1px;
+	height: 1px;
+	}
+.lvml {
+	behavior: url(#default#VML);
+	display: inline-block;
+	position: absolute;
+	}
+
+
+/* control positioning */
+
+.leaflet-control {
+	position: relative;
+	z-index: 800;
+	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+	pointer-events: auto;
+	}
+.leaflet-top,
+.leaflet-bottom {
+	position: absolute;
+	z-index: 1000;
+	pointer-events: none;
+	}
+.leaflet-top {
+	top: 0;
+	}
+.leaflet-right {
+	right: 0;
+	}
+.leaflet-bottom {
+	bottom: 0;
+	}
+.leaflet-left {
+	left: 0;
+	}
+.leaflet-control {
+	float: left;
+	clear: both;
+	}
+.leaflet-right .leaflet-control {
+	float: right;
+	}
+.leaflet-top .leaflet-control {
+	margin-top: 10px;
+	}
+.leaflet-bottom .leaflet-control {
+	margin-bottom: 10px;
+	}
+.leaflet-left .leaflet-control {
+	margin-left: 10px;
+	}
+.leaflet-right .leaflet-control {
+	margin-right: 10px;
+	}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile {
+	will-change: opacity;
+	}
+.leaflet-fade-anim .leaflet-popup {
+	opacity: 0;
+	-webkit-transition: opacity 0.2s linear;
+	   -moz-transition: opacity 0.2s linear;
+	     -o-transition: opacity 0.2s linear;
+	        transition: opacity 0.2s linear;
+	}
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+	opacity: 1;
+	}
+.leaflet-zoom-animated {
+	-webkit-transform-origin: 0 0;
+	    -ms-transform-origin: 0 0;
+	        transform-origin: 0 0;
+	}
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	will-change: transform;
+	}
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
+	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+	}
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile {
+	-webkit-transition: none;
+	   -moz-transition: none;
+	     -o-transition: none;
+	        transition: none;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+	visibility: hidden;
+	}
+
+
+/* cursors */
+
+.leaflet-interactive {
+	cursor: pointer;
+	}
+.leaflet-grab {
+	cursor: -webkit-grab;
+	cursor:    -moz-grab;
+	}
+.leaflet-crosshair,
+.leaflet-crosshair .leaflet-interactive {
+	cursor: crosshair;
+	}
+.leaflet-popup-pane,
+.leaflet-control {
+	cursor: auto;
+	}
+.leaflet-dragging .leaflet-grab,
+.leaflet-dragging .leaflet-grab .leaflet-interactive,
+.leaflet-dragging .leaflet-marker-draggable {
+	cursor: move;
+	cursor: -webkit-grabbing;
+	cursor:    -moz-grabbing;
+	}
+
+/* marker & overlays interactivity */
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-image-layer,
+.leaflet-pane > svg path,
+.leaflet-tile-container {
+	pointer-events: none;
+	}
+
+.leaflet-marker-icon.leaflet-interactive,
+.leaflet-image-layer.leaflet-interactive,
+.leaflet-pane > svg path.leaflet-interactive {
+	pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */
+	pointer-events: auto;
+	}
+
+/* visual tweaks */
+
+.leaflet-container {
+	background: #ddd;
+	outline: 0;
+	}
+.leaflet-container a {
+	color: #0078A8;
+	}
+.leaflet-container a.leaflet-active {
+	outline: 2px solid orange;
+	}
+.leaflet-zoom-box {
+	border: 2px dotted #38f;
+	background: rgba(255,255,255,0.5);
+	}
+
+
+/* general typography */
+.leaflet-container {
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
+	border-radius: 4px;
+	}
+.leaflet-bar a,
+.leaflet-bar a:hover {
+	background-color: #fff;
+	border-bottom: 1px solid #ccc;
+	width: 26px;
+	height: 26px;
+	line-height: 26px;
+	display: block;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	}
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	display: block;
+	}
+.leaflet-bar a:hover {
+	background-color: #f4f4f4;
+	}
+.leaflet-bar a:first-child {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	}
+.leaflet-bar a:last-child {
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	border-bottom: none;
+	}
+.leaflet-bar a.leaflet-disabled {
+	cursor: default;
+	background-color: #f4f4f4;
+	color: #bbb;
+	}
+
+.leaflet-touch .leaflet-bar a {
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
+	}
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in,
+.leaflet-control-zoom-out {
+	font: bold 18px 'Lucida Console', Monaco, monospace;
+	text-indent: 1px;
+	}
+.leaflet-control-zoom-out {
+	font-size: 20px;
+	}
+
+.leaflet-touch .leaflet-control-zoom-in {
+	font-size: 22px;
+	}
+.leaflet-touch .leaflet-control-zoom-out {
+	font-size: 24px;
+	}
+
+
+/* layers control */
+
+.leaflet-control-layers {
+	box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+	background: #fff;
+	border-radius: 5px;
+	}
+.leaflet-control-layers-toggle {
+	background-image: url(../public/layers.png);
+	width: 36px;
+	height: 36px;
+	}
+.leaflet-retina .leaflet-control-layers-toggle {
+	background-image: url(../public/layers-2x.png);
+	background-size: 26px 26px;
+	}
+.leaflet-touch .leaflet-control-layers-toggle {
+	width: 44px;
+	height: 44px;
+	}
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+	display: none;
+	}
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+	display: block;
+	position: relative;
+	}
+.leaflet-control-layers-expanded {
+	padding: 6px 10px 6px 6px;
+	color: #333;
+	background: #fff;
+	}
+.leaflet-control-layers-scrollbar {
+	overflow-y: scroll;
+	padding-right: 5px;
+	}
+.leaflet-control-layers-selector {
+	margin-top: 2px;
+	position: relative;
+	top: 1px;
+	}
+.leaflet-control-layers label {
+	display: block;
+	}
+.leaflet-control-layers-separator {
+	height: 0;
+	border-top: 1px solid #ddd;
+	margin: 5px -10px 5px -6px;
+	}
+
+/* Default icon URLs */
+.leaflet-default-icon-path {
+	background-image: url(../public/marker-icon.png);
+	}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+	background: #fff;
+	background: rgba(255, 255, 255, 0.7);
+	margin: 0;
+	}
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+	padding: 0 5px;
+	color: #333;
+	}
+.leaflet-control-attribution a {
+	text-decoration: none;
+	}
+.leaflet-control-attribution a:hover {
+	text-decoration: underline;
+	}
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+	font-size: 11px;
+	}
+.leaflet-left .leaflet-control-scale {
+	margin-left: 5px;
+	}
+.leaflet-bottom .leaflet-control-scale {
+	margin-bottom: 5px;
+	}
+.leaflet-control-scale-line {
+	border: 2px solid #777;
+	border-top: none;
+	line-height: 1.1;
+	padding: 2px 5px 1px;
+	font-size: 11px;
+	white-space: nowrap;
+	overflow: hidden;
+	-moz-box-sizing: border-box;
+	     box-sizing: border-box;
+
+	background: #fff;
+	background: rgba(255, 255, 255, 0.5);
+	}
+.leaflet-control-scale-line:not(:first-child) {
+	border-top: 2px solid #777;
+	border-bottom: none;
+	margin-top: -2px;
+	}
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+	border-bottom: 2px solid #777;
+	}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	box-shadow: none;
+	}
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	border: 2px solid rgba(0,0,0,0.2);
+	background-clip: padding-box;
+	}
+
+
+/* popup */
+
+.leaflet-popup {
+	position: absolute;
+	text-align: center;
+	margin-bottom: 20px;
+	}
+.leaflet-popup-content-wrapper {
+	padding: 1px;
+	text-align: left;
+	border-radius: 12px;
+	}
+.leaflet-popup-content {
+	margin: 13px 19px;
+	line-height: 1.4;
+	}
+.leaflet-popup-content p {
+	margin: 18px 0;
+	}
+.leaflet-popup-tip-container {
+	width: 40px;
+	height: 20px;
+	position: absolute;
+	left: 50%;
+	margin-left: -20px;
+	overflow: hidden;
+	pointer-events: none;
+	}
+.leaflet-popup-tip {
+	width: 17px;
+	height: 17px;
+	padding: 1px;
+
+	margin: -10px auto 0;
+
+	-webkit-transform: rotate(45deg);
+	   -moz-transform: rotate(45deg);
+	    -ms-transform: rotate(45deg);
+	     -o-transform: rotate(45deg);
+	        transform: rotate(45deg);
+	}
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip {
+	background: white;
+	color: #333;
+	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+	}
+.leaflet-container a.leaflet-popup-close-button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 4px 4px 0 0;
+	border: none;
+	text-align: center;
+	width: 18px;
+	height: 14px;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
+	color: #c3c3c3;
+	text-decoration: none;
+	font-weight: bold;
+	background: transparent;
+	}
+.leaflet-container a.leaflet-popup-close-button:hover {
+	color: #999;
+	}
+.leaflet-popup-scrolled {
+	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	}
+
+.leaflet-oldie .leaflet-popup-content-wrapper {
+	zoom: 1;
+	}
+.leaflet-oldie .leaflet-popup-tip {
+	width: 24px;
+	margin: 0 auto;
+
+	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+	}
+.leaflet-oldie .leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
+
+.leaflet-oldie .leaflet-control-zoom,
+.leaflet-oldie .leaflet-control-layers,
+.leaflet-oldie .leaflet-popup-content-wrapper,
+.leaflet-oldie .leaflet-popup-tip {
+	border: 1px solid #999;
+	}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+	background: #fff;
+	border: 1px solid #666;
+	}
+
+
+/* Tooltip */
+/* Base styles for the element that has a tooltip */
+.leaflet-tooltip {
+	position: absolute;
+	padding: 6px;
+	background-color: #fff;
+	border: 1px solid #fff;
+	border-radius: 3px;
+	color: #222;
+	white-space: nowrap;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	pointer-events: none;
+	box-shadow: 0 1px 3px rgba(0,0,0,0.4);
+	}
+.leaflet-tooltip.leaflet-clickable {
+	cursor: pointer;
+	pointer-events: auto;
+	}
+.leaflet-tooltip-top:before,
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+	position: absolute;
+	pointer-events: none;
+	border: 6px solid transparent;
+	background: transparent;
+	content: "";
+	}
+
+/* Directions */
+
+.leaflet-tooltip-bottom {
+	margin-top: 6px;
+}
+.leaflet-tooltip-top {
+	margin-top: -6px;
+}
+.leaflet-tooltip-bottom:before,
+.leaflet-tooltip-top:before {
+	left: 50%;
+	margin-left: -6px;
+	}
+.leaflet-tooltip-top:before {
+	bottom: 0;
+	margin-bottom: -12px;
+	border-top-color: #fff;
+	}
+.leaflet-tooltip-bottom:before {
+	top: 0;
+	margin-top: -12px;
+	margin-left: -6px;
+	border-bottom-color: #fff;
+	}
+.leaflet-tooltip-left {
+	margin-left: -6px;
+}
+.leaflet-tooltip-right {
+	margin-left: 6px;
+}
+.leaflet-tooltip-left:before,
+.leaflet-tooltip-right:before {
+	top: 50%;
+	margin-top: -6px;
+	}
+.leaflet-tooltip-left:before {
+	right: 0;
+	margin-right: -12px;
+	border-left-color: #fff;
+	}
+.leaflet-tooltip-right:before {
+	left: 0;
+	margin-left: -12px;
+	border-right-color: #fff;
+	}