From 5c30fe61c8191ef3e783ce1adf98d918159e2916 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 1 Jul 2017 02:58:59 -0400 Subject: [PATCH] Actually made Leaflets work! --- map.html | 8 ++++++-- resources/game/css/style.css | 4 ---- resources/map/css/style.css | 9 +++++++++ .../images/biome_map_full_10.png | Bin .../{game => map}/images/tiles/blue_tile.png | Bin .../{game => map}/images/tiles/green_tile.png | Bin .../images/tiles/purple_tile.png | Bin .../{game => map}/images/tiles/red_tile.png | Bin .../{game => map}/images/tiles/white_tile.png | Bin .../images/tiles/yellow_tile.png | Bin resources/map/map.js | 18 ++++++++++++++++++ resources/nav.js | 4 ++-- 12 files changed, 35 insertions(+), 8 deletions(-) delete mode 100644 resources/game/css/style.css create mode 100644 resources/map/css/style.css rename resources/{game => map}/images/biome_map_full_10.png (100%) rename resources/{game => map}/images/tiles/blue_tile.png (100%) rename resources/{game => map}/images/tiles/green_tile.png (100%) rename resources/{game => map}/images/tiles/purple_tile.png (100%) rename resources/{game => map}/images/tiles/red_tile.png (100%) rename resources/{game => map}/images/tiles/white_tile.png (100%) rename resources/{game => map}/images/tiles/yellow_tile.png (100%) create mode 100644 resources/map/map.js diff --git a/map.html b/map.html index 062af51..a21065e 100644 --- a/map.html +++ b/map.html @@ -6,8 +6,9 @@ Civilization Map - + + +

Leaflet Map

+
- +

Civilization Map

+ diff --git a/resources/game/css/style.css b/resources/game/css/style.css deleted file mode 100644 index d355124..0000000 --- a/resources/game/css/style.css +++ /dev/null @@ -1,4 +0,0 @@ -#biome_map{ - width: 100%; - height: auto; -} diff --git a/resources/map/css/style.css b/resources/map/css/style.css new file mode 100644 index 0000000..90250ca --- /dev/null +++ b/resources/map/css/style.css @@ -0,0 +1,9 @@ +#biome_map{ + width: 100%; + height: auto; +} + +#leaflet_map{ + height: 400px; + width: 640px; +} diff --git a/resources/game/images/biome_map_full_10.png b/resources/map/images/biome_map_full_10.png similarity index 100% rename from resources/game/images/biome_map_full_10.png rename to resources/map/images/biome_map_full_10.png diff --git a/resources/game/images/tiles/blue_tile.png b/resources/map/images/tiles/blue_tile.png similarity index 100% rename from resources/game/images/tiles/blue_tile.png rename to resources/map/images/tiles/blue_tile.png diff --git a/resources/game/images/tiles/green_tile.png b/resources/map/images/tiles/green_tile.png similarity index 100% rename from resources/game/images/tiles/green_tile.png rename to resources/map/images/tiles/green_tile.png diff --git a/resources/game/images/tiles/purple_tile.png b/resources/map/images/tiles/purple_tile.png similarity index 100% rename from resources/game/images/tiles/purple_tile.png rename to resources/map/images/tiles/purple_tile.png diff --git a/resources/game/images/tiles/red_tile.png b/resources/map/images/tiles/red_tile.png similarity index 100% rename from resources/game/images/tiles/red_tile.png rename to resources/map/images/tiles/red_tile.png diff --git a/resources/game/images/tiles/white_tile.png b/resources/map/images/tiles/white_tile.png similarity index 100% rename from resources/game/images/tiles/white_tile.png rename to resources/map/images/tiles/white_tile.png diff --git a/resources/game/images/tiles/yellow_tile.png b/resources/map/images/tiles/yellow_tile.png similarity index 100% rename from resources/game/images/tiles/yellow_tile.png rename to resources/map/images/tiles/yellow_tile.png diff --git a/resources/map/map.js b/resources/map/map.js new file mode 100644 index 0000000..5cd0269 --- /dev/null +++ b/resources/map/map.js @@ -0,0 +1,18 @@ +$("document").ready(function(){ + var mymap = L.map('leaflet_map').setView([51.505, -0.09], 13); + L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', { + attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox', + maxZoom: 18, + id: 'mapbox.streets', + accessToken: 'pk.eyJ1IjoiYWxpc3VuZGVyc3Rvcm0iLCJhIjoiY2o0a3hubndlMG5ocjMzbjNyeW9yN2psOCJ9.5nZ_P1lpiJO08pRvtq2cZg' + }).addTo(mymap); + + var circle = L.circle([51.508, -0.11], { + color: 'red', + fillColor: '#f03', + fillOpacity: 0.5, + radius: 500 + }).addTo(mymap); + console.log("done loading?"); + console.info(mymap); +}); diff --git a/resources/nav.js b/resources/nav.js index 2ba0503..691c4c6 100644 --- a/resources/nav.js +++ b/resources/nav.js @@ -1,4 +1,4 @@ -window.onload = function(){ +$("document").ready(function(){ $("nav") .append($("") @@ -21,4 +21,4 @@ window.onload = function(){ .attr("href", "./spawn.html")); -} +});