improvements

download_data.py

@@ -222,9 +222,12 @@ def main_google_sheets(output_dir: Path, config_files_dir: Path) -> None:
     logger.info(f'Reading rows from Google Sheets. Rows to process: {len(data)}.')
     counter = 0
     for row in data:
-        if all([row['latitude'], row['longitude']]) and row.get('import', 'UNKNOWN') == 'FALSE':
+        if (
+            all([row['latitude'], row['longitude']])
+            and row.get('import', 'UNKNOWN') == 'FALSE'
+        ):
             geojson['features'].append(
-                geojson_point_feature(lat=row['latitude'], lon=row['longitude'], properties={})
+                geojson_point_feature(lat=row['latitude'], lon=row['longitude'], properties={'type': row.get('typ')})
             )
             counter += 1
     logger.info(f'{counter} features to export.')

index.html

@@ -158,7 +158,7 @@
 
               <div class="card-content pt-3 pb-3">
                 <div id="sidebar2-content-div" class="content">
-                    <p>Pobierz dane:</p>
+                    <p>Pobierz dane o AED dodanych do OSM:</p>
                     <a href="./aed_poland.geojson" target="_blank" class="button">
                         <svg style="width:24px;height:24px" viewBox="0 0 24 24">
                             <path fill="currentColor" d="M17.9,17.39C17.64,16.59 16.89,16 16,16H15V13A1,1 0 0,0 14,12H8V10H10A1,1 0 0,0 11,9V7H13A2,2 0 0,0 15,5V4.59C17.93,5.77 20,8.64 20,12C20,14.08 19.2,15.97 17.9,17.39M11,19.93C7.05,19.44 4,16.08 4,12C4,11.38 4.08,10.78 4.21,10.21L9,15V16A2,2 0 0,0 11,18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
@@ -173,7 +173,7 @@
                         </svg> Excel</a>
                     <hr>
                     <p>Warstwy dodatkowe:</p>
-                        <button onclick="toggleCustomLayer()" class="button">Toggle custom layer</button>
+                        <button onclick="toggleCustomLayer()" class="button">Włącz/wyłącz</button> warstwę AED <b>mobilnych</b> zebranych z urzędów, które jeszcze nie zostały dodane
                 </div>
               </div>
 

src/map.js

@@ -177,13 +177,13 @@ map.on('load', () => {
 });
 
 function toggleCustomLayer() {
-    const customLayerId = "custom-layer";
+    const customLayerId = "mobile-aed";
     let layer = map.getLayer(customLayerId);
     if (layer) {
-        console.log("Removing custom layer from map.");
+        console.log("Removing " + customLayerId + " layer from map.");
         map.removeLayer(customLayerId);
     } else {
-        console.log("Adding custom layer to map.");
+        console.log("Adding " + customLayerId + " layer to map.");
         map.addLayer({
             'id': customLayerId,
             'type': 'circle',
@@ -194,7 +194,7 @@ function toggleCustomLayer() {
                 'circle-stroke-color': 'rgba(245, 245, 245, 0.88)',
                 'circle-stroke-width': 3,
             },
-            'filter': ['!', ['has', 'point_count']],
+            'filter': ['==', 'type', 'mobile'],
         });
     }
 }