Merge pull request #43 from geogeeks-au/revert-41-event-maps

Revert "Add Leaflet slippy map to event pages"
geogeeks-au · Jun 22, 2023 · 24eeabf · 24eeabf
2 parents 3d5af57 + 9f67e56
commit 24eeabf
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 99 deletions.
diff --git a/2022/0501_mount-lawley.md b/2022/0501_mount-lawley.md
@@ -7,8 +7,7 @@ time: "9:30 am"
 location:
     name: Viaje Coffee
     address: 8/609 Beaufort Street, Mount Lawley
-    latitude: -31.9355
-    longitude: 115.87101
+    map: https://www.openstreetmap.org/node/9694280411
 info_url: https://osmcal.org/event/1326/
 ---
 Join us at 9:30am for a coffee, morning tea and a chat at the cute little Viaje Coffee.

diff --git a/2022/0623_meetup-fremantle.md b/2022/0623_meetup-fremantle.md
@@ -5,10 +5,9 @@ title: "Geogeeks meetup"
 date: "Thursday, 23rd June"
 time: "5:30 pm"
 location:
-    name: Robert Harper Building
+    name:
     address: 49 Phillimore Street, Fremantle
-    latitude: -32.0534911
-    longitude: 115.7442822
+    map: https://www.openstreetmap.org/node/9352218085
 registration_url: https://www.eventbrite.com.au/e/geogeeks-meetup-23-june-2022-tickets-365345427007
 ---
 We're back! We're reinstating regular geospatial community meetups. Starting in Fremantle!

diff --git a/2022/0710_fremantle.md b/2022/0710_fremantle.md
@@ -7,8 +7,7 @@ time: "9:30 am"
 location:
     name: Il Cibo
     address: Market Street, Fremantle
-    latitude: -32.0528776
-    longitude: 115.7459013
+    map: https://www.openstreetmap.org/node/5213286325
 registration_url: https://osmcal.org/event/1399/
 ---
 Social Mapping Sunday - the Fremantle edition! We’re planning a day of surveying the area and indoor desktop mapping.

diff --git a/2022/0714_qgis-terriajs.md b/2022/0714_qgis-terriajs.md
@@ -7,8 +7,7 @@ time: 5:30 – 8:00 p.m.
 location:
     name: Riff (Spacecubed)
     address: 45 St Georges Tce, Perth
-    latitude: -31.955847
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 registration_url: https://events.humanitix.com/geogeeks-meetup-july-14th-2022
 ---
 We’re excited to be back at Riff! Come help us celebrate with an evening of short talks from members of the Perth open geospatial community.

diff --git a/2022/0814_claisebrook.md b/2022/0814_claisebrook.md
@@ -7,8 +7,7 @@ time: 9:30AM – 2PM
 location:
     name: Kinky Lizard espresso Bar
     address:  78a/20 Royal Street, Perth
-    latitude: -31.9530254
-    longitude: 115.8794482
+    map:
 registration_url: https://osmcal.org/event/1502/
 ---
 Come for another Perth mapping party, this time starting in Claisebrook for coffee,

diff --git a/2022/0825_meetup.md b/2022/0825_meetup.md
@@ -7,8 +7,7 @@ time: 5:30 – 8:00 p.m.
 location:
     name: The Vault, at Riff (Spacecubed)
     address: 45 St Georges Tce, Perth
-    latitude: -31.955846
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 ---
 The plan for the evening includes:
 

diff --git a/2022/1013_drones.md b/2022/1013_drones.md
@@ -7,8 +7,7 @@ time: 5:30 – 8:00 p.m.
 location:
     name: The Vault, at Riff (Spacecubed)
     address: 45 St Georges Tce, Perth
-    latitude: -31.955845
-    longitude: 115.8589800
+    map: https://www.openstreetmap.org/node/6829139688
 registration_url: https://events.humanitix.com/geogeeks-meetup-drones-opendronemap-openstreetmap-as-database
 ---
 Join us for an evening of talks and skill sharing with the Perth open geospatial community!

diff --git a/2022/1106_rokeby-road.md b/2022/1106_rokeby-road.md
@@ -7,8 +7,7 @@ time: 9:30AM – 2PM
 location:
     name: Rokeby Road
     address: Subiaco
-    latitude: -31.94483
-    longitude: 115.82405
+    map: https://www.openstreetmap.org/?mlat=-31.94483&mlon=115.82405#map=19/-31.94483/115.82405
 registration_url: https://osmcal.org/event/1668/
 ---
 Join us for a coffee and an exploration of Rokeby Rd in Subiaco at our next mapping party.

diff --git a/2022/1208_xmas-geosocial.md b/2022/1208_xmas-geosocial.md
@@ -7,8 +7,7 @@ time: 5:30 p.m.
 location:
     name: The Globe
     address: 495-497 Wellington Street, Perth
-    latitude: -31.9516241
-    longitude: 115.8584903
+    map: https://www.openstreetmap.org/node/4417406489
 registration_url: https://events.humanitix.com/geogeeks-end-of-year-geo-social
 ---
 Join us for a social catchup with the WA open geospatial community.

diff --git a/2023/0301_qgis-plugins.md b/2023/0301_qgis-plugins.md
@@ -7,8 +7,7 @@ time: 5:30 p.m.
 location:
     name: Riff (Spacecubed)
     address: 45 St Georges Tce, Perth
-    latitude: -31.9558444
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 registration_url: https://events.humanitix.com/geogeeks-meetup-qgis-plugins-and-more
 ---
 Please join us for a casual evening of short talks about QGIS and open source GIS from the Perth open geospatial community.

diff --git a/2023/0326_lake-leschenaultia.md b/2023/0326_lake-leschenaultia.md
@@ -6,10 +6,9 @@ time: 10:30AM
 location:
     name: Reflections Café
     address: Lake Leschenaultia (near Chidlow)
-    latitude: -31.85132
-    longitude: 116.25366
+    map: https://www.openstreetmap.org/way/719481809
 registration_url: https://osmcal.org/event/1984/
-homepage: false
+published: false
 ---
 For our first [Geogeeks](https://geogeeks.org/) mapping day out in 2023, we're heading to 
 [Lake Leschenaultia](https://en.wikipedia.org/wiki/Lake_Leschenaultia) in the Perth hills!

diff --git a/2023/0405_hacknight.md b/2023/0405_hacknight.md
@@ -6,8 +6,7 @@ time: 5:30PM
 location:
     name: Riff (Spacecubed), in the Vault
     address: 45 St Georges Tce, Perth
-    latitude: -31.955843
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 homepage: false
 ---
 Join us for a casual open geospatial hack night! Bring your projects, your challenges and ideas! All skill levels and areas of interest are welcome.

diff --git a/2023/0510_image-classification-qgis-plugins.md b/2023/0510_image-classification-qgis-plugins.md
@@ -6,8 +6,7 @@ time: 5:30 - 8pm
 location:
     name: Riff (Spacecubed), in the Town Hall area
     address: 45 St Georges Tce, Perth
-    latitude: -31.955842
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 registration_url: https://events.humanitix.com/geogeeks-meetup-image-classification-qgis-plugins-and-more
 homepage: false
 ---

diff --git a/2023/0513_osm-hyde-park.md b/2023/0513_osm-hyde-park.md
@@ -6,8 +6,7 @@ time: 9:30AM
 location:
     name: Hyde Park
     address: Perth
-    latitude: -31.93742
-    longitude: 115.86016
+    map: https://www.openstreetmap.org/way/4938194
 registration_url: https://osmcal.org/event/2096/
 homepage: false
 ---

diff --git a/2023/0607_hacknight.md b/2023/0607_hacknight.md
@@ -6,8 +6,7 @@ time: 5:30PM
 location:
     name: Riff (Spacecubed), in the 'Town Hall'
     address: 45 St Georges Tce, Perth
-    latitude: -31.955841
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 homepage: false
 registration_url: https://events.humanitix.com/geogeeks-meetup-june-hack-night
 ---

diff --git a/2023/0617_osm-coogee.md b/2023/0617_osm-coogee.md
@@ -6,8 +6,7 @@ time: 10:15AM
 location:
     name: Beach Point Cafe
     address: Coogee
-    latitude: -32.1095135
-    longitude: 115.7643982
+    map: https://www.openstreetmap.org/node/9572709420
 registration_url: https://osmcal.org/event/2132/
 homepage: false
 ---
@@ -17,7 +16,7 @@ Snacks/Coffee at 10:15 at Beach Point Cafe, provided by [OSGeo Oceania](https://
 
 Let's meet in Freo for an early coffee at 9:30, to catch the bus from the Freo Markets. Take the 9:50am bus 548 from Fremantle Station (17 stops, till 10:05) to Beach Point Cafe.
 
-### Everyone is welcome
+## Everyone is welcome
 
 We'll introduce each other, plan some routes to survey as teams. Then walk past the docks, shop, houses and parks, or down the beach taking notes. Meet for lunch when our legs get sore.
 No experience necessary, easy OSM mapping
@@ -26,7 +25,7 @@ No experience necessary, easy OSM mapping
 * drawing on a printed map or
 * taking photos and notes. We've got all the materials, come down and learn about OSM.
 
-### RSVP, get in touch
+## RSVP, get in touch
 
 * [OSM events in Australia](https://osmcal.org/?in=Australia)
 * Join [the Geogeeks Slack](https://join.slack.com/t/geogeeks/shared_invite/zt-13fnotoqb-YkyMTmvwZEB_nDUis_30hw) to coordinate on the day.

diff --git a/2023/0705_qfield-osm.md b/2023/0705_qfield-osm.md
@@ -6,8 +6,7 @@ time: 5:30–8pm
 location:
     name: Riff (Spacecubed), in the Town Hall area
     address: 45 St Georges Tce, Perth
-    latitude: -31.955841
-    longitude: 115.85898
+    map: https://www.openstreetmap.org/node/6829139688
 registration_url: https://events.humanitix.com/geogeeks-meetup-qfield-osm-data-visualisation-and-more
 homepage: true
 ---

diff --git a/Gemfile b/Gemfile
@@ -6,4 +6,3 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 gem "jekyll"
 gem "webrick"
-gem "jekyll-leaflet"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -32,7 +32,6 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-leaflet (0.2.1)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
@@ -70,7 +69,6 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll
-  jekyll-leaflet
   webrick
 
 BUNDLED WITH

diff --git a/README.md b/README.md
@@ -31,10 +31,9 @@ title: "Event: Title Here"
 date:
 time:
 location:
-    name: 
-    address: 
-    latitude: 
-    longitude: 
+    name:
+    address:
+    map:
 registration_url:
 homepage: true
 ---

diff --git a/_config.yml b/_config.yml
@@ -1,3 +1 @@
 keep_files: [ workshops, geogeeks.ics ]
-plugins:
-    - jekyll-leaflet
diff --git a/_layouts/event.html b/_layouts/event.html
@@ -13,8 +13,8 @@
     <dd class="col-sm-10">
         {% if page.location.name %}<em>{{ page.location.name }}</em>{% endif %}{% if page.location.name and page.location.address %}, {% endif %}
         {% if page.location.address %}{{ page.location.address }}{% endif %}
-        {% if page.location.latitude %}
-            [<a href="#map">See map below</a>]
+        {% if page.location.map %}
+          [<a href="{{page.location.map}}">map</a>]
         {% endif %}
     </dd>
 </dl>
@@ -26,16 +26,3 @@
         <a href="{{ page.registration_url }}" class="btn btn-primary">Register now!</a>
     </p>
 {% endif %}
-
-{% if page.location.latitude %}
-    <a name="map"></a>
-    {% leaflet_map { "zoom": 18 } %}
-
-        {% leaflet_marker {
-            "id": "event-location",
-            "latitude" : {{ page.location.latitude }},
-            "longitude": {{ page.location.longitude }}
-        } %}
-
-    {% endleaflet_map %}
-{% endif %}
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -85,8 +85,8 @@ <h3 class="mt-3"><a href="{{ event.url }}">{{ event.title }}</a></h3>
                 <p class="text-white-75 m-0">
                   {% if event.location.name %}<em>{{ event.location.name }}</em>{% endif %}{% if event.location.name and event.location.address %}, {% endif %}
                   {% if event.location.address %}{{ event.location.address }}{% endif %}
-                  {% if event.location.latitude %}
-                    [<a href="https://www.openstreetmap.org/?mlat={{event.location.latitude}}&mlon={{event.location.longitude}}" class="text-white" target="_blank">map</a>]
+                  {% if event.location.map %}
+                    [<a href="{{event.location.map}}" class="text-white" target="_blank">map</a>]
                   {% endif %}
                 </p>
                 <div class="px-5 pb-1 pt-3">

diff --git a/_layouts/map.html b/_layouts/map.html
diff --git a/_layouts/plain.html b/_layouts/plain.html
@@ -17,9 +17,6 @@
                     <li class="nav-item {% if page.url == '/events.html' %}active{% endif %}">
                         <a class="nav-link" href="/events.html">Events</a>
                     </li>
-                    <li class="nav-item {% if page.url == '/map.html' %}active{% endif %}">
-                        <a class="nav-link" href="/map.html">Map</a>
-                    </li>
                 </ul>
                 <form action="https://duckduckgo.com/" method="get" id="search-form" class="form-inline my-2 my-lg-0">
                     <input type="hidden" name="sites" value="https://geogeeks.org" /><!-- This site only -->

diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -57,8 +57,3 @@ header.masthead p {
 .text-white a:hover {
   color: #b83a17;
 }
-
-.bigmap .leaflet-map {
-  /* @todo There's probably a better way to do this. */
-  height: 80vh !important;
-}
diff --git a/map.md b/map.md