remove duplicate coordinate

compose.yml

@@ -153,7 +153,7 @@ networks:
 
 configs:
   feeds_list:
-    name: beta_lumbung_space_feeds_list_v8
+    name: beta_lumbung_space_feeds_list_v4
     file: feeds_list.txt
   feeds_list_pen:
     name: beta_lumbung_space_feeds_list_pen_v2

config.toml

@@ -4,7 +4,6 @@ title = "lumbung.space"
 theme = "lumbung-theme"
 pluralizeListTitles = "false"
 paginate = 20
-hasCJKlanguage = "true"
 
 [params]
     logo = "/img/logo.svg"

data/geojsonContributors.json

@@ -5,7 +5,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [34.46684826773766, 31.501803673432892]
+        "coordinates": [31.501803673432892, 34.46684826773766]
       },
       "properties": {
         "groupName": "The Question of Funding"
@@ -422,7 +422,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-0.200965, 5.560014]
+        "coordinates": [5.560014, -0.200965]
       },
       "properties": {
         "groupName": "Nubuke Foundation - Arts Collaboratory"
@@ -442,7 +442,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [35.513829, 33.897204]
+        "coordinates": [33.897204, 35.513829]
       },
       "properties": {
         "groupName": "Temporary Art Platform - Arts Collaboratory"
@@ -462,7 +462,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-74.087834, 4.635649]
+        "coordinates": [4.635649, -74.087834]
       },
       "properties": {
         "groupName": "Lugar a Dudas - Arts Collaboratory"
@@ -472,7 +472,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-76.549099, 3.451646]
+        "coordinates": [3.451646, -76.549099]
       },
       "properties": {
         "groupName": "Helena Producciones - Arts Collaboratory"
@@ -482,7 +482,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [18.463735, -33.940484]
+        "coordinates": [-33.940484, 18.463735]
       },
       "properties": {
         "groupName": "Gugulective - Arts Collaboratory"
@@ -502,7 +502,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-90.516175, 14.624033]
+        "coordinates": [14.624033, -90.516175]
       },
       "properties": {
         "groupName": "La Torana - Arts Collaboratory"
@@ -512,7 +512,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [106.832686, -6.218968]
+        "coordinates": [-6.218968, 106.832686]
       },
       "properties": {
         "groupName": "ruangrupa"
@@ -522,7 +522,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [28.047305, -26.204103]
+        "coordinates": [-26.204103, 28.047305]
       },
       "properties": {
         "groupName": "Keleketla! Library - Arts Collaboratory",
@@ -534,7 +534,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [67.063473, 24.861462]
+        "coordinates": [24.861462, 67.063473]
       },
       "properties": {
         "groupName": "Vasl Artists' Association - Arts Collaboratory"
@@ -544,7 +544,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [3.379206, 6.453060]
+        "coordinates": [6.453060, 3.379206]
       },
       "properties": {
         "groupName": "Video Art Network Lagos - Arts Collaboratory"
@@ -554,7 +554,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-68.122441, -16.507456]
+        "coordinates": [-16.507456, -68.122441]
       },
       "properties": {
         "groupName": "Casa Tres Patios - Arts Collaboratory"
@@ -564,7 +564,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-77.033966, -12.046374]
+        "coordinates": [-12.046374, -77.033966]
       },
       "properties": {
         "groupName": "Bisagra - Arts Collaboratory"
@@ -574,7 +574,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [121.028812, 14.565859]
+        "coordinates": [14.565859, 121.028812]
       },
       "properties": {
         "groupName": "Green Papaya Art Projects - Arts Collaboratory"
@@ -584,7 +584,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [32.570926, -25.965053]
+        "coordinates": [-25.965053, 32.570926]
       },
       "properties": {
         "groupName": "Nucleo de Arte - Arts Collaboratory"
@@ -594,7 +594,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-99.127662, 19.433735]
+        "coordinates": [19.433735, -99.127662]
       },
       "properties": {
         "groupName": "Casa Gallina - Arts Collaboratory"
@@ -604,7 +604,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-56.168350, -34.905134]
+        "coordinates": [-34.905134, -56.168350]
       },
       "properties": {
         "groupName": "Espacio de Arte Contemporáneo - Arts Collaboratory"
@@ -614,7 +614,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [72.825833, 18.964700]
+        "coordinates": [18.964700, 72.825833]
       },
       "properties": {
         "groupName": "Clark House Initiative - Arts Collaboratory"
@@ -624,7 +624,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [104.9165275, 11.5636628]
+        "coordinates": [11.5636628, 104.9165275]
       },
       "properties": {
         "groupName": "SA SA BASSAC - Arts Collaboratory"
@@ -654,7 +654,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-70.648204, -33.447503]
+        "coordinates": [-33.447503, -70.648204]
       },
       "properties": {
         "groupName": "Metales Pesados - Arts Collaboratory"
@@ -664,7 +664,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [-46.6523816, -23.5351122]
+        "coordinates": [-23.5351122, -46.6523816]
       },
       "properties": {
         "groupName": "Casa do Povo - Arts Collaboratory"
@@ -684,7 +684,7 @@
       "type": "Feature",
       "geometry": {
         "type": "Point",
-        "coordinates": [110.3661793, -7.7830803]
+        "coordinates": [-7.7830803, 110.3661793]
       },
       "properties": {
         "groupName": "KUNCI Cultural Studies Center - Arts Collaboratory"

feeds_list.txt

@@ -12,6 +12,3 @@ https://ruangrupa.id/feed/
 https://wajukuuarts.wordpress.com/feed/
 https://www.masartemasaccion.org/feed/?lang=en
 https://www.ruralschoolofeconomics.info/rss.xml
-https://riwanua.id/feed/
-https://zapier.com/engine/rss/9657521/balik
-

themes/lumbung-theme/layouts/_default/list.html

@@ -22,9 +22,6 @@
                   {{- partial "partials/shout_card.html" . -}}
                 {{ end }}
 
-            {{ else if in .Params.sources "pen.lumbung.space" }}
-                  {{- partial "partials/pen_card.html" . -}}
-
             {{ else if eq .Section "social" }}
               {{- partial "partials/social_card.html" . -}}
 

themes/lumbung-theme/layouts/_default/single.html

@@ -2,11 +2,13 @@
     <main class="main single">
       <article class="h-entry">
       <header>
-        <h1 class="p-name single"><a href="{{ .Permalink }}" class="u-url">{{ .Title }}</a></h1>
+        <h1 class="p-name"><a href="{{ .Permalink }}" class="u-url">{{ .Title }}</a></h1>
-        <div class="metadata"><span class="from p-author">{{ if .Params.contributors }}By <b>{{range .Params.contributors}} <a href='{{ "/contributors/" | relLangURL }}{{ . | urlize }}/'> {{ . }},</a> {{ end }}</b>{{ end }} {{with .Params.original_link }}originally posted on <b><a href="{{ . }}">{{ end }}{{ .Params.feed_name }}</a></b> on <time class="dt-published" datetime="{{ .Date.Format `Jan 02 2006` }}">{{ .Date.Format "Jan 02, 2006" }}</time></span></div>
+        <p>
-      </header>
+          Published by <a class="p-author" href="/about">{{ $.Param "author" }}</a>
+          on <time class="dt-published" datetime="{{ .Date.Format `Jan 02 2006` }}">{{ .Date.Format "Jan 02, 2006" }}</time>
+        </p>
+
       <div class="e-content">
-        {{with .Params.featured_image}}<img src="{{.}}"></img>{{end}}
         {{ .Content }}
       </div>
       </article>

themes/lumbung-theme/layouts/index.html

@@ -23,16 +23,6 @@
                   {{- partial "partials/shout_card.html" . -}}
                 {{ end }}
 
-            {{ else if eq .Section "pen" }}
-                {{ if in .Params.sources "pen.lumbung.space" }}
-                  {{- partial "partials/pen_card.html" . -}}
-                {{ end }}
-
-            {{ else if eq .Section "timeline"}}
-                {{ if in .Params.sources "pen.lumbung.space" }}
-                  {{- partial "partials/pen_card.html" . -}}
-                {{ end }}
-
             {{ else if eq .Section "social" }}
               {{- partial "partials/social_card.html" . -}}
 

themes/lumbung-theme/layouts/partials/header.html

@@ -25,7 +25,7 @@
             <li><a href="/publishers/">publishers</a></li>
             <li class="has-submenu">ekonomi
                 <ul class="submenu">
-                    <li><a href="/tags/lumbungkiosproducts/">kios</a></li>
+                    {{/*  <li><a href="/tags/lumbungkiosproducts/">kios</a></li>  */}}
                     <li><a href="/tags/lumbunggallery/">gallery</a></li>
                 </ul>
             </li>

themes/lumbung-theme/layouts/partials/pen_card.html

@@ -1,35 +1,30 @@
     <div class='pen card {{ .Params.feed_name }} filter-item' data-section="{{ .Section }}" data-sources='{{- partial "data/sources.html" . -}}' data-contributors='{{- partial "data/contributors.html" . -}}' data-tags='{{- partial "data/tags.html" . -}}'>
       <article class="h-entry pen">
         <header>
-        <div class="pen-source"><span class="from p-author">From {{ if .Params.author }}<b>{{.Params.author}}</b> at {{ end }}<a href="{{ "/sources/" | relLangURL }}{{ .Params.feed_name | urlize }}">{{ .Params.feed_name }}</a></span></div>
+        <div class="pen-source"><span class="from p-author">From {{ if .Params.author }}<b>{{.Params.author}}</b> at {{ end }}<a href="{{ "/categories/" | relLangURL }}{{ .Params.feed_name | urlize }}">{{ .Params.feed_name }}</a></span></div>
           
           {{ $postPermalink := .Permalink}}
           <time class="dt-published" datetime="{{ .Date.Format `Jan 02 2006` }}">{{ .Date.Format "Jan 02, 2006" }}</time>
-          <h2 class="p-name"><a href="{{ .Permalink }}" class="u-url">{{ .Title }}</a></h2> 
+          <h2 class="p-name"><a href="{{ .Permalink }}" class="u-url">{{ .Title }}</a></h2>
+          
         </header>
-        {{$first_image := ""}}
+        
-        {{$matches := findRESubmatch `<img\s.*?src=(?:'|")([^'">]+)(?:'|")` .Content 1 }}
+        {{ with (index (.Resources.ByType "image") 0) }}
-        {{range $matches}}{{$first_image = index . 1}}{{end}}
+        {{ $height := add .Height 0.0}}
-        {{with .Resources.Get $first_image}}
+        {{ $ratio := div $height .Width}}
-        {{/* Check for resource type since some TIFFS show up as image, but can not do image operations. Then we can ignore them. */}}
+        {{ $thumb := .Fit "540x540 q80 webp"}}
-          {{if .ResourceType}}
+        <div class="p-summary{{if gt $ratio 1 }} portrait {{else}} landscape {{end}}">
-            {{ $height := add .Height 0.0}}
+          <div class="summary-image {{if gt $ratio 1 }} portrait {{else}} landscape {{end}}"> 
-            {{ $ratio := div $height .Width}}
+            <a href="{{ $postPermalink }}"><img src="{{ $thumb.Permalink }}"  alt="{{ .Title }}"> </a>
-            {{ $thumb := .Fit "540x540 q80 webp"}}
+          </div>
-            <div class="p-summary{{if gt $ratio 1 }} portrait {{else}} landscape {{end}}">
-              <div class="summary-image {{if gt $ratio 1 }} portrait {{else}} landscape {{end}}"> 
-                <a href="{{ $postPermalink }}"><img src="{{ $thumb.Permalink }}"  alt="{{ .Title }}"> </a>
-              </div>
           {{ else }}
           <div class="p-summary">
-          {{ end }}
+            {{ end }}
-      {{ else }}
-          <div class="p-summary">
-      {{end}}
             <div class="summary-text">
               {{ .Summary }}
             </div>
           </div>
+          
           <footer class='post-footer'>
             <a href="{{ .RelPermalink }}">
               <svg width="11" height="11" viewBox="0 0 11 11" xmlns="http://www.w3.org/2000/svg">
@@ -37,5 +32,5 @@
               </svg>
             </a>
           </footer>            
-      </article>
+        </article>
-    </div>
+      </div>

themes/lumbung-theme/layouts/partials/shout_card.html

@@ -19,8 +19,7 @@
         </div>
       {{end}}
     {{ else if (.Resources.ByType "image") }}
-      {{/* Somehow the image resources are iterated in reverse, so we need to get the last one*/}}
+      {{ with (index (.Resources.ByType "image") 0) }}
-      {{ range last 1 (.Resources.ByType "image") }}
         {{ $img := . }}
         {{ $height := add .Height 0.0}}
         {{ $ratio := div $height .Width}}

themes/lumbung-theme/layouts/shortcodes/kios_map.html

@@ -1,15 +1,8 @@
-<link
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css"
-  rel="stylesheet"
+  integrity="sha256-kLaT2GOSpHechhsozzB+flnD+zUyjE2LlfWPgU04xyI=" crossorigin="" />
-  href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css"
-  integrity="sha256-kLaT2GOSpHechhsozzB+flnD+zUyjE2LlfWPgU04xyI="
-  crossorigin=""
-/>
 
-<script
+<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
-  src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
+  integrity="sha256-WBkoXOwTeyKclOHuWtc+i2uENFpDZ9YPdf5Hf+D7ewM=" crossorigin=""></script>
-  integrity="sha256-WBkoXOwTeyKclOHuWtc+i2uENFpDZ9YPdf5Hf+D7ewM="
-  crossorigin=""
-></script>
 
 <div id="map"></div>
 
@@ -19,11 +12,6 @@
     padding-bottom: 70%;
     margin-bottom: 80px;
   }
-
-  .black-dot {
-    background-color: black;
-    border-radius: 50%;
-  }
 </style>
 
 <script>
@@ -32,33 +20,21 @@
     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
   });
 
-
-  var blackDotIcon = L.divIcon({
-    className: 'black-dot',
-    iconSize: [20, 20],
-    iconAnchor: [10, 10]
-  });
-
-
   // Create makers layer group
   var makers = L.layerGroup();
   {{ with getJSON "https://kios-admin.lumbung.space/api/makers"}}
     {{ range .docs }}
-    var makerMarker = L.marker(L.GeoJSON.coordsToLatLng({{ .location }}), {
+      var makerMarker = L.marker(L.GeoJSON.coordsToLatLng({{ .location }}));
-      icon: blackDotIcon  
-    });
       makerMarker.bindPopup({{ .name }})
       makers.addLayer(makerMarker);
     {{ end }}
   {{ end }}
-
+  
   // Create retailers layer group
   var retailers = L.layerGroup();
   {{ with getJSON "https://kios-admin.lumbung.space/api/retailers"}}
     {{ range .docs }}
-      var retailerMarker = L.marker(L.GeoJSON.coordsToLatLng({{ .location }}), {
+      var retailerMarker = L.marker(L.GeoJSON.coordsToLatLng({{ .location }}));
-        icon: blackDotIcon  
-      });
       retailerMarker.bindPopup({{ .name }})
       retailers.addLayer(retailerMarker);
     {{ end }}
@@ -69,11 +45,11 @@
   {{ with getJSON "https://kios-admin.lumbung.space/api/dispatches"}}
     {{ range .docs }}
       var start = L.GeoJSON.coordsToLatLng({{ .startingPoint.location }});
-      var startMarker = L.marker(start, {icon: blackDotIcon});
+      var startMarker = L.marker(start);
       startMarker.bindPopup({{ .startingPoint.name }});
 
       var end = L.GeoJSON.coordsToLatLng({{ .endPoint.location }});
-      var endMarker = L.marker(end, {icon: blackDotIcon});
+      var endMarker = L.marker(end);
       endMarker.bindPopup({{ .endPoint.name }});
 
       // Add line to display dispatch route
@@ -86,9 +62,9 @@
       productsList.forEach((product, i) => productsString = productsString + product.productTitle + (i + 1 < productsList.length ? ', ' : ""));
 
       route.bindPopup(
-         '<p>Origin: <strong>' + {{ .startingPoint.name }} + '</strong><br />' +
+         '<p>Origin: <strong>' + {{ .startingPoint.name }} + '</strong><br />' + 
-         'Destination: <strong>' + {{ .endPoint.name }} + '</strong><br />' +
+         'Destination: <strong>' + {{ .endPoint.name }} + '</strong><br />' + 
-         'Courier: <strong>' + {{ .courier.name }} + '</strong><br />' +
+         'Courier: <strong>' + {{ .courier.name }} + '</strong><br />' + 
          'Products: <strong>' + productsString + '</strong><br />' +
          'Status: <strong>' + {{ .status }} + '</strong></p>');
 
@@ -99,19 +75,19 @@
   {{ end }}
 
   var map = L.map('map', {
-    center: [-6.1815, 106.8228],
+    center: [0, 0],
-    zoom: 3,
+    zoom: 2,
     layers: [osm, dispatches]
   });
-
+  
   var overlayMaps = {
     "Dispatches": dispatches,
     "Makers": makers,
     "Retailers": retailers
   };
-
+  
   var layerControl = L.control.layers(overlayMaps, null, {collapsed: false, position: "topleft"}).addTo(map);
   window.addEventListener('load', (event) => {
     map.invalidateSize();
   });
-</script>
+</script>

themes/lumbung-theme/static/css/main.css

@@ -86,7 +86,6 @@ a {
 
 .container .single {
     max-width: 65ch;
-    margin: auto;
 }
 
 .card {
@@ -556,11 +555,11 @@ footer.post-footer {
 }
 
 .shout .p-summary.portrait {
-    flex-direction: column; 
+    /* flex-direction: row; */
 }
 
-.shout .p-summary.landscape 
+.shout .p-summary.landscape {
-{    flex-direction: column;
+    flex-direction: column;
 }
 
 .shout .summary-image > img {
@@ -1012,10 +1011,10 @@ label:hover {
     display: flex;
 }
 
-/* leaflet map */
+/* publishers map */
 #map {
     margin-top: 2rem;
-    margin-bottom: 4rem !important;
+    margin-bottom: 4rem;
 
     /* makes map "break out of container" and take full-width */
     width: 100vw !important;
@@ -1943,10 +1942,6 @@ input:checked + label + .description {
     height: auto;
 }
 
-.single header{
-    margin:0;
-}
-
 .single .h-entry figure{
     margin: 0 0 20px;
 }
@@ -1955,27 +1950,6 @@ input:checked + label + .description {
     margin: 0;
 }
 
-.single h1 {
-  padding: 0.5rem;
-  background: #fff;
-  width:100%;
-}
-
-.e-content{
-    padding:1em;
-}
-
-.single .metadata{
-   border: 2px solid #333;
-  font-size: 14px;
-  padding: 0.5rem;
-  align-items: center;
-  background: #e8e8e8;
-  position:relative;
-  width:calc(100% + 2em);
-  right:1em;
-}
-
 /* lumbung radio player widget  */
 .lumbung-radio-player {
     display: flex;