jekyll-webmaps-simple-theme 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69064f80b50dce2a2c6e32fbebd8779f469eb7fc4e34083a19a5315f733da687
-  data.tar.gz: 15535b618039795c44b16a2428e1b2fc92e318ad53d6c56a3f454ef27775a111
+  metadata.gz: 96a853947b6bf0201080d2d6d86c7c8c37c7b97680542532025ee4ab372ef980
+  data.tar.gz: 1c9103a6da5d95ed4cbf8a0ee797a783c2f00a251fe6d247b541594d0939c21a
 SHA512:
-  metadata.gz: 0c546e628bd0474b9f2c0929b3a6f93250940d41b0ca193c7c038f06922cb673054b8f7b1ceeb26d804fc3b752de1eeaca4ea321faf855be4e617a52e9a63073
-  data.tar.gz: 53c69d1dd7a7bdf4af43598ccf1a440bd1ea1c41284ce8410f6178906eed337c077f3d2bb3216205156d395b7f25c1cb318bd83f4e0ed0378cd48524217a5738
+  metadata.gz: cd8ae01defebdd729e45faa63403e3ef08eba7fea627b1201b4e3a51b3381a7744f7673146886b9dff8e558d5d22c77ef7bcd466fb50ba0e4c7feb4100b08b0d
+  data.tar.gz: 98754e24e24648a3777566f4908264d83d1f2cf0e40852cc061a5a3991218fb9758e256e53c842c98c89838a835e765c7d9f95fc625ee25eef2866b95e275c2a

data/_data/mapdata.yml

@@ -26,14 +26,13 @@ geojson:
       feat:
         - population
 
-  polygon: 
+  polygon:
     -
       url: 'assets/data/json/sarawak_admin_dummy.geojson'
       id: admin
       name: Administration
       feat:
-        - NAME_1
-        - POP
+        - NAME_2
   line:
 
 base:

data/_includes/head.html

@@ -15,12 +15,15 @@
   <!-- - -->
 
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
+  <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css"  type="text/css">
+  <link rel="stylesheet" href="{{ site.url }}/assets/css/bootstrap.min.css"  type="text/css">
+  <link rel="stylesheet" href="{{ site.url }}/assets/css/font-awesome.min.css"  type="text/css">
+
   <!-- JS -->
-  <script src="{{ '/assets/js/jquery.min.js' | relative_url }}"></script>
-  <script src="{{ '/assets/js/bootstrap.min.js' | relative_url }}"></script>
-	<script src="{{ '/assets/js/leaflet.js' | relative_url }}"></script>
-  <script src="{{ '/assets/js/Leaflet.fullscreen.min.js' | relative_url }}"></script>
+  <script src="{{ site.url }}/assets/js/jquery.min.js"></script>
+  <script src="{{ site.url }}/assets/js/bootstrap.min.js"></script>
+	<script src="{{ site.url }}/assets/js/leaflet.js"></script>
+  <script src="{{ site.url }}/assets/js/Leaflet.fullscreen.min.js"></script>
   {% for js in site.data.mapdata.base %}{% if js.extrajs == true %}<script type="text/javascript" src="{{ js.leaflet-js }}"></script>{% endif %}{% endfor %}
   {% for js in site.data.mapdata.overlay %}{% if js.extrajs == true %}<script type="text/javascript" src="{{ js.leaflet-js }}"></script>{% endif %}{% endfor %}
 

data/_includes/map.html

@@ -50,23 +50,37 @@
     {% if site.data.mapdata.load_geojson == true %}
 
       {% for map in site.data.mapdata.geojson.point %}
-      function onEachFeature(feature, layer) {
+      function onEachPointFeature(feature, layer) {
         // does this feature have a property named popupContent?
-        if (feature.properties && feature.properties.population) {
-          layer.bindPopup(feature.properties.population);
+        if (feature.properties && feature.properties.{{ map.feat }}) {
+          layer.bindPopup(feature.properties.{{ map.feat }});
         }
       }
-      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachFeature});
+
+      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachPointFeature});
       $.getJSON("{{ map.url }}", function(data){ {{ map.id }}.addData(data);});
       {% endfor %}
 
       {% for map in site.data.mapdata.geojson.polygon %}
-      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachFeature});
+      function onEachPolygonFeature(feature, layer) {
+      // does this feature have a property named popupContent?
+      if (feature.properties && feature.properties.{{ map.feat }}) {
+        layer.bindPopup(feature.properties.{{ map.feat }});
+      }
+    }
+
+      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachPolygonFeature});
       $.getJSON("{{ map.url }}", function(data){ {{ map.id }}.addData(data);});
       {% endfor %}
 
       {% for map in site.data.mapdata.geojson.line %}
-      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachFeature});
+      function onEachLineFeature(feature, layer) {
+        // does this feature have a property named popupContent?
+        if (feature.properties && feature.properties.{{ map.feat }}) {
+          layer.bindPopup(feature.properties.{{ map.feat }});
+        }
+      }
+      var {{ map.id }}= L.geoJson(null,{onEachFeature: onEachLineFeature});
       $.getJSON("{{ map.url }}", function(data){ {{ map.id }}.addData(data);});
       {% endfor %}
 
@@ -117,4 +131,7 @@
     map.addControl(new legend());
 
   </script>
+  <script src="{{ site.url }}/assets/js/jquery.min.js"></script>
+  <script src="{{ site.url }}/assets/js/leaflet.js"></script>
+  <script src="{{ site.url }}/assets/js/Leaflet.fullscreen.min.js"></script>
 </div>

data/_layouts/default.html

@@ -4,16 +4,8 @@
   {% include head.html %}
 
 <body>
-  {% include header.html %}
 
-  <!-- {% include fork_me.html %} -->
+{{ content }}
 
-  {% include about.html %}
-
-  {% include contact.html %}
-
-  {{ content }}
-
-  {% include map.html %}
 </body>
 </html>

data/_layouts/page.html

@@ -1,5 +1,3 @@
 ---
 layout: default
 ---
-
-{{ content }}

data/_layouts/post.html

@@ -0,0 +1,3 @@
+---
+layout: default
+---