Fix mapping JS scripts (#23)

DigitaleGesellschaft · Nov 20, 2022 · 19de83c · 19de83c
1 parent fa39919
commit 19de83c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-theme-conference (3.6.0)
+    jekyll-theme-conference (3.6.1)
       jekyll (~> 4.0)
 
 GEM

diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ To install:
    bundle
    ```
 
-4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
+4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 
 5. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
 

diff --git a/_includes/js/map.js b/_includes/js/map.js
@@ -1,16 +1,16 @@
-window.conference.mapConfig = (() => {
+window.conference.map = (() => {
     let config;
     let lang;
 
     let map;
 
     const setup = (elId) => {
-        map = L.map(elId).setView(config.map.home_coord, config.map.default_zoom);
+        map = L.map(elId).setView(config.home_coord, config.default_zoom);
 
-        L.tileLayer.provider(config.map.map_provider).addTo(map);
+        L.tileLayer.provider(config.map_provider).addTo(map);
 
         L.easyButton('far fa-star', () => {
-            map.flyTo(config.map.home_coord, config.map.default_zoom);
+            map.flyTo(config.home_coord, config.default_zoom);
         }, lang.location.focus_conf).addTo(map);
 
         L.control.locate({

diff --git a/_layouts/config.html b/_layouts/config.html
@@ -2,9 +2,9 @@
     {%- include partials/get_enable_map.html -%}
     {%- if enable_map %}
     "map": {
-        "map_provider": "{{ site.conference.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
-        "home_coord": [{{ site.conference.map.home_coord }}],
-        "default_zoom": {{ site.conference.map.default_zoom | default: 17 }}
+        "map_provider": "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
+        "home_coord": [{{ site.conference.location.map.home_coord | default: '47.3744489, 47.3744489' }}],
+        "default_zoom": {{ site.conference.location.map.default_zoom | default: 17 }}
     },
     {%- endif %}
 

diff --git a/jekyll-theme-conference.gemspec b/jekyll-theme-conference.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-conference"
-  spec.version       = "3.6.0"
+  spec.version       = "3.6.1"
   spec.authors       = ["Lorenz Schmid"]
   spec.email         = ["lorenzschmid@users.noreply.github.com"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,7 +110,7 @@ To install: @@
        bundle
        ```
-. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
+. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 . Continue with the _Setup_ section further below to customize the theme and add some content for your conference
@@ Expand Down @@