-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
189 changed files
with
147 additions
and
5,764 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 3.1.3 | ||
| 3.1.6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| # State of the Map 2024 Website | ||
| # State of the Map 2025 Website | ||
|
|
||
| This repo is the Jekyll configuration, styles and content powering https://2024.stateofthemap.org | ||
| This repo is the Jekyll configuration, styles and content powering https://2025.stateofthemap.org | ||
|
|
||
| <!--Note that the SotM program is managed through our submission system at https://pretalx.com/sotm2024. If you change it on the submission system, it will be updated on the website automatically. Do that rather than making pull requests on the "session" files here.--> | ||
| <!--Note that the SotM program is managed through our submission system at https://pretalx.com/sotm2025. If you change it on the submission system, it will be updated on the website automatically. Do that rather than making pull requests on the "session" files here.--> | ||
|
|
||
| ## Local installation | ||
|
|
||
|
|
@@ -12,8 +12,8 @@ See https://jekyllrb.com/docs/installation/ | |
|
|
||
| ### View locally | ||
|
|
||
| * `git clone [email protected]:openstreetmap/stateofthemap-2024.git` | ||
| * `cd stateofthemap-2024` | ||
| * `git clone [email protected]:openstreetmap/stateofthemap-2025.git` | ||
| * `cd stateofthemap-2025` | ||
| * `jekyll serve -wl` | ||
| * Point your browser to `http://localhost:4000/` | ||
|
|
||
|
|
@@ -24,8 +24,8 @@ Alternatively you can use Docker to install Jekyll and to serve the site within | |
| ### Using docker-compose | ||
|
|
||
| * [Install docker-compose](https://docs.docker.com/compose/install/) | ||
| * `git clone [email protected]:openstreetmap/stateofthemap-2024.git` | ||
| * `cd stateofthemap-2024` | ||
| * `git clone [email protected]:openstreetmap/stateofthemap-2025.git` | ||
| * `cd stateofthemap-2025` | ||
| * `docker-compose up --build` | ||
| * Point your browser to `http://localhost:4000/` | ||
|
|
||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| # Site settings | ||
| title: "State of the Map 2024 – Nairobi, Kenya" | ||
| title: "State of the Map 2025 – Manila" | ||
| email: [email protected] | ||
| description: "The global OpenStreetMap conference. September 6 - 8, 2024 in Nairobi, Kenya & online." | ||
| url: "http://2024.stateofthemap.org" # the base hostname & protocol for your site | ||
| twitter_username: state | ||
| description: "The global OpenStreetMap conference. 2025 in Manila & online." | ||
| url: "http://2025.stateofthemap.org" # the base hostname & protocol for your site | ||
| twitter_username: sotm | ||
| github_username: jekyll | ||
|
|
||
| # Build settings | ||
| markdown: kramdown | ||
|
|
||
| # Color settings (hex-codes without the leading hash-tag) | ||
| color: | ||
| primary-dark: '#3cb9f7' # main: blue | ||
| primary-light: '#f2bb40' # secondary: yellow | ||
| background-light: '#bedeff' | ||
| links: '#04065e' # dark blue | ||
| links-light: '#2464aa' # light-ish blue??? | ||
| links-white: '#fff' | ||
| text: '#030304' | ||
| text-light: '#fff' | ||
| primary-dark: '#e5e5e5' # main: blue | ||
| primary-light: '#2464aa' # secondary: yellow | ||
| background-light: '#446' | ||
| links: '#fff' | ||
| links-light: '#fff' | ||
| links-white: '#2464aa' | ||
| text: '#333' | ||
| text-light: '#030304' | ||
|
|
||
| # Settings for map tiles used in leaflet maps | ||
| map_tiles: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,20 @@ | ||
| <div id="map" style="height:420px; width:100%"></div> | ||
| <script> | ||
| document.addEventListener('DOMContentLoaded', function() { | ||
| var map = L.map('map').setView([-1.27903, 36.81649], {{ include.zoom }}); | ||
| var map = L.map('map').setView([14.656760, 121.067045], {{ include.zoom }}); | ||
| L.control.scale().addTo(map); | ||
| L.tileLayer('{{ site.map_tiles.url}}', { | ||
| attribution: '{{ site.map_tiles.attribution }}', | ||
| maxZoom: {{ site.map_tiles.maxZoom}} | ||
| }).addTo(map); | ||
| map.scrollWheelZoom.disable(); | ||
| L.marker([-1.27903550863266, 36.81655079126358], {icon: L.icon({ | ||
| iconUrl: "{{ "/img/logo/sotm_2024-pin.svg" | prepend: site.baseurl }}", | ||
| iconSize: [60, 60], | ||
| iconAnchor: [30, 60] | ||
| })}).bindPopup("<h3>University of Nairobi Towers</h3><p>Conference Venue.<br><a href='https://osm.org/go/l9wM~Burm?m' target='_blank'>Open location on osm.org</a>.</p>").addTo(map); | ||
| L.circleMarker([14.656760, 121.067045], { | ||
| radius: 33, | ||
| weight: 3.5, | ||
| color: "#ffc700", | ||
| fillColor: "#f92329", | ||
| fillOpacity: 0.0, | ||
| className: 'map-marker' | ||
| }).bindPopup("<h3>Conference Venue</h3><p>UP Film Institute (UPFI) Cine Adarna.<br><a href='https://www.openstreetmap.org/way/149993740' target='_blank'>Open location on osm.org</a>.</p>").addTo(map); | ||
| }, false); | ||
| </script> |
Oops, something went wrong.