manual updating from codebase fixes

kauevestena · Oct 15, 2024 · 359aa8d · 359aa8d
1 parent e142ceb
commit 359aa8d
Show file tree

Hide file tree

Showing 63 changed files with 240 additions and 96 deletions.
diff --git a/data/data_updating.html b/data/data_updating.html
@@ -70,7 +70,7 @@ <h1><a href="https://kauevestena.github.io/opensidewalkmap_beta">OSWM</a> Updati
 
         <tr><th><b>Webmap Generation</b></th><th>28/08/2024 07:33:01</th></tr>
 
-        <tr><th><b>Statistical Charts</b></th><th>15/10/2024 07:36:54</th></tr>
+        <tr><th><b>Statistical Charts</b></th><th>15/10/2024 18:20:44</th></tr>
 
         <tr><th><b>Wiki check for keys</b></th><th>14/07/2022 15:14:22</th></tr>
 

diff --git a/data/last_updated.json b/data/last_updated.json
@@ -2,7 +2,7 @@
     "Data Fetching": "15/10/2024 07:34:51",
     "Data Pre-Processing": "11/01/2024 13:41:01",
     "Webmap Generation": "28/08/2024 07:33:01",
-    "Statistical Charts": "15/10/2024 07:36:54",
+    "Statistical Charts": "15/10/2024 18:20:44",
     "Wiki check for keys": "14/07/2022 15:14:22",
     "Data Quality Tool": "15/10/2024 07:36:48",
     "Versioning Data": "22/09/2024 09:46:15",

diff --git a/data/versioning/crossings_versioning.json b/data/versioning/crossings_versioning.json
diff --git a/data/versioning/kerbs_versioning.json b/data/versioning/kerbs_versioning.json
diff --git a/data/versioning/sidewalks_versioning.json b/data/versioning/sidewalks_versioning.json
diff --git a/oswm_codebase b/oswm_codebase
diff --git a/statistics/crossings/crossing_surface.html b/statistics/crossings/crossing_surface.html
@@ -21,6 +21,7 @@
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossing_types.html">Crossing Type</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossing_surface.html">Surface Type</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_smoothness_x_surface.html">Surface x Smoothness</a>
+  <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_length.html">Length (km)</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_age.html">Update Age</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_n_revs.html">Number of Revisions</a>
 </div>
@@ -37,14 +38,14 @@
 
 
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.20.1"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.17.0"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 </head>
 <body>
   <div id="vis"></div>
   <script>
     (function(vegaEmbed) {
-      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-f28e71a278829623535b67c4b9cc13f3"}, "mark": {"type": "bar"}, "encoding": {"color": {"field": "feature count", "type": "quantitative"}, "tooltip": [{"field": "surface type", "type": "nominal"}, {"field": "length(km)", "type": "quantitative"}, {"field": "feature count", "type": "quantitative"}], "x": {"field": "surface type", "sort": "-y", "type": "nominal"}, "y": {"field": "length(km)", "type": "quantitative"}}, "height": 300, "params": [{"name": "include_filter_out_opt", "bind": {"input": "checkbox", "name": "Include \"?\" (Unknown)"}, "value": true}, {"name": "param_8", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Crossings Surface Type", "transform": [{"filter": "include_filter_out_opt || datum['surface type'] != '?'"}], "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.20.1.json", "datasets": {"data-f28e71a278829623535b67c4b9cc13f3": [{"surface type": "?", "feature count": 1428, "length(km)": 16.931007775824543}, {"surface type": "asphalt", "feature count": 477, "length(km)": 5.382137588786362}, {"surface type": "compacted", "feature count": 9, "length(km)": 0.09699884878239012}, {"surface type": "concrete", "feature count": 12, "length(km)": 0.12376068480070912}, {"surface type": "concrete:plates", "feature count": 1, "length(km)": 0.00553937900848931}, {"surface type": "paved", "feature count": 6, "length(km)": 0.06647686712715223}, {"surface type": "paving_stones", "feature count": 22, "length(km)": 0.26225360220055666}, {"surface type": "sett", "feature count": 3, "length(km)": 0.03268074697006189}]}};
+      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-dc8cb63f98ba96682cfcb70874414dba"}, "mark": {"type": "bar"}, "encoding": {"color": {"field": "feature count", "type": "quantitative"}, "tooltip": [{"field": "surface type", "type": "nominal"}, {"field": "length(km)", "type": "quantitative"}, {"field": "feature count", "type": "quantitative"}], "x": {"field": "surface type", "sort": "-y", "type": "nominal"}, "y": {"field": "length(km)", "type": "quantitative"}}, "height": 300, "params": [{"name": "include_filter_out_opt", "bind": {"input": "checkbox", "name": "Include \"?\" (Unknown)"}, "value": true}, {"name": "param_8", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Crossings Surface Type", "transform": [{"filter": "include_filter_out_opt || datum['surface type'] != '?'"}], "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.17.0.json", "datasets": {"data-dc8cb63f98ba96682cfcb70874414dba": [{"surface type": "?", "feature count": 1428, "length(km)": 16.931007775825616}, {"surface type": "asphalt", "feature count": 477, "length(km)": 5.38213758878607}, {"surface type": "compacted", "feature count": 9, "length(km)": 0.09699884878239012}, {"surface type": "concrete", "feature count": 12, "length(km)": 0.12376068480070912}, {"surface type": "concrete:plates", "feature count": 1, "length(km)": 0.00553937900848931}, {"surface type": "paved", "feature count": 6, "length(km)": 0.06647686712715223}, {"surface type": "paving_stones", "feature count": 22, "length(km)": 0.26225360220055666}, {"surface type": "sett", "feature count": 3, "length(km)": 0.03268074697006189}]}};
       var embedOpt = {"mode": "vega-lite"};
 
       function showError(el, error){

diff --git a/statistics/crossings/crossing_types.html b/statistics/crossings/crossing_types.html
@@ -21,6 +21,7 @@
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossing_types.html">Crossing Type</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossing_surface.html">Surface Type</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_smoothness_x_surface.html">Surface x Smoothness</a>
+  <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_length.html">Length (km)</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_age.html">Update Age</a>
   <a href="https://kauevestena.github.io/opensidewalkmap_beta/statistics/crossings/crossings_n_revs.html">Number of Revisions</a>
 </div>
@@ -37,14 +38,14 @@
 
 
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.20.1"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.17.0"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 </head>
 <body>
   <div id="vis"></div>
   <script>
     (function(vegaEmbed) {
-      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-21614de90c2422f47f062765da9b9998"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "crossing", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_7", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Crossing Type", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.20.1.json", "datasets": {"data-21614de90c2422f47f062765da9b9998": [{"crossing": "?", "count": 998, "percent": "50.97%"}, {"crossing": "unmarked", "count": 688, "percent": "35.14%"}, {"crossing": "marked", "count": 108, "percent": "5.52%"}, {"crossing": "traffic_signals", "count": 83, "percent": "4.24%"}, {"crossing": "uncontrolled", "count": 69, "percent": "3.52%"}, {"crossing": "zebra", "count": 12, "percent": "0.61%"}]}};
+      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-21614de90c2422f47f062765da9b9998"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "crossing", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_7", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Crossing Type", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.17.0.json", "datasets": {"data-21614de90c2422f47f062765da9b9998": [{"crossing": "?", "count": 998, "percent": "50.97%"}, {"crossing": "unmarked", "count": 688, "percent": "35.14%"}, {"crossing": "marked", "count": 108, "percent": "5.52%"}, {"crossing": "traffic_signals", "count": 83, "percent": "4.24%"}, {"crossing": "uncontrolled", "count": 69, "percent": "3.52%"}, {"crossing": "zebra", "count": 12, "percent": "0.61%"}]}};
       var embedOpt = {"mode": "vega-lite"};
 
       function showError(el, error){

diff --git a/statistics/crossings/crossings_age.html b/statistics/crossings/crossings_age.html
diff --git a/statistics/crossings/crossings_length.html b/statistics/crossings/crossings_length.html
diff --git a/statistics/crossings/crossings_n_revs.html b/statistics/crossings/crossings_n_revs.html
diff --git a/statistics/crossings/crossings_smoothness_x_surface.html b/statistics/crossings/crossings_smoothness_x_surface.html
diff --git a/statistics/index.html b/statistics/index.html
diff --git a/statistics/kerbs/kerb_tactile_paving.html b/statistics/kerbs/kerb_tactile_paving.html
@@ -39,14 +39,14 @@
 
 
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.20.1"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.17.0"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 </head>
 <body>
   <div id="vis"></div>
   <script>
     (function(vegaEmbed) {
-      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-f40e0dd127e032afd38c9e979c31fa43"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "tactile_paving", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_12", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Tactile Paving Presence", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.20.1.json", "datasets": {"data-f40e0dd127e032afd38c9e979c31fa43": [{"tactile_paving": "?", "count": 2491, "percent": "90.88%"}, {"tactile_paving": "no", "count": 213, "percent": "7.77%"}, {"tactile_paving": "yes", "count": 25, "percent": "0.91%"}, {"tactile_paving": "contrasted", "count": 11, "percent": "0.4%"}, {"tactile_paving": "bad", "count": 1, "percent": "0.04%"}]}};
+      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-f40e0dd127e032afd38c9e979c31fa43"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "tactile_paving", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_12", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Tactile Paving Presence", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.17.0.json", "datasets": {"data-f40e0dd127e032afd38c9e979c31fa43": [{"tactile_paving": "?", "count": 2491, "percent": "90.88%"}, {"tactile_paving": "no", "count": 213, "percent": "7.77%"}, {"tactile_paving": "yes", "count": 25, "percent": "0.91%"}, {"tactile_paving": "contrasted", "count": 11, "percent": "0.4%"}, {"tactile_paving": "bad", "count": 1, "percent": "0.04%"}]}};
       var embedOpt = {"mode": "vega-lite"};
 
       function showError(el, error){

diff --git a/statistics/kerbs/kerb_types.html b/statistics/kerbs/kerb_types.html
@@ -39,14 +39,14 @@
 
 
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.20.1"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.17.0"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 </head>
 <body>
   <div id="vis"></div>
   <script>
     (function(vegaEmbed) {
-      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-78868622dc5bb6e0b0fd4a915cce9fe8"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "kerb", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_11", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Type", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.20.1.json", "datasets": {"data-78868622dc5bb6e0b0fd4a915cce9fe8": [{"kerb": "?", "count": 1765, "percent": "64.39%"}, {"kerb": "lowered", "count": 488, "percent": "17.8%"}, {"kerb": "raised", "count": 295, "percent": "10.76%"}, {"kerb": "flush", "count": 93, "percent": "3.39%"}, {"kerb": "no", "count": 78, "percent": "2.85%"}, {"kerb": "rolled", "count": 10, "percent": "0.36%"}, {"kerb": "regular", "count": 9, "percent": "0.33%"}, {"kerb": "normal", "count": 2, "percent": "0.07%"}, {"kerb": "lowered=no", "count": 1, "percent": "0.04%"}]}};
+      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-78868622dc5bb6e0b0fd4a915cce9fe8"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "kerb", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_11", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Type", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.17.0.json", "datasets": {"data-78868622dc5bb6e0b0fd4a915cce9fe8": [{"kerb": "?", "count": 1765, "percent": "64.39%"}, {"kerb": "lowered", "count": 488, "percent": "17.8%"}, {"kerb": "raised", "count": 295, "percent": "10.76%"}, {"kerb": "flush", "count": 93, "percent": "3.39%"}, {"kerb": "no", "count": 78, "percent": "2.85%"}, {"kerb": "rolled", "count": 10, "percent": "0.36%"}, {"kerb": "regular", "count": 9, "percent": "0.33%"}, {"kerb": "normal", "count": 2, "percent": "0.07%"}, {"kerb": "lowered=no", "count": 1, "percent": "0.04%"}]}};
       var embedOpt = {"mode": "vega-lite"};
 
       function showError(el, error){

diff --git a/statistics/kerbs/kerb_wheelchair_access.html b/statistics/kerbs/kerb_wheelchair_access.html
@@ -39,14 +39,14 @@
 
 
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.20.1"></script>
+  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-lite@5.17.0"></script>
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 </head>
 <body>
   <div id="vis"></div>
   <script>
     (function(vegaEmbed) {
-      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-eaabbb6056f82cf3abed0da886b31bca"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "wheelchair", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_13", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Wheelchair Acessibility", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.20.1.json", "datasets": {"data-eaabbb6056f82cf3abed0da886b31bca": [{"wheelchair": "?", "count": 2417, "percent": "88.18%"}, {"wheelchair": "no", "count": 171, "percent": "6.24%"}, {"wheelchair": "yes", "count": 119, "percent": "4.34%"}, {"wheelchair": "limited", "count": 34, "percent": "1.24%"}]}};
+      var spec = {"config": {"view": {"continuousWidth": 300, "continuousHeight": 300}, "title": {"fontSize": 24}}, "data": {"name": "data-eaabbb6056f82cf3abed0da886b31bca"}, "mark": {"type": "bar"}, "encoding": {"tooltip": [{"field": "percent", "type": "nominal"}], "x": {"field": "wheelchair", "sort": "-y", "type": "nominal"}, "y": {"field": "count", "type": "quantitative"}}, "height": 300, "params": [{"name": "param_13", "select": {"type": "interval", "encodings": ["x", "y"]}, "bind": "scales"}], "title": "Kerb Wheelchair Acessibility", "width": 650, "$schema": "https://vega.github.io/schema/vega-lite/v5.17.0.json", "datasets": {"data-eaabbb6056f82cf3abed0da886b31bca": [{"wheelchair": "?", "count": 2417, "percent": "88.18%"}, {"wheelchair": "no", "count": 171, "percent": "6.24%"}, {"wheelchair": "yes", "count": 119, "percent": "4.34%"}, {"wheelchair": "limited", "count": 34, "percent": "1.24%"}]}};
       var embedOpt = {"mode": "vega-lite"};
 
       function showError(el, error){

diff --git a/statistics/kerbs/kerbs_age.html b/statistics/kerbs/kerbs_age.html
diff --git a/statistics/kerbs/kerbs_n_revs.html b/statistics/kerbs/kerbs_n_revs.html
+46 −27		dashboard/statistics_funcs.py
+40 −35		dashboard/statistics_specs.py
+0 −95		functions.py
+1 −1		getting_feature_versioning_data.py
+103 −0		versioning_funcs.py