Reverting retrieve_map_data.py, added some misecellaneous fixes and support for pre-selected layers

Author: SpaceCowboy326

map_data.json

@@ -23,28 +23,75 @@
     'quilting-quilds': 'quilting-guilds'
 }
 
-def retrieve_json_blob(url):
-    map_category_page = requests.get(url)
-    return json.loads(map_category_page.text) 
-
-def pull_geojson_from_json(blob):
-    for category in blob:
-        if 'field_geojson_link' in category.keys():
-            print(category['field_geojson_link'])
-            internal_url = category['field_geojson_link'][0]['uri'].replace('internal:','')
-            geojson_url = BASE_URL + internal_url
-            print(geojson_url)
-            geojson_page = requests.get(geojson_url)
-            if (geojson_page.status_code == 200 and geojson_page.text is not None):
-                print(geojson_page.text)
-
-#map_layer_url = BASE_URL + '/map-layers'
-#map_categories = web(1, map_layer_url)
-#print(json.dumps(map_categories))
-
-json_blob_url = "https://data.openupstate.org/rest/maps?_format=json"
-map_data = retrieve_json_blob(json_blob_url)
-pull_geojson_from_json(map_data)
+#Retrieve a single map category url
+def retrieve_map_category_url(url):
+    map_category_url = BASE_URL + url
+    map_category_page = requests.get(map_category_url)
+    #Don't spam the server
+    plain = map_category_page.text
+    s = BeautifulSoup(plain, "html.parser")
+    geojson_link_anchor_list = s.select(".field--name-field-geojson-link a")
+    geojson_link_anchor = ""
+    if (geojson_link_anchor_list):
+        geojson_link_anchor = geojson_link_anchor_list[0]
+    return geojson_link_anchor.text
+
+#Retrieve a single map category url
+def retrieve_map_category_geojson_data(url):
+    full_url = BASE_URL + url
+    geojson_page = requests.get(full_url)
+    geojson_data = ""
+    if (geojson_page.status_code == 200 and geojson_page.text is not None):
+        geojson_data = json.loads(geojson_page.text)
+    return geojson_data
+
+
+def web(page,WebUrl):
+    href_list = []
+    if(page>0):
+        url = WebUrl
+        code = requests.get(url)
+        plain = code.text
+        s = BeautifulSoup(plain, "html.parser")
+        #only_a_tags = SoupStrainer(".field-content a")
+        count_entries = 0
+        for link in s.select(".field-content a"):
+        #for link in only_a_tags:
+        #for link in only_a_tags.a:
+            href = link.get('href')
+            
+            if MAP_URL_DIRECTORY in href:
+                category = href.split(MAP_URL_DIRECTORY)[1]
+                #url_category = geojson_url_exceptions[category] or category;
+                
+                url_category = ''
+                if category in geojson_url_exceptions:
+                    url_category = geojson_url_exceptions[category]
+                else:
+                    url_category = category
+
+                map_entry = {
+                    'href': href,
+                    'geojson_url': "/map/geojson/" + url_category,
+                    'name': link.get_text(),
+                    'category': category,
+                }
+                map_entry["geojson_data"] = retrieve_map_category_geojson_data(map_entry["geojson_url"])
+
+                #skip for now
+                #map_entry['map_spreadsheet_url'] = retrieve_map_category_url(href)
+                #print(map_entry)
+                if (map_entry["geojson_data"]):
+                    href_list.append(map_entry)
+
+                count_entries += 1
+                #if (count_entries > 10):
+                #    break
+        return href_list
+
+map_layer_url = BASE_URL + '/map-layers'
+map_categories = web(1, map_layer_url)
+print(json.dumps(map_categories))
 
 #Retrieve map category URL
 def retrieve_map_category_urls(url):
@@ -56,4 +103,7 @@ def retrieve_map_category_urls(url):
         time.sleep(5)
         map_category_page = requests.get(map_category_url)
         geojson_link_anchor = s.select(".field--name-field-geojson-link a")
-        geojson_link_anchor.text
+        geojson_link_anchor.text
+
+
+

retrieve_open_map_data.py

@@ -10,20 +10,11 @@
             <div class="open-data--utility-control open-data--utility-control__add" v-on:click="updateMapLocations()">Update locations</div>
             <div class="open-data--utility-control open-data--utility-control__remove" v-on:click="removeAllMapLayers()">Remove locations</div>
             <div class="clearfix"></div>
-            <div class="open-data--utility-control-toggle" id="utility_control_panel_toggle"><div class="open-data--utility-control-toggle-arrow" v-on:click="toggleUtilityControls()">Toggle Controls</div>
+            <div class="open-data--utility-control-toggle" id="utility_control_panel_toggle"><div class="open-data--utility-control-toggle-arrow" v-on:click="toggleUtilityControls()">Toggle Controls</div></div>
         </div>
-
-    </div>
-    <!--<div class="open-data--utility-control-toggle"><div class="open-data--utility-control-toggle-arrow" v-on:click="toggleUtilityControls()">V</div></div>-->
-
-        <!--<img src="../../public/arrows.svg"/>
-        <svg id="more-arrows" viewBox="0 0 75 65">
-            <polygon class="arrow-top" points="37.6,27.9 1.8,1.3 3.3,0 37.6,25.3 71.9,0 73.7,1.3 "/>
-            <polygon class="arrow-middle" points="37.6,45.8 0.8,18.7 4.4,16.4 37.6,41.2 71.2,16.4 74.5,18.7 "/>
-            <polygon class="arrow-bottom" points="37.6,64 0,36.1 5.1,32.8 37.6,56.8 70.4,32.8 75.5,36.1 "/>
-        </svg>-->
+        <!--<div class="open-data--utility-control-toggle"><div class="open-data--utility-control-toggle-arrow" v-on:click="toggleUtilityControls()">V</div></div>-->
     </div>
-    <div class="open-data--map-data--category-container">
+    <div class="open-data--map-data--category-container" v-if="!map_only">
         <div class="open-data--selected-items">
             <div class="open-data--selected-item" v-bind:style="selected_map_category.item_styles || {}" v-on:click="toggleMapLayer(selected_map_category)" v-bind:key="selected_map_category.id" v-for="(selected_map_category, index) in selectedGeoJsonData">
                 {{selected_map_category.name}}
@@ -32,7 +23,7 @@
         <input type="textbox" class="open-data--map-data--filter-input" v-model="filterTerm" v-on:keyup="filterMapCategories()" placeholder="Filter selection here..." id="map_data_filter_input"/>
         <div class="open-data--list-container">
             <ul class="open-data--map-data--list">
-                <li class="open-data--map-data--item" v-on:click="toggleMapLayer(map_category)" v-bind:style="map_category.item_styles" v-bind:key="map_category.name" v-for="(map_category, index) in filteredGeoJsonData">
+                <li class="open-data--map-data--item" v-on:mouseover="highlightMapCategory(map_category)" v-on:click="toggleMapLayer(map_category)" v-bind:style="map_category.item_styles" v-bind:key="map_category.name" v-for="(map_category, index) in filteredGeoJsonData">
                     <span class="open-data--name">{{map_category.name}}</span>
                     <div class="open-data--controls">
                         <input id="remove_map_layer" type="checkbox" v-if="hasMapLayer(map_category)">
@@ -54,7 +45,8 @@
         map_category.item_styles = {};
     });
 
-window.map_json = map_json;
+    //TODO: stop using globals globals.
+    window.map_json = map_json;
 
     function generateRandomHexColor() {
         return '#' + ("000000" + Math.random().toString(16).slice(2, 8).toUpperCase()).slice(-6);
@@ -79,9 +71,13 @@ window.map_json = map_json;
                 filteredGeoJsonData: map_json,
                 selectedGeoJsonData: {},
                 filterTerm: "",
+                hoveredMapCategory: null,
             }
         },
         methods: {
+            highlightMapCategory: function () {
+
+            },
             updateMapLocations: function () {
                 let L = window.L;
                 let map = window.my_map;
@@ -92,7 +88,7 @@ window.map_json = map_json;
                 if (map && L) {
                     this.geoJsonData.forEach(function(map_category, index) {
                         if (map_category.geojson_data.type !== "FeatureCollection") {
-                            console.log("diff type", map_category)
+                            //console.log("diff type", map_category)
                         }
                         map_data.addMapLayer(map_category);
                     });
@@ -110,6 +106,10 @@ window.map_json = map_json;
                 }
             },
             fetchMapData: function () {
+                /*
+                TODO: If we want to use opendata site, resolve COORS issues. If data is stored in a database, we can just hit our own
+                API here.
+
                 var xmlhttp = new XMLHttpRequest();
 
                 xmlhttp.onreadystatechange = function() {
@@ -125,10 +125,10 @@ window.map_json = map_json;
                     }
                     }
                 };
-
+    
                 xmlhttp.open("GET", "https://data.openupstate.org/rest/maps?_format=json", true);
                 xmlhttp.send();
-    /*
+
                 let map_data_promise = fetch("https://data.openupstate.org/rest/maps?_format=json").then(function(data){
                     console.log("fetch data", data);
                 });
@@ -159,6 +159,7 @@ window.map_json = map_json;
                 let geo_json = map_category.geojson_data;
                 let map = window.my_map;
                 let L = window.L;
+
                 if (map_category.layer && !map.hasLayer(map_category)) {
                     let marker_color = this.setMapCategoryColor(map_category, map_category.marker_color);
                     map.addLayer(map_category.layer);
@@ -242,13 +243,13 @@ window.map_json = map_json;
                 }
             },
             addPreSelectedMaps: function(map_selections) {
+                let map_data = this;
                 console.log("MAP SELECTIONS", map_selections);
                 this.geoJsonData.forEach(function(map_category, index) {
-                    if (map_category.category.type !== "FeatureCollection") {
-                     console.log("diff type", map_category);
+                    if (map_selections.includes(map_category.category)) {
+                        map_data.addMapLayer(map_category);
                     }
                 });
-                map_data.addMapLayer(map_category);
             },
             toggleUtilityControls: function () {
                 let control_panel = document.getElementById("utility_control_panel");
@@ -290,6 +291,7 @@ control_panel_toggle.style.display = "none";
     .open-data--control-label {
         font-size:10px;
     }
+
     .open-data--map-data--item {
         background-color: white;
         border: 0.5px solid gray;
@@ -458,8 +460,11 @@ control_panel_toggle.style.display = "none";
     }
 
 .open-data--map-marker {
-    fill-opacity: .3px;
     transition: all 2s ease-out;
+
+    &:hover {
+        
+    }
 }
 
 

src/components/MapData.vue

@@ -23,8 +23,8 @@ export default new Router({
       name: 'about',
       component: MapData,
       props: (route) => ({ 
-        preselected_maps: route.query.preselected_maps,
-        map_only: route.query.map_only
+        preselected_maps: route.query.preselected_maps ? route.query.preselected_maps.split(',') : [],
+        map_only: !!route.query.map_only
       })
     },
   ]