From 8cfc11e73540e35ffd73f68a160f8c57cdca6710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Wed, 6 Mar 2019 09:41:33 +0100
Subject: [PATCH 1/2] CategoryOverpassFilter: copy all properties from <option>

---
 src/CategoryOverpassFilter.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CategoryOverpassFilter.js b/src/CategoryOverpassFilter.js
index 8899e52b..3fda1737 100644
--- a/src/CategoryOverpassFilter.js
+++ b/src/CategoryOverpassFilter.js
@@ -69,13 +69,13 @@ class CategoryOverpassFilter {
             let k = option.value
             f.values[k] = {}
 
+            Array.from(option.attributes).forEach(attr => {
+              f.values[k][attr.name] = attr.value
+            })
+
             if (option.textContent) {
               f.values[k].name = option.textContent
             }
-
-            if (option.hasAttribute('query')) {
-              f.values[k].query = option.getAttribute('query')
-            }
           }
         }
 

From 7213f5d5ec3f5790e8bfb16c2f4da368a66b7b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Wed, 6 Mar 2019 09:42:02 +0100
Subject: [PATCH 2/2] CategoryOverpassFilter: sort filter items by name by
 default

---
 src/CategoryOverpassFilter.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/CategoryOverpassFilter.js b/src/CategoryOverpassFilter.js
index 3fda1737..8c0a039b 100644
--- a/src/CategoryOverpassFilter.js
+++ b/src/CategoryOverpassFilter.js
@@ -1,5 +1,6 @@
 const OverpassLayer = require('overpass-layer')
 const tabs = require('modulekit-tabs')
+const natsort = require('natsort')
 
 const state = require('./state')
 const Filter = require('overpass-frontend').Filter
@@ -100,6 +101,25 @@ class CategoryOverpassFilter {
             }
           }
         }
+
+        if (!('sort' in f) || (f.sort === 'natsort')) {
+          let v = {}
+          let sorter = natsort()
+          let keys = Object.keys(f.values)
+
+          keys
+            .sort((a, b) => {
+              let weight = (f.values[a].weight || 0) - (f.values[b].weight || 0)
+              if (weight !== 0) {
+                return weight
+              }
+
+              return sorter(f.values[a].name, f.values[b].name)
+            })
+            .forEach(k => { v[k] = f.values[k] })
+
+          f.values = v
+        }
       }
     }